Merge branch 'master' of 120.26.43.151:loujiachen/DesignerConfigs

xumiaojie · xumiaojie
2 parents 46c6e297 b7520fca
Showing 36 changed files with 17 additions and 12 deletions Show diff stats
Datas/__enums__.xlsx
Datas/common/FUIPanel.xlsx
Datas/common/NumericType.xlsx
Datas/common/NumericTypeEx.xlsx
Datas/pro2d/CarbonMonster.xlsx
Datas/pro2d/CardPool.xlsx
Datas/pro2d/CompassDatas.xlsx
Datas/pro2d/ConsumptionItemData.xlsx
Datas/pro2d/DropChildGroup.xlsx
Datas/pro2d/DropGroup.xlsx
Datas/pro2d/EquipmentData.xlsx
Datas/pro2d/EquipmentLvUpMaterials.xlsx
Datas/pro2d/GlobalBaseDatas.xlsx
Datas/pro2d/GuideInfoConfig.xlsx
Datas/pro2d/HeroGradeMemoryComposite.xls
Datas/pro2d/HeroGradeMemoryData.xls
Datas/pro2d/HeroGradeMemoryGroup.xls
Datas/pro2d/HeroGradeMemoryLevelUp.xls
Datas/pro2d/HeroGradeUpValue.xlsx
Datas/pro2d/HeroLvUpValue.xlsx
@@ -613,7 +613,7 @@
     </bean>
     <bean name="GuideInfoConfig">
-      <var name="GuideID" type="int"/>、
+      <var name="GuideID" type="int"/>
       <var name="GuideTitle" type="string"/>
       <var name="GuideInfo" type="string"/>
       <var name="GuideImage" type="string"/>
@@ -643,15 +643,11 @@
         <var name="searchRange" type="float"/>
         <var name="atkRange" type="float"/>
         <var name="atkSpeed" type="float"/>
-        <var name="crit" type="int"/>
-        <var name="critRate" type="float"/>
+        <var name="crit" type="float"/>
         <var name="critHurt" type="int"/>
-        <var name="dodge" type="int"/>
-        <var name="dodgeRate" type="float"/>
-        <var name="block" type="int"/>
-        <var name="blockRate" type="float"/>
-        <var name="parry" type="int"/>
-        <var name="parryRate" type="float"/>
+        <var name="dodge" type="float"/>
+        <var name="block" type="float"/>
+        <var name="parry" type="float"/>
         <var name="stiffness" type="int"/>
         <var name="atkDropSpProbability" type="float"/>
         <var name="damageReduction" type="int"/>
@@ -694,9 +690,9 @@
         <var name="crit1" type="float"/>
         <var name="crit2" type="float"/>
         <var name="crit3" type="float"/>
-        <var name="atkPct1" type="float"/>
-        <var name="atkPct2" type="float"/>
-        <var name="atkPct3" type="float"/>
+        <var name="atkAdd1" type="float"/>
+        <var name="atkAdd2" type="float"/>
+        <var name="atkAdd3" type="float"/>
     </bean>
     <bean name="HeroGradeUpValue">
@@ -720,6 +716,12 @@
         <var name="Grade_8" type="list,int"/>
         <var name="Grade_9" type="list,int"/>
         <var name="Grade_10" type="list,int"/>
+        <var name="Grade_11" type="list,int"/>
+        <var name="Grade_12" type="list,int"/>
+        <var name="Grade_13" type="list,int"/>
+        <var name="Grade_14" type="list,int"/>
+        <var name="Grade_15" type="list,int"/>
+        <var name="Grade_16" type="list,int"/>
     </bean>
     <bean name="HeroGradeMemoryData">
@@ -872,6 +874,7 @@
         <var name="recommendPower" type="int"/>
         <var name="showCarbonEnemy" type="string"/>
         <var name="dropID" type="string"/>
+        <var name="bossdropID" type="int"/>
         <var name="mapItemdropID" type="int"/>
         <var name="mapItemdropCount" type="int"/>
         <var name="mapTreasuredropID" type="int"/>
@@ -894,6 +897,8 @@
     <bean name="MonsterLvUp">
         <var name="MonsterLvID" type="int"/>
         <var name="LvAtk" type="int"/>
+        <var name="LvElementAtk" type="int"/>
+        <var name="LvDef" type="int"/>
         <var name="LvWeaknessDef" type="int"/>
         <var name="LvNormalDef" type="int"/>
         <var name="LvHP" type="int"/>