From 9a808cbdb6dcb0ce36888290b13b2f2cdc210faa Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期四, 23 五月 2019 16:11:24 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
Core/GameEngine/Model/Config/TaskFeedbackFuncConfig.cs | 29 ++++++++++++++++++++++++++---
1 files changed, 26 insertions(+), 3 deletions(-)
diff --git a/Core/GameEngine/Model/Config/TaskFeedbackFuncConfig.cs b/Core/GameEngine/Model/Config/TaskFeedbackFuncConfig.cs
index 84754c3..e949e6a 100644
--- a/Core/GameEngine/Model/Config/TaskFeedbackFuncConfig.cs
+++ b/Core/GameEngine/Model/Config/TaskFeedbackFuncConfig.cs
@@ -1,6 +1,6 @@
锘�//--------------------------------------------------------
// [Author]: Fish
-// [ Date ]: Thursday, May 16, 2019
+// [ Date ]: Thursday, May 23, 2019
//--------------------------------------------------------
using System.Collections.Generic;
@@ -16,7 +16,11 @@
public readonly int id;
public readonly string name;
public readonly int jump;
- public readonly int guide;
+ public readonly int guide;
+ public readonly int type;
+ public readonly int condition;
+ public readonly Int2[] itemCondition;
+ public readonly Int2[] betterEquips;
public TaskFeedbackFuncConfig()
{
@@ -34,7 +38,25 @@
int.TryParse(tables[2],out jump);
- int.TryParse(tables[3],out guide);
+ int.TryParse(tables[3],out guide);
+
+ int.TryParse(tables[4],out type);
+
+ int.TryParse(tables[5],out condition);
+
+ string[] itemConditionStringArray = tables[6].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[] betterEquipsStringArray = tables[7].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
+ betterEquips = new Int2[betterEquipsStringArray.Length];
+ for (int i=0;i<betterEquipsStringArray.Length;i++)
+ {
+ Int2.TryParse(betterEquipsStringArray[i],out betterEquips[i]);
+ }
}
catch (Exception ex)
{
@@ -118,6 +140,7 @@
path = AssetVersionUtility.GetAssetFilePath("config/TaskFeedbackFunc.txt");
}
+ configs.Clear();
var tempConfig = new TaskFeedbackFuncConfig();
var preParse = tempConfig is IConfigPostProcess;
--
Gitblit v1.8.0