From 918b86d8e821b196e71cec3507d40780c157689f Mon Sep 17 00:00:00 2001
From: yangjiyve <1711972070@qq.com>
Date: Mon, 20 Feb 2023 18:54:32 +0800
Subject: [PATCH] item杂项表删除

---
 Datas/pro2d/GlobalBaseDatas.xlsx | Bin 12282 -> 0 bytes
 Defines/pro2d.xml                | 15 +--------------
 2 files changed, 1 insertion(+), 14 deletions(-)

diff --git a/Datas/pro2d/GlobalBaseDatas.xlsx b/Datas/pro2d/GlobalBaseDatas.xlsx
index 8f5927c..fe073e2 100644
Binary files a/Datas/pro2d/GlobalBaseDatas.xlsx and b/Datas/pro2d/GlobalBaseDatas.xlsx differ
diff --git a/Defines/pro2d.xml b/Defines/pro2d.xml
index 7e04bb7..f0624ec 100644
--- a/Defines/pro2d.xml
+++ b/Defines/pro2d.xml
@@ -303,12 +303,6 @@
     </bean>
 
   
-    <bean name="MiscellaneousData">
-        <var name="Name" type="string"/>
-        <var name="Path" type="string"/>
-    </bean>
-
-  
     <bean name="BraekdownResult">
         <var name="ItemID" type="int"/>
         <var name="MinNum" type="int"/>
@@ -353,12 +347,6 @@
     </bean>
 
 
-    <bean name="ItemMiscellaneousData">
-        <var name="MiscellaneousDataKey" type="string"/>
-        <var name="MiscellaneousDataList" type="list,MiscellaneousData"/>
-    </bean>
-
-
     <bean name="OpenBox">
         <var name="ID" type="int"/>
         <var name="Name" type="string"/>
@@ -910,8 +898,7 @@
     <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="TbItemData" value="ItemData" input="pro2d/ItemData.xlsx"/>
     <table name="TbOpenBox" value="OpenBox" input="pro2d/OpenBox.xlsx"/>
     <table name="TbConsumptionItemData" value="ConsumptionItemData" input="pro2d/ConsumptionItemData.xlsx"/>
     <table name="TbCoupleTies" value="CoupleTies" input="pro2d/CoupleTiesDatas.xlsx"/>
--
libgit2 0.21.2