Commit d69699bfcdd28536d40aba8ca5e17850f553cb69
Merge branch 'master' of 120.26.43.151:loujiachen/DesignerConfigs
Showing
4 changed files
with
12 additions
and
0 deletions
Show diff stats
Datas/pro2d/HeroSkillLvUpValue.xlsx
No preview for this file type
No preview for this file type
Datas/pro2d/QuestDatas.xlsx
No preview for this file type
Defines/pro2d.xml
| @@ -768,6 +768,9 @@ | @@ -768,6 +768,9 @@ | ||
| 768 | <var name="QuestGoalTypeTag" type="int"/> | 768 | <var name="QuestGoalTypeTag" type="int"/> |
| 769 | <var name="QuestGoalProgressMax" type="int"/> | 769 | <var name="QuestGoalProgressMax" type="int"/> |
| 770 | <var name="QuestPrecondition" type="int"/> | 770 | <var name="QuestPrecondition" type="int"/> |
| 771 | + <var name="UnlockCondition" type="int"/> | ||
| 772 | + <var name="TaskCondition" type="int"/> | ||
| 773 | + <var name="Circulable" type="int"/> | ||
| 771 | <var name="QuestAward" type="string"/> | 774 | <var name="QuestAward" type="string"/> |
| 772 | </bean> | 775 | </bean> |
| 773 | 776 | ||
| @@ -776,6 +779,14 @@ | @@ -776,6 +779,14 @@ | ||
| 776 | <var name="QuestDataStructs" type="map,int,QuestDataStruct"/> | 779 | <var name="QuestDataStructs" type="map,int,QuestDataStruct"/> |
| 777 | </bean> | 780 | </bean> |
| 778 | 781 | ||
| 782 | + <bean name="QuestDataCondition"> | ||
| 783 | + <var name="ID" type="int"/> | ||
| 784 | + <var name="ConditionName" type="string"/> | ||
| 785 | + <var name="TaskConditionTypeName" type="string"/> | ||
| 786 | + <var name="TaskConditionType" type="int"/> | ||
| 787 | + <var name="CompareConditionType" type="string"/> | ||
| 788 | + <var name="ParamList" type="int"/> | ||
| 789 | + </bean> | ||
| 779 | 790 | ||
| 780 | <bean name="RechargeDatas"> | 791 | <bean name="RechargeDatas"> |
| 781 | <var name="StoreType" type="int"/> | 792 | <var name="StoreType" type="int"/> |
| @@ -1030,6 +1041,7 @@ | @@ -1030,6 +1041,7 @@ | ||
| 1030 | <table name="TbPopupsDatas" value="PopupsDatas" input="pro2d/PopupsDatas.xlsx"/> | 1041 | <table name="TbPopupsDatas" value="PopupsDatas" input="pro2d/PopupsDatas.xlsx"/> |
| 1031 | <table name="TbPropertiesName" value="PropertiesName" input="pro2d/PropertiesName.xls"/> | 1042 | <table name="TbPropertiesName" value="PropertiesName" input="pro2d/PropertiesName.xls"/> |
| 1032 | <table name="TbQuestDatas" value="QuestDatas" input="pro2d/QuestDatas.xlsx"/> | 1043 | <table name="TbQuestDatas" value="QuestDatas" input="pro2d/QuestDatas.xlsx"/> |
| 1044 | + <table name="TbQuestDataCondition" value="QuestDataCondition" input="pro2d/QuestDataCondition.xlsx"/> | ||
| 1033 | 1045 | ||
| 1034 | <table name="TbRogueChapter" value="RogueChapter" input="pro2d/RogueChapter.xlsx"/> | 1046 | <table name="TbRogueChapter" value="RogueChapter" input="pro2d/RogueChapter.xlsx"/> |
| 1035 | <table name="TbRogueMonsterCard" value="RogueMonsterCard" input="pro2d/RogueMonsterCard.xlsx"/> | 1047 | <table name="TbRogueMonsterCard" value="RogueMonsterCard" input="pro2d/RogueMonsterCard.xlsx"/> |