From e17e51ddbdbe254efafe885cac4f976d0c74de1a Mon Sep 17 00:00:00 2001
From: zqj <582132116@qq.com>
Date: Tue, 25 Oct 2022 15:33:48 +0800
Subject: [PATCH] feat: 关卡掉落

---
 Datas/pro2d/DropChildGroup.xlsx | Bin 11313 -> 0 bytes
 Datas/pro2d/DropColorGroup.xlsx | Bin 10699 -> 0 bytes
 Datas/pro2d/DropGroup.xlsx      | Bin 10471 -> 0 bytes
 Datas/pro2d/MainChapter.xlsx    | Bin 12841 -> 0 bytes
 Defines/pro2d.xml               | 26 +++++++++-----------------
 5 files changed, 9 insertions(+), 17 deletions(-)
 delete mode 100644 Datas/pro2d/DropColorGroup.xlsx

diff --git a/Datas/pro2d/DropChildGroup.xlsx b/Datas/pro2d/DropChildGroup.xlsx
index 78ecef6..6acd2fb 100644
Binary files a/Datas/pro2d/DropChildGroup.xlsx and b/Datas/pro2d/DropChildGroup.xlsx differ
diff --git a/Datas/pro2d/DropColorGroup.xlsx b/Datas/pro2d/DropColorGroup.xlsx
deleted file mode 100644
index 3fedfc9..0000000
Binary files a/Datas/pro2d/DropColorGroup.xlsx and /dev/null differ
diff --git a/Datas/pro2d/DropGroup.xlsx b/Datas/pro2d/DropGroup.xlsx
index 09afc36..9328554 100644
Binary files a/Datas/pro2d/DropGroup.xlsx and b/Datas/pro2d/DropGroup.xlsx differ
diff --git a/Datas/pro2d/MainChapter.xlsx b/Datas/pro2d/MainChapter.xlsx
index d4d1095..642b7a5 100644
Binary files a/Datas/pro2d/MainChapter.xlsx and b/Datas/pro2d/MainChapter.xlsx differ
diff --git a/Defines/pro2d.xml b/Defines/pro2d.xml
index ccb5f37..a47bc88 100644
--- a/Defines/pro2d.xml
+++ b/Defines/pro2d.xml
@@ -443,6 +443,7 @@
     <var name="bonusAward_3" type="string"/>
     <var name="recommendPower" type="int"/>
     <var name="showCarbonEnemy" type="string"/>
+    <var name="dropID" type="int"/>
   </bean>
 
   <bean name="MainChapter">
@@ -549,30 +550,21 @@
     <var name="DBG" type="string"/>
   </bean>
 
+    
+  
   <bean name="DropGroup">
     <var name="ID" type="int"/>
-    <var name="ColorID" type="int"/>
-    <var name="DrawCount" type="int"/>
-    <var name="Desc" type="string"/>
-    <var name="Costs" type="string"/>
+    <var name="childInfos" type="list,int"/>
   </bean>
   
-  <bean name="DropInfo">
-    <var name="Min" type="int"/>
-    <var name="Max" type="int"/>
-    <var name="Weight" type="int"/>
-  </bean>
-    
-  <bean name="DropColorGroup">
-    <var name="ID" type="int"/>
-    <var name="Name" type="string"/>
-    <var name="DropInfos" type="map,int,DropInfo"/>
+  <bean name="dropInfo">
+    <var name="min" type="int"/>
+    <var name="max" type="int"/>
+    <var name="weight" type="int"/>
   </bean>
-  
   <bean name="DropChildGroup">
     <var name="ID" type="int"/>
-    <var name="Name" type="string"/>
-    <var name="DropInfos" type="map,int,DropInfo"/>
+    <var name="dropInfos" type="map,int,dropInfo"/>
   </bean>
   
   <bean name="CardGroupInfo">
--
libgit2 0.21.2