Commit 7885f5e522820323b069de358eb218ddb415a5bc
Merge branch 'master' of 120.26.43.151:loujiachen/DesignerConfigs
# Conflicts: # Datas/pro2d/task/QuestAchievementDatas.xlsx # Datas/pro2d/task/QuestDatas.xlsx # Defines/pro2d.xml
Showing
7 changed files
with
14 additions
and
2 deletions
Show diff stats
Datas/pro2d/DialogueAll.xlsx
No preview for this file type
Datas/pro2d/SkillConfig.xlsx
No preview for this file type
Datas/pro2d/SkillToSkillConfig.xlsx
No preview for this file type
No preview for this file type
Datas/pro2d/task/QuestCircleCtl.xlsx
No preview for this file type
Datas/pro2d/task/QuestLimitCtl.xlsx
No preview for this file type
Defines/pro2d.xml
| @@ -980,7 +980,6 @@ | @@ -980,7 +980,6 @@ | ||
| 980 | <bean name="QuestAchievementDataStruct"> | 980 | <bean name="QuestAchievementDataStruct"> |
| 981 | <var name="Name" type="string"/> | 981 | <var name="Name" type="string"/> |
| 982 | <var name="GoalText" type="string"/> | 982 | <var name="GoalText" type="string"/> |
| 983 | - <var name="Active" type="int"/> | ||
| 984 | <var name="GoalTypeTag" type="int"/> | 983 | <var name="GoalTypeTag" type="int"/> |
| 985 | <var name="Unlock" type="int"/> | 984 | <var name="Unlock" type="int"/> |
| 986 | <var name="Compare" type="string"/> | 985 | <var name="Compare" type="string"/> |
| @@ -1029,6 +1028,7 @@ | @@ -1029,6 +1028,7 @@ | ||
| 1029 | <var name="ID" type="int"/> | 1028 | <var name="ID" type="int"/> |
| 1030 | <var name="Name" type="string"/> | 1029 | <var name="Name" type="string"/> |
| 1031 | <var name="OpenFguiId" type="int"/> | 1030 | <var name="OpenFguiId" type="int"/> |
| 1031 | + <var name="OpenFguiParameters" type="string"/> | ||
| 1032 | <var name="UnlockGlobalQuestID" type="int"/> | 1032 | <var name="UnlockGlobalQuestID" type="int"/> |
| 1033 | <var name="Time" type="string"/> | 1033 | <var name="Time" type="string"/> |
| 1034 | </bean> | 1034 | </bean> |
| @@ -1037,6 +1037,7 @@ | @@ -1037,6 +1037,7 @@ | ||
| 1037 | <var name="ID" type="int"/> | 1037 | <var name="ID" type="int"/> |
| 1038 | <var name="Name" type="string"/> | 1038 | <var name="Name" type="string"/> |
| 1039 | <var name="OpenFguiId" type="int"/> | 1039 | <var name="OpenFguiId" type="int"/> |
| 1040 | + <var name="OpenFguiParameters" type="string"/> | ||
| 1040 | <var name="UnlockGlobalQuestID" type="int"/> | 1041 | <var name="UnlockGlobalQuestID" type="int"/> |
| 1041 | <var name="StartTime" type="string"/> | 1042 | <var name="StartTime" type="string"/> |
| 1042 | <var name="EndTime" type="string"/> | 1043 | <var name="EndTime" type="string"/> |
| @@ -1188,7 +1189,17 @@ | @@ -1188,7 +1189,17 @@ | ||
| 1188 | <bean name="signData"> | 1189 | <bean name="signData"> |
| 1189 | <var name="reward" type="string"/> | 1190 | <var name="reward" type="string"/> |
| 1190 | </bean> | 1191 | </bean> |
| 1191 | - | 1192 | + |
| 1193 | + <bean name="SurvivalCarbon"> | ||
| 1194 | + <var name="SurvivalCarbonId" type="int"/> | ||
| 1195 | + <var name="CarbonName" type="string"/> | ||
| 1196 | + <var name="CarbonCost" type="int"/> | ||
| 1197 | + <var name="CostItemId" type="int"/> | ||
| 1198 | + <var name="LimitLV" type="int"/> | ||
| 1199 | + <var name="CountdownTime" type="int"/> | ||
| 1200 | + <var name="SceneID" type="int"/> | ||
| 1201 | + <var name="Reward" type="string"/> | ||
| 1202 | + </bean> | ||
| 1192 | 1203 | ||
| 1193 | <bean name="TeamBonus"> | 1204 | <bean name="TeamBonus"> |
| 1194 | <var name="ID" type="int"/> | 1205 | <var name="ID" type="int"/> |
| @@ -1398,6 +1409,7 @@ | @@ -1398,6 +1409,7 @@ | ||
| 1398 | <table name="TbSmallDialoge" value="SmallDialoge" input="pro2d/SmallDialoge.xlsx"/> | 1409 | <table name="TbSmallDialoge" value="SmallDialoge" input="pro2d/SmallDialoge.xlsx"/> |
| 1399 | <table name="TbSkillLuckyCoinConfig" value="SkillLuckyCoinConfig" input="pro2d/SkillLuckyCoinConfig.xlsx"/> | 1410 | <table name="TbSkillLuckyCoinConfig" value="SkillLuckyCoinConfig" input="pro2d/SkillLuckyCoinConfig.xlsx"/> |
| 1400 | <table name="TbSkillConfig" value="SkillConfig" input="pro2d/SkillConfig.xlsx"/> | 1411 | <table name="TbSkillConfig" value="SkillConfig" input="pro2d/SkillConfig.xlsx"/> |
| 1412 | + <table name="TbSurvivalCarbon" value="SurvivalCarbon" input="pro2d/SurvivalCarbon.xlsx"/> | ||
| 1401 | 1413 | ||
| 1402 | <table name="TbTeamBonus" value="TeamBonus" input="pro2d/TeamBonus.xlsx"/> | 1414 | <table name="TbTeamBonus" value="TeamBonus" input="pro2d/TeamBonus.xlsx"/> |
| 1403 | 1415 |