Commit 70300e3c15c0d56624579e6c6714901b4a45583a
Merge branch 'master' of 120.26.43.151:loujiachen/DesignerConfigs
# Conflicts: # Datas/pro2d/PopupsDatas.xlsx
Showing
9 changed files
with
2 additions
and
2 deletions
Show diff stats
Datas/pro2d/DialogueAll.xlsx
No preview for this file type
Datas/pro2d/EquipBreakdown.xlsx
No preview for this file type
Datas/pro2d/EquipmentLvUpMaterials.xlsx
No preview for this file type
Datas/pro2d/FavorabilityDataConfig.xlsx
No preview for this file type
Datas/pro2d/MainChapter.xlsx
No preview for this file type
Datas/pro2d/PopupsDatas.xlsx
No preview for this file type
Datas/pro2d/hero.xlsx
No preview for this file type
Datas/pro2d/task/QuestFavorability.xlsx
No preview for this file type
Defines/pro2d.xml
@@ -783,6 +783,7 @@ | @@ -783,6 +783,7 @@ | ||
783 | <var name="firstAward" type="string"/> | 783 | <var name="firstAward" type="string"/> |
784 | <var name="normalAward" type="string"/> | 784 | <var name="normalAward" type="string"/> |
785 | <var name="FailAward" type="string"/> | 785 | <var name="FailAward" type="string"/> |
786 | + <var name="favorExp" type="int"/> | ||
786 | <var name="carbonExp" type="int"/> | 787 | <var name="carbonExp" type="int"/> |
787 | <var name="carbonFailExp" type="int"/> | 788 | <var name="carbonFailExp" type="int"/> |
788 | <var name="spCost" type="int"/> | 789 | <var name="spCost" type="int"/> |
@@ -953,8 +954,7 @@ | @@ -953,8 +954,7 @@ | ||
953 | <var name="UnlockConditionTag" type="int"/> | 954 | <var name="UnlockConditionTag" type="int"/> |
954 | <var name="UnlockConditionCompare" type="string"/> | 955 | <var name="UnlockConditionCompare" type="string"/> |
955 | <var name="UnlockConditionParamList" type="int"/> | 956 | <var name="UnlockConditionParamList" type="int"/> |
956 | - <var name="QuestConditionParamList1" type="int"/> | ||
957 | - <var name="QuestConditionParamList2" type="int"/> | 957 | + <var name="QuestConditionParamList" type="int"/> |
958 | </bean> | 958 | </bean> |
959 | 959 | ||
960 | <bean name="QuestFavorability"> | 960 | <bean name="QuestFavorability"> |