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

---
 Core/GameEngine/Model/Config/CrossServerArenaConfig.cs |   13 ++++++++-----
 1 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/Core/GameEngine/Model/Config/CrossServerArenaConfig.cs b/Core/GameEngine/Model/Config/CrossServerArenaConfig.cs
index 8bdccf2..fc681ce 100644
--- a/Core/GameEngine/Model/Config/CrossServerArenaConfig.cs
+++ b/Core/GameEngine/Model/Config/CrossServerArenaConfig.cs
@@ -1,6 +1,6 @@
 锘�//--------------------------------------------------------
 //    [Author]:			绗簩涓栫晫
-//    [  Date ]:		   Thursday, December 20, 2018
+//    [  Date ]:		   Thursday, December 27, 2018
 //--------------------------------------------------------
 
 using UnityEngine;
@@ -13,6 +13,7 @@
 
 		public int DanLV { get ; private set ; }
 		public string Name { get ; private set; } 
+		public int DanType { get ; private set ; }
 		public string IconKey { get ; private set; } 
 		public int LVUpScore { get ; private set ; }
 		public string DanLVAwardList { get ; private set; } 
@@ -30,13 +31,15 @@
 			
 				Name = rawContents[1].Trim();
 			
-				IconKey = rawContents[2].Trim();
+				DanType=IsNumeric(rawContents[2]) ? int.Parse(rawContents[2]):0; 
 			
-				LVUpScore=IsNumeric(rawContents[3]) ? int.Parse(rawContents[3]):0; 
+				IconKey = rawContents[3].Trim();
 			
-				DanLVAwardList = rawContents[4].Trim();
+				LVUpScore=IsNumeric(rawContents[4]) ? int.Parse(rawContents[4]):0; 
 			
-				SeasonAwardList = rawContents[5].Trim();
+				DanLVAwardList = rawContents[5].Trim();
+			
+				SeasonAwardList = rawContents[6].Trim();
             }
             catch (Exception ex)
             {

--
Gitblit v1.8.0