From bd71056ff04be170588476b12324ae91e888a88f Mon Sep 17 00:00:00 2001
From: zqj <582132116@qq.com>
Date: Mon, 17 Apr 2023 11:54:23 +0800
Subject: [PATCH] fix: update 任务表和成就系统表

---
 Datas/pro2d/task/QuestAchievementDatas.xlsx | Bin 10110 -> 0 bytes
 Datas/pro2d/task/QuestDataCondition.xlsx    | Bin 11292 -> 0 bytes
 Datas/pro2d/task/QuestDatas.xlsx            | Bin 17235 -> 0 bytes
 Defines/pro2d.xml                           | 19 ++++++++-----------
 4 files changed, 8 insertions(+), 11 deletions(-)
 delete mode 100644 Datas/pro2d/task/QuestDataCondition.xlsx

diff --git a/Datas/pro2d/task/QuestAchievementDatas.xlsx b/Datas/pro2d/task/QuestAchievementDatas.xlsx
index 9f21bdb..d7db469 100644
Binary files a/Datas/pro2d/task/QuestAchievementDatas.xlsx and b/Datas/pro2d/task/QuestAchievementDatas.xlsx differ
diff --git a/Datas/pro2d/task/QuestDataCondition.xlsx b/Datas/pro2d/task/QuestDataCondition.xlsx
deleted file mode 100644
index fac77ed..0000000
Binary files a/Datas/pro2d/task/QuestDataCondition.xlsx and /dev/null differ
diff --git a/Datas/pro2d/task/QuestDatas.xlsx b/Datas/pro2d/task/QuestDatas.xlsx
index 9fa6605..674f549 100644
Binary files a/Datas/pro2d/task/QuestDatas.xlsx and b/Datas/pro2d/task/QuestDatas.xlsx differ
diff --git a/Defines/pro2d.xml b/Defines/pro2d.xml
index 53973ec..2cd6f83 100644
--- a/Defines/pro2d.xml
+++ b/Defines/pro2d.xml
@@ -853,12 +853,11 @@
         <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="UnlockConditionCompare" type="string"/>
+        <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"/>
         <var name="StartTime" type="string"/>
@@ -869,12 +868,11 @@
         <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="UnlockConditionCompare" type="string"/>
+        <var name="UnlockConditionParamList" type="int"/>
+        <var name="TaskConditionCompare" type="string"/>
+        <var name="TaskConditionParamList" type="int"/>
         <var name="QuestAward" type="string"/>
     </bean>
 	
@@ -1177,7 +1175,6 @@
     <table name="TbPropertiesName" value="PropertiesName" input="pro2d/PropertiesName.xls"/>
     <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