Commit 439793fc8c45f8bfd31d3d09d5ff4a4e21483789

Authored by yangjiyue
2 parents 10b2acea d01e6154

Merge branch 'master' of 120.26.43.151:loujiachen/DesignerConfigs

Datas/common/UnityScene.xlsx
No preview for this file type
Datas/pro2d/CatSurvivorMonster.xlsx
No preview for this file type
Datas/pro2d/PunchInfo.xlsx
No preview for this file type
Datas/pro2d/Punchboard.xlsx
No preview for this file type
Defines/pro2d.xml
... ... @@ -249,10 +249,6 @@
249 249  
250 250 <bean name="CatSurvivorMonster">
251 251 <var name="SurvivorId" type="int"/>
252   - <var name="LuckyCoin" type="int"/>
253   - <var name="MapID" type="int"/>
254   - <var name="Difficult" type="string"/>
255   - <var name="TotalTime" type="int"/>
256 252 <var name="SurvivorMonsterWave" type="list,SurvivorMonsterWave"/>
257 253 </bean>
258 254  
... ... @@ -264,6 +260,7 @@
264 260  
265 261 <bean name="SurvivorMonsterWave">
266 262 <var name="key" type="int"/>
  263 + <var name="Exp" type="int"/>
267 264 <var name="StartTime" type="int"/>
268 265 <var name="EndTime" type="int"/>
269 266 <var name="SurvivorBorn" type="list,SurvivorBorn"/>
... ...