From 773dbce274dec45bdb88b86c544bcc8094c7da98 Mon Sep 17 00:00:00 2001
From: yangjiyve <1711972070@qq.com>
Date: Thu, 22 Sep 2022 16:02:28 +0800
Subject: [PATCH] grade移动到itemdata

---
 Datas/pro2d/EquipmentData.xlsx | Bin 122660 -> 0 bytes
 Datas/pro2d/ItemData.xlsx      | Bin 43207 -> 0 bytes
 Defines/pro2d.xml              | 21 +++++++++++----------
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/Datas/pro2d/EquipmentData.xlsx b/Datas/pro2d/EquipmentData.xlsx
index 96b3a04..56e96e1 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 40ec2f5..be780e2 100644
Binary files a/Datas/pro2d/ItemData.xlsx and b/Datas/pro2d/ItemData.xlsx differ
diff --git a/Defines/pro2d.xml b/Defines/pro2d.xml
index 8f0259a..1fe6f2b 100644
--- a/Defines/pro2d.xml
+++ b/Defines/pro2d.xml
@@ -212,11 +212,6 @@
     <var name="EquipTypeName" type="string"/>
     <var name="TypeImagePath" type="string"/>
   </bean>
-
-  <bean name="EquipmentMiscellaneousData">
-    <var name="MiscellaneousDataKey" type="string"/>
-    <var name="MiscellaneousDataList" type="list,MiscellaneousData"/>
-  </bean>
   
   <bean name="MiscellaneousData">
     <var name="Name" type="string"/>
@@ -241,9 +236,8 @@
     <var name="MaterialsCombinationID" type="int"/>
     <var name="MaterialsCombinations" type="map,int,string"/>
   </bean>
-
-
-
+  
+  
   <bean name="ItemData">
     <var name="ID" type="int"/>
     <var name="Name" type="string"/>
@@ -263,6 +257,13 @@
     <var name="GetWay" type="string"/>
   </bean>
 
+
+  <bean name="ItemMiscellaneousData">
+    <var name="MiscellaneousDataKey" type="string"/>
+    <var name="MiscellaneousDataList" type="list,MiscellaneousData"/>
+  </bean>
+  
+  
   <bean name="ItemRandom">
     <var name="ID" type="int"/>
     <var name="Name" type="string"/>
@@ -554,10 +555,10 @@
 
   <table name="TbEquipmentData" value="EquipmentData" input="pro2d/BaseData@EquipmentData.xlsx"/>
   <table name="TbEquipmentType" value="EquipmentType" input="pro2d/EquipmentType@EquipmentData.xlsx"/>
-  <table name="TbEquipmentMiscellaneousData" value="EquipmentMiscellaneousData" input="pro2d/EquipmentMiscellaneousData@EquipmentData.xlsx"/>
   <table name="TbEquipBreakdown" value="EquipBreakdown" input="pro2d/EquipBreakdown.xlsx"/>
   <table name="TbEquipmentLvUpMaterials" value="EquipmentLvUpMaterials" input="pro2d/EquipmentLvUpMaterials.xlsx"/>
-  <table name="TbItemData" value="ItemData" input="pro2d/ItemData.xlsx"/>
+  <table name="TbItemData" value="ItemData" input="pro2d/BaseData@ItemData.xlsx"/>
+  <table name="TbItemMiscellaneousData" value="ItemMiscellaneousData" input="pro2d/MiscellaneousData@ItemData.xlsx"/>
   <table name="TbItemRandom" value="ItemRandom" input="pro2d/ItemRandom.xlsx"/>
   <table name="TbConsumptionItemData" value="ConsumptionItemData" input="pro2d/ConsumptionItemData.xlsx"/>
 
--
libgit2 0.21.2