From 1c469de1f50837875d4c540c675b4ff3ed397831 Mon Sep 17 00:00:00 2001
From: zqj <582132116@qq.com>
Date: Thu, 9 Feb 2023 14:14:04 +0800
Subject: [PATCH] feat: 添加装备合成表

---
 Datas/pro2d/EquipMentComposite.xlsx | Bin 0 -> 9141 bytes
 Datas/pro2d/EquipmentData.xlsx      | Bin 2463737 -> 0 bytes
 Defines/pro2d.xml                   | 7 ++++++-
 3 files changed, 6 insertions(+), 1 deletion(-)
 create mode 100644 Datas/pro2d/EquipMentComposite.xlsx

diff --git a/Datas/pro2d/EquipMentComposite.xlsx b/Datas/pro2d/EquipMentComposite.xlsx
new file mode 100644
index 0000000..f2f3dc7
Binary files /dev/null and b/Datas/pro2d/EquipMentComposite.xlsx differ
diff --git a/Datas/pro2d/EquipmentData.xlsx b/Datas/pro2d/EquipmentData.xlsx
index fd46e9c..11b941c 100644
Binary files a/Datas/pro2d/EquipmentData.xlsx and b/Datas/pro2d/EquipmentData.xlsx differ
diff --git a/Defines/pro2d.xml b/Defines/pro2d.xml
index 95f06ec..6d039a0 100644
--- a/Defines/pro2d.xml
+++ b/Defines/pro2d.xml
@@ -328,7 +328,11 @@
         <var name="MaterialsCombinations" type="map,int,string"/>
     </bean>
 
-
+	<bean name="EquipmentComposite">
+        <var name="EquipID" type="int32"/>
+        <var name="Composite" type="string"/>
+    </bean>
+	
     <bean name="ItemData">
         <var name="ID" type="int"/>
         <var name="Name" type="string"/>
@@ -898,6 +902,7 @@
     <table name="TbEquipmentType" value="EquipmentType" input="pro2d/EquipmentType@EquipmentData.xlsx"/>
     <table name="TbEquipBreakdown" value="EquipBreakdown" input="pro2d/EquipBreakdown.xlsx"/>
     <table name="TbEquipmentLvUpMaterials" value="EquipmentLvUpMaterials" input="pro2d/EquipmentLvUpMaterials.xlsx"/>
+    <table name="TbEquipmentComposite" value="EquipmentComposite" input="pro2d/EquipmentComposite.xlsx"/>
     <table name="TbItemData" value="ItemData" input="pro2d/BaseData@ItemData.xlsx"/>
     <table name="TbItemMiscellaneousData" value="ItemMiscellaneousData" input="pro2d/MiscellaneousData@ItemData.xlsx"/>
     <table name="TbOpenBox" value="OpenBox" input="pro2d/OpenBox.xlsx"/>
--
libgit2 0.21.2