Merge branch 'master' of 120.26.43.151:loujiachen/DesignerConfigs

Array
2 parents 832e6768 c8bd778d
Showing 3 changed files with 48 additions and 23 deletions Show diff stats
Datas/common/UnityScene.xlsx
Datas/pro2d/CatSurvivorMonster.xlsx
Defines/pro2d.xml
@@ -200,6 +200,53 @@
         <var name="mainCarbonWaves" type="list,mainCarbonWaves"/>
     </bean>
  
+    <bean name="mainCarbonWaves">
+        <var name="key" type="int"/>
+        <var name="mapId" type="string"/>
+        <var name="targetDoor" type="int"/>
+        <var name="mainMonsterWave" type="list,mainMonsterWave"/>
+    </bean>
+
+    <bean name="mainMonsterWave">
+        <var name="key" type="int"/>
+        <var name="name" type="string"/>
+        <var name="isTrigger" type="bool"/>
+        <var name="startWait" type="float"/>
+        <var name="completeWait" type="float"/>
+        <var name="monsterBorn" type="list,MonsterBorn"/>
+    </bean>
+
+    <bean name="MonsterBorn">
+        <var name="enemyID" type="string"/>
+        <var name="count" type="int"/>
+        <var name="bornId" type="int"/>
+        <var name="delay" type="float"/>
+    </bean>
+
+    <bean name="CatSurvivorMonster">
+        <var name="SurvivorId" type="int"/>
+        <var name="LuckyCoin" type="int"/>
+        <var name="MapID" type="int"/>
+        <var name="Difficult" type="string"/>
+        <var name="TotalTime" type="int"/>
+        <var name="SurvivorMonsterWave" type="list,SurvivorMonsterWave"/>
+    </bean>
+
+    <bean name="SurvivorMonsterWave">
+        <var name="key" type="int"/>
+        <var name="StartTime" type="int"/>
+        <var name="EndTime" type="int"/>
+        <var name="SurvivorBorn" type="list,SurvivorBorn"/>
+    </bean>
+
+    <bean name="SurvivorBorn">
+        <var name="enemyID" type="string"/>
+        <var name="Level" type="int"/>
+        <var name="startBorn" type="bool"/>
+        <var name="interval" type="int"/>
+        <var name="bornId" type="string"/>
+        <var name="bornCount" type="int"/>
+    </bean>
  
     <bean name="DialogueAll">
         <var name="ID" type="int"/>
@@ -750,29 +797,6 @@
      <var name="Description" type="string"/>
    </bean>
  
-    <bean name="mainCarbonWaves">
-        <var name="key" type="int"/>
-        <var name="mapId" type="string"/>
-        <var name="targetDoor" type="int"/>
-        <var name="mainMonsterWave" type="list,mainMonsterWave"/>
-    </bean>
-
-    <bean name="mainMonsterWave">
-        <var name="key" type="int"/>
-        <var name="name" type="string"/>
-        <var name="isTrigger" type="bool"/>
-        <var name="startWait" type="float"/>
-        <var name="completeWait" type="float"/>
-        <var name="monsterBorn" type="list,MonsterBorn"/>
-    </bean>
-
-    <bean name="MonsterBorn">
-        <var name="enemyID" type="string"/>
-        <var name="count" type="int"/>
-        <var name="bornId" type="int"/>
-        <var name="delay" type="float"/>
-    </bean>
-
     <bean name="MonsterWave">
         <var name="id" type="int"/>
         <var name="name" type="string"/>
@@ -1261,6 +1285,7 @@
     <table name="TbCardPool" value="CardPool" input="pro2d/CardPool.xlsx"/>
     <table name="TbCrystalReinforcement" value="CrystalReinforcement" input="pro2d/CrystalReinforcement.xlsx"/>
     <table name="TbCarbonMonster" value="CarbonMonster" input="pro2d/CarbonMonster.xlsx"/>
+    <table name="TbCatSurvivorMonster" value="CatSurvivorMonster" input="pro2d/CatSurvivorMonster.xlsx"/>
     <table name="TbConsumptionItemData" value="ConsumptionItemData" input="pro2d/ConsumptionItemData.xlsx"/>
     <table name="TbCoupleTies" value="CoupleTies" input="pro2d/CoupleTiesDatas.xlsx"/>