From dfc82d9707cc5e55ed84691fc7e6b88761722366 Mon Sep 17 00:00:00 2001
From: yangjiyve <1711972070@qq.com>
Date: Fri, 26 Aug 2022 17:42:34 +0800
Subject: [PATCH] 强化材料表格更新，数据格式list→map<int32,string>

---
 Datas/pro2d/EquipmentData.xlsx          | Bin 112882 -> 0 bytes
 Datas/pro2d/EquipmentLvUpMaterials.xlsx | Bin 10146 -> 0 bytes
 Defines/pro2d.xml                       | 18 +++++-------------
 3 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/Datas/pro2d/EquipmentData.xlsx b/Datas/pro2d/EquipmentData.xlsx
index 83d12ce..74dcd4d 100644
Binary files a/Datas/pro2d/EquipmentData.xlsx and b/Datas/pro2d/EquipmentData.xlsx differ
diff --git a/Datas/pro2d/EquipmentLvUpMaterials.xlsx b/Datas/pro2d/EquipmentLvUpMaterials.xlsx
index c9c41bc..88764dd 100644
Binary files a/Datas/pro2d/EquipmentLvUpMaterials.xlsx and b/Datas/pro2d/EquipmentLvUpMaterials.xlsx differ
diff --git a/Defines/pro2d.xml b/Defines/pro2d.xml
index 7d3236d..0b20bcd 100644
--- a/Defines/pro2d.xml
+++ b/Defines/pro2d.xml
@@ -138,7 +138,6 @@
     <var name="AtkLv1" type="float"/>
     <var name="AtkLv2" type="float"/>
     <var name="AtkLv3" type="float"/>
-    
     <var name="Atk" type="float"/>
     <var name="FireAtk" type="float"/>
     <var name="ThunderAtk" type="float"/>
@@ -154,7 +153,6 @@
     <var name="CritLv1" type="float"/>
     <var name="CritLv2" type="float"/>
     <var name="CritLv3" type="float"/>
-    
     <var name="CritHurt" type="float"/>
     <var name="CritHurtlV1" type="float"/>
     <var name="CritHurtlV2" type="float"/>
@@ -163,7 +161,6 @@
     <var name="DefLv1" type="int"/>
     <var name="DefLv2" type="int"/>
     <var name="DefLv3" type="int"/>
-
     <var name="Def" type="int"/>
     <var name="FireDef" type="int"/>
     <var name="ThunderDef" type="int"/>
@@ -172,25 +169,25 @@
     <var name="IceDef" type="int"/>
     <var name="PoisonDef" type="int"/>
     
-    <var name="Dodge" type="float"/>
     <var name="DodgeLv1" type="float"/>
     <var name="DodgeLv2" type="float"/>
     <var name="DodgeLv3" type="float"/>
+    <var name="Dodge" type="float"/>
     
-    <var name="Block" type="float"/>
     <var name="BlockLv1" type="float"/>
     <var name="BlockLv2" type="float"/>
     <var name="BlockLv3" type="float"/>
+    <var name="Block" type="float"/>
     
-    <var name="Parry" type="float"/>
     <var name="ParryLv1" type="float"/>
     <var name="ParryLv2" type="float"/>
     <var name="ParryLv3" type="float"/>
+    <var name="Parry" type="float"/>
     
-    <var name="Hp" type="int"/>
     <var name="HpLv1" type="int"/>
     <var name="HpLv2" type="int"/>
     <var name="HpLv3" type="int"/>
+    <var name="Hp" type="int"/>
     
     <var name="HpPerUp" type="int"/>
     <var name="Steal" type="int"/>
@@ -220,14 +217,9 @@
   </bean>
 
 
-  <bean name="MaterialsCombination">
-    <var name="ItemID" type="int"/>
-    <var name="ItemNum" type="int"/>
-  </bean>
-
   <bean name="EquipmentLvUpMaterials">
     <var name="MaterialsCombinationID" type="int"/>
-    <var name="MaterialsCombinations" type="list,MaterialsCombination"/>
+    <var name="MaterialsCombinations" type="map,int,string"/>
   </bean>
   
   
--
libgit2 0.21.2