From d1fe47e500458a48b2aa2f5f326eee03eb50f85a Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期二, 18 九月 2018 11:34:34 +0800
Subject: [PATCH] Merge branch '3610法宝之魂改为由各个法宝单独觉醒,取消激活条件'

---
 Core/GameEngine/Model/Config/TreasureConfig.cs |   44 ++++++++++++++++++++++++++------------------
 1 files changed, 26 insertions(+), 18 deletions(-)

diff --git a/Core/GameEngine/Model/Config/TreasureConfig.cs b/Core/GameEngine/Model/Config/TreasureConfig.cs
index b86c221..d08f371 100644
--- a/Core/GameEngine/Model/Config/TreasureConfig.cs
+++ b/Core/GameEngine/Model/Config/TreasureConfig.cs
@@ -1,6 +1,6 @@
 锘�//--------------------------------------------------------
 //    [Author]:			绗簩涓栫晫
-//    [  Date ]:		   Friday, June 29, 2018
+//    [  Date ]:		   Tuesday, September 18, 2018
 //--------------------------------------------------------
 
 using UnityEngine;
@@ -9,8 +9,8 @@
 namespace TableConfig {
 
     
-	public partial class TreasureConfig : ConfigBase {
-
+	public partial class TreasureConfig : ConfigBase {
+
 		public int ID { get ; private set ; }
 		public int Category { get ; private set ; }
 		public int PreTreasure { get ; private set ; }
@@ -29,20 +29,21 @@
 		public int LineId { get ; private set ; }
 		public int ChallengeLevel { get ; private set ; }
 		public int[] Potentials;
+		public int[] SkillPower;
 		public string NeedItem { get ; private set; } 
 		public int EffectID { get ; private set ; }
 		public string[] Verse;
 		public int ShowNetGotEffect { get ; private set ; }
-		public int PreferredStage { get ; private set ; }
+		public int PreferredStage { get ; private set ; }
 
-		public override string getKey()
-        {
-            return ID.ToString();
+		public override string getKey()
+        {
+            return ID.ToString();
         }
 
 		public override void Parse() {
-			try
-            {
+			try
+            {
                 ID=IsNumeric(rawContents[0]) ? int.Parse(rawContents[0]):0; 
 			
 				Category=IsNumeric(rawContents[1]) ? int.Parse(rawContents[1]):0; 
@@ -89,19 +90,26 @@
 					 int.TryParse(PotentialsStringArray[i],out Potentials[i]);
 				}
 			
-				NeedItem = rawContents[18].Trim();
+				string[] SkillPowerStringArray = rawContents[18].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
+				SkillPower = new int[SkillPowerStringArray.Length];
+				for (int i=0;i<SkillPowerStringArray.Length;i++)
+				{
+					 int.TryParse(SkillPowerStringArray[i],out SkillPower[i]);
+				}
 			
-				EffectID=IsNumeric(rawContents[19]) ? int.Parse(rawContents[19]):0; 
+				NeedItem = rawContents[19].Trim();
 			
-				Verse = rawContents[20].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
+				EffectID=IsNumeric(rawContents[20]) ? int.Parse(rawContents[20]):0; 
 			
-				ShowNetGotEffect=IsNumeric(rawContents[21]) ? int.Parse(rawContents[21]):0; 
+				Verse = rawContents[21].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
 			
-				PreferredStage=IsNumeric(rawContents[22]) ? int.Parse(rawContents[22]):0; 
-            }
-            catch (Exception ex)
-            {
-                DebugEx.Log(ex);
+				ShowNetGotEffect=IsNumeric(rawContents[22]) ? int.Parse(rawContents[22]):0; 
+			
+				PreferredStage=IsNumeric(rawContents[23]) ? int.Parse(rawContents[23]):0; 
+            }
+            catch (Exception ex)
+            {
+                DebugEx.Log(ex);
             }
 		}
 	

--
Gitblit v1.8.0