From 857e1c6875f4a197df75b9c31eb4cd7fca43a849 Mon Sep 17 00:00:00 2001
From: ZhaoLu-Hoshea\Administrator <470780285@qq.com>
Date: Wed, 7 Sep 2022 14:54:24 +0800
Subject: [PATCH] 修改关卡怪物配置表与怪物波次配置表

---
 Datas/pro2d/CarbonMonster.xlsx | Bin 10946 -> 0 bytes
 Datas/pro2d/MonsterWave.xlsx   | Bin 10181 -> 0 bytes
 Defines/pro2d.xml              | 20 ++++++++------------
 3 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/Datas/pro2d/CarbonMonster.xlsx b/Datas/pro2d/CarbonMonster.xlsx
index 0ddf39b..1dae8f3 100644
Binary files a/Datas/pro2d/CarbonMonster.xlsx and b/Datas/pro2d/CarbonMonster.xlsx differ
diff --git a/Datas/pro2d/MonsterWave.xlsx b/Datas/pro2d/MonsterWave.xlsx
index 4c200a9..e7ca11f 100644
Binary files a/Datas/pro2d/MonsterWave.xlsx and b/Datas/pro2d/MonsterWave.xlsx differ
diff --git a/Defines/pro2d.xml b/Defines/pro2d.xml
index c736b2d..60707d5 100644
--- a/Defines/pro2d.xml
+++ b/Defines/pro2d.xml
@@ -57,16 +57,15 @@
 	<bean name="MonsterWave">
 		<var name="id" type="int"/>
 	    <var name="name" type="string"/>
-		<var name="monsters" type="map,int,int"/>
-	    <var name="battleSceneName" type="string"/>
-		<var name="monsterBorn" type="MonsterBorn"/>
+		<var name="wait" type="float"/>
+		<var name="monsterBorn" type="map,int,MonsterBorn"/>
     </bean>
 
 	<bean name="MonsterBorn">
-		<var name="id" type="int"/>
-		<var name="roleId" type="int"/>
-	    <var name="x" type="float"/>
-		<var name="z" type="float"/>
+		<var name="enemyID" type="string"/>
+		<var name="count" type="int"/>
+	    <var name="bornId" type="int"/>
+		<var name="delay" type="float"/>
     </bean>
 
 	<bean name="Skill">
@@ -393,15 +392,12 @@
 	</bean>
 
 	<bean name = "mainCarbonWave">
-		<var name="enemyid" type="int"/>
-		<var name="count" type="int"/>
-		<var name="time" type="float"/>
-		<var name="bornId" type="int"/>
+		<var name="WaveId" type="string"/>
+		<var name="mapName" type="string"/>
 	</bean>
 
 	<bean name="CarbonMonster">
 		<var name="carbonId" type="int"/>
-		<var name="mapName" type="string"/>
 		<var name="mainCarbonWaves" type="map,int,mainCarbonWave"/>
 	</bean>
 
--
libgit2 0.21.2