From b010718dbb8efdc9031570ddebe152e6890f80ae Mon Sep 17 00:00:00 2001
From: client_Lhy <995049470@qq.com>
Date: 星期三, 12 六月 2019 11:01:33 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/MainInterfacePanel/TaskFeedbackModel.cs | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/System/MainInterfacePanel/TaskFeedbackModel.cs b/System/MainInterfacePanel/TaskFeedbackModel.cs
index f46256f..58da517 100644
--- a/System/MainInterfacePanel/TaskFeedbackModel.cs
+++ b/System/MainInterfacePanel/TaskFeedbackModel.cs
@@ -174,11 +174,13 @@
if (feedback.failFuns != null)
{
var index = Mathf.Min(condition, feedback.failFuns.Count - 1);
+ var funcTitle = index < config.funcTitles.Length ? config.funcTitles[index] : string.Empty;
List<int> succFuncs;
if (TryGetSatisfyConditionFuncs(feedback.failFuns[index], out succFuncs))
{
taskFeedbackFuncs.Clear();
taskFeedbackFuncs.AddRange(succFuncs);
+ TaskFeedbackFuncWin.funcTitle = funcTitle;
WindowCenter.Instance.Open<TaskFeedbackFuncWin>();
}
}
@@ -204,11 +206,13 @@
{
var taskIndex = feedback.IndexOfSideTasks(condition);
var index = Mathf.Min(taskIndex, feedback.failFuns.Count - 1);
+ var funcTitle = index < config.funcTitles.Length ? config.funcTitles[index] : string.Empty;
List<int> succFuncs;
if (TryGetSatisfyConditionFuncs(feedback.failFuns[index], out succFuncs))
{
taskFeedbackFuncs.Clear();
taskFeedbackFuncs.AddRange(succFuncs);
+ TaskFeedbackFuncWin.funcTitle = funcTitle;
WindowCenter.Instance.Open<TaskFeedbackFuncWin>();
}
}
@@ -235,11 +239,13 @@
IsSatisfySideTask(feedback.sideTasks, out sideTaskId);
var taskIndex = feedback.IndexOfSideTasks(sideTaskId);
var index = Mathf.Min(taskIndex, feedback.failFuns.Count - 1);
+ var funcTitle = index < config.funcTitles.Length ? config.funcTitles[index] : string.Empty;
List<int> succFuncs;
if (TryGetSatisfyConditionFuncs(feedback.failFuns[index], out succFuncs))
{
taskFeedbackFuncs.Clear();
taskFeedbackFuncs.AddRange(succFuncs);
+ TaskFeedbackFuncWin.funcTitle = funcTitle;
WindowCenter.Instance.Open<TaskFeedbackFuncWin>();
}
}
--
Gitblit v1.8.0