From 1b5827f6250cdde26a88a6a096505a8dee606b35 Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期五, 17 五月 2019 11:21:38 +0800
Subject: [PATCH] Merge branch 'master' into ClientPreciousDungeon

---
 Core/GameEngine/Model/Config/TaskFeedbackConfig.cs |   24 +++++++++++++++---------
 1 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/Core/GameEngine/Model/Config/TaskFeedbackConfig.cs b/Core/GameEngine/Model/Config/TaskFeedbackConfig.cs
index 1fa2c49..72b34b0 100644
--- a/Core/GameEngine/Model/Config/TaskFeedbackConfig.cs
+++ b/Core/GameEngine/Model/Config/TaskFeedbackConfig.cs
@@ -1,6 +1,6 @@
 锘�//--------------------------------------------------------
 //    [Author]:           Fish
-//    [  Date ]:           Wednesday, May 15, 2019
+//    [  Date ]:           Friday, May 17, 2019
 //--------------------------------------------------------
 
 using System.Collections.Generic;
@@ -19,9 +19,11 @@
 	public readonly string equips;
 	public readonly string items;
 	public readonly string sideTasks;
+	public readonly string reikiRoot;
 	public readonly int[] succGuide;
-	public readonly int[] failGuide;
-	public readonly string remind;
+	public readonly int jump;
+	public readonly int[] failFuncs;
+	public readonly string[] remind;
 
 	public TaskFeedbackConfig()
     {
@@ -45,21 +47,25 @@
 
 			sideTasks = tables[5];
 
-			string[] succGuideStringArray = tables[6].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
+			reikiRoot = tables[6];
+
+			string[] succGuideStringArray = tables[7].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
 			succGuide = new int[succGuideStringArray.Length];
 			for (int i=0;i<succGuideStringArray.Length;i++)
 			{
 				 int.TryParse(succGuideStringArray[i],out succGuide[i]);
 			}
 
-			string[] failGuideStringArray = tables[7].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
-			failGuide = new int[failGuideStringArray.Length];
-			for (int i=0;i<failGuideStringArray.Length;i++)
+			int.TryParse(tables[8],out jump); 
+
+			string[] failFuncsStringArray = tables[9].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
+			failFuncs = new int[failFuncsStringArray.Length];
+			for (int i=0;i<failFuncsStringArray.Length;i++)
 			{
-				 int.TryParse(failGuideStringArray[i],out failGuide[i]);
+				 int.TryParse(failFuncsStringArray[i],out failFuncs[i]);
 			}
 
-			remind = tables[8];
+			remind = tables[10].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
         }
         catch (Exception ex)
         {

--
Gitblit v1.8.0