From 29db26c8316842fada4881c256a86c52429fbd77 Mon Sep 17 00:00:00 2001
From: client_Lhy <995049470@qq.com>
Date: 星期五, 05 七月 2019 10:43:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into LuaOrgan

---
 Core/GameEngine/Model/Config/TaskFeedbackConfig.cs |   12 ++++++++++--
 1 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/Core/GameEngine/Model/Config/TaskFeedbackConfig.cs b/Core/GameEngine/Model/Config/TaskFeedbackConfig.cs
index 2ae1400..79e5e3d 100644
--- a/Core/GameEngine/Model/Config/TaskFeedbackConfig.cs
+++ b/Core/GameEngine/Model/Config/TaskFeedbackConfig.cs
@@ -1,6 +1,6 @@
 锘�//--------------------------------------------------------
 //    [Author]:           Fish
-//    [  Date ]:           Tuesday, June 11, 2019
+//    [  Date ]:           Thursday, July 04, 2019
 //--------------------------------------------------------
 
 using System.Collections.Generic;
@@ -24,6 +24,7 @@
 	public readonly int jump;
 	public readonly string[] funcTitles;
 	public readonly string failFuncs;
+	public readonly int[] onlyOneFunc;
 	public readonly string[] remind;
 
 	public TaskFeedbackConfig()
@@ -58,7 +59,14 @@
 
 			failFuncs = tables[10];
 
-			remind = tables[11].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
+			string[] onlyOneFuncStringArray = tables[11].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
+			onlyOneFunc = new int[onlyOneFuncStringArray.Length];
+			for (int i=0;i<onlyOneFuncStringArray.Length;i++)
+			{
+				 int.TryParse(onlyOneFuncStringArray[i],out onlyOneFunc[i]);
+			}
+
+			remind = tables[12].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
         }
         catch (Exception ex)
         {

--
Gitblit v1.8.0