loujiachen / DesignerConfigs

Commit 366c9b7ddc8f8329d6c903a9d55c01f11b6b154f

Authored by yangjiyue
2 parents 3334121b 692d1446

Merge branch 'master' of 120.26.43.151:loujiachen/DesignerConfigs

Showing 7 changed files with 23 additions and 2 deletions   Show diff stats
Inline Side-by-side
Datas/pro2d/CarbonMonster.xlsx
View file @366c9b7
No preview for this file type
Datas/pro2d/Dispatch.xlsx
View file @366c9b7
No preview for this file type
Datas/pro2d/EquipmentData.xlsx
View file @366c9b7
No preview for this file type
Datas/pro2d/task/QuestAchievementDatas.xlsx 0 → 100644
View file @366c9b7
No preview for this file type
Datas/pro2d/QuestDataCondition.xlsx renamed to Datas/pro2d/task/QuestDataCondition.xlsx
View file @366c9b7
No preview for this file type
Datas/pro2d/QuestDatas.xlsx renamed to Datas/pro2d/task/QuestDatas.xlsx
View file @366c9b7
No preview for this file type
@@ -861,13 +861,33 @@ @@ -861,13 +861,33 @@
861 <var name="TaskCondition" type="int"/> 861 <var name="TaskCondition" type="int"/>
862 <var name="Circulable" type="int"/> 862 <var name="Circulable" type="int"/>
863 <var name="QuestAward" type="string"/> 863 <var name="QuestAward" type="string"/>
  864 + <var name="StartTime" type="string"/>
  865 + <var name="EndTime" type="string"/>
864 </bean> 866 </bean>
865 867
  868 + <bean name="QuestAchievementDataStruct">
  869 + <var name="QuestName" type="string"/>
  870 + <var name="QuestGoalText" type="string"/>
  871 + <var name="Active" type="int"/>
  872 + <var name="QuestGoal" type="int"/>
  873 + <var name="QuestGoalTypeTag" type="int"/>
  874 + <var name="QuestGoalProgressMax" type="int"/>
  875 + <var name="QuestPrecondition" type="int"/>
  876 + <var name="UnlockCondition" type="int"/>
  877 + <var name="TaskCondition" type="int"/>
  878 + <var name="QuestAward" type="string"/>
  879 + </bean>
  880 +
866 <bean name="QuestDatas"> 881 <bean name="QuestDatas">
867 <var name="QuestTag" type="int"/> 882 <var name="QuestTag" type="int"/>
868 <var name="QuestDataStructs" type="map,int,QuestDataStruct"/> 883 <var name="QuestDataStructs" type="map,int,QuestDataStruct"/>
869 </bean> 884 </bean>
870 885
  886 + <bean name="QuestAchievementDatas">
  887 + <var name="QuestTag" type="int"/>
  888 + <var name="QuestAchievementDataStructs" type="map,int,QuestAchievementDataStruct"/>
  889 + </bean>
  890 +
871 <bean name="QuestDataCondition"> 891 <bean name="QuestDataCondition">
872 <var name="ID" type="int"/> 892 <var name="ID" type="int"/>
873 <var name="ConditionName" type="string"/> 893 <var name="ConditionName" type="string"/>
@@ -1146,8 +1166,9 @@ @@ -1146,8 +1166,9 @@
1146 <table name="TbOpenBox" value="OpenBox" input="pro2d/OpenBox.xlsx"/> 1166 <table name="TbOpenBox" value="OpenBox" input="pro2d/OpenBox.xlsx"/>
1147 <table name="TbPopupsDatas" value="PopupsDatas" input="pro2d/PopupsDatas.xlsx"/> 1167 <table name="TbPopupsDatas" value="PopupsDatas" input="pro2d/PopupsDatas.xlsx"/>
1148 <table name="TbPropertiesName" value="PropertiesName" input="pro2d/PropertiesName.xls"/> 1168 <table name="TbPropertiesName" value="PropertiesName" input="pro2d/PropertiesName.xls"/>
1149 - <table name="TbQuestDatas" value="QuestDatas" input="pro2d/QuestDatas.xlsx"/>  
1150 - <table name="TbQuestDataCondition" value="QuestDataCondition" input="pro2d/QuestDataCondition.xlsx"/> 1169 + <table name="TbQuestDatas" value="QuestDatas" input="pro2d/task/QuestDatas.xlsx"/>
  1170 + <table name="TbQuestAchievementData" value="QuestAchievementDatas" input="pro2d/task/QuestAchievementDatas.xlsx"/>
  1171 + <table name="TbQuestDataCondition" value="QuestDataCondition" input="pro2d/task/QuestDataCondition.xlsx"/>
1151 1172
1152 <table name="TbRogueChapter" value="RogueChapter" input="pro2d/RogueChapter.xlsx"/> 1173 <table name="TbRogueChapter" value="RogueChapter" input="pro2d/RogueChapter.xlsx"/>
1153 <table name="TbRogueMonsterCard" value="RogueMonsterCard" input="pro2d/RogueMonsterCard.xlsx"/> 1174 <table name="TbRogueMonsterCard" value="RogueMonsterCard" input="pro2d/RogueMonsterCard.xlsx"/>