From 2e390d9c6e10a27ea8b6797edeac5da46866f5e2 Mon Sep 17 00:00:00 2001
From: yangjiyve <1711972070@qq.com>
Date: Tue, 22 Nov 2022 17:19:59 +0800
Subject: [PATCH] 增加学宫门票，增加血宫关卡数量限制（999关）,更改血宫表格数据格式

---
 Datas/pro2d/GlobalBaseDatas.xlsx      | Bin 10321 -> 0 bytes
 Datas/pro2d/ItemData.xlsx             | Bin 53258 -> 0 bytes
 Datas/pro2d/UnlimitedCarbonDatas.xlsx | Bin 15564 -> 0 bytes
 Defines/pro2d.xml                     | 10 +++++++---
 4 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/Datas/pro2d/GlobalBaseDatas.xlsx b/Datas/pro2d/GlobalBaseDatas.xlsx
index 519582f..21a0287 100644
Binary files a/Datas/pro2d/GlobalBaseDatas.xlsx and b/Datas/pro2d/GlobalBaseDatas.xlsx differ
diff --git a/Datas/pro2d/ItemData.xlsx b/Datas/pro2d/ItemData.xlsx
index a0161c6..0f62871 100644
Binary files a/Datas/pro2d/ItemData.xlsx and b/Datas/pro2d/ItemData.xlsx differ
diff --git a/Datas/pro2d/UnlimitedCarbonDatas.xlsx b/Datas/pro2d/UnlimitedCarbonDatas.xlsx
index 69a6f8c..6a22ea7 100644
Binary files a/Datas/pro2d/UnlimitedCarbonDatas.xlsx and b/Datas/pro2d/UnlimitedCarbonDatas.xlsx differ
diff --git a/Defines/pro2d.xml b/Defines/pro2d.xml
index 9789547..b2b13ae 100644
--- a/Defines/pro2d.xml
+++ b/Defines/pro2d.xml
@@ -122,8 +122,12 @@
         <var name="cd" type="float"/>
     </bean>
 
-    <bean name="UnlimitedCarbonDatas">
-        <var name="CarbonLayer" type="int"/>
+    <bean name="UnlimitedChapterDatas">
+        <var name="ChapterID" type="int"/>
+        <var name="UnlimitedCarbonDatas" type="map,int,UnlimitedCarbonData"/>
+    </bean>
+
+    <bean name="UnlimitedCarbonData">
         <var name="MonsterPoolID" type="int"/>
         <var name="BaseCost" type="int"/>
         <var name="CostRatio" type="string"/>
@@ -853,7 +857,7 @@
     <table name="TbOpenBox" value="OpenBox" input="pro2d/OpenBox.xlsx"/>
     <table name="TbConsumptionItemData" value="ConsumptionItemData" input="pro2d/ConsumptionItemData.xlsx"/>
     <table name="TbCoupleTies" value="CoupleTies" input="pro2d/CoupleTiesDatas.xlsx"/>
-    <table name="TbUnlimitedCarbonDatas" value="UnlimitedCarbonDatas" input="pro2d/CarbonDatas@UnlimitedCarbonDatas.xlsx"/>
+    <table name="TbUnlimitedChapterDatas" value="UnlimitedChapterDatas" input="pro2d/ChapterDatas@UnlimitedCarbonDatas.xlsx"/>
     <table name="TbUnlimitedCarbonMonsterCostDatas" value="UnlimitedCarbonMonsterCostDatas" input="pro2d/MonsterDatas@UnlimitedCarbonDatas.xlsx"/>
     <table name="TbUnlimitedCarbonPreviewReward" value="UnlimitedCarbonPreviewReward" input="pro2d/PreviewReward@UnlimitedCarbonDatas.xlsx"/>
     <table name="TbPopupsDatas" value="PopupsDatas" input="pro2d/PopupsDatas.xlsx"/>
--
libgit2 0.21.2