From 45bdd62ba4ef98a262222fb7dd70d0076ee8a1ef Mon Sep 17 00:00:00 2001
From: zqj <582132116@qq.com>
Date: Tue, 11 Apr 2023 16:05:44 +0800
Subject: [PATCH] feat: add achievement

---
 Datas/pro2d/QuestDataCondition.xlsx         | Bin 11292 -> 0 bytes
 Datas/pro2d/QuestDatas.xlsx                 | Bin 17227 -> 0 bytes
 Datas/pro2d/task/QuestAchievementDatas.xlsx | Bin 0 -> 10191 bytes
 Datas/pro2d/task/QuestDataCondition.xlsx    | Bin 0 -> 11292 bytes
 Datas/pro2d/task/QuestDatas.xlsx            | Bin 0 -> 17200 bytes
 Defines/pro2d.xml                           | 25 +++++++++++++++++++++++--
 6 files changed, 23 insertions(+), 2 deletions(-)
 delete mode 100644 Datas/pro2d/QuestDataCondition.xlsx
 delete mode 100644 Datas/pro2d/QuestDatas.xlsx
 create mode 100644 Datas/pro2d/task/QuestAchievementDatas.xlsx
 create mode 100644 Datas/pro2d/task/QuestDataCondition.xlsx
 create mode 100644 Datas/pro2d/task/QuestDatas.xlsx

diff --git a/Datas/pro2d/QuestDataCondition.xlsx b/Datas/pro2d/QuestDataCondition.xlsx
deleted file mode 100644
index fac77ed..0000000
Binary files a/Datas/pro2d/QuestDataCondition.xlsx and /dev/null differ
diff --git a/Datas/pro2d/QuestDatas.xlsx b/Datas/pro2d/QuestDatas.xlsx
deleted file mode 100644
index a48d036..0000000
Binary files a/Datas/pro2d/QuestDatas.xlsx and /dev/null differ
diff --git a/Datas/pro2d/task/QuestAchievementDatas.xlsx b/Datas/pro2d/task/QuestAchievementDatas.xlsx
new file mode 100644
index 0000000..03a443f
Binary files /dev/null and b/Datas/pro2d/task/QuestAchievementDatas.xlsx differ
diff --git a/Datas/pro2d/task/QuestDataCondition.xlsx b/Datas/pro2d/task/QuestDataCondition.xlsx
new file mode 100644
index 0000000..fac77ed
Binary files /dev/null and b/Datas/pro2d/task/QuestDataCondition.xlsx differ
diff --git a/Datas/pro2d/task/QuestDatas.xlsx b/Datas/pro2d/task/QuestDatas.xlsx
new file mode 100644
index 0000000..fa1b9d4
Binary files /dev/null and b/Datas/pro2d/task/QuestDatas.xlsx differ
diff --git a/Defines/pro2d.xml b/Defines/pro2d.xml
index 62b9cc3..6a526b5 100644
--- a/Defines/pro2d.xml
+++ b/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"/>
@@ -1145,8 +1165,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"/>
--
libgit2 0.21.2