From 9e9f4ee114b4989e1f1f8c73c3cb5f267c321848 Mon Sep 17 00:00:00 2001
From: zqj <582132116@qq.com>
Date: Tue, 16 May 2023 15:43:54 +0800
Subject: [PATCH] feat: add likability

---
 Datas/pro2d/QuestDatas.xlsx           | Bin 17227 -> 0 bytes
 Datas/pro2d/hero.xlsx                 | Bin 35350 -> 0 bytes
 Datas/pro2d/task/QuestDatas.xlsx      | Bin 17363 -> 0 bytes
 Datas/pro2d/task/QuestLikability.xlsx | Bin 0 -> 10070 bytes
 Defines/pro2d.xml                     | 26 ++++++++++++++++++--------
 5 files changed, 18 insertions(+), 8 deletions(-)
 delete mode 100644 Datas/pro2d/QuestDatas.xlsx
 create mode 100644 Datas/pro2d/task/QuestLikability.xlsx

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/hero.xlsx b/Datas/pro2d/hero.xlsx
index 5b24aea..4d4abd4 100644
Binary files a/Datas/pro2d/hero.xlsx and b/Datas/pro2d/hero.xlsx differ
diff --git a/Datas/pro2d/task/QuestDatas.xlsx b/Datas/pro2d/task/QuestDatas.xlsx
index 587e155..f7a2202 100644
Binary files a/Datas/pro2d/task/QuestDatas.xlsx and b/Datas/pro2d/task/QuestDatas.xlsx differ
diff --git a/Datas/pro2d/task/QuestLikability.xlsx b/Datas/pro2d/task/QuestLikability.xlsx
new file mode 100644
index 0000000..3f6a11f
Binary files /dev/null and b/Datas/pro2d/task/QuestLikability.xlsx differ
diff --git a/Defines/pro2d.xml b/Defines/pro2d.xml
index cfcba04..bf4618d 100644
--- a/Defines/pro2d.xml
+++ b/Defines/pro2d.xml
@@ -580,6 +580,7 @@
         <var name="ArmorType" type="(list#sep==),int"/>
         <var name="ShoesType" type="(list#sep==),int"/>
         <var name="CoupleTiesID" type="int"/>
+        <var name="LikabilityMaxLevel" type="int"/>
 
         <var name="atks" type="map,NumericType,int"/>
         <var name="defs" type="map,NumericType,int"/>
@@ -943,16 +944,24 @@
         <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"/>
-        <var name="TaskConditionTypeName" type="string"/>
-        <var name="TaskConditionType" type="int"/>
-        <var name="CompareConditionType" type="string"/>
-        <var name="ParamList" type="int"/>
+		
+    <bean name="QuestLikabilityDataStruct">
+        <var name="QuestName" type="string"/>
+        <var name="QuestGoalText" type="string"/>
+        <var name="QuestGoalTypeTag" type="int"/>
+        <var name="UnlockConditionTag" type="int"/>
+        <var name="UnlockConditionCompare" type="string"/>
+        <var name="UnlockConditionParamList" type="int"/>
+        <var name="QuestConditionParamList1" type="int"/>
+        <var name="QuestConditionParamList2" type="int"/>
+        <var name="QuestAward" type="string"/>
     </bean>
 
+    <bean name="QuestLikability">
+        <var name="QuestTag" type="int"/>
+        <var name="QuestLikabilityDataStructs" type="map,int,QuestLikabilityDataStruct"/>
+    </bean>
+	
     <bean name="RechargeDatas">
         <var name="StoreType" type="int"/>
         <var name="StoreResetCycle" type="int"/>
@@ -1281,6 +1290,7 @@
     <table name="TbPunchboard" value="Punchboard" input="pro2d/Punchboard.xlsx"/>
     <table name="TbQuestDatas" value="QuestDatas" input="pro2d/task/QuestDatas.xlsx"/>
     <table name="TbQuestAchievementData" value="QuestAchievementDatas" input="pro2d/task/QuestAchievementDatas.xlsx"/>
+    <table name="TbQuestLikability" value="QuestLikability" input="pro2d/task/QuestLikability.xlsx"/>
 
     <table name="TbRogueChapter" value="RogueChapter" input="pro2d/RogueChapter.xlsx"/>
     <table name="TbRogueMonsterCard" value="RogueMonsterCard" input="pro2d/RogueMonsterCard.xlsx"/>
--
libgit2 0.21.2