Commit cd23852e2699492dc1059f6d962c7c3ffc605336
1 parent
c0c6fff0
关卡怪物表和怪物波次表合并
Showing
3 changed files
with
29 additions
and
21 deletions
Show diff stats
Datas/pro2d/CarbonMonster.xlsx
No preview for this file type
No preview for this file type
Defines/pro2d.xml
| ... | ... | @@ -105,21 +105,6 @@ |
| 105 | 105 | <var name="Image" type="string"/> |
| 106 | 106 | </bean> |
| 107 | 107 | |
| 108 | - <bean name="MonsterWave"> | |
| 109 | - <var name="id" type="int"/> | |
| 110 | - <var name="name" type="string"/> | |
| 111 | - <var name="startWait" type="float"/> | |
| 112 | - <var name="completeWait" type="float"/> | |
| 113 | - <var name="monsterBorn" type="map,int,MonsterBorn"/> | |
| 114 | - </bean> | |
| 115 | - | |
| 116 | - <bean name="MonsterBorn"> | |
| 117 | - <var name="enemyID" type="string"/> | |
| 118 | - <var name="count" type="int"/> | |
| 119 | - <var name="bornId" type="int"/> | |
| 120 | - <var name="delay" type="float"/> | |
| 121 | - </bean> | |
| 122 | - | |
| 123 | 108 | <bean name="Skill"> |
| 124 | 109 | <var name="id" type="int"/> |
| 125 | 110 | <var name="imageUrl" type="string"/> |
| ... | ... | @@ -526,15 +511,38 @@ |
| 526 | 511 | <var name="skillOrders" type="list,SkillOrder"/> |
| 527 | 512 | </bean> |
| 528 | 513 | |
| 529 | - <bean name="mainCarbonWave"> | |
| 530 | - <var name="WaveId" type="string"/> | |
| 531 | - <var name="mapId" type="string"/> | |
| 532 | - </bean> | |
| 533 | - | |
| 534 | 514 | <bean name="CarbonMonster"> |
| 535 | 515 | <var name="carbonId" type="int"/> |
| 536 | 516 | <var name="carbonMonsterLevel" type="int"/> |
| 537 | - <var name="mainCarbonWaves" type="map,int,mainCarbonWave"/> | |
| 517 | + <var name="mainCarbonWaves" type="list,mainCarbonWaves"/> | |
| 518 | + </bean> | |
| 519 | + | |
| 520 | + <bean name="mainCarbonWaves"> | |
| 521 | + <var name="key" type="int"/> | |
| 522 | + <var name="mapId" type="string"/> | |
| 523 | + <var name="mainMonsterWave" type="list,mainMonsterWave"/> | |
| 524 | + </bean> | |
| 525 | + | |
| 526 | + <bean name="mainMonsterWave"> | |
| 527 | + <var name="name" type="string"/> | |
| 528 | + <var name="startWait" type="float"/> | |
| 529 | + <var name="completeWait" type="float"/> | |
| 530 | + <var name="monsterBorn" type="list,MonsterBorn"/> | |
| 531 | + </bean> | |
| 532 | + | |
| 533 | + <bean name="MonsterBorn"> | |
| 534 | + <var name="enemyID" type="string"/> | |
| 535 | + <var name="count" type="int"/> | |
| 536 | + <var name="bornId" type="int"/> | |
| 537 | + <var name="delay" type="float"/> | |
| 538 | + </bean> | |
| 539 | + | |
| 540 | + <bean name="MonsterWave"> | |
| 541 | + <var name="id" type="int"/> | |
| 542 | + <var name="name" type="string"/> | |
| 543 | + <var name="startWait" type="float"/> | |
| 544 | + <var name="completeWait" type="float"/> | |
| 545 | + <var name="monsterBorn" type="map,int,MonsterBorn"/> | |
| 538 | 546 | </bean> |
| 539 | 547 | |
| 540 | 548 | <bean name="mainCarbon"> | ... | ... |