loujiachen / DesignerConfigs

Commit cff0d477da9f6e0b20aa8631d9baddaee109c849

Authored by zhangqijia
1 parent b0c296f5

update

Showing 3 changed files with 3 additions and 7 deletions   Show diff stats
Inline Side-by-side
Datas/pro2d/FavorabilityDataConfig.xlsx renamed to Datas/pro2d/favorability/FavorabilityDataConfig.xlsx
View file @cff0d47
No preview for this file type
Datas/pro2d/hero.xlsx
View file @cff0d47
No preview for this file type
Defines/pro2d.xml
  Show/Hide comments   View file @cff0d47
... ... @@ -580,12 +580,8 @@
580 580 <var name="ArmorType" type="(list#sep==),int"/>
581 581 <var name="ShoesType" type="(list#sep==),int"/>
582 582 <var name="CoupleTiesID" type="int"/>
583   -<<<<<<< HEAD
584   - <var name="LikabilityMaxLevel" type="int"/>
585   -=======
586 583 <var name="FavorabilityID" type="string"/>
587   ->>>>>>> e4dfabea8ccf36a2b635c861249f594ebe48c61d
588   -
  584 +
589 585 <var name="atks" type="map,NumericType,int"/>
590 586 <var name="defs" type="map,NumericType,int"/>
591 587 </bean>
... ... @@ -1213,7 +1209,7 @@
1213 1209 </bean>
1214 1210  
1215 1211 <bean name="FavorabilityDataConfig">
1216   - <var name="FAID" type="string"/>
  1212 + <var name="FAID" type="int"/>
1217 1213 <var name="LevelDatas" type="map,int,LevelData"/>
1218 1214 </bean>
1219 1215  
... ... @@ -1328,5 +1324,5 @@
1328 1324 <table name="TbCompassDatas" value="CompassDatas" input="pro2d/CompassDatas.xlsx"/>
1329 1325 <table name="TbLanguage" value="Language" input="pro2d/Language.xlsx"/>
1330 1326 <table name="TbCompassSkillConfig" value="CompassSkillConfig" input="pro2d/CompassSkillConfig.xlsx"/>
1331   - <table name="TbFavorabilityDataConfig" value="FavorabilityDataConfig" input="pro2d/FavorabilityDataConfig.xlsx"/>
  1327 + <table name="TbFavorabilityDataConfig" value="FavorabilityDataConfig" input="pro2d/favorability/FavorabilityDataConfig.xlsx"/>
1332 1328 </module>
1333 1329 \ No newline at end of file
... ...