From 97ce4d44bed3df19b585f947001e27095e765b84 Mon Sep 17 00:00:00 2001
From: client_Lhy <995049470@qq.com>
Date: 星期一, 01 七月 2019 15:23:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into LuaOrgan

---
 Core/GameEngine/Model/Config/SpiritWeaponConfig.cs |   36 ++++++++++++++++++++++++++++++++++--
 1 files changed, 34 insertions(+), 2 deletions(-)

diff --git a/Core/GameEngine/Model/Config/SpiritWeaponConfig.cs b/Core/GameEngine/Model/Config/SpiritWeaponConfig.cs
index 50b5446..6910e18 100644
--- a/Core/GameEngine/Model/Config/SpiritWeaponConfig.cs
+++ b/Core/GameEngine/Model/Config/SpiritWeaponConfig.cs
@@ -19,8 +19,11 @@
 	public readonly int[] AttrValueList;
 	public readonly int[] AttrColorList;
 	public readonly int AttrScore;
-
-	public SpiritWeaponConfig()
+    public readonly Int2[] UpCostItem;
+    public readonly int NextItemID;
+
+    static HashSet<int> RelatedItems = new HashSet<int>();
+    public SpiritWeaponConfig()
     {
     }
 
@@ -31,6 +34,10 @@
             var tables = input.Split('\t');
 
             int.TryParse(tables[0],out ItemID); 
+            if(!RelatedItems.Contains(ItemID))
+            {
+                RelatedItems.Add(ItemID);
+            }
 
 			int.TryParse(tables[1],out Level); 
 
@@ -56,12 +63,37 @@
 			}
 
 			int.TryParse(tables[5],out AttrScore); 
+
+            string[] UpCostItemAry = tables[6].Trim().Split(StringUtility.splitSeparator, StringSplitOptions.RemoveEmptyEntries);
+            UpCostItem = new Int2[UpCostItemAry.Length];
+            for (int i = 0; i < UpCostItem.Length; i++)
+            {
+                UpCostItem[i] = new Int2();
+                var UpCostItemInfo = UpCostItemAry[i].Split('_');
+                int.TryParse(UpCostItemInfo[0], out UpCostItem[i].x);
+                int.TryParse(UpCostItemInfo[1], out UpCostItem[i].y);
+                if (!RelatedItems.Contains(UpCostItem[i].x))
+                {
+                    RelatedItems.Add(UpCostItem[i].x);
+                }
+            }
+
+            int.TryParse(tables[7], out NextItemID);
+
         }
         catch (Exception ex)
         {
             DebugEx.Log(ex);
         }
     }
+    public static HashSet<int> GetAllRelatedItems()
+    {
+        if(!inited)
+        {
+            return RelatedItems;
+        }
+        return RelatedItems;
+    }
 
     static Dictionary<string, SpiritWeaponConfig> configs = new Dictionary<string, SpiritWeaponConfig>();
     public static SpiritWeaponConfig Get(string id)

--
Gitblit v1.8.0