From 8c8db626a47c24cda0eb68ad097042f55c43253a Mon Sep 17 00:00:00 2001
From: loujiachen <839838859@qq.com>
Date: Wed, 15 Jun 2022 17:08:43 +0800
Subject: [PATCH] 关卡章节配表第一版

---
 Datas/pro2d/CarbonMonster.xlsx | Bin 10414 -> 0 bytes
 Datas/pro2d/MainChapter.xlsx   | Bin 0 -> 10857 bytes
 Datas/pro2d/RogueChapter.xlsx  | Bin 10316 -> 0 bytes
 Defines/pro2d.xml              | 27 ++++++++++++++++++++++++---
 4 files changed, 24 insertions(+), 3 deletions(-)
 create mode 100644 Datas/pro2d/MainChapter.xlsx

diff --git a/Datas/pro2d/CarbonMonster.xlsx b/Datas/pro2d/CarbonMonster.xlsx
index 9b43d98..9f84a8c 100644
Binary files a/Datas/pro2d/CarbonMonster.xlsx and b/Datas/pro2d/CarbonMonster.xlsx differ
diff --git a/Datas/pro2d/MainChapter.xlsx b/Datas/pro2d/MainChapter.xlsx
new file mode 100644
index 0000000..10faceb
Binary files /dev/null and b/Datas/pro2d/MainChapter.xlsx differ
diff --git a/Datas/pro2d/RogueChapter.xlsx b/Datas/pro2d/RogueChapter.xlsx
index 91e0d7a..90292e7 100644
Binary files a/Datas/pro2d/RogueChapter.xlsx and b/Datas/pro2d/RogueChapter.xlsx differ
diff --git a/Defines/pro2d.xml b/Defines/pro2d.xml
index 65f4861..7922569 100644
--- a/Defines/pro2d.xml
+++ b/Defines/pro2d.xml
@@ -213,7 +213,7 @@
 		<var name="PassiveSkillId" type="list,int"/>
 	</bean>
 
-	<bean name = "mainCarbon">
+	<bean name = "mainCarbonWave">
 		<var name="enemyid" type="int"/>
 		<var name="count" type="int"/>
 		<var name="time" type="float"/>
@@ -225,11 +225,31 @@
 
 	<bean name="CarbonMonster">
 		<var name="carbonId" type="int"/>
-		<var name="carbonName" type="string"/>
 		<var name="mapName" type="string"/>
-		<var name="mainCarbons" type="map,int,mainCarbon"/>
+		<var name="mainCarbonWaves" type="map,int,mainCarbonWave"/>
 	</bean>
 
+	<bean name="mainCarbon">
+		<var name="carbonName" type="string"/>
+		<var name="firstAward" type="string"/>
+		<var name="normalAward" type="string"/>
+		<var name="carbonExp" type="int"/>
+		<var name="carbonFailExp" type="int"/>
+		<var name="spCost" type="int"/>
+		<var name="bonusCondition_1" type="string"/>
+		<var name="bonusAward_1" type="string"/>
+		<var name="bonusCondition_2" type="string"/>
+		<var name="bonusAward_2" type="string"/>
+		<var name="bonusCondition_3" type="string"/>
+		<var name="bonusAward_3" type="string"/>
+		<var name="recommendPower" type="int"/>
+    </bean>
+
+	<bean name="MainChapter">
+		<var name="chapterId" type="int"/>
+		<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"/>
@@ -238,6 +258,7 @@
 	<table name="TbRogueMonsterCard" value="RogueMonsterCard" input="pro2d/RogueMonsterCard.xlsx"/>
 	<table name="TbRogueMonster" value="RogueMonster" input="pro2d/RogueMonster.xlsx"/>
 
+	<table name="TbMainChapter" value="MainChapter" input="pro2d/MainChapter.xlsx"/>
 	<table name="TbCarbonMonster" value="CarbonMonster" input="pro2d/CarbonMonster.xlsx"/>
 
 	<table name="TbEquipmentData" value="EquipmentData" input="pro2d/EquipmentData.xlsx"/>
--
libgit2 0.21.2