From 1c4c727710b59a94f7d8ac4a7475ad24af3e81b2 Mon Sep 17 00:00:00 2001
From: jiyue <852847474@qq.com>
Date: Wed, 17 May 2023 11:38:11 +0800
Subject: [PATCH] 表修改

---
 Datas/pro2d/EquipmentData.xlsx | Bin 58861 -> 0 bytes
 Datas/pro2d/ItemData.xlsx      | Bin 71742 -> 0 bytes
 Datas/pro2d/PopupsDatas.xlsx   | Bin 13417 -> 0 bytes
 Defines/pro2d.xml              | 13 +++++++------
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/Datas/pro2d/EquipmentData.xlsx b/Datas/pro2d/EquipmentData.xlsx
index 2efadfa..9478768 100644
Binary files a/Datas/pro2d/EquipmentData.xlsx and b/Datas/pro2d/EquipmentData.xlsx differ
diff --git a/Datas/pro2d/ItemData.xlsx b/Datas/pro2d/ItemData.xlsx
index 4dcbd1a..b3cb8ec 100644
Binary files a/Datas/pro2d/ItemData.xlsx and b/Datas/pro2d/ItemData.xlsx differ
diff --git a/Datas/pro2d/PopupsDatas.xlsx b/Datas/pro2d/PopupsDatas.xlsx
index d20e21e..bca0515 100644
Binary files a/Datas/pro2d/PopupsDatas.xlsx and b/Datas/pro2d/PopupsDatas.xlsx differ
diff --git a/Defines/pro2d.xml b/Defines/pro2d.xml
index 7966e77..33e01d3 100644
--- a/Defines/pro2d.xml
+++ b/Defines/pro2d.xml
@@ -387,10 +387,6 @@
       <var name="Dodge" type="float"/>
       <var name="Hp" type="float"/>
       <var name="StrengthenMaterialsCombinationID" type="int"/>
-      <var name="ImageName" type="string"/>
-      <var name="DetailText" type="string"/>
-      <var name="GetWay" type="string"/>
-      <var name="GetWayLink" type="string"/>
    </bean>
 
     <bean name="EquipmentType">
@@ -707,7 +703,6 @@
         <var name="UnlockHeroNum" type="int"/>
         <var name="AdvanceID" type="int"/>
         <var name="Overflow" type="string"/>
-
     </bean>
 
 
@@ -728,7 +723,13 @@
         <var name="ImageName" type="string"/>
         <var name="DetailText" type="string"/>
         <var name="GetWay" type="string"/>
-        <var name="GetWayLink" type="string"/>
+        <var name="GetWayLink" type="(list#sep=;),(ItemGetWayData#sep=-)"/>
+    </bean>
+
+    <bean name="ItemGetWayData">
+        <var name="Type" type="string"/>
+        <var name="Chapter" type="int"/>
+        <var name="Carbon" type="int"/>
     </bean>
 
     <bean name="IntervalTable">
--
libgit2 0.21.2