Commit 7f788e9f0d0a18fafcaae74ef29372f7cb4a6d6b

Authored by zhanghualin
2 parents 6879a3ac 59dac284

Merge branch 'master' of 120.26.43.151:loujiachen/DesignerConfigs

Datas/pro2d/HeroToSkill.xlsx
No preview for this file type
Datas/pro2d/MainChapter.xlsx
No preview for this file type
Datas/pro2d/RogueMonsterCard.xlsx
No preview for this file type
Datas/pro2d/SkillConfig.xlsx
No preview for this file type
Datas/pro2d/hero.xlsx
No preview for this file type
@@ -37,6 +37,7 @@ @@ -37,6 +37,7 @@
37 <var name="passiveSkillId2" type="int"/> 37 <var name="passiveSkillId2" type="int"/>
38 <var name="passiveSkillId3" type="int"/> 38 <var name="passiveSkillId3" type="int"/>
39 <var name="perfabName" type="string"/> 39 <var name="perfabName" type="string"/>
  40 + <var name="iconUrl" type="string"/>
40 <var name="attackLv" type="int"/> 41 <var name="attackLv" type="int"/>
41 <var name="group" type="int"/> 42 <var name="group" type="int"/>
42 <var name="occupation" type="int"/> 43 <var name="occupation" type="int"/>
@@ -257,6 +258,7 @@ @@ -257,6 +258,7 @@
257 <var name="bonusCondition_3" type="string"/> 258 <var name="bonusCondition_3" type="string"/>
258 <var name="bonusAward_3" type="string"/> 259 <var name="bonusAward_3" type="string"/>
259 <var name="recommendPower" type="int"/> 260 <var name="recommendPower" type="int"/>
  261 + <var name="showCarbonEnemy" type="string"/>
260 </bean> 262 </bean>
261 263
262 <bean name="MainChapter"> 264 <bean name="MainChapter">