From 46c40f2884363718d4a561e01688b4d715f6a441 Mon Sep 17 00:00:00 2001
From: wlk <1093471401@qq.com>
Date: Thu, 20 Oct 2022 10:41:54 +0800
Subject: [PATCH] 修改抽卡表结构

---
 Datas/pro2d/DropAllGroup.xlsx    | Bin 0 -> 10657 bytes
 Datas/pro2d/DropChildGroup.xlsx  | Bin 12236 -> 0 bytes
 Datas/pro2d/DropParentGroup.xlsx | Bin 0 -> 11020 bytes
 Defines/pro2d.xml                | 23 +++++++++++++++++------
 4 files changed, 17 insertions(+), 6 deletions(-)
 create mode 100644 Datas/pro2d/DropAllGroup.xlsx
 create mode 100644 Datas/pro2d/DropParentGroup.xlsx

diff --git a/Datas/pro2d/DropAllGroup.xlsx b/Datas/pro2d/DropAllGroup.xlsx
new file mode 100644
index 0000000..c19979a
Binary files /dev/null and b/Datas/pro2d/DropAllGroup.xlsx differ
diff --git a/Datas/pro2d/DropChildGroup.xlsx b/Datas/pro2d/DropChildGroup.xlsx
index 7fae5cd..65cf220 100644
Binary files a/Datas/pro2d/DropChildGroup.xlsx and b/Datas/pro2d/DropChildGroup.xlsx differ
diff --git a/Datas/pro2d/DropParentGroup.xlsx b/Datas/pro2d/DropParentGroup.xlsx
new file mode 100644
index 0000000..39d65f8
Binary files /dev/null and b/Datas/pro2d/DropParentGroup.xlsx differ
diff --git a/Defines/pro2d.xml b/Defines/pro2d.xml
index 5f289c7..43d86a8 100644
--- a/Defines/pro2d.xml
+++ b/Defines/pro2d.xml
@@ -544,17 +544,20 @@
     <var name="DBG" type="string"/>
   </bean>
 
-  <bean name="DropGroup">
+  <bean name="DropAllGroup">
     <var name="ID" type="int"/>
-    <var name="ChildId" type="int"/>
+    <var name="ParentId" type="int"/>
     <var name="DrawCount" type="int"/>
     <var name="Desc" type="string"/>
     <var name="Costs" type="string"/>
   </bean>
   
-  <bean name="DropInfo">
-    <var name="Min" type="int"/>
-    <var name="Max" type="int"/>
+  <bean name="DropParentGroup">
+    <var name="ID" type="int"/>
+    <var name="ParentDropInfos" type="map,int,ParentDropInfo"/>
+  </bean>
+  
+  <bean name="ParentDropInfo">
     <var name="Weight" type="int"/>
     <var name="Desc" type="string"/>
   </bean>
@@ -565,6 +568,13 @@
     <var name="DropInfos" type="map,int,DropInfo"/>
   </bean>
   
+  <bean name="DropInfo">
+    <var name="Min" type="int"/>
+    <var name="Max" type="int"/>
+    <var name="Weight" type="int"/>
+    <var name="Desc" type="string"/>
+  </bean>
+  
   <table name="TbHero" value="Hero" input="pro2d/hero.xlsx"/>
   <table name="TbHeroLvUpValue" value="HeroLvUpValue" input="pro2d/HeroLvUpValue.xlsx"/>
   <table name="TbMonsterWave" value="MonsterWave" input="pro2d/MonsterWave.xlsx"/>
@@ -605,6 +615,7 @@
   <table name="TbWeapon" value="Weapon" input="pro2d/Weapon.xlsx"/>
   <table name="TbDialogueAll" value="DialogueAll" input="pro2d/DialogueAll.xlsx"/>
   <table name="TbDialogueToChapter" value="DialogueToChapter" input="pro2d/DialogueToChapter.xlsx"/>
-  <table name="TbDropGroup" value="DropGroup" input="pro2d/DropGroup.xlsx"/>
+  <table name="TbDropAllGroup" value="DropAllGroup" input="pro2d/DropAllGroup.xlsx"/>
+  <table name="TbDropParentGroup" value="DropParentGroup" input="pro2d/DropParentGroup.xlsx"/>
   <table name="TbDropChildGroup" value="DropChildGroup" input="pro2d/DropChildGroup.xlsx"/>
 </module>
\ No newline at end of file
--
libgit2 0.21.2