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

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

diff --git a/Core/GameEngine/Model/Config/FunctionForecastConfig.cs b/Core/GameEngine/Model/Config/FunctionForecastConfig.cs
index fb16528..ba97f64 100644
--- a/Core/GameEngine/Model/Config/FunctionForecastConfig.cs
+++ b/Core/GameEngine/Model/Config/FunctionForecastConfig.cs
@@ -1,6 +1,6 @@
 锘�//--------------------------------------------------------
 //    [Author]:			绗簩涓栫晫
-//    [  Date ]:		   Saturday, January 06, 2018
+//    [  Date ]:		   Tuesday, September 11, 2018
 //--------------------------------------------------------
 
 using UnityEngine;
@@ -11,13 +11,17 @@
     
 	public partial class FunctionForecastConfig : ConfigBase {
 
-		public int FuncId { get ; private set ; }
-		public string FuncName { get ; private set; } 
-		public int OpenLevel { get ; private set ; }
-		public string Describe { get ; private set; } 
-		public string FuncIconKey { get ; private set; } 
-		public string DetailDescribe { get ; private set; } 
-		public string OpenDescribe { get ; private set; } 
+		public int FuncId { get ; private set ; }
+		public string FuncName { get ; private set; } 
+		public int OpenLevel { get ; private set ; }
+		public string Describe { get ; private set; } 
+		public string FuncIconKey { get ; private set; } 
+		public string DetailDescribe { get ; private set; } 
+		public string OpenDescribe { get ; private set; } 
+		public string Icon { get ; private set; } 
+		public string Content { get ; private set; } 
+		public int DisplayLevel { get ; private set ; }
+		public int Display { get ; private set ; }
 
 		public override string getKey()
         {
@@ -27,19 +31,27 @@
 		public override void Parse() {
 			try
             {
-                FuncId=IsNumeric(rawContents[0]) ? int.Parse(rawContents[0]):0; 
-			
-				FuncName = rawContents[1].Trim();
-			
-				OpenLevel=IsNumeric(rawContents[2]) ? int.Parse(rawContents[2]):0; 
-			
-				Describe = rawContents[3].Trim();
-			
-				FuncIconKey = rawContents[4].Trim();
-			
-				DetailDescribe = rawContents[5].Trim();
-			
-				OpenDescribe = rawContents[6].Trim();
+                FuncId=IsNumeric(rawContents[0]) ? int.Parse(rawContents[0]):0; 
+			
+				FuncName = rawContents[1].Trim();
+			
+				OpenLevel=IsNumeric(rawContents[2]) ? int.Parse(rawContents[2]):0; 
+			
+				Describe = rawContents[3].Trim();
+			
+				FuncIconKey = rawContents[4].Trim();
+			
+				DetailDescribe = rawContents[5].Trim();
+			
+				OpenDescribe = rawContents[6].Trim();
+			
+				Icon = rawContents[7].Trim();
+			
+				Content = rawContents[8].Trim();
+			
+				DisplayLevel=IsNumeric(rawContents[9]) ? int.Parse(rawContents[9]):0; 
+			
+				Display=IsNumeric(rawContents[10]) ? int.Parse(rawContents[10]):0; 
             }
             catch (Exception ex)
             {

--
Gitblit v1.8.0