Commit f59fb4154e6ee89ae4fbd3ab2e87b0db87bd5d03

Authored by yangjiyue
2 parents 1a130622 6de31d6f

Merge branch 'master' of 120.26.43.151:loujiachen/DesignerConfigs

Datas/pro2d/HeroGradeMemoryComposite.xls
No preview for this file type
Datas/pro2d/HeroGradeMemoryGroup.xls
No preview for this file type
Datas/pro2d/task/QuestAchievementDatas.xlsx
No preview for this file type
Datas/pro2d/task/QuestDatas.xlsx
No preview for this file type
Datas/pro2d/task/QuestFavorability.xlsx
No preview for this file type
Defines/pro2d.xml
... ... @@ -935,8 +935,6 @@
935 935 <var name="QuestGoalText" type="string"/>
936 936 <var name="Active" type="int"/>
937 937 <var name="QuestGoalTypeTag" type="int"/>
938   - <var name="UnlockConditionTag" type="int"/>
939   - <var name="UnlockConditionCompare" type="string"/>
940 938 <var name="UnlockConditionParamList" type="int"/>
941 939 <var name="TaskConditionCompare" type="string"/>
942 940 <var name="TaskConditionParamList" type="int"/>
... ...