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

---
 Core/GameEngine/Model/Config/FunctionForecastConfig.cs |   33 ++++++++++++++++++---------------
 1 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/Core/GameEngine/Model/Config/FunctionForecastConfig.cs b/Core/GameEngine/Model/Config/FunctionForecastConfig.cs
index 3e8880f..f89cfe9 100644
--- a/Core/GameEngine/Model/Config/FunctionForecastConfig.cs
+++ b/Core/GameEngine/Model/Config/FunctionForecastConfig.cs
@@ -1,6 +1,6 @@
 锘�//--------------------------------------------------------
 //    [Author]:			绗簩涓栫晫
-//    [  Date ]:		   Monday, September 17, 2018
+//    [  Date ]:		   Tuesday, October 30, 2018
 //--------------------------------------------------------
 
 using UnityEngine;
@@ -12,6 +12,7 @@
 	public partial class FunctionForecastConfig : ConfigBase {
 
 		public int FuncId { get ; private set ; }
+		public string Award { get ; private set; } 
 		public string FuncName { get ; private set; } 
 		public int OpenLevel { get ; private set ; }
 		public string Describe { get ; private set; } 
@@ -37,33 +38,35 @@
             {
                 FuncId=IsNumeric(rawContents[0]) ? int.Parse(rawContents[0]):0; 
 			
-				FuncName = rawContents[1].Trim();
+				Award = rawContents[1].Trim();
 			
-				OpenLevel=IsNumeric(rawContents[2]) ? int.Parse(rawContents[2]):0; 
+				FuncName = rawContents[2].Trim();
 			
-				Describe = rawContents[3].Trim();
+				OpenLevel=IsNumeric(rawContents[3]) ? int.Parse(rawContents[3]):0; 
 			
-				FuncIconKey = rawContents[4].Trim();
+				Describe = rawContents[4].Trim();
 			
-				DetailDescribe = rawContents[5].Trim();
+				FuncIconKey = rawContents[5].Trim();
 			
-				OpenDescribe = rawContents[6].Trim();
+				DetailDescribe = rawContents[6].Trim();
 			
-				Icon = rawContents[7].Trim();
+				OpenDescribe = rawContents[7].Trim();
 			
-				Content = rawContents[8].Trim();
+				Icon = rawContents[8].Trim();
 			
-				DisplayLevel=IsNumeric(rawContents[9]) ? int.Parse(rawContents[9]):0; 
+				Content = rawContents[9].Trim();
 			
-				Display=IsNumeric(rawContents[10]) ? int.Parse(rawContents[10]):0; 
+				DisplayLevel=IsNumeric(rawContents[10]) ? int.Parse(rawContents[10]):0; 
 			
-				RedPointLV=IsNumeric(rawContents[11]) ? int.Parse(rawContents[11]):0; 
+				Display=IsNumeric(rawContents[11]) ? int.Parse(rawContents[11]):0; 
 			
-				RedPointPercentage=IsNumeric(rawContents[12]) ? int.Parse(rawContents[12]):0; 
+				RedPointLV=IsNumeric(rawContents[12]) ? int.Parse(rawContents[12]):0; 
 			
-				FrameLevel=IsNumeric(rawContents[13]) ? int.Parse(rawContents[13]):0; 
+				RedPointPercentage=IsNumeric(rawContents[13]) ? int.Parse(rawContents[13]):0; 
 			
-				OpenNumber=IsNumeric(rawContents[14]) ? int.Parse(rawContents[14]):0; 
+				FrameLevel=IsNumeric(rawContents[14]) ? int.Parse(rawContents[14]):0; 
+			
+				OpenNumber=IsNumeric(rawContents[15]) ? int.Parse(rawContents[15]):0; 
             }
             catch (Exception ex)
             {

--
Gitblit v1.8.0