From 8e5310cdc62573a2ad646d926284cff669abadb7 Mon Sep 17 00:00:00 2001
From: wlk <1093471401@qq.com>
Date: Thu, 20 Oct 2022 11:04:02 +0800
Subject: [PATCH] 表回溯

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

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