Commit 6cd2b018735160e19637821f708f777d4d1ea4dd
Merge branch 'master' of 120.26.43.151:loujiachen/DesignerConfigs
Showing
3 changed files
with
48 additions
and
23 deletions
Show diff stats
Datas/common/UnityScene.xlsx
No preview for this file type
No preview for this file type
Defines/pro2d.xml
| @@ -200,6 +200,53 @@ | @@ -200,6 +200,53 @@ | ||
| 200 | <var name="mainCarbonWaves" type="list,mainCarbonWaves"/> | 200 | <var name="mainCarbonWaves" type="list,mainCarbonWaves"/> |
| 201 | </bean> | 201 | </bean> |
| 202 | 202 | ||
| 203 | + <bean name="mainCarbonWaves"> | ||
| 204 | + <var name="key" type="int"/> | ||
| 205 | + <var name="mapId" type="string"/> | ||
| 206 | + <var name="targetDoor" type="int"/> | ||
| 207 | + <var name="mainMonsterWave" type="list,mainMonsterWave"/> | ||
| 208 | + </bean> | ||
| 209 | + | ||
| 210 | + <bean name="mainMonsterWave"> | ||
| 211 | + <var name="key" type="int"/> | ||
| 212 | + <var name="name" type="string"/> | ||
| 213 | + <var name="isTrigger" type="bool"/> | ||
| 214 | + <var name="startWait" type="float"/> | ||
| 215 | + <var name="completeWait" type="float"/> | ||
| 216 | + <var name="monsterBorn" type="list,MonsterBorn"/> | ||
| 217 | + </bean> | ||
| 218 | + | ||
| 219 | + <bean name="MonsterBorn"> | ||
| 220 | + <var name="enemyID" type="string"/> | ||
| 221 | + <var name="count" type="int"/> | ||
| 222 | + <var name="bornId" type="int"/> | ||
| 223 | + <var name="delay" type="float"/> | ||
| 224 | + </bean> | ||
| 225 | + | ||
| 226 | + <bean name="CatSurvivorMonster"> | ||
| 227 | + <var name="SurvivorId" type="int"/> | ||
| 228 | + <var name="LuckyCoin" type="int"/> | ||
| 229 | + <var name="MapID" type="int"/> | ||
| 230 | + <var name="Difficult" type="string"/> | ||
| 231 | + <var name="TotalTime" type="int"/> | ||
| 232 | + <var name="SurvivorMonsterWave" type="list,SurvivorMonsterWave"/> | ||
| 233 | + </bean> | ||
| 234 | + | ||
| 235 | + <bean name="SurvivorMonsterWave"> | ||
| 236 | + <var name="key" type="int"/> | ||
| 237 | + <var name="StartTime" type="int"/> | ||
| 238 | + <var name="EndTime" type="int"/> | ||
| 239 | + <var name="SurvivorBorn" type="list,SurvivorBorn"/> | ||
| 240 | + </bean> | ||
| 241 | + | ||
| 242 | + <bean name="SurvivorBorn"> | ||
| 243 | + <var name="enemyID" type="string"/> | ||
| 244 | + <var name="Level" type="int"/> | ||
| 245 | + <var name="startBorn" type="bool"/> | ||
| 246 | + <var name="interval" type="int"/> | ||
| 247 | + <var name="bornId" type="string"/> | ||
| 248 | + <var name="bornCount" type="int"/> | ||
| 249 | + </bean> | ||
| 203 | 250 | ||
| 204 | <bean name="DialogueAll"> | 251 | <bean name="DialogueAll"> |
| 205 | <var name="ID" type="int"/> | 252 | <var name="ID" type="int"/> |
| @@ -750,29 +797,6 @@ | @@ -750,29 +797,6 @@ | ||
| 750 | <var name="Description" type="string"/> | 797 | <var name="Description" type="string"/> |
| 751 | </bean> | 798 | </bean> |
| 752 | 799 | ||
| 753 | - <bean name="mainCarbonWaves"> | ||
| 754 | - <var name="key" type="int"/> | ||
| 755 | - <var name="mapId" type="string"/> | ||
| 756 | - <var name="targetDoor" type="int"/> | ||
| 757 | - <var name="mainMonsterWave" type="list,mainMonsterWave"/> | ||
| 758 | - </bean> | ||
| 759 | - | ||
| 760 | - <bean name="mainMonsterWave"> | ||
| 761 | - <var name="key" type="int"/> | ||
| 762 | - <var name="name" type="string"/> | ||
| 763 | - <var name="isTrigger" type="bool"/> | ||
| 764 | - <var name="startWait" type="float"/> | ||
| 765 | - <var name="completeWait" type="float"/> | ||
| 766 | - <var name="monsterBorn" type="list,MonsterBorn"/> | ||
| 767 | - </bean> | ||
| 768 | - | ||
| 769 | - <bean name="MonsterBorn"> | ||
| 770 | - <var name="enemyID" type="string"/> | ||
| 771 | - <var name="count" type="int"/> | ||
| 772 | - <var name="bornId" type="int"/> | ||
| 773 | - <var name="delay" type="float"/> | ||
| 774 | - </bean> | ||
| 775 | - | ||
| 776 | <bean name="MonsterWave"> | 800 | <bean name="MonsterWave"> |
| 777 | <var name="id" type="int"/> | 801 | <var name="id" type="int"/> |
| 778 | <var name="name" type="string"/> | 802 | <var name="name" type="string"/> |
| @@ -1261,6 +1285,7 @@ | @@ -1261,6 +1285,7 @@ | ||
| 1261 | <table name="TbCardPool" value="CardPool" input="pro2d/CardPool.xlsx"/> | 1285 | <table name="TbCardPool" value="CardPool" input="pro2d/CardPool.xlsx"/> |
| 1262 | <table name="TbCrystalReinforcement" value="CrystalReinforcement" input="pro2d/CrystalReinforcement.xlsx"/> | 1286 | <table name="TbCrystalReinforcement" value="CrystalReinforcement" input="pro2d/CrystalReinforcement.xlsx"/> |
| 1263 | <table name="TbCarbonMonster" value="CarbonMonster" input="pro2d/CarbonMonster.xlsx"/> | 1287 | <table name="TbCarbonMonster" value="CarbonMonster" input="pro2d/CarbonMonster.xlsx"/> |
| 1288 | + <table name="TbCatSurvivorMonster" value="CatSurvivorMonster" input="pro2d/CatSurvivorMonster.xlsx"/> | ||
| 1264 | <table name="TbConsumptionItemData" value="ConsumptionItemData" input="pro2d/ConsumptionItemData.xlsx"/> | 1289 | <table name="TbConsumptionItemData" value="ConsumptionItemData" input="pro2d/ConsumptionItemData.xlsx"/> |
| 1265 | <table name="TbCoupleTies" value="CoupleTies" input="pro2d/CoupleTiesDatas.xlsx"/> | 1290 | <table name="TbCoupleTies" value="CoupleTies" input="pro2d/CoupleTiesDatas.xlsx"/> |
| 1266 | 1291 |