From beec0f774f45e1efbbdc0984710f87550e1a5a95 Mon Sep 17 00:00:00 2001
From: wlk <1093471401@qq.com>
Date: Mon, 15 May 2023 11:03:11 +0800
Subject: [PATCH] 幸运黑猫配表更新

---
 Datas/pro2d/GlobalBaseDatas.xlsx | Bin 17389 -> 0 bytes
 Datas/pro2d/ItemData.xlsx        | Bin 71439 -> 0 bytes
 Datas/pro2d/Punchboard.xlsx      | Bin 0 -> 14177 bytes
 Defines/pro2d.xml                | 25 +++++++++++++++++++++++++
 4 files changed, 25 insertions(+), 0 deletions(-)
 create mode 100644 Datas/pro2d/Punchboard.xlsx

diff --git a/Datas/pro2d/GlobalBaseDatas.xlsx b/Datas/pro2d/GlobalBaseDatas.xlsx
index 0c35c4c..97438ac 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 86b3b51..0cff4c5 100644
Binary files a/Datas/pro2d/ItemData.xlsx and b/Datas/pro2d/ItemData.xlsx differ
diff --git a/Datas/pro2d/Punchboard.xlsx b/Datas/pro2d/Punchboard.xlsx
new file mode 100644
index 0000000..be493bc
Binary files /dev/null and b/Datas/pro2d/Punchboard.xlsx differ
diff --git a/Defines/pro2d.xml b/Defines/pro2d.xml
index ec3c819..4122399 100644
--- a/Defines/pro2d.xml
+++ b/Defines/pro2d.xml
@@ -881,6 +881,30 @@
         <var name="PropertiesNameText" type="string"/>
     </bean>
 
+  <bean name="Punchboard">
+    <var name="id" type="int"/>
+    <var name="name" type="string"/>
+    <var name="IconName" type="string"/>
+    <var name="Weight" type="int"/>
+    <var name="Grade" type="string"/>
+    <var name="Description" type="string"/>
+    <var name="type" type="int"/>
+    <var name="FixedGold" type="int"/>
+    <var name="isRandom" type="bool"/>
+    <var name="RandomGold" type="(list#sep==),int"/>
+    <var name="isAdjacent" type="bool"/>
+    <var name="AdjacentId"  type="(list#sep==),int"/>
+    <var name="AdjacentGold" type="int"/>
+    <var name="isAccumulate" type="bool"/>
+    <var name="AccumulateGold" type="int"/>
+    <var name="isCountdown" type="bool"/>
+    <var name="CountdownTime" type="int"/>
+    <var name="CountdownToId" type="(list#sep==),int"/>
+    <var name="isEliminate" type="bool"/>
+    <var name="EliminateID"  type="(list#sep==),int"/>
+    <var name="EliminateGold" type="int"/>
+  </bean>
+
     <bean name="QuestDataStruct">
         <var name="QuestName" type="string"/>
         <var name="QuestGoalText" type="string"/>
@@ -1243,6 +1267,7 @@
     <table name="TbOpenBox" value="OpenBox" input="pro2d/OpenBox.xlsx"/>
     <table name="TbPopupsDatas" value="PopupsDatas" input="pro2d/PopupsDatas.xlsx"/>
     <table name="TbPropertiesName" value="PropertiesName" input="pro2d/PropertiesName.xls"/>
+    <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"/>
 
--
libgit2 0.21.2