Commit 3d7a85e12e5585cc235f659b6693e82f21f71b03

Authored by xumiaojie
2 parents dae4b9e2 410cd939

Merge branch 'master' of 120.26.43.151:loujiachen/DesignerConfigs

Datas/pro2d/CarbonMonster.xlsx
No preview for this file type
Datas/pro2d/CatSurvivorMonster.xlsx
No preview for this file type
Datas/pro2d/MainChapter.xlsx
No preview for this file type
@@ -856,6 +856,7 @@ @@ -856,6 +856,7 @@
856 856
857 <bean name="mainCarbon"> 857 <bean name="mainCarbon">
858 <var name="carbonName" type="string"/> 858 <var name="carbonName" type="string"/>
  859 + <var name="limitLv" type="int"/>
859 <var name="firstAward" type="string"/> 860 <var name="firstAward" type="string"/>
860 <var name="normalAward" type="int"/> 861 <var name="normalAward" type="int"/>
861 <var name="favorExp" type="int"/> 862 <var name="favorExp" type="int"/>