From bc8eefc82f2b1862fc0c417f9813e22fee809b26 Mon Sep 17 00:00:00 2001
From: client_Zxw <826696702@qq.com>
Date: 星期五, 21 九月 2018 20:22:34 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

---
 Core/GameEngine/Model/Config/DogzConfig.cs |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/Core/GameEngine/Model/Config/DogzConfig.cs b/Core/GameEngine/Model/Config/DogzConfig.cs
index fd635a1..1bd92e6 100644
--- a/Core/GameEngine/Model/Config/DogzConfig.cs
+++ b/Core/GameEngine/Model/Config/DogzConfig.cs
@@ -1,6 +1,6 @@
 锘�//--------------------------------------------------------
 //    [Author]:			绗簩涓栫晫
-//    [  Date ]:		   Friday, August 17, 2018
+//    [  Date ]:		   Friday, September 21, 2018
 //--------------------------------------------------------
 
 using UnityEngine;
@@ -17,6 +17,7 @@
 		public int[] BaseAttrTypes;
 		public int[] BaseAttrValues;
 		public int[] HelpBattleSkills;
+		public int FightPowerEx { get ; private set ; }
 		public int[] EquipPlaceColorList;
 
 		public override string getKey()
@@ -54,7 +55,9 @@
 					 int.TryParse(HelpBattleSkillsStringArray[i],out HelpBattleSkills[i]);
 				}
 			
-				string[] EquipPlaceColorListStringArray = rawContents[6].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
+				FightPowerEx=IsNumeric(rawContents[6]) ? int.Parse(rawContents[6]):0; 
+			
+				string[] EquipPlaceColorListStringArray = rawContents[7].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
 				EquipPlaceColorList = new int[EquipPlaceColorListStringArray.Length];
 				for (int i=0;i<EquipPlaceColorListStringArray.Length;i++)
 				{

--
Gitblit v1.8.0