From 64305a17c006445bfc036ca0890ea8e96727aff7 Mon Sep 17 00:00:00 2001
From: zqj <582132116@qq.com>
Date: Tue, 10 May 2022 11:57:24 +0800
Subject: [PATCH] fix: RogueChapter 改为map

---
 Datas/pro2d/RogueChapter.xlsx | Bin 10013 -> 0 bytes
 Defines/pro2d.xml             | 5 +++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/Datas/pro2d/RogueChapter.xlsx b/Datas/pro2d/RogueChapter.xlsx
index 6eb5aa2..dc0ac67 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 28a0dbd..fc6b4de 100644
--- a/Defines/pro2d.xml
+++ b/Defines/pro2d.xml
@@ -70,10 +70,10 @@
     </bean>
 
 	<bean name="Carbon">
-		<var name="id" type="int"/>
 		<var name="carbonName" type="string"/>
 		<var name="carbonMonster" type="string"/>
 		<var name="firstAward" type="string"/>
+		<var name="normalAward" type="string"/>
 		<var name="progressSum" type="int"/>
 		<var name="carbonExp" type="int"/>
 		<var name="carbonFailExp" type="int"/>
@@ -89,7 +89,7 @@
 
 	<bean name="RogueChapter">
 		<var name="chapterId" type="int"/>
-		<var name="carbons" type="list,Carbon"/>
+		<var name="carbons" type="map,int,Carbon"/>
     </bean>
 
 	<bean name="RogueMonsterCard">
@@ -195,6 +195,7 @@
 	<table name="TbMonsterWave" value="MonsterWave" input="pro2d/MonsterWave.xlsx"/>
 	<table name="TbSkill" value="Skill" input="pro2d/Skill.xlsx"/>
 	<table name="TbRogueChapter" value="RogueChapter" input="pro2d/RogueChapter.xlsx"/>
+	<table name="TbMapTest" value="MapTest" input="pro2d/MapTest.xlsx"/>
 	<table name="TbRogueMonsterCard" value="RogueMonsterCard" input="pro2d/RogueMonsterCard.xlsx"/>
 	<table name="TbRogueMonster" value="RogueMonster" input="pro2d/RogueMonster.xlsx"/>
 
--
libgit2 0.21.2