From 94017d49b17f3c2912ff16fe1c270e436ef9d2a8 Mon Sep 17 00:00:00 2001
From: yangjiyve <1711972070@qq.com>
Date: Wed, 24 Aug 2022 18:08:50 +0800
Subject: [PATCH] 武器升级材料表

---
 Datas/pro2d/EquipmentLvUpMaterials.xlsx | Bin 0 -> 10092 bytes
 Defines/pro2d.xml                       | 17 ++++++++++++++++-
 2 files changed, 16 insertions(+), 1 deletion(-)
 create mode 100644 Datas/pro2d/EquipmentLvUpMaterials.xlsx

diff --git a/Datas/pro2d/EquipmentLvUpMaterials.xlsx b/Datas/pro2d/EquipmentLvUpMaterials.xlsx
new file mode 100644
index 0000000..c70ccae
Binary files /dev/null and b/Datas/pro2d/EquipmentLvUpMaterials.xlsx differ
diff --git a/Defines/pro2d.xml b/Defines/pro2d.xml
index 33e2d7b..118db1d 100644
--- a/Defines/pro2d.xml
+++ b/Defines/pro2d.xml
@@ -53,6 +53,7 @@
 		<var name="atk2" type="float"/>
 		<var name="atk3" type="float"/>
 	</bean>
+  
 	<bean name="MonsterWave">
 		<var name="id" type="int"/>
 	    <var name="name" type="string"/>
@@ -174,13 +175,26 @@
     <var name="MaxNum" type="int"/>
     <var name="RandomWeight" type="int"/>
   </bean>
+      
     
   <bean name="EquipBreakdown">
     <var name="EquipID" type="int"/>
     <var name="BraekdownResults" type="list,BraekdownResult"/>
   </bean>
-  
 
+
+  <bean name="MaterialsCombination">
+    <var name="ItemID" type="int"/>
+    <var name="ItemNum" type="int"/>
+  </bean>
+
+  <bean name="EquipmentLvUpMaterials">
+    <var name="MaterialsCombinationID" type="int"/>
+    <var name="MaterialsCombinations" type="list,MaterialsCombination"/>
+  </bean>
+  
+  
+  
   <bean name="ItemData">
     <var name="ID" type="int"/>
     <var name="Name" type="string"/>
@@ -427,6 +441,7 @@
 
 	<table name="TbEquipmentData" value="EquipmentData" input="pro2d/EquipmentData.xlsx"/>
 	<table name="TbEquipBreakdown" value="EquipBreakdown" input="pro2d/EquipBreakdown.xlsx"/>
+	<table name="TbEquipmentLvUpMaterials" value="EquipmentLvUpMaterials" input="pro2d/EquipmentLvUpMaterials.xlsx"/>
 	<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"/>
--
libgit2 0.21.2