From cd23852e2699492dc1059f6d962c7c3ffc605336 Mon Sep 17 00:00:00 2001
From: ZhaoLu-Hoshea\Administrator <470780285@qq.com>
Date: Mon, 12 Dec 2022 18:15:48 +0800
Subject: [PATCH] 关卡怪物表和怪物波次表合并

---
 Datas/pro2d/CarbonMonster.xlsx     | Bin 12743 -> 0 bytes
 Datas/pro2d/CarbonMonster_old.xlsx | Bin 0 -> 12743 bytes
 Defines/pro2d.xml                  | 50 +++++++++++++++++++++++++++++---------------------
 3 files changed, 29 insertions(+), 21 deletions(-)
 create mode 100644 Datas/pro2d/CarbonMonster_old.xlsx

diff --git a/Datas/pro2d/CarbonMonster.xlsx b/Datas/pro2d/CarbonMonster.xlsx
index cf5f814..760efa4 100644
Binary files a/Datas/pro2d/CarbonMonster.xlsx and b/Datas/pro2d/CarbonMonster.xlsx differ
diff --git a/Datas/pro2d/CarbonMonster_old.xlsx b/Datas/pro2d/CarbonMonster_old.xlsx
new file mode 100644
index 0000000..cf5f814
Binary files /dev/null and b/Datas/pro2d/CarbonMonster_old.xlsx differ
diff --git a/Defines/pro2d.xml b/Defines/pro2d.xml
index 9d1f3d3..4acf764 100644
--- a/Defines/pro2d.xml
+++ b/Defines/pro2d.xml
@@ -105,21 +105,6 @@
         <var name="Image" type="string"/>
     </bean>
 
-    <bean name="MonsterWave">
-        <var name="id" type="int"/>
-        <var name="name" type="string"/>
-        <var name="startWait" type="float"/>
-        <var name="completeWait" type="float"/>
-        <var name="monsterBorn" type="map,int,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="Skill">
         <var name="id" type="int"/>
         <var name="imageUrl" type="string"/>
@@ -526,15 +511,38 @@
         <var name="skillOrders" type="list,SkillOrder"/>
     </bean>
 
-    <bean name="mainCarbonWave">
-        <var name="WaveId" type="string"/>
-        <var name="mapId" type="string"/>
-    </bean>
-
     <bean name="CarbonMonster">
         <var name="carbonId" type="int"/>
         <var name="carbonMonsterLevel" type="int"/>
-        <var name="mainCarbonWaves" type="map,int,mainCarbonWave"/>
+        <var name="mainCarbonWaves" type="list,mainCarbonWaves"/>
+    </bean>
+
+    <bean name="mainCarbonWaves">
+        <var name="key" type="int"/>
+        <var name="mapId" type="string"/>
+        <var name="mainMonsterWave" type="list,mainMonsterWave"/>
+    </bean>
+
+    <bean name="mainMonsterWave">
+        <var name="name" type="string"/>
+        <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"/>
+        <var name="startWait" type="float"/>
+        <var name="completeWait" type="float"/>
+        <var name="monsterBorn" type="map,int,MonsterBorn"/>
     </bean>
 
     <bean name="mainCarbon">
--
libgit2 0.21.2