From 15b3357a13326ea382cf4860f92fd84bf4d68619 Mon Sep 17 00:00:00 2001
From: client_Lhy <995049470@qq.com>
Date: 星期二, 11 六月 2019 14:55:27 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

---
 Core/GameEngine/Model/Config/TaskFeedbackFuncConfig.cs |   17 ++++++++++-------
 1 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/Core/GameEngine/Model/Config/TaskFeedbackFuncConfig.cs b/Core/GameEngine/Model/Config/TaskFeedbackFuncConfig.cs
index 3beed52..83dbfd0 100644
--- a/Core/GameEngine/Model/Config/TaskFeedbackFuncConfig.cs
+++ b/Core/GameEngine/Model/Config/TaskFeedbackFuncConfig.cs
@@ -1,6 +1,6 @@
 锘�//--------------------------------------------------------
 //    [Author]:           Fish
-//    [  Date ]:           Friday, May 31, 2019
+//    [  Date ]:           Monday, June 10, 2019
 //--------------------------------------------------------
 
 using System.Collections.Generic;
@@ -15,6 +15,7 @@
 
     public readonly int id;
 	public readonly string name;
+	public readonly string category;
 	public readonly int jump;
 	public readonly int guide;
 	public readonly int type;
@@ -36,22 +37,24 @@
 
 			name = tables[1];
 
-			int.TryParse(tables[2],out jump); 
+			category = tables[2];
 
-			int.TryParse(tables[3],out guide); 
+			int.TryParse(tables[3],out jump); 
 
-			int.TryParse(tables[4],out type); 
+			int.TryParse(tables[4],out guide); 
 
-			int.TryParse(tables[5],out condition); 
+			int.TryParse(tables[5],out type); 
 
-			string[] itemConditionStringArray = tables[6].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
+			int.TryParse(tables[6],out condition); 
+
+			string[] itemConditionStringArray = tables[7].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
 			itemCondition = new Int2[itemConditionStringArray.Length];
 			for (int i=0;i<itemConditionStringArray.Length;i++)
 			{
 				 Int2.TryParse(itemConditionStringArray[i],out itemCondition[i]);
 			}
 
-			string[] excludeFuncsStringArray = tables[7].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
+			string[] excludeFuncsStringArray = tables[8].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
 			excludeFuncs = new int[excludeFuncsStringArray.Length];
 			for (int i=0;i<excludeFuncsStringArray.Length;i++)
 			{

--
Gitblit v1.8.0