From 76b29db9d274c6a483f5b3708e5e1762b5b78d61 Mon Sep 17 00:00:00 2001
From: zqj <582132116@qq.com>
Date: Mon, 19 Jun 2023 18:07:03 +0800
Subject: [PATCH] fix: 任务表+成就表格式统一，字段名修改

---
 Datas/__enums__.xlsx                        | Bin 12118 -> 0 bytes
 Datas/common/FUIPanel.xlsx                  | Bin 12104 -> 0 bytes
 Datas/pro2d/CatSurvivorBuffPool.xlsx        | Bin 0 -> 10739 bytes
 Datas/pro2d/CatSurvivorLevelExp.xlsx        | Bin 0 -> 8898 bytes
 Datas/pro2d/task/QuestAchievementDatas.xlsx | Bin 13104 -> 0 bytes
 Datas/pro2d/task/QuestDatas.xlsx            | Bin 1334645 -> 0 bytes
 Defines/pro2d.xml                           | 59 ++++++++++++++++++++++++++++++++++++++++++-----------------
 7 files changed, 42 insertions(+), 17 deletions(-)
 create mode 100644 Datas/pro2d/CatSurvivorBuffPool.xlsx
 create mode 100644 Datas/pro2d/CatSurvivorLevelExp.xlsx

diff --git a/Datas/__enums__.xlsx b/Datas/__enums__.xlsx
index c9864c8..38e7cae 100644
Binary files a/Datas/__enums__.xlsx and b/Datas/__enums__.xlsx differ
diff --git a/Datas/common/FUIPanel.xlsx b/Datas/common/FUIPanel.xlsx
index 86944a4..f699831 100644
Binary files a/Datas/common/FUIPanel.xlsx and b/Datas/common/FUIPanel.xlsx differ
diff --git a/Datas/pro2d/CatSurvivorBuffPool.xlsx b/Datas/pro2d/CatSurvivorBuffPool.xlsx
new file mode 100644
index 0000000..e208348
Binary files /dev/null and b/Datas/pro2d/CatSurvivorBuffPool.xlsx differ
diff --git a/Datas/pro2d/CatSurvivorLevelExp.xlsx b/Datas/pro2d/CatSurvivorLevelExp.xlsx
new file mode 100644
index 0000000..b2a563d
Binary files /dev/null and b/Datas/pro2d/CatSurvivorLevelExp.xlsx differ
diff --git a/Datas/pro2d/task/QuestAchievementDatas.xlsx b/Datas/pro2d/task/QuestAchievementDatas.xlsx
index 153f4c2..136dfb7 100644
Binary files a/Datas/pro2d/task/QuestAchievementDatas.xlsx and b/Datas/pro2d/task/QuestAchievementDatas.xlsx differ
diff --git a/Datas/pro2d/task/QuestDatas.xlsx b/Datas/pro2d/task/QuestDatas.xlsx
index c457d69..43b6ba0 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 0004d74..a7bbac8 100644
--- a/Defines/pro2d.xml
+++ b/Defines/pro2d.xml
@@ -142,6 +142,30 @@
         <var name="QualityStr" type="string"/>
         <var name="CardPoolDatas" type="map,int,CardPoolData"/>
     </bean>
+    
+    
+     <bean name="CatSurvivorBuffPool">
+        <var name="CatSurvivorBuffPoolType" type="int"/>
+        <var name="CatSurvivorBuffPoolData" type="list,CatSurvivorBuffData"/>
+    </bean>
+     
+     <bean name="CatSurvivorBuffData">
+        <var name="BuffType" type="string"/>
+        <var name="DataType" type="string"/>
+        <var name="Name" type="string"/>
+        <var name="DataID" type="int"/>
+        <var name="Descriptions" type="string"/>
+        <var name="MaxAmounts" type="int"/>
+        <var name="AddDescriptions" type="string"/>
+        <var name="AddData" type="string"/>
+    </bean>
+
+    <bean name="CatSurvivorLevelExp">
+        <var name="Level" type="int"/>
+        <var name="NeedExp" type="int"/>
+        <var name="BuffRank" type="string"/>
+    </bean>
+    
 
     <bean name="CrystalReinforcement">
         <var name="ID" type="int"/>
@@ -943,27 +967,26 @@
   </bean>
 
     <bean name="QuestDataStruct">
-        <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="QuestConditionCompare" type="string"/>
-        <var name="QuestConditionParamList" type="int"/>
-        <var name="Circulable" type="int"/>
-        <var name="QuestAward" type="string"/>
+        <var name="Name" type="string"/>
+        <var name="GoalText" type="string"/>
+        <var name="GoalTypeTag" type="int"/>
+        <var name="Unlock" type="int"/>
+        <var name="Compare" type="string"/>
+        <var name="AchieveProcess" type="int"/>
+        <var name="AchieveGoal" type="int"/>
+        <var name="Reward" type="string"/>
     </bean>
 
     <bean name="QuestAchievementDataStruct">
-        <var name="QuestName" type="string"/>
-        <var name="QuestGoalText" type="string"/>
+        <var name="Name" type="string"/>
+        <var name="GoalText" type="string"/>
         <var name="Active" type="int"/>
-        <var name="QuestGoalTypeTag" type="int"/>
-        <var name="UnlockConditionParamList" type="int"/>
-        <var name="QuestConditionCompare" type="string"/>
-        <var name="QuestConditionParamList" type="int"/>
-        <var name="QuestGoal" type="int"/>
-        <var name="QuestAward" type="string"/>
+        <var name="GoalTypeTag" type="int"/>
+        <var name="Unlock" type="int"/>
+        <var name="Compare" type="string"/>
+        <var name="AchieveProcess" type="int"/>
+        <var name="AchieveGoal" type="int"/>
+        <var name="Reward" type="string"/>
     </bean>
 	
 	
@@ -1284,6 +1307,8 @@
     <table name="TbCardGroup" value="CardGroup" input="pro2d/CardGroup.xlsx"/>
     <table name="TbCardQuality" value="CardQuality" input="pro2d/CardQuality.xlsx"/>
     <table name="TbCardPool" value="CardPool" input="pro2d/CardPool.xlsx"/>
+    <table name="TbCatSurvivorBuffPool" value="CatSurvivorBuffPool" input="pro2d/CatSurvivorBuffPool.xlsx"/>
+    <table name="TbCatSurvivorLevelExp" value="CatSurvivorLevelExp" input="pro2d/CatSurvivorLevelExp.xlsx"/>
     <table name="TbCrystalReinforcement" value="CrystalReinforcement" input="pro2d/CrystalReinforcement.xlsx"/>
     <table name="TbCarbonMonster" value="CarbonMonster" input="pro2d/CarbonMonster.xlsx"/>
     <table name="TbCatSurvivorMonster" value="CatSurvivorMonster" input="pro2d/CatSurvivorMonster.xlsx"/>
--
libgit2 0.21.2