From e9b2d1cdd1edb19c9c6670d89e1f1348056cfbae Mon Sep 17 00:00:00 2001
From: yangjiyve <1711972070@qq.com>
Date: Thu, 17 Nov 2022 18:27:50 +0800
Subject: [PATCH] 弹窗、全局变量表修改

---
 Datas/pro2d/GlobalBaseDatas.xlsx | Bin 10341 -> 0 bytes
 Datas/pro2d/PopupsDatas.xlsx     | Bin 0 -> 11501 bytes
 Defines/pro2d.xml                | 8 ++++++++
 3 files changed, 8 insertions(+), 0 deletions(-)
 create mode 100644 Datas/pro2d/PopupsDatas.xlsx

diff --git a/Datas/pro2d/GlobalBaseDatas.xlsx b/Datas/pro2d/GlobalBaseDatas.xlsx
index b3d839d..5cd5e8b 100644
Binary files a/Datas/pro2d/GlobalBaseDatas.xlsx and b/Datas/pro2d/GlobalBaseDatas.xlsx differ
diff --git a/Datas/pro2d/PopupsDatas.xlsx b/Datas/pro2d/PopupsDatas.xlsx
new file mode 100644
index 0000000..dbb283e
Binary files /dev/null and b/Datas/pro2d/PopupsDatas.xlsx differ
diff --git a/Defines/pro2d.xml b/Defines/pro2d.xml
index 8d0a45d..feaa9a3 100644
--- a/Defines/pro2d.xml
+++ b/Defines/pro2d.xml
@@ -147,6 +147,13 @@
         <var name="BoxReawardID" type="list,int"/>
     </bean>
 
+    <bean name="PopupsDatas">
+        <var name="PopupsName" type="string"/>
+        <var name="PopupsTitle" type="string"/>
+        <var name="PopupsContext" type="string"/>
+        <var name="PopupsButtonText" type="string"/>
+    </bean>
+
     <bean name="Carbon">
         <var name="carbonName" type="string"/>
         <var name="carbonMonster" type="string"/>
@@ -846,6 +853,7 @@
     <table name="TbUnlimitedCarbonDatas" value="UnlimitedCarbonDatas" input="pro2d/CarbonDatas@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"/>
 
 
     <table name="TbQuestDatas" value="QuestDatas" input="pro2d/QuestDatas.xlsx"/>
--
libgit2 0.21.2