From 436bf8633d2f3b1c35bc0c724b35734ac9c83177 Mon Sep 17 00:00:00 2001
From: wlk <1093471401@qq.com>
Date: Thu, 30 Mar 2023 11:06:00 +0800
Subject: [PATCH] 改装备表

---
 Datas/common/NumericType.xlsx         | Bin 13139 -> 0 bytes
 Datas/common/NumericTypeEx.xlsx       | Bin 12456 -> 0 bytes
 Datas/pro2d/EquipmentData.xlsx        | Bin 2289650 -> 0 bytes
 Datas/pro2d/EquipmentDataNew.xlsx     | Bin 99004 -> 0 bytes
 Datas/pro2d/EquipmentDataOld.xlsx     | Bin 0 -> 2289650 bytes
 Datas/pro2d/SkillLuckyCoinConfig.xlsx | Bin 11244 -> 0 bytes
 Defines/pro2d.xml                     | 10 +++++-----
 7 files changed, 5 insertions(+), 5 deletions(-)
 delete mode 100644 Datas/pro2d/EquipmentDataNew.xlsx
 create mode 100644 Datas/pro2d/EquipmentDataOld.xlsx

diff --git a/Datas/common/NumericType.xlsx b/Datas/common/NumericType.xlsx
index 9d195da..7becfe3 100644
Binary files a/Datas/common/NumericType.xlsx and b/Datas/common/NumericType.xlsx differ
diff --git a/Datas/common/NumericTypeEx.xlsx b/Datas/common/NumericTypeEx.xlsx
index 65f38a9..5a8a68f 100644
Binary files a/Datas/common/NumericTypeEx.xlsx and b/Datas/common/NumericTypeEx.xlsx differ
diff --git a/Datas/pro2d/EquipmentData.xlsx b/Datas/pro2d/EquipmentData.xlsx
index ef3b97a..c6a739f 100644
Binary files a/Datas/pro2d/EquipmentData.xlsx and b/Datas/pro2d/EquipmentData.xlsx differ
diff --git a/Datas/pro2d/EquipmentDataNew.xlsx b/Datas/pro2d/EquipmentDataNew.xlsx
deleted file mode 100644
index 272d64c..0000000
Binary files a/Datas/pro2d/EquipmentDataNew.xlsx and /dev/null differ
diff --git a/Datas/pro2d/EquipmentDataOld.xlsx b/Datas/pro2d/EquipmentDataOld.xlsx
new file mode 100644
index 0000000..ef3b97a
Binary files /dev/null and b/Datas/pro2d/EquipmentDataOld.xlsx differ
diff --git a/Datas/pro2d/SkillLuckyCoinConfig.xlsx b/Datas/pro2d/SkillLuckyCoinConfig.xlsx
index da63f0c..6646342 100644
Binary files a/Datas/pro2d/SkillLuckyCoinConfig.xlsx and b/Datas/pro2d/SkillLuckyCoinConfig.xlsx differ
diff --git a/Defines/pro2d.xml b/Defines/pro2d.xml
index 41b4cc0..80582b1 100644
--- a/Defines/pro2d.xml
+++ b/Defines/pro2d.xml
@@ -275,7 +275,7 @@
     </bean>
 
 
-    <bean name="EquipmentData">
+    <bean name="EquipmentDataOld">
         <var name="EquipID" type="int"/>
         <var name="EquipName" type="string"/>
         <var name="EquipType" type="int"/>
@@ -353,7 +353,7 @@
         <var name="GetWayLink" type="string"/>
     </bean>
 
-   <bean name="EquipmentDataNew">
+   <bean name="EquipmentData">
       <var name="EquipID" type="int"/>
       <var name="EquipName" type="string"/>
       <var name="EquipType" type="int"/>
@@ -1080,10 +1080,10 @@
     <table name="TbDropGroup" value="DropGroup" input="pro2d/DropGroup.xlsx"/>
     <table name="TbDropChildGroup" value="DropChildGroup" input="pro2d/DropChildGroup.xlsx"/>
 
+    <table name="TbEquipmentDataOld" value="EquipmentDataOld" input="pro2d/BaseData@EquipmentDataOld.xlsx"/>
     <table name="TbEquipmentData" value="EquipmentData" input="pro2d/BaseData@EquipmentData.xlsx"/>
-    <table name="TbEquipmentDataNew" value="EquipmentDataNew" input="pro2d/BaseData@EquipmentDataNew.xlsx"/>
-    <table name="TbEquipmentType" value="EquipmentType" input="pro2d/EquipmentType@EquipmentDataNew.xlsx"/>
-    <table name="TbEquipmentAdvancedEntry" value="EquipmentAdvancedEntry" input="pro2d/EquipmentAdvancedEntry@EquipmentDataNew.xlsx"/>
+    <table name="TbEquipmentType" value="EquipmentType" input="pro2d/EquipmentType@EquipmentData.xlsx"/>
+    <table name="TbEquipmentAdvancedEntry" value="EquipmentAdvancedEntry" input="pro2d/EquipmentAdvancedEntry@EquipmentData.xlsx"/>
   
     <table name="TbEquipBreakdown" value="EquipBreakdown" input="pro2d/EquipBreakdown.xlsx"/>
     <table name="TbEquipmentLvUpMaterials" value="EquipmentLvUpMaterials" input="pro2d/EquipmentLvUpMaterials.xlsx"/>
--
libgit2 0.21.2