From 0d86cb96d37ebc52d1c65e7f4b46b6a10ba2d947 Mon Sep 17 00:00:00 2001
From: client_Hale <339726288@qq.com>
Date: 星期四, 04 七月 2019 16:44:47 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/MainInterfacePanel/TaskFeedbackModel.cs | 27 ++++++++++++++++++++++++---
1 files changed, 24 insertions(+), 3 deletions(-)
diff --git a/System/MainInterfacePanel/TaskFeedbackModel.cs b/System/MainInterfacePanel/TaskFeedbackModel.cs
index 7a20734..88f1a52 100644
--- a/System/MainInterfacePanel/TaskFeedbackModel.cs
+++ b/System/MainInterfacePanel/TaskFeedbackModel.cs
@@ -180,7 +180,14 @@
if (TryGetSatisfyConditionFuncs(feedback.failFuns[index], out succFuncs))
{
taskFeedbackFuncs.Clear();
- taskFeedbackFuncs.AddRange(succFuncs);
+ if (config.onlyOneFunc == 1)
+ {
+ taskFeedbackFuncs.Add(succFuncs[0]);
+ }
+ else
+ {
+ taskFeedbackFuncs.AddRange(succFuncs);
+ }
TaskFeedbackFuncWin.funcTitle = funcTitle;
WindowCenter.Instance.Open<TaskFeedbackFuncWin>();
}
@@ -212,7 +219,14 @@
if (TryGetSatisfyConditionFuncs(feedback.failFuns[index], out succFuncs))
{
taskFeedbackFuncs.Clear();
- taskFeedbackFuncs.AddRange(succFuncs);
+ if (config.onlyOneFunc == 1)
+ {
+ taskFeedbackFuncs.Add(succFuncs[0]);
+ }
+ else
+ {
+ taskFeedbackFuncs.AddRange(succFuncs);
+ }
TaskFeedbackFuncWin.funcTitle = funcTitle;
WindowCenter.Instance.Open<TaskFeedbackFuncWin>();
}
@@ -245,7 +259,14 @@
if (TryGetSatisfyConditionFuncs(feedback.failFuns[index], out succFuncs))
{
taskFeedbackFuncs.Clear();
- taskFeedbackFuncs.AddRange(succFuncs);
+ if (config.onlyOneFunc == 1)
+ {
+ taskFeedbackFuncs.Add(succFuncs[0]);
+ }
+ else
+ {
+ taskFeedbackFuncs.AddRange(succFuncs);
+ }
TaskFeedbackFuncWin.funcTitle = funcTitle;
WindowCenter.Instance.Open<TaskFeedbackFuncWin>();
}
--
Gitblit v1.8.0