Compare View
Commits (2)
Showing
4 changed files
Show diff stats
Datas/pro2d/CarbonMonster.xlsx
No preview for this file type
No preview for this file type
Datas/pro2d/RogueChapter.xlsx
No preview for this file type
Defines/pro2d.xml
@@ -214,7 +214,7 @@ | @@ -214,7 +214,7 @@ | ||
214 | <var name="PassiveSkillId" type="list,int"/> | 214 | <var name="PassiveSkillId" type="list,int"/> |
215 | </bean> | 215 | </bean> |
216 | 216 | ||
217 | - <bean name = "mainCarbon"> | 217 | + <bean name = "mainCarbonWave"> |
218 | <var name="enemyid" type="int"/> | 218 | <var name="enemyid" type="int"/> |
219 | <var name="count" type="int"/> | 219 | <var name="count" type="int"/> |
220 | <var name="time" type="float"/> | 220 | <var name="time" type="float"/> |
@@ -226,11 +226,31 @@ | @@ -226,11 +226,31 @@ | ||
226 | 226 | ||
227 | <bean name="CarbonMonster"> | 227 | <bean name="CarbonMonster"> |
228 | <var name="carbonId" type="int"/> | 228 | <var name="carbonId" type="int"/> |
229 | - <var name="carbonName" type="string"/> | ||
230 | <var name="mapName" type="string"/> | 229 | <var name="mapName" type="string"/> |
231 | - <var name="mainCarbons" type="map,int,mainCarbon"/> | 230 | + <var name="mainCarbonWaves" type="map,int,mainCarbonWave"/> |
232 | </bean> | 231 | </bean> |
233 | 232 | ||
233 | + <bean name="mainCarbon"> | ||
234 | + <var name="carbonName" type="string"/> | ||
235 | + <var name="firstAward" type="string"/> | ||
236 | + <var name="normalAward" type="string"/> | ||
237 | + <var name="carbonExp" type="int"/> | ||
238 | + <var name="carbonFailExp" type="int"/> | ||
239 | + <var name="spCost" type="int"/> | ||
240 | + <var name="bonusCondition_1" type="string"/> | ||
241 | + <var name="bonusAward_1" type="string"/> | ||
242 | + <var name="bonusCondition_2" type="string"/> | ||
243 | + <var name="bonusAward_2" type="string"/> | ||
244 | + <var name="bonusCondition_3" type="string"/> | ||
245 | + <var name="bonusAward_3" type="string"/> | ||
246 | + <var name="recommendPower" type="int"/> | ||
247 | + </bean> | ||
248 | + | ||
249 | + <bean name="MainChapter"> | ||
250 | + <var name="chapterId" type="int"/> | ||
251 | + <var name="mainCarbons" type="map,int,mainCarbon"/> | ||
252 | + </bean> | ||
253 | + | ||
234 | <table name="TbHero" value="Hero" input="pro2d/hero.xlsx"/> | 254 | <table name="TbHero" value="Hero" input="pro2d/hero.xlsx"/> |
235 | <table name="TbMonsterWave" value="MonsterWave" input="pro2d/MonsterWave.xlsx"/> | 255 | <table name="TbMonsterWave" value="MonsterWave" input="pro2d/MonsterWave.xlsx"/> |
236 | <table name="TbSkill" value="Skill" input="pro2d/Skill.xlsx"/> | 256 | <table name="TbSkill" value="Skill" input="pro2d/Skill.xlsx"/> |
@@ -239,6 +259,7 @@ | @@ -239,6 +259,7 @@ | ||
239 | <table name="TbRogueMonsterCard" value="RogueMonsterCard" input="pro2d/RogueMonsterCard.xlsx"/> | 259 | <table name="TbRogueMonsterCard" value="RogueMonsterCard" input="pro2d/RogueMonsterCard.xlsx"/> |
240 | <table name="TbRogueMonster" value="RogueMonster" input="pro2d/RogueMonster.xlsx"/> | 260 | <table name="TbRogueMonster" value="RogueMonster" input="pro2d/RogueMonster.xlsx"/> |
241 | 261 | ||
262 | + <table name="TbMainChapter" value="MainChapter" input="pro2d/MainChapter.xlsx"/> | ||
242 | <table name="TbCarbonMonster" value="CarbonMonster" input="pro2d/CarbonMonster.xlsx"/> | 263 | <table name="TbCarbonMonster" value="CarbonMonster" input="pro2d/CarbonMonster.xlsx"/> |
243 | 264 | ||
244 | <table name="TbEquipmentData" value="EquipmentData" input="pro2d/EquipmentData.xlsx"/> | 265 | <table name="TbEquipmentData" value="EquipmentData" input="pro2d/EquipmentData.xlsx"/> |