From ff1063ff14582b652c91b931a2c0d2855dccc1f2 Mon Sep 17 00:00:00 2001
From: client_Zxw <826696702@qq.com>
Date: 星期五, 04 一月 2019 11:41:12 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

---
 Core/GameEngine/Model/Config/GatherSoulPropertyConfig.cs |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Core/GameEngine/Model/Config/GatherSoulPropertyConfig.cs b/Core/GameEngine/Model/Config/GatherSoulPropertyConfig.cs
index 4822786..aed139c 100644
--- a/Core/GameEngine/Model/Config/GatherSoulPropertyConfig.cs
+++ b/Core/GameEngine/Model/Config/GatherSoulPropertyConfig.cs
@@ -1,6 +1,6 @@
 锘�//--------------------------------------------------------
 //    [Author]:			绗簩涓栫晫
-//    [  Date ]:		   Tuesday, December 18, 2018
+//    [  Date ]:		   Friday, January 04, 2019
 //--------------------------------------------------------
 
 using UnityEngine;
@@ -17,7 +17,7 @@
 		public string AttrInfo3 { get ; private set; } 
 		public string AttrInfo4 { get ; private set; } 
 		public string AttrInfo5 { get ; private set; } 
-		public int sort { get ; private set ; }
+		public string sort { get ; private set; } 
 
 		public override string getKey()
         {
@@ -39,7 +39,7 @@
 			
 				AttrInfo5 = rawContents[5].Trim();
 			
-				sort=IsNumeric(rawContents[6]) ? int.Parse(rawContents[6]):0; 
+				sort = rawContents[6].Trim();
             }
             catch (Exception ex)
             {

--
Gitblit v1.8.0