loujiachen / DesignerConfigs

Commit e47f02ef4848f68fd8fbc34d0674768725ed5af1

Authored by yangjiyue
2 parents b274ce1e f6927f0f

Merge branch 'master' of 120.26.43.151:loujiachen/DesignerConfigs 

# Conflicts:
#	Defines/pro2d.xml
Showing 3 changed files with 22 additions and 2 deletions   Show diff stats
Inline Side-by-side
Datas/pro2d/AccountLevelExp.xlsx 0 → 100644
View file @e47f02e
No preview for this file type
Datas/pro2d/RogueChapter.xlsx
View file @e47f02e
No preview for this file type
@@ -72,8 +72,18 @@ @@ -72,8 +72,18 @@
72 <var name="id" type="int"/> 72 <var name="id" type="int"/>
73 <var name="carbonName" type="string"/> 73 <var name="carbonName" type="string"/>
74 <var name="carbonMonster" type="string"/> 74 <var name="carbonMonster" type="string"/>
75 - <var name="gift" type="string"/> 75 + <var name="firstAward" type="string"/>
76 <var name="progressSum" type="int"/> 76 <var name="progressSum" type="int"/>
  77 + <var name="carbonExp" type="int"/>
  78 + <var name="carbonFailExp" type="int"/>
  79 + <var name="spCost" type="int"/>
  80 + <var name="bonusCondition_1" type="string"/>
  81 + <var name="bonusAward_1" type="string"/>
  82 + <var name="bonusCondition_2" type="string"/>
  83 + <var name="bonusAward_2" type="string"/>
  84 + <var name="bonusCondition_3" type="string"/>
  85 + <var name="bonusAward_3" type="string"/>
  86 + <var name="recommendPower" type="int"/>
77 </bean> 87 </bean>
78 88
79 <bean name="RogueChapter"> 89 <bean name="RogueChapter">
@@ -101,7 +111,7 @@ @@ -101,7 +111,7 @@
101 <var name="carbonId" type="int"/> 111 <var name="carbonId" type="int"/>
102 <var name="waves" type="list,Wave"/> 112 <var name="waves" type="list,Wave"/>
103 </bean> 113 </bean>
104 - 114 +
105 <bean name="EquipmentData"> 115 <bean name="EquipmentData">
106 <var name="EquipID" type="int"/> 116 <var name="EquipID" type="int"/>
107 <var name="EquipName" type="string"/> 117 <var name="EquipName" type="string"/>
@@ -151,12 +161,22 @@ @@ -151,12 +161,22 @@
151 <var name="Texture" type="string"/> 161 <var name="Texture" type="string"/>
152 </bean> 162 </bean>
153 163
  164 + <bean name="AccountLevelExp">
  165 + <var name="level" type="int"/>
  166 + <var name="needExp" type="int"/>
  167 + </bean>
  168 +
  169 +
154 <table name="TbHero" value="Hero" input="pro2d/hero.xlsx"/> 170 <table name="TbHero" value="Hero" input="pro2d/hero.xlsx"/>
155 <table name="TbMonsterWave" value="MonsterWave" input="pro2d/MonsterWave.xlsx"/> 171 <table name="TbMonsterWave" value="MonsterWave" input="pro2d/MonsterWave.xlsx"/>
156 <table name="TbSkill" value="Skill" input="pro2d/Skill.xlsx"/> 172 <table name="TbSkill" value="Skill" input="pro2d/Skill.xlsx"/>
157 <table name="TbRogueChapter" value="RogueChapter" input="pro2d/RogueChapter.xlsx"/> 173 <table name="TbRogueChapter" value="RogueChapter" input="pro2d/RogueChapter.xlsx"/>
158 <table name="TbRogueMonsterCard" value="RogueMonsterCard" input="pro2d/RogueMonsterCard.xlsx"/> 174 <table name="TbRogueMonsterCard" value="RogueMonsterCard" input="pro2d/RogueMonsterCard.xlsx"/>
159 <table name="TbRogueMonster" value="RogueMonster" input="pro2d/RogueMonster.xlsx"/> 175 <table name="TbRogueMonster" value="RogueMonster" input="pro2d/RogueMonster.xlsx"/>
  176 +
160 <table name="TbEquipmentData" value="EquipmentData" input="pro2d/EquipmentData.xlsx"/> 177 <table name="TbEquipmentData" value="EquipmentData" input="pro2d/EquipmentData.xlsx"/>
161 <table name="TbItemData" value="ItemData" input="pro2d/ItemData.xlsx"/> 178 <table name="TbItemData" value="ItemData" input="pro2d/ItemData.xlsx"/>
  179 +
  180 + <table name="TbAccountLevelExp" value="AccountLevelExp" input="pro2d/AccountLevelExp.xlsx"/>
  181 +
162 </module> 182 </module>
163 \ No newline at end of file 183 \ No newline at end of file