From a4449516e72d07c715c662ef9915ffd982e1398d Mon Sep 17 00:00:00 2001
From: wlk <1093471401@qq.com>
Date: Wed, 7 Sep 2022 18:11:00 +0800
Subject: [PATCH] 道具加体力，对话内容

---
 Datas/pro2d/DialogueAll.xlsx       | Bin 15045 -> 0 bytes
 Datas/pro2d/DialogueToChapter.xlsx | Bin 10970 -> 0 bytes
 Datas/pro2d/EnergyItemData.xlsx    | Bin 0 -> 8821 bytes
 Defines/pro2d.xml                  | 6 ++++++
 4 files changed, 6 insertions(+), 0 deletions(-)
 create mode 100644 Datas/pro2d/EnergyItemData.xlsx

diff --git a/Datas/pro2d/DialogueAll.xlsx b/Datas/pro2d/DialogueAll.xlsx
index fd3deab..e426e25 100644
Binary files a/Datas/pro2d/DialogueAll.xlsx and b/Datas/pro2d/DialogueAll.xlsx differ
diff --git a/Datas/pro2d/DialogueToChapter.xlsx b/Datas/pro2d/DialogueToChapter.xlsx
index 59a147e..0a8d072 100644
Binary files a/Datas/pro2d/DialogueToChapter.xlsx and b/Datas/pro2d/DialogueToChapter.xlsx differ
diff --git a/Datas/pro2d/EnergyItemData.xlsx b/Datas/pro2d/EnergyItemData.xlsx
new file mode 100644
index 0000000..d3131fe
Binary files /dev/null and b/Datas/pro2d/EnergyItemData.xlsx differ
diff --git a/Defines/pro2d.xml b/Defines/pro2d.xml
index 60707d5..4d687f6 100644
--- a/Defines/pro2d.xml
+++ b/Defines/pro2d.xml
@@ -253,6 +253,11 @@
     <var name="ID" type="int"/>
     <var name="Exp" type="int"/>
   </bean>
+  
+    <bean name="EnergyItemData">
+    <var name="ID" type="int"/>
+    <var name="EnergyValue" type="int"/>
+  </bean>
 
 	<bean name="QuestDataStruct">
 		<var name="QuestName" type="string"/>
@@ -536,6 +541,7 @@
 	<table name="TbItemData" value="ItemData" input="pro2d/ItemData.xlsx"/>
 	<table name="TbItemRandom" value="ItemRandom" input="pro2d/ItemRandom.xlsx"/>
 	<table name="TbExpItemData" value="ExpItemData" input="pro2d/ExpItemData.xlsx"/>
+  <table name="TbEnergyItemData" value="EnergyItemData" input="pro2d/EnergyItemData.xlsx"/>
 	<table name="TbQuestDatas" value="QuestDatas" input="pro2d/QuestDatas.xlsx"/>
 	<table name="TbIntervalTable" value="IntervalTable" input="pro2d/IntervalTable.xlsx"/>
 	<table name="TbStoreDatas" value="StoreDatas" input="pro2d/StoreDatas.xlsx"/>
--
libgit2 0.21.2