From dbe10e58fdf5b9664f8cbd13ba37139fbee2abb9 Mon Sep 17 00:00:00 2001
From: yangjiyve <1711972070@qq.com>
Date: Thu, 15 Sep 2022 16:49:42 +0800
Subject: [PATCH] 删除EquipmenType，将其内容加入EquipmenData当中

---
 Datas/pro2d/EquipmentData.xlsx | Bin 111606 -> 0 bytes
 Datas/pro2d/EquipmentType.xlsx | Bin 10765 -> 0 bytes
 Defines/pro2d.xml              | 16 ++++++++++++++--
 3 files changed, 14 insertions(+), 2 deletions(-)
 delete mode 100644 Datas/pro2d/EquipmentType.xlsx

diff --git a/Datas/pro2d/EquipmentData.xlsx b/Datas/pro2d/EquipmentData.xlsx
index 6bde707..5a7fe7a 100644
Binary files a/Datas/pro2d/EquipmentData.xlsx and b/Datas/pro2d/EquipmentData.xlsx differ
diff --git a/Datas/pro2d/EquipmentType.xlsx b/Datas/pro2d/EquipmentType.xlsx
deleted file mode 100644
index 4be1266..0000000
Binary files a/Datas/pro2d/EquipmentType.xlsx and /dev/null differ
diff --git a/Defines/pro2d.xml b/Defines/pro2d.xml
index 1eb0b79..90dace8 100644
--- a/Defines/pro2d.xml
+++ b/Defines/pro2d.xml
@@ -207,10 +207,21 @@
 
   <bean name="EquipmentType">
     <var name="EquipType" type="int"/>
+    <var name="EquipBagClassify" type="int"/>
     <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"/>
+    <var name="Path" type="string"/>
+  </bean>
+
   <bean name="BraekdownResult">
     <var name="ItemID" type="int"/>
     <var name="MinNum" type="int"/>
@@ -540,8 +551,9 @@
   <table name="TbMainChapter" value="MainChapter" input="pro2d/MainChapter.xlsx"/>
   <table name="TbCarbonMonster" value="CarbonMonster" input="pro2d/CarbonMonster.xlsx"/>
 
-  <table name="TbEquipmentData" value="EquipmentData" input="pro2d/EquipmentData.xlsx"/>
-  <table name="TbEquipmentType" value="EquipmentType" input="pro2d/EquipmentType.xlsx"/>
+  <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"/>
--
libgit2 0.21.2