From f850f309f9f3b07bfc2ebc79cfd5b13331dc2fe9 Mon Sep 17 00:00:00 2001
From: zqj <582132116@qq.com>
Date: Wed, 19 Oct 2022 12:30:10 +0800
Subject: [PATCH] fix: 1.DropPool rename DropGroup  2.抽奖返回奖励字段修改

---
 Datas/pro2d/DropChildGroup.xlsx | Bin 0 -> 10541 bytes
 Datas/pro2d/DropChildPool.xlsx  | Bin 10538 -> 0 bytes
 Datas/pro2d/DropGroup.xlsx      | Bin 0 -> 11369 bytes
 Datas/pro2d/DropPool.xlsx       | Bin 11357 -> 0 bytes
 Datas/pro2d/ItemRandom.xlsx     | Bin 10347 -> 0 bytes
 Defines/pro2d.xml               | 8 ++++----
 6 files changed, 4 insertions(+), 4 deletions(-)
 create mode 100644 Datas/pro2d/DropChildGroup.xlsx
 delete mode 100644 Datas/pro2d/DropChildPool.xlsx
 create mode 100644 Datas/pro2d/DropGroup.xlsx
 delete mode 100644 Datas/pro2d/DropPool.xlsx

diff --git a/Datas/pro2d/DropChildGroup.xlsx b/Datas/pro2d/DropChildGroup.xlsx
new file mode 100644
index 0000000..d9cb4cb
Binary files /dev/null and b/Datas/pro2d/DropChildGroup.xlsx differ
diff --git a/Datas/pro2d/DropChildPool.xlsx b/Datas/pro2d/DropChildPool.xlsx
deleted file mode 100644
index 3bc59c4..0000000
Binary files a/Datas/pro2d/DropChildPool.xlsx and /dev/null differ
diff --git a/Datas/pro2d/DropGroup.xlsx b/Datas/pro2d/DropGroup.xlsx
new file mode 100644
index 0000000..63bb0ba
Binary files /dev/null and b/Datas/pro2d/DropGroup.xlsx differ
diff --git a/Datas/pro2d/DropPool.xlsx b/Datas/pro2d/DropPool.xlsx
deleted file mode 100644
index c1dfbc0..0000000
Binary files a/Datas/pro2d/DropPool.xlsx and /dev/null differ
diff --git a/Datas/pro2d/ItemRandom.xlsx b/Datas/pro2d/ItemRandom.xlsx
index 592c4f9..ee7f554 100644
Binary files a/Datas/pro2d/ItemRandom.xlsx and b/Datas/pro2d/ItemRandom.xlsx differ
diff --git a/Defines/pro2d.xml b/Defines/pro2d.xml
index b66c453..5f289c7 100644
--- a/Defines/pro2d.xml
+++ b/Defines/pro2d.xml
@@ -544,7 +544,7 @@
     <var name="DBG" type="string"/>
   </bean>
 
-  <bean name="DropPool">
+  <bean name="DropGroup">
     <var name="ID" type="int"/>
     <var name="ChildId" type="int"/>
     <var name="DrawCount" type="int"/>
@@ -559,7 +559,7 @@
     <var name="Desc" type="string"/>
   </bean>
   
-  <bean name="DropChildPool">
+  <bean name="DropChildGroup">
     <var name="ID" type="int"/>
     <var name="Name" type="string"/>
     <var name="DropInfos" type="map,int,DropInfo"/>
@@ -605,6 +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="TbDropPool" value="DropPool" input="pro2d/DropPool.xlsx"/>
-  <table name="TbDropChildPool" value="DropChildPool" input="pro2d/DropChildPool.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