loujiachen / DesignerConfigs

Commit c0a1d285ff75a8e23d88923474d079d15974d84e

Authored by yangjiyue
2 parents c633cfdc 148936c5

Merge branch 'master' of 120.26.43.151:loujiachen/DesignerConfigs

Showing 3 changed files with 6 additions and 1 deletions   Show diff stats
Inline Side-by-side
Datas/pro2d/EquipMentComposite.xlsx 0 → 100644
View file @c0a1d28
No preview for this file type
Datas/pro2d/EquipmentData.xlsx
View file @c0a1d28
No preview for this file type
Defines/pro2d.xml
  Show/Hide comments   View file @c0a1d28
... ... @@ -328,7 +328,11 @@
328 328 <var name="MaterialsCombinations" type="map,int,string"/>
329 329 </bean>
330 330  
331   -
  331 + <bean name="EquipmentComposite">
  332 + <var name="EquipID" type="int32"/>
  333 + <var name="Composite" type="string"/>
  334 + </bean>
  335 +
332 336 <bean name="ItemData">
333 337 <var name="ID" type="int"/>
334 338 <var name="Name" type="string"/>
... ... @@ -899,6 +903,7 @@
899 903 <table name="TbEquipmentType" value="EquipmentType" input="pro2d/EquipmentType@EquipmentData.xlsx"/>
900 904 <table name="TbEquipBreakdown" value="EquipBreakdown" input="pro2d/EquipBreakdown.xlsx"/>
901 905 <table name="TbEquipmentLvUpMaterials" value="EquipmentLvUpMaterials" input="pro2d/EquipmentLvUpMaterials.xlsx"/>
  906 + <table name="TbEquipmentComposite" value="EquipmentComposite" input="pro2d/EquipmentComposite.xlsx"/>
902 907 <table name="TbItemData" value="ItemData" input="pro2d/BaseData@ItemData.xlsx"/>
903 908 <table name="TbItemMiscellaneousData" value="ItemMiscellaneousData" input="pro2d/MiscellaneousData@ItemData.xlsx"/>
904 909 <table name="TbOpenBox" value="OpenBox" input="pro2d/OpenBox.xlsx"/>
... ...