删除EquipmenType，将其内容加入EquipmenData当中

yangjiyue
1 parent 2eb760ba
Showing 3 changed files with 14 additions and 2 deletions Show diff stats
Datas/pro2d/EquipmentData.xlsx
Datas/pro2d/EquipmentType.xlsx
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"/>