loujiachen / DesignerConfigs

Commit dbe10e58fdf5b9664f8cbd13ba37139fbee2abb9

Authored by yangjiyue
1 parent 2eb760ba

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

Showing 3 changed files with 14 additions and 2 deletions   Show diff stats
Inline Side-by-side
Datas/pro2d/EquipmentData.xlsx
View file @dbe10e5
No preview for this file type
Datas/pro2d/EquipmentType.xlsx deleted
View file @2eb760b
No preview for this file type
@@ -207,10 +207,21 @@ @@ -207,10 +207,21 @@
207 207
208 <bean name="EquipmentType"> 208 <bean name="EquipmentType">
209 <var name="EquipType" type="int"/> 209 <var name="EquipType" type="int"/>
  210 + <var name="EquipBagClassify" type="int"/>
210 <var name="EquipTypeName" type="string"/> 211 <var name="EquipTypeName" type="string"/>
211 <var name="TypeImagePath" type="string"/> 212 <var name="TypeImagePath" type="string"/>
212 </bean> 213 </bean>
213 214
  215 + <bean name="EquipmentMiscellaneousData">
  216 + <var name="MiscellaneousDataKey" type="string"/>
  217 + <var name="MiscellaneousDataList" type="list,MiscellaneousData"/>
  218 + </bean>
  219 +
  220 + <bean name="MiscellaneousData">
  221 + <var name="Name" type="string"/>
  222 + <var name="Path" type="string"/>
  223 + </bean>
  224 +
214 <bean name="BraekdownResult"> 225 <bean name="BraekdownResult">
215 <var name="ItemID" type="int"/> 226 <var name="ItemID" type="int"/>
216 <var name="MinNum" type="int"/> 227 <var name="MinNum" type="int"/>
@@ -540,8 +551,9 @@ @@ -540,8 +551,9 @@
540 <table name="TbMainChapter" value="MainChapter" input="pro2d/MainChapter.xlsx"/> 551 <table name="TbMainChapter" value="MainChapter" input="pro2d/MainChapter.xlsx"/>
541 <table name="TbCarbonMonster" value="CarbonMonster" input="pro2d/CarbonMonster.xlsx"/> 552 <table name="TbCarbonMonster" value="CarbonMonster" input="pro2d/CarbonMonster.xlsx"/>
542 553
543 - <table name="TbEquipmentData" value="EquipmentData" input="pro2d/EquipmentData.xlsx"/>  
544 - <table name="TbEquipmentType" value="EquipmentType" input="pro2d/EquipmentType.xlsx"/> 554 + <table name="TbEquipmentData" value="EquipmentData" input="pro2d/BaseData@EquipmentData.xlsx"/>
  555 + <table name="TbEquipmentType" value="EquipmentType" input="pro2d/EquipmentType@EquipmentData.xlsx"/>
  556 + <table name="TbEquipmentMiscellaneousData" value="EquipmentMiscellaneousData" input="pro2d/EquipmentMiscellaneousData@EquipmentData.xlsx"/>
545 <table name="TbEquipBreakdown" value="EquipBreakdown" input="pro2d/EquipBreakdown.xlsx"/> 557 <table name="TbEquipBreakdown" value="EquipBreakdown" input="pro2d/EquipBreakdown.xlsx"/>
546 <table name="TbEquipmentLvUpMaterials" value="EquipmentLvUpMaterials" input="pro2d/EquipmentLvUpMaterials.xlsx"/> 558 <table name="TbEquipmentLvUpMaterials" value="EquipmentLvUpMaterials" input="pro2d/EquipmentLvUpMaterials.xlsx"/>
547 <table name="TbItemData" value="ItemData" input="pro2d/ItemData.xlsx"/> 559 <table name="TbItemData" value="ItemData" input="pro2d/ItemData.xlsx"/>