loujiachen / DesignerConfigs

Commit 773dbce274dec45bdb88b86c544bcc8094c7da98

Authored by yangjiyue
1 parent 9e06736a

grade移动到itemdata

Showing 3 changed files with 11 additions and 10 deletions   Show diff stats
Inline Side-by-side
Datas/pro2d/EquipmentData.xlsx
View file @773dbce
No preview for this file type
Datas/pro2d/ItemData.xlsx
View file @773dbce
No preview for this file type
@@ -212,11 +212,6 @@ @@ -212,11 +212,6 @@
212 <var name="EquipTypeName" type="string"/> 212 <var name="EquipTypeName" type="string"/>
213 <var name="TypeImagePath" type="string"/> 213 <var name="TypeImagePath" type="string"/>
214 </bean> 214 </bean>
215 -  
216 - <bean name="EquipmentMiscellaneousData">  
217 - <var name="MiscellaneousDataKey" type="string"/>  
218 - <var name="MiscellaneousDataList" type="list,MiscellaneousData"/>  
219 - </bean>  
220 215
221 <bean name="MiscellaneousData"> 216 <bean name="MiscellaneousData">
222 <var name="Name" type="string"/> 217 <var name="Name" type="string"/>
@@ -241,9 +236,8 @@ @@ -241,9 +236,8 @@
241 <var name="MaterialsCombinationID" type="int"/> 236 <var name="MaterialsCombinationID" type="int"/>
242 <var name="MaterialsCombinations" type="map,int,string"/> 237 <var name="MaterialsCombinations" type="map,int,string"/>
243 </bean> 238 </bean>
244 -  
245 -  
246 - 239 +
  240 +
247 <bean name="ItemData"> 241 <bean name="ItemData">
248 <var name="ID" type="int"/> 242 <var name="ID" type="int"/>
249 <var name="Name" type="string"/> 243 <var name="Name" type="string"/>
@@ -263,6 +257,13 @@ @@ -263,6 +257,13 @@
263 <var name="GetWay" type="string"/> 257 <var name="GetWay" type="string"/>
264 </bean> 258 </bean>
265 259
  260 +
  261 + <bean name="ItemMiscellaneousData">
  262 + <var name="MiscellaneousDataKey" type="string"/>
  263 + <var name="MiscellaneousDataList" type="list,MiscellaneousData"/>
  264 + </bean>
  265 +
  266 +
266 <bean name="ItemRandom"> 267 <bean name="ItemRandom">
267 <var name="ID" type="int"/> 268 <var name="ID" type="int"/>
268 <var name="Name" type="string"/> 269 <var name="Name" type="string"/>
@@ -554,10 +555,10 @@ @@ -554,10 +555,10 @@
554 555
555 <table name="TbEquipmentData" value="EquipmentData" input="pro2d/BaseData@EquipmentData.xlsx"/> 556 <table name="TbEquipmentData" value="EquipmentData" input="pro2d/BaseData@EquipmentData.xlsx"/>
556 <table name="TbEquipmentType" value="EquipmentType" input="pro2d/EquipmentType@EquipmentData.xlsx"/> 557 <table name="TbEquipmentType" value="EquipmentType" input="pro2d/EquipmentType@EquipmentData.xlsx"/>
557 - <table name="TbEquipmentMiscellaneousData" value="EquipmentMiscellaneousData" input="pro2d/EquipmentMiscellaneousData@EquipmentData.xlsx"/>  
558 <table name="TbEquipBreakdown" value="EquipBreakdown" input="pro2d/EquipBreakdown.xlsx"/> 558 <table name="TbEquipBreakdown" value="EquipBreakdown" input="pro2d/EquipBreakdown.xlsx"/>
559 <table name="TbEquipmentLvUpMaterials" value="EquipmentLvUpMaterials" input="pro2d/EquipmentLvUpMaterials.xlsx"/> 559 <table name="TbEquipmentLvUpMaterials" value="EquipmentLvUpMaterials" input="pro2d/EquipmentLvUpMaterials.xlsx"/>
560 - <table name="TbItemData" value="ItemData" input="pro2d/ItemData.xlsx"/> 560 + <table name="TbItemData" value="ItemData" input="pro2d/BaseData@ItemData.xlsx"/>
  561 + <table name="TbItemMiscellaneousData" value="ItemMiscellaneousData" input="pro2d/MiscellaneousData@ItemData.xlsx"/>
561 <table name="TbItemRandom" value="ItemRandom" input="pro2d/ItemRandom.xlsx"/> 562 <table name="TbItemRandom" value="ItemRandom" input="pro2d/ItemRandom.xlsx"/>
562 <table name="TbConsumptionItemData" value="ConsumptionItemData" input="pro2d/ConsumptionItemData.xlsx"/> 563 <table name="TbConsumptionItemData" value="ConsumptionItemData" input="pro2d/ConsumptionItemData.xlsx"/>
563 564