Merge branch 'master' of 120.26.43.151:loujiachen/DesignerConfigs

yangjiyue
2 parents 3334121b 692d1446
Showing 7 changed files with 23 additions and 2 deletions Show diff stats
Datas/pro2d/CarbonMonster.xlsx
Datas/pro2d/Dispatch.xlsx
Datas/pro2d/EquipmentData.xlsx
Datas/pro2d/task/QuestAchievementDatas.xlsx
Datas/pro2d/QuestDataCondition.xlsx -> Datas/pro2d/task/QuestDataCondition.xlsx
Datas/pro2d/QuestDatas.xlsx -> Datas/pro2d/task/QuestDatas.xlsx
Defines/pro2d.xml
@@ -861,13 +861,33 @@
         <var name="TaskCondition" type="int"/>
         <var name="Circulable" type="int"/>
         <var name="QuestAward" type="string"/>
+        <var name="StartTime" type="string"/>
+        <var name="EndTime" type="string"/>
     </bean>
  
+    <bean name="QuestAchievementDataStruct">
+        <var name="QuestName" type="string"/>
+        <var name="QuestGoalText" type="string"/>
+        <var name="Active" type="int"/>
+        <var name="QuestGoal" type="int"/>
+        <var name="QuestGoalTypeTag" type="int"/>
+        <var name="QuestGoalProgressMax" type="int"/>
+        <var name="QuestPrecondition" type="int"/>
+        <var name="UnlockCondition" type="int"/>
+        <var name="TaskCondition" type="int"/>
+        <var name="QuestAward" type="string"/>
+    </bean>
+	
     <bean name="QuestDatas">
         <var name="QuestTag" type="int"/>
         <var name="QuestDataStructs" type="map,int,QuestDataStruct"/>
     </bean>
  
+    <bean name="QuestAchievementDatas">
+        <var name="QuestTag" type="int"/>
+        <var name="QuestAchievementDataStructs" type="map,int,QuestAchievementDataStruct"/>
+    </bean>
+	
     <bean name="QuestDataCondition">
         <var name="ID" type="int"/>
         <var name="ConditionName" type="string"/>
@@ -1146,8 +1166,9 @@
     <table name="TbOpenBox" value="OpenBox" input="pro2d/OpenBox.xlsx"/>
     <table name="TbPopupsDatas" value="PopupsDatas" input="pro2d/PopupsDatas.xlsx"/>
     <table name="TbPropertiesName" value="PropertiesName" input="pro2d/PropertiesName.xls"/>
-    <table name="TbQuestDatas" value="QuestDatas" input="pro2d/QuestDatas.xlsx"/>
-    <table name="TbQuestDataCondition" value="QuestDataCondition" input="pro2d/QuestDataCondition.xlsx"/>
+    <table name="TbQuestDatas" value="QuestDatas" input="pro2d/task/QuestDatas.xlsx"/>
+    <table name="TbQuestAchievementData" value="QuestAchievementDatas" input="pro2d/task/QuestAchievementDatas.xlsx"/>
+    <table name="TbQuestDataCondition" value="QuestDataCondition" input="pro2d/task/QuestDataCondition.xlsx"/>
  
     <table name="TbRogueChapter" value="RogueChapter" input="pro2d/RogueChapter.xlsx"/>
     <table name="TbRogueMonsterCard" value="RogueMonsterCard" input="pro2d/RogueMonsterCard.xlsx"/>