Merge branch 'master' of 120.26.43.151:loujiachen/DesignerConfigs

yangjiyue
2 parents 96015ef5 1063d9cb
Showing 6 changed files with 40 additions and 1 deletions Show diff stats
Datas/common/NumericType.xlsx
Datas/common/NumericTypeEx.xlsx
Datas/pro2d/Dispatch.xlsx
Datas/pro2d/EquipmentDataNew.xlsx
Datas/pro2d/GlobalBaseDatas.xlsx
Defines/pro2d.xml
@@ -353,6 +353,29 @@
         <var name="GetWayLink" type="string"/>
     </bean>
  
+   <bean name="EquipmentDataNew">
+      <var name="EquipID" type="int"/>
+      <var name="EquipName" type="string"/>
+      <var name="EquipType" type="int"/>
+      <var name="Grade" type="int"/>
+      <var name="Star" type="int"/>
+
+      <var name="GemNum" type="int"/>
+      <var name="PrefabId" type="int"/>
+      <var name="Atk" type="float"/>
+      <var name="Crit" type="float"/>
+      <var name="Def" type="float"/>
+      <var name="Dodge" type="float"/>
+      <var name="Hp" type="float"/>
+    
+      <var name="StrengthenMaterialsCombinationID" type="int"/>
+
+      <var name="ImageName" type="string"/>
+      <var name="DetailText" type="string"/>
+      <var name="GetWay" type="string"/>
+      <var name="GetWayLink" type="string"/>
+   </bean>
+
     <bean name="EquipmentType">
         <var name="EquipType" type="int"/>
         <var name="EquipBagClassify" type="int"/>
@@ -361,6 +384,19 @@
         <var name="GemType" type="string"/>
     </bean>
  
+  <bean name="EquipmentAdvancedEntry">
+    <var name="ID" type="int"/>
+    <var name="Description" type="string"/>
+    <var name="EntryToWeapon" type="string"/>
+    <var name="Star" type="int"/>
+    <var name="weight" type="int"/>
+    <var name="Lower" type="int"/>
+    <var name="Upper" type="int"/>
+    <var name="IsPct" type="bool"/>
+  </bean>
+  
+    
+
     <bean name="EquipBreakdown">
         <var name="EquipID" type="int"/>
         <var name="BraekdownResults" type="list,BraekdownResult"/>
@@ -1045,7 +1081,10 @@
     <table name="TbDropChildGroup" value="DropChildGroup" input="pro2d/DropChildGroup.xlsx"/>
  
     <table name="TbEquipmentData" value="EquipmentData" input="pro2d/BaseData@EquipmentData.xlsx"/>
-    <table name="TbEquipmentType" value="EquipmentType" input="pro2d/EquipmentType@EquipmentData.xlsx"/>
+    <table name="TbEquipmentDataNew" value="EquipmentDataNew" input="pro2d/BaseData@EquipmentDataNew.xlsx"/>
+    <table name="TbEquipmentType" value="EquipmentType" input="pro2d/EquipmentType@EquipmentDataNew.xlsx"/>
+    <table name="TbEquipmentAdvancedEntry" value="EquipmentAdvancedEntry" input="pro2d/EquipmentAdvancedEntry@EquipmentDataNew.xlsx"/>
+  
     <table name="TbEquipBreakdown" value="EquipBreakdown" input="pro2d/EquipBreakdown.xlsx"/>
     <table name="TbEquipmentLvUpMaterials" value="EquipmentLvUpMaterials" input="pro2d/EquipmentLvUpMaterials.xlsx"/>
     <table name="TbEquipmentComposite" value="EquipmentComposite" input="pro2d/EquipmentComposite.xlsx"/>