Merge branch 'master' of 120.26.43.151:loujiachen/DesignerConfigs

zhanghualin
2 parents 6879a3ac 59dac284
Showing 6 changed files with 2 additions and 0 deletions Show diff stats
Datas/pro2d/HeroToSkill.xlsx
Datas/pro2d/MainChapter.xlsx
Datas/pro2d/RogueMonsterCard.xlsx
Datas/pro2d/SkillConfig.xlsx
Datas/pro2d/hero.xlsx
Defines/pro2d.xml
@@ -37,6 +37,7 @@
 	    <var name="passiveSkillId2" type="int"/>
 	    <var name="passiveSkillId3" type="int"/>
 	    <var name="perfabName" type="string"/>
+		<var name="iconUrl" type="string"/>
 	    <var name="attackLv" type="int"/>
 	    <var name="group" type="int"/>
 	    <var name="occupation" type="int"/>
@@ -257,6 +258,7 @@
 		<var name="bonusCondition_3" type="string"/>
 		<var name="bonusAward_3" type="string"/>
 		<var name="recommendPower" type="int"/>
+		<var name="showCarbonEnemy" type="string"/>
     </bean>
  
 	<bean name="MainChapter">