update

zhangqijia
2 parents 9e9f4ee1 e4dfabea
Showing 8 changed files with 6 additions and 1 deletions Show diff stats
Datas/pro2d/ConsumptionItemData.xlsx
Datas/pro2d/DialogueAll.xlsx
Datas/pro2d/FavorabilityDataConfig.xlsx
Datas/pro2d/HeroLevelExp.xlsx
Datas/pro2d/ItemData.xlsx
Datas/pro2d/PopupsDatas.xlsx
Datas/pro2d/RoleLevelValue.xlsx
Defines/pro2d.xml
@@ -580,7 +580,11 @@
         <var name="ArmorType" type="(list#sep==),int"/>
         <var name="ShoesType" type="(list#sep==),int"/>
         <var name="CoupleTiesID" type="int"/>
+<<<<<<< HEAD
         <var name="LikabilityMaxLevel" type="int"/>
+=======
+        <var name="FavorabilityID" type="string"/>
+>>>>>>> e4dfabea8ccf36a2b635c861249f594ebe48c61d
  
         <var name="atks" type="map,NumericType,int"/>
         <var name="defs" type="map,NumericType,int"/>
@@ -1209,7 +1213,7 @@
     </bean>
  
     <bean name="FavorabilityDataConfig">
-        <var name="FAID" type="int"/>
+        <var name="FAID" type="string"/>
         <var name="LevelDatas" type="map,int,LevelData"/>
     </bean>
  
@@ -1324,4 +1328,5 @@
     <table name="TbCompassDatas" value="CompassDatas" input="pro2d/CompassDatas.xlsx"/>
     <table name="TbLanguage" value="Language" input="pro2d/Language.xlsx"/>
     <table name="TbCompassSkillConfig" value="CompassSkillConfig" input="pro2d/CompassSkillConfig.xlsx"/>
+    <table name="TbFavorabilityDataConfig" value="FavorabilityDataConfig" input="pro2d/FavorabilityDataConfig.xlsx"/>
 </module>
 \ No newline at end of file