From 012bd7ed2cc9eaa385214ccb770472631d654482 Mon Sep 17 00:00:00 2001
From: zqj <582132116@qq.com>
Date: Mon, 3 Jul 2023 15:46:11 +0800
Subject: [PATCH] add: 素材副本加上体力字段，任务表/任务活动表名字修改整合

---
 Datas/pro2d/HeroFragmentsCarbon.xlsx              | Bin 10293 -> 0 bytes
 Datas/pro2d/quest/QuestAchievementDatas.xlsx      | Bin 0 -> 12775 bytes
 Datas/pro2d/quest/QuestDatas.xlsx                 | Bin 0 -> 1333520 bytes
 Datas/pro2d/quest/QuestDescription.xlsx           | Bin 0 -> 10243 bytes
 Datas/pro2d/quest/QuestFavorability.xlsx          | Bin 0 -> 14395 bytes
 Datas/pro2d/quest/QuestGlobal.xlsx                | Bin 0 -> 10093 bytes
 Datas/pro2d/quest_carbon/HeroFragmentsCarbon.xlsx | Bin 0 -> 9947 bytes
 Datas/pro2d/quest_carbon/QuestCircleCtl.xlsx      | Bin 0 -> 9402 bytes
 Datas/pro2d/quest_carbon/QuestLimitCtl.xlsx       | Bin 0 -> 9433 bytes
 Datas/pro2d/quest_carbon/SurvivalCarbon.xlsx      | Bin 0 -> 11394 bytes
 Datas/pro2d/task/QuestAchievementDatas.xlsx       | Bin 12775 -> 0 bytes
 Datas/pro2d/task/QuestCircleCtl.xlsx              | Bin 9402 -> 0 bytes
 Datas/pro2d/task/QuestDatas.xlsx                  | Bin 1333520 -> 0 bytes
 Datas/pro2d/task/QuestDescription.xlsx            | Bin 10243 -> 0 bytes
 Datas/pro2d/task/QuestFavorability.xlsx           | Bin 14395 -> 0 bytes
 Datas/pro2d/task/QuestGlobal.xlsx                 | Bin 10093 -> 0 bytes
 Datas/pro2d/task/QuestLimitCtl.xlsx               | Bin 9433 -> 0 bytes
 Defines/pro2d.xml                                 | 17 +++++++++--------
 18 files changed, 9 insertions(+), 8 deletions(-)
 delete mode 100644 Datas/pro2d/HeroFragmentsCarbon.xlsx
 create mode 100644 Datas/pro2d/quest/QuestAchievementDatas.xlsx
 create mode 100644 Datas/pro2d/quest/QuestDatas.xlsx
 create mode 100644 Datas/pro2d/quest/QuestDescription.xlsx
 create mode 100644 Datas/pro2d/quest/QuestFavorability.xlsx
 create mode 100644 Datas/pro2d/quest/QuestGlobal.xlsx
 create mode 100644 Datas/pro2d/quest_carbon/HeroFragmentsCarbon.xlsx
 create mode 100644 Datas/pro2d/quest_carbon/QuestCircleCtl.xlsx
 create mode 100644 Datas/pro2d/quest_carbon/QuestLimitCtl.xlsx
 create mode 100644 Datas/pro2d/quest_carbon/SurvivalCarbon.xlsx
 delete mode 100644 Datas/pro2d/task/QuestAchievementDatas.xlsx
 delete mode 100644 Datas/pro2d/task/QuestCircleCtl.xlsx
 delete mode 100644 Datas/pro2d/task/QuestDatas.xlsx
 delete mode 100644 Datas/pro2d/task/QuestDescription.xlsx
 delete mode 100644 Datas/pro2d/task/QuestFavorability.xlsx
 delete mode 100644 Datas/pro2d/task/QuestGlobal.xlsx
 delete mode 100644 Datas/pro2d/task/QuestLimitCtl.xlsx

diff --git a/Datas/pro2d/HeroFragmentsCarbon.xlsx b/Datas/pro2d/HeroFragmentsCarbon.xlsx
deleted file mode 100644
index 3822a05..0000000
Binary files a/Datas/pro2d/HeroFragmentsCarbon.xlsx and /dev/null differ
diff --git a/Datas/pro2d/quest/QuestAchievementDatas.xlsx b/Datas/pro2d/quest/QuestAchievementDatas.xlsx
new file mode 100644
index 0000000..1dacaaf
Binary files /dev/null and b/Datas/pro2d/quest/QuestAchievementDatas.xlsx differ
diff --git a/Datas/pro2d/quest/QuestDatas.xlsx b/Datas/pro2d/quest/QuestDatas.xlsx
new file mode 100644
index 0000000..43b6ba0
Binary files /dev/null and b/Datas/pro2d/quest/QuestDatas.xlsx differ
diff --git a/Datas/pro2d/quest/QuestDescription.xlsx b/Datas/pro2d/quest/QuestDescription.xlsx
new file mode 100644
index 0000000..aa88cca
Binary files /dev/null and b/Datas/pro2d/quest/QuestDescription.xlsx differ
diff --git a/Datas/pro2d/quest/QuestFavorability.xlsx b/Datas/pro2d/quest/QuestFavorability.xlsx
new file mode 100644
index 0000000..70c9507
Binary files /dev/null and b/Datas/pro2d/quest/QuestFavorability.xlsx differ
diff --git a/Datas/pro2d/quest/QuestGlobal.xlsx b/Datas/pro2d/quest/QuestGlobal.xlsx
new file mode 100644
index 0000000..3531aeb
Binary files /dev/null and b/Datas/pro2d/quest/QuestGlobal.xlsx differ
diff --git a/Datas/pro2d/quest_carbon/HeroFragmentsCarbon.xlsx b/Datas/pro2d/quest_carbon/HeroFragmentsCarbon.xlsx
new file mode 100644
index 0000000..3b23723
Binary files /dev/null and b/Datas/pro2d/quest_carbon/HeroFragmentsCarbon.xlsx differ
diff --git a/Datas/pro2d/quest_carbon/QuestCircleCtl.xlsx b/Datas/pro2d/quest_carbon/QuestCircleCtl.xlsx
new file mode 100644
index 0000000..77d7134
Binary files /dev/null and b/Datas/pro2d/quest_carbon/QuestCircleCtl.xlsx differ
diff --git a/Datas/pro2d/quest_carbon/QuestLimitCtl.xlsx b/Datas/pro2d/quest_carbon/QuestLimitCtl.xlsx
new file mode 100644
index 0000000..f2a08d1
Binary files /dev/null and b/Datas/pro2d/quest_carbon/QuestLimitCtl.xlsx differ
diff --git a/Datas/pro2d/quest_carbon/SurvivalCarbon.xlsx b/Datas/pro2d/quest_carbon/SurvivalCarbon.xlsx
new file mode 100644
index 0000000..e4bc2f0
Binary files /dev/null and b/Datas/pro2d/quest_carbon/SurvivalCarbon.xlsx differ
diff --git a/Datas/pro2d/task/QuestAchievementDatas.xlsx b/Datas/pro2d/task/QuestAchievementDatas.xlsx
deleted file mode 100644
index 1dacaaf..0000000
Binary files a/Datas/pro2d/task/QuestAchievementDatas.xlsx and /dev/null differ
diff --git a/Datas/pro2d/task/QuestCircleCtl.xlsx b/Datas/pro2d/task/QuestCircleCtl.xlsx
deleted file mode 100644
index 77d7134..0000000
Binary files a/Datas/pro2d/task/QuestCircleCtl.xlsx and /dev/null differ
diff --git a/Datas/pro2d/task/QuestDatas.xlsx b/Datas/pro2d/task/QuestDatas.xlsx
deleted file mode 100644
index 43b6ba0..0000000
Binary files a/Datas/pro2d/task/QuestDatas.xlsx and /dev/null differ
diff --git a/Datas/pro2d/task/QuestDescription.xlsx b/Datas/pro2d/task/QuestDescription.xlsx
deleted file mode 100644
index aa88cca..0000000
Binary files a/Datas/pro2d/task/QuestDescription.xlsx and /dev/null differ
diff --git a/Datas/pro2d/task/QuestFavorability.xlsx b/Datas/pro2d/task/QuestFavorability.xlsx
deleted file mode 100644
index 70c9507..0000000
Binary files a/Datas/pro2d/task/QuestFavorability.xlsx and /dev/null differ
diff --git a/Datas/pro2d/task/QuestGlobal.xlsx b/Datas/pro2d/task/QuestGlobal.xlsx
deleted file mode 100644
index 3531aeb..0000000
Binary files a/Datas/pro2d/task/QuestGlobal.xlsx and /dev/null differ
diff --git a/Datas/pro2d/task/QuestLimitCtl.xlsx b/Datas/pro2d/task/QuestLimitCtl.xlsx
deleted file mode 100644
index f2a08d1..0000000
Binary files a/Datas/pro2d/task/QuestLimitCtl.xlsx and /dev/null differ
diff --git a/Defines/pro2d.xml b/Defines/pro2d.xml
index add2e16..09b3e20 100644
--- a/Defines/pro2d.xml
+++ b/Defines/pro2d.xml
@@ -800,6 +800,7 @@
       <var name="HeroFragmentsCarbonName" type="string"/>
       <var name="HeroFragmentsCarbonCost" type="int"/>
       <var name="SceneID" type="int"/>
+      <var name="CostSP" type="int"/>
       <var name="Reward" type="string"/>
    </bean>
   
@@ -1396,7 +1397,7 @@
     <table name="TbHeroGradeMemoryExp" value="HeroGradeMemoryExp" input="pro2d/HeroGradeMemoryExp.xls"/>
     <table name="TbHeroGradeMemoryLevelUp" value="HeroGradeMemoryLevelUp" input="pro2d/HeroGradeMemoryLevelUp.xls"/>
     <table name="TbHeroToSkill" value="HeroToSkill" input="pro2d/HeroToSkill.xlsx"/>
-    <table name="TbHeroFragmentsCarbon" value="HeroFragmentsCarbon" input="pro2d/HeroFragmentsCarbon.xlsx"/>
+    <table name="TbHeroFragmentsCarbon" value="HeroFragmentsCarbon" input="pro2d/quest_carbon/HeroFragmentsCarbon.xlsx"/>
     <table name="TbHeroReinMaterials" value="HeroReinMaterials" input="pro2d/HeroReinMaterials.xlsx"/>
     <table name="TbHeroLevelExp" value="HeroLevelExp" input="pro2d/HeroLevelExp.xlsx"/>
     <table name="TbHeroItemFragment" value="HeroItemFragment" index="ItemCardID,ItemFragmentID,HeroID" input="pro2d/HeroItemFragment.xlsx"/>
@@ -1420,12 +1421,12 @@
     <table name="TbPropertiesName" value="PropertiesName" input="pro2d/PropertiesName.xls"/>
     <table name="TbPunchboard" value="Punchboard" input="pro2d/Punchboard.xlsx"/>
     <table name="TbPunchInfo" value="PunchInfo" input="pro2d/PunchInfo.xlsx"/>
-    <table name="TbQuestDatas" value="QuestDatas" input="pro2d/task/QuestDatas.xlsx"/>
-    <table name="TbQuestAchievementData" value="QuestAchievementDatas" input="pro2d/task/QuestAchievementDatas.xlsx"/>
-    <table name="TbQuestFavorability" value="QuestFavorability" input="pro2d/task/QuestFavorability.xlsx"/>
-    <table name="TbQuestGlobal" value="QuestGlobal" input="pro2d/task/QuestGlobal.xlsx"/>
-    <table name="TbQuestCircleCtl" value="QuestCircleCtl" input="pro2d/task/QuestCircleCtl.xlsx"/>
-    <table name="TbQuestLimitCtl" value="QuestLimitCtl" input="pro2d/task/QuestLimitCtl.xlsx"/>
+    <table name="TbQuestDatas" value="QuestDatas" input="pro2d/quest/QuestDatas.xlsx"/>
+    <table name="TbQuestAchievementData" value="QuestAchievementDatas" input="pro2d/quest/QuestAchievementDatas.xlsx"/>
+    <table name="TbQuestFavorability" value="QuestFavorability" input="pro2d/quest/QuestFavorability.xlsx"/>
+    <table name="TbQuestGlobal" value="QuestGlobal" input="pro2d/quest/QuestGlobal.xlsx"/>
+    <table name="TbQuestCircleCtl" value="QuestCircleCtl" input="pro2d/quest_carbon/QuestCircleCtl.xlsx"/>
+    <table name="TbQuestLimitCtl" value="QuestLimitCtl" input="pro2d/quest_carbon/QuestLimitCtl.xlsx"/>
 
     <table name="TbRogueChapter" value="RogueChapter" input="pro2d/RogueChapter.xlsx"/>
     <table name="TbRogueMonsterCard" value="RogueMonsterCard" input="pro2d/RogueMonsterCard.xlsx"/>
@@ -1442,7 +1443,7 @@
     <table name="TbSmallDialoge" value="SmallDialoge" input="pro2d/SmallDialoge.xlsx"/>
     <table name="TbSkillLuckyCoinConfig" value="SkillLuckyCoinConfig" input="pro2d/SkillLuckyCoinConfig.xlsx"/>
     <table name="TbSkillConfig" value="SkillConfig" input="pro2d/SkillConfig.xlsx"/>
-    <table name="TbSurvivalCarbon" value="SurvivalCarbon" input="pro2d/SurvivalCarbon.xlsx"/>
+    <table name="TbSurvivalCarbon" value="SurvivalCarbon" input="pro2d/quest_carbon/SurvivalCarbon.xlsx"/>
 
     <table name="TbTeamBonus" value="TeamBonus" input="pro2d/TeamBonus.xlsx"/>
 
--
libgit2 0.21.2