From c0c6fff03b05a43f5ba739cf07fc17a4156c9c58 Mon Sep 17 00:00:00 2001
From: zqj <582132116@qq.com>
Date: Fri, 9 Dec 2022 17:08:57 +0800
Subject: [PATCH] 修改抽卡池的表结构

---
 Datas/pro2d/CardPool.xlsx         | Bin 13035 -> 0 bytes
 Datas/pro2d/CardQuality.xlsx      | Bin 10523 -> 0 bytes
 Datas/pro2d/HeroItemFragment.xlsx | Bin 10890 -> 0 bytes
 Defines/pro2d.xml                 | 13 +++++++------
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/Datas/pro2d/CardPool.xlsx b/Datas/pro2d/CardPool.xlsx
index 13fbb55..c1862cf 100644
Binary files a/Datas/pro2d/CardPool.xlsx and b/Datas/pro2d/CardPool.xlsx differ
diff --git a/Datas/pro2d/CardQuality.xlsx b/Datas/pro2d/CardQuality.xlsx
index 71a39ce..ad5067a 100644
Binary files a/Datas/pro2d/CardQuality.xlsx and b/Datas/pro2d/CardQuality.xlsx differ
diff --git a/Datas/pro2d/HeroItemFragment.xlsx b/Datas/pro2d/HeroItemFragment.xlsx
index 2eb61a6..44c6ac9 100644
Binary files a/Datas/pro2d/HeroItemFragment.xlsx and b/Datas/pro2d/HeroItemFragment.xlsx differ
diff --git a/Defines/pro2d.xml b/Defines/pro2d.xml
index 6e25379..9d1f3d3 100644
--- a/Defines/pro2d.xml
+++ b/Defines/pro2d.xml
@@ -675,14 +675,16 @@
         <var name="ID" type="int"/>
         <var name="ColorInfos" type="map,int,CardColorInfo"/>
     </bean>
-
-    <bean name="CardPool">
-        <var name="ID" type="int"/>
-        <var name="Quality" type="int"/>
-        <var name="QualityStr" type="string"/>
+	
+	<bean name="CardPoolData">
         <var name="Pool_1" type="int"/>
         <var name="Pool_2" type="int"/>
         <var name="Pool_3" type="int"/>
+	</bean>
+    <bean name="CardPool">
+        <var name="Quality" type="int"/>
+        <var name="QualityStr" type="string"/>
+        <var name="CardPoolDatas" type="map,int,CardPoolData"/>
     </bean>
 
     <bean name="CrystalReinforcement">
@@ -818,7 +820,6 @@
     </bean>
   
      <bean name="HeroItemFragment">
-        <var name="ID" type="int"/>
         <var name="ItemCardID" type="int"/>
         <var name="ItemFragmentID" type="int"/>
         <var name="Transform" type="int"/>
--
libgit2 0.21.2