From 438fbc32b80e8e174249e3d723f4db22d2af4915 Mon Sep 17 00:00:00 2001
From: client_Hale <339726288@qq.com>
Date: 星期二, 11 十二月 2018 15:32:15 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

---
 Core/GameEngine/Model/Config/GodWeaponEffectConfig.cs |   30 ++++++++++++++++++------------
 1 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/Core/GameEngine/Model/Config/GodWeaponEffectConfig.cs b/Core/GameEngine/Model/Config/GodWeaponEffectConfig.cs
index 4d5e3a7..e29cc41 100644
--- a/Core/GameEngine/Model/Config/GodWeaponEffectConfig.cs
+++ b/Core/GameEngine/Model/Config/GodWeaponEffectConfig.cs
@@ -1,6 +1,6 @@
 锘�//--------------------------------------------------------
 //    [Author]:			绗簩涓栫晫
-//    [  Date ]:		   Friday, November 23, 2018
+//    [  Date ]:		   Tuesday, December 11, 2018
 //--------------------------------------------------------
 
 using UnityEngine;
@@ -11,10 +11,12 @@
     
 	public partial class GodWeaponEffectConfig : ConfigBase {
 
-		public int id { get ; private set ; }
-		public int type { get ; private set ; }
-		public int level { get ; private set ; }
-		public string effect { get ; private set; } 
+		public int id { get ; private set ; }
+		public int type { get ; private set ; }
+		public int level { get ; private set ; }
+		public string effect { get ; private set; } 
+		public int fightPower { get ; private set ; }
+		public string attr { get ; private set; } 
 
 		public override string getKey()
         {
@@ -24,13 +26,17 @@
 		public override void Parse() {
 			try
             {
-                id=IsNumeric(rawContents[0]) ? int.Parse(rawContents[0]):0; 
-			
-				type=IsNumeric(rawContents[1]) ? int.Parse(rawContents[1]):0; 
-			
-				level=IsNumeric(rawContents[2]) ? int.Parse(rawContents[2]):0; 
-			
-				effect = rawContents[3].Trim();
+                id=IsNumeric(rawContents[0]) ? int.Parse(rawContents[0]):0; 
+			
+				type=IsNumeric(rawContents[1]) ? int.Parse(rawContents[1]):0; 
+			
+				level=IsNumeric(rawContents[2]) ? int.Parse(rawContents[2]):0; 
+			
+				effect = rawContents[3].Trim();
+			
+				fightPower=IsNumeric(rawContents[4]) ? int.Parse(rawContents[4]):0; 
+			
+				attr = rawContents[5].Trim();
             }
             catch (Exception ex)
             {

--
Gitblit v1.8.0