From d3d283d04203e48288a4a7048fbd949d8019d65e Mon Sep 17 00:00:00 2001
From: yangjiyve <1711972070@qq.com>
Date: Wed, 20 Jul 2022 12:27:09 +0800
Subject: [PATCH] 增加商品配表

---
 Datas/pro2d/GoodsDatas.xlsx | Bin 0 -> 12178 bytes
 Datas/pro2d/ItemData.xlsx   | Bin 21265 -> 0 bytes
 Defines/pro2d.xml           | 19 +++++++++++++++++--
 3 files changed, 17 insertions(+), 2 deletions(-)
 create mode 100644 Datas/pro2d/GoodsDatas.xlsx

diff --git a/Datas/pro2d/GoodsDatas.xlsx b/Datas/pro2d/GoodsDatas.xlsx
new file mode 100644
index 0000000..5698c88
Binary files /dev/null and b/Datas/pro2d/GoodsDatas.xlsx differ
diff --git a/Datas/pro2d/ItemData.xlsx b/Datas/pro2d/ItemData.xlsx
index 0808039..59407b3 100644
Binary files a/Datas/pro2d/ItemData.xlsx and b/Datas/pro2d/ItemData.xlsx differ
diff --git a/Defines/pro2d.xml b/Defines/pro2d.xml
index 3f19ddb..7241d38 100644
--- a/Defines/pro2d.xml
+++ b/Defines/pro2d.xml
@@ -166,8 +166,6 @@
     <var name="Strengthen" type="bool"/>
     <var name="Split" type="bool"/>
     <var name="Exchange" type="bool"/>
-    <var name="BuyPrice" type="int"/>
-    <var name="SellPrice" type="int"/>
     <var name="Texture" type="string"/>
     <var name="DetailText" type="string"/>
     <var name="GetWay" type="string"/>
@@ -197,6 +195,22 @@
     <var name="QuestIntervalTime" type="long"/>
     <var name="QuestDurationTime" type="long"/>
   </bean>
+  
+  <bean name="GoodsDataStruct">
+    <var name="GoodsName" type="string"/>
+    <var name="GoodsDescription" type="string"/>
+    <var name="GoodsItems" type="string"/>
+    <var name="GoodsCurrency" type="int"/>
+    <var name="GoodsBuyPrice" type="int"/>
+    <var name="GoodsSellPrice" type="int"/>
+    <var name="GoodsBuyLimit" type="int"/>
+    <var name="GoodsImage" type="string"/>
+    </bean>
+
+  <bean name="GoodsDatas">
+    <var name="GoodsType" type="int"/>
+    <var name="GoodsDataStructs" type="map,int,GoodsDataStruct"/>
+  </bean>
 
 	<bean name="AccountLevelExp">
 		<var name="level" type="int"/>
@@ -304,6 +318,7 @@
 	<table name="TbExpItemData" value="ExpItemData" input="pro2d/ExpItemData.xlsx"/>
 	<table name="TbQuestDatas" value="QuestDatas" input="pro2d/QuestDatas.xlsx"/>
 	<table name="TbQuestIntervalTable" value="QuestIntervalTable" input="pro2d/QuestIntervalTable.xlsx"/>
+	<table name="TbGoodsDatas" value="GoodsDatas" input="pro2d/GoodsDatas.xlsx"/>
 
 	<table name="TbAccountLevelExp" value="AccountLevelExp" input="pro2d/AccountLevelExp.xlsx"/>
 	<table name="TbHeroLevelExp" value="HeroLevelExp" input="pro2d/HeroLevelExp.xlsx"/>
--
libgit2 0.21.2