From 575b150dd085b5891e77327ded8d90f14d230d40 Mon Sep 17 00:00:00 2001
From: zqj <582132116@qq.com>
Date: Thu, 15 Jun 2023 15:36:26 +0800
Subject: [PATCH] add: 全局任务表

---
 Datas/pro2d/task/QuestActivityCtl.xlsx | Bin 0 -> 9407 bytes
 Datas/pro2d/task/QuestDatas.xlsx       | Bin 1321089 -> 0 bytes
 Datas/pro2d/task/QuestDescription.xlsx | Bin 0 -> 10091 bytes
 Datas/pro2d/task/QuestGlobal.xlsx      | Bin 0 -> 9908 bytes
 Defines/pro2d.xml                      | 14 ++++++++++++++
 5 files changed, 14 insertions(+), 0 deletions(-)
 create mode 100644 Datas/pro2d/task/QuestActivityCtl.xlsx
 create mode 100644 Datas/pro2d/task/QuestDescription.xlsx
 create mode 100644 Datas/pro2d/task/QuestGlobal.xlsx

diff --git a/Datas/pro2d/task/QuestActivityCtl.xlsx b/Datas/pro2d/task/QuestActivityCtl.xlsx
new file mode 100644
index 0000000..18010a8
Binary files /dev/null and b/Datas/pro2d/task/QuestActivityCtl.xlsx differ
diff --git a/Datas/pro2d/task/QuestDatas.xlsx b/Datas/pro2d/task/QuestDatas.xlsx
index c09ba4c..e204db6 100644
Binary files a/Datas/pro2d/task/QuestDatas.xlsx and b/Datas/pro2d/task/QuestDatas.xlsx differ
diff --git a/Datas/pro2d/task/QuestDescription.xlsx b/Datas/pro2d/task/QuestDescription.xlsx
new file mode 100644
index 0000000..8de5094
Binary files /dev/null and b/Datas/pro2d/task/QuestDescription.xlsx differ
diff --git a/Datas/pro2d/task/QuestGlobal.xlsx b/Datas/pro2d/task/QuestGlobal.xlsx
new file mode 100644
index 0000000..af9c982
Binary files /dev/null and b/Datas/pro2d/task/QuestGlobal.xlsx differ
diff --git a/Defines/pro2d.xml b/Defines/pro2d.xml
index 71c36bc..b837011 100644
--- a/Defines/pro2d.xml
+++ b/Defines/pro2d.xml
@@ -941,6 +941,7 @@
         <var name="QuestAward" type="string"/>
     </bean>
 	
+	
     <bean name="QuestDatas">
         <var name="QuestTag" type="int"/>
         <var name="QuestDataStructs" type="map,int,QuestDataStruct"/>
@@ -966,6 +967,19 @@
         <var name="FavorabilityQuests" type="map,int,FavorabilityQuest"/>
     </bean>
 	
+    <bean name="QuestGlobal">
+         <var name="QuestID" type="int"/>
+         <var name="QuestName" type="string"/>
+        <var name="QuestGoalText" type="string"/>
+        <var name="Active" type="int"/>
+        <var name="QuestGoalTypeTag" type="int"/>
+        <var name="UnlockConditionParamList" type="int"/>
+        <var name="TaskConditionCompare" type="string"/>
+        <var name="TaskConditionParamList" type="int"/>
+        <var name="Circulable" type="int"/>
+        <var name="QuestAward" type="string"/>
+    </bean>
+	
     <bean name="RechargeDatas">
         <var name="StoreType" type="int"/>
         <var name="StoreResetCycle" type="int"/>
--
libgit2 0.21.2