Commit ab2511f4c3b539123a2b11e3307a6d2013d7d1ca
update
Showing
8 changed files
with
6 additions
and
1 deletions
Show diff stats
Datas/pro2d/ConsumptionItemData.xlsx
No preview for this file type
Datas/pro2d/DialogueAll.xlsx
No preview for this file type
Datas/pro2d/FavorabilityDataConfig.xlsx
No preview for this file type
Datas/pro2d/HeroLevelExp.xlsx
No preview for this file type
Datas/pro2d/ItemData.xlsx
No preview for this file type
Datas/pro2d/PopupsDatas.xlsx
No preview for this file type
Datas/pro2d/RoleLevelValue.xlsx
No preview for this file type
Defines/pro2d.xml
| @@ -580,7 +580,11 @@ | @@ -580,7 +580,11 @@ | ||
| 580 | <var name="ArmorType" type="(list#sep==),int"/> | 580 | <var name="ArmorType" type="(list#sep==),int"/> |
| 581 | <var name="ShoesType" type="(list#sep==),int"/> | 581 | <var name="ShoesType" type="(list#sep==),int"/> |
| 582 | <var name="CoupleTiesID" type="int"/> | 582 | <var name="CoupleTiesID" type="int"/> |
| 583 | +<<<<<<< HEAD | ||
| 583 | <var name="LikabilityMaxLevel" type="int"/> | 584 | <var name="LikabilityMaxLevel" type="int"/> |
| 585 | +======= | ||
| 586 | + <var name="FavorabilityID" type="string"/> | ||
| 587 | +>>>>>>> e4dfabea8ccf36a2b635c861249f594ebe48c61d | ||
| 584 | 588 | ||
| 585 | <var name="atks" type="map,NumericType,int"/> | 589 | <var name="atks" type="map,NumericType,int"/> |
| 586 | <var name="defs" type="map,NumericType,int"/> | 590 | <var name="defs" type="map,NumericType,int"/> |
| @@ -1209,7 +1213,7 @@ | @@ -1209,7 +1213,7 @@ | ||
| 1209 | </bean> | 1213 | </bean> |
| 1210 | 1214 | ||
| 1211 | <bean name="FavorabilityDataConfig"> | 1215 | <bean name="FavorabilityDataConfig"> |
| 1212 | - <var name="FAID" type="int"/> | 1216 | + <var name="FAID" type="string"/> |
| 1213 | <var name="LevelDatas" type="map,int,LevelData"/> | 1217 | <var name="LevelDatas" type="map,int,LevelData"/> |
| 1214 | </bean> | 1218 | </bean> |
| 1215 | 1219 | ||
| @@ -1324,4 +1328,5 @@ | @@ -1324,4 +1328,5 @@ | ||
| 1324 | <table name="TbCompassDatas" value="CompassDatas" input="pro2d/CompassDatas.xlsx"/> | 1328 | <table name="TbCompassDatas" value="CompassDatas" input="pro2d/CompassDatas.xlsx"/> |
| 1325 | <table name="TbLanguage" value="Language" input="pro2d/Language.xlsx"/> | 1329 | <table name="TbLanguage" value="Language" input="pro2d/Language.xlsx"/> |
| 1326 | <table name="TbCompassSkillConfig" value="CompassSkillConfig" input="pro2d/CompassSkillConfig.xlsx"/> | 1330 | <table name="TbCompassSkillConfig" value="CompassSkillConfig" input="pro2d/CompassSkillConfig.xlsx"/> |
| 1331 | + <table name="TbFavorabilityDataConfig" value="FavorabilityDataConfig" input="pro2d/FavorabilityDataConfig.xlsx"/> | ||
| 1327 | </module> | 1332 | </module> |
| 1328 | \ No newline at end of file | 1333 | \ No newline at end of file |