From e458dfed60cefbfc36cb332ca2bf0fad1b320c12 Mon Sep 17 00:00:00 2001
From: loujiachen <839838859@qq.com>
Date: Wed, 1 Jun 2022 17:42:14 +0800
Subject: [PATCH] 支持配表创建多个不同的关卡、地图、怪物

---
 Datas/pro2d/CarbonMonster.xlsx      | Bin 0 -> 9838 bytes
 Datas/pro2d/FirstCarbonMonster.xlsx | Bin 9093 -> 0 bytes
 Datas/pro2d/RogueChapter.xlsx       | Bin 10223 -> 0 bytes
 Datas/pro2d/RogueMonster.xlsx       | Bin 10742 -> 0 bytes
 Defines/pro2d.xml                   | 11 ++++++++---
 5 files changed, 8 insertions(+), 3 deletions(-)
 create mode 100644 Datas/pro2d/CarbonMonster.xlsx
 delete mode 100644 Datas/pro2d/FirstCarbonMonster.xlsx

diff --git a/Datas/pro2d/CarbonMonster.xlsx b/Datas/pro2d/CarbonMonster.xlsx
new file mode 100644
index 0000000..29e5580
Binary files /dev/null and b/Datas/pro2d/CarbonMonster.xlsx differ
diff --git a/Datas/pro2d/FirstCarbonMonster.xlsx b/Datas/pro2d/FirstCarbonMonster.xlsx
deleted file mode 100644
index 5b2d245..0000000
Binary files a/Datas/pro2d/FirstCarbonMonster.xlsx and /dev/null differ
diff --git a/Datas/pro2d/RogueChapter.xlsx b/Datas/pro2d/RogueChapter.xlsx
index 523815b..91e0d7a 100644
Binary files a/Datas/pro2d/RogueChapter.xlsx and b/Datas/pro2d/RogueChapter.xlsx differ
diff --git a/Datas/pro2d/RogueMonster.xlsx b/Datas/pro2d/RogueMonster.xlsx
index 7270c39..9948503 100644
Binary files a/Datas/pro2d/RogueMonster.xlsx and b/Datas/pro2d/RogueMonster.xlsx differ
diff --git a/Defines/pro2d.xml b/Defines/pro2d.xml
index 58f0657..3d130b2 100644
--- a/Defines/pro2d.xml
+++ b/Defines/pro2d.xml
@@ -204,8 +204,7 @@
 		<var name="PassiveSkillId" type="list,int"/>
 	</bean>
 
-	<bean name="FirstCarbonMonster">
-		<var name="id" type="int"/>
+	<bean name = "mainCarbon">
 		<var name="enemyid" type="int"/>
 		<var name="count" type="int"/>
 		<var name="time" type="float"/>
@@ -215,6 +214,12 @@
 		<var name="maxY" type="float"/>
 	</bean>
 
+	<bean name="CarbonMonster">
+		<var name="carbonId" type="int"/>
+		<var name="mapName" type="string"/>
+		<var name="mainCarbons" type="map,int,mainCarbon"/>
+	</bean>
+
     <table name="TbHero" value="Hero" input="pro2d/hero.xlsx"/>
 	<table name="TbMonsterWave" value="MonsterWave" input="pro2d/MonsterWave.xlsx"/>
 	<table name="TbSkill" value="Skill" input="pro2d/Skill.xlsx"/>
@@ -223,7 +228,7 @@
 	<table name="TbRogueMonsterCard" value="RogueMonsterCard" input="pro2d/RogueMonsterCard.xlsx"/>
 	<table name="TbRogueMonster" value="RogueMonster" input="pro2d/RogueMonster.xlsx"/>
 
-	<table name="TbFirstCarbonMonster" value="FirstCarbonMonster" input="pro2d/FirstCarbonMonster.xlsx"/>
+	<table name="TbCarbonMonster" value="CarbonMonster" input="pro2d/CarbonMonster.xlsx"/>
 
 	<table name="TbEquipmentData" value="EquipmentData" input="pro2d/EquipmentData.xlsx"/>
 	<table name="TbItemData" value="ItemData" input="pro2d/ItemData.xlsx"/>
--
libgit2 0.21.2