Commit 5a283060990a595c680dc52bcdad5a6742944b6c

Authored by loujiachen
2 parents 02619680 d13930c5

Merge branch 'master' of 120.26.43.151:loujiachen/DesignerConfigs

Datas/__enums__.xlsx
No preview for this file type
Datas/common/FUIPanel.xlsx
No preview for this file type
Datas/pro2d/CarbonMonster.xlsx
No preview for this file type
Datas/pro2d/ItemData.xlsx
No preview for this file type
@@ -293,10 +293,7 @@ @@ -293,10 +293,7 @@
293 <var name="enemyid" type="int"/> 293 <var name="enemyid" type="int"/>
294 <var name="count" type="int"/> 294 <var name="count" type="int"/>
295 <var name="time" type="float"/> 295 <var name="time" type="float"/>
296 - <var name="minX" type="float"/>  
297 - <var name="minY" type="float"/>  
298 - <var name="maxX" type="float"/>  
299 - <var name="maxY" type="float"/> 296 + <var name="bornId" type="int"/>
300 </bean> 297 </bean>
301 298
302 <bean name="CarbonMonster"> 299 <bean name="CarbonMonster">