From 4fe8ab5d91e3517a350ff3bd8f0d541edc817224 Mon Sep 17 00:00:00 2001
From: client_Lhy <995049470@qq.com>
Date: 星期四, 04 七月 2019 22:33:21 +0800
Subject: [PATCH] 7677 灵器

---
 Core/GameEngine/Model/Config/SpiritWeaponConfig.cs |   88 +++++++++++++++++++-------------------------
 1 files changed, 38 insertions(+), 50 deletions(-)

diff --git a/Core/GameEngine/Model/Config/SpiritWeaponConfig.cs b/Core/GameEngine/Model/Config/SpiritWeaponConfig.cs
index 6910e18..7e5c8cd 100644
--- a/Core/GameEngine/Model/Config/SpiritWeaponConfig.cs
+++ b/Core/GameEngine/Model/Config/SpiritWeaponConfig.cs
@@ -1,6 +1,6 @@
 锘�//--------------------------------------------------------
 //    [Author]:           Fish
-//    [  Date ]:           Thursday, June 20, 2019
+//    [  Date ]:           Thursday, July 04, 2019
 //--------------------------------------------------------
 
 using System.Collections.Generic;
@@ -13,17 +13,19 @@
 public partial class SpiritWeaponConfig
 {
 
-    public readonly int ItemID;
-	public readonly int Level;
-	public readonly int[] AttrIDList;
-	public readonly int[] AttrValueList;
-	public readonly int[] AttrColorList;
-	public readonly int AttrScore;
-    public readonly Int2[] UpCostItem;
-    public readonly int NextItemID;
-
-    static HashSet<int> RelatedItems = new HashSet<int>();
-    public SpiritWeaponConfig()
+    public readonly int ItemID;
+	public readonly int Level;
+	public readonly int[] AttrIDList;
+	public readonly int[] AttrValueList;
+	public readonly int[] AttrColorList;
+	public readonly int AttrScore;
+	public readonly Int2[] UpCostItem;
+	public readonly int NextItemID;
+	public readonly int NPCID;
+	public readonly Vector3 Rotation;
+	public readonly float scale;
+
+	public SpiritWeaponConfig()
     {
     }
 
@@ -33,66 +35,52 @@
         {
             var tables = input.Split('\t');
 
-            int.TryParse(tables[0],out ItemID); 
-            if(!RelatedItems.Contains(ItemID))
-            {
-                RelatedItems.Add(ItemID);
-            }
-
-			int.TryParse(tables[1],out Level); 
-
+            int.TryParse(tables[0],out ItemID); 
+
+			int.TryParse(tables[1],out Level); 
+
 			string[] AttrIDListStringArray = tables[2].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
 			AttrIDList = new int[AttrIDListStringArray.Length];
 			for (int i=0;i<AttrIDListStringArray.Length;i++)
 			{
 				 int.TryParse(AttrIDListStringArray[i],out AttrIDList[i]);
-			}
-
+			}
+
 			string[] AttrValueListStringArray = tables[3].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
 			AttrValueList = new int[AttrValueListStringArray.Length];
 			for (int i=0;i<AttrValueListStringArray.Length;i++)
 			{
 				 int.TryParse(AttrValueListStringArray[i],out AttrValueList[i]);
-			}
-
+			}
+
 			string[] AttrColorListStringArray = tables[4].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
 			AttrColorList = new int[AttrColorListStringArray.Length];
 			for (int i=0;i<AttrColorListStringArray.Length;i++)
 			{
 				 int.TryParse(AttrColorListStringArray[i],out AttrColorList[i]);
-			}
-
-			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);
+			int.TryParse(tables[5],out AttrScore); 
 
+			string[] UpCostItemStringArray = tables[6].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
+			UpCostItem = new Int2[UpCostItemStringArray.Length];
+			for (int i=0;i<UpCostItemStringArray.Length;i++)
+			{
+				 Int2.TryParse(UpCostItemStringArray[i],out UpCostItem[i]);
+			}
+
+			int.TryParse(tables[7],out NextItemID); 
+
+			int.TryParse(tables[8],out NPCID); 
+
+			Rotation=tables[9].Vector3Parse();
+
+			float.TryParse(tables[10],out scale); 
         }
         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>();

--
Gitblit v1.8.0