From b418f1bc5cc8e2c8be73e190d0fb198befe5da00 Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期四, 04 七月 2019 16:40:07 +0800
Subject: [PATCH] 3335 任务反馈修改
---
Core/GameEngine/Model/Config/TaskFeedbackConfig.cs.meta | 2 +-
Core/GameEngine/Model/Config/TaskFeedbackConfig.cs | 7 +++++--
System/MainInterfacePanel/TaskFeedbackModel.cs | 27 ++++++++++++++++++++++++---
3 files changed, 30 insertions(+), 6 deletions(-)
diff --git a/Core/GameEngine/Model/Config/TaskFeedbackConfig.cs b/Core/GameEngine/Model/Config/TaskFeedbackConfig.cs
index 2ae1400..c66924e 100644
--- a/Core/GameEngine/Model/Config/TaskFeedbackConfig.cs
+++ b/Core/GameEngine/Model/Config/TaskFeedbackConfig.cs
@@ -1,6 +1,6 @@
锘�//--------------------------------------------------------
// [Author]: Fish
-// [ Date ]: Tuesday, June 11, 2019
+// [ Date ]: Thursday, July 04, 2019
//--------------------------------------------------------
using System.Collections.Generic;
@@ -24,6 +24,7 @@
public readonly int jump;
public readonly string[] funcTitles;
public readonly string failFuncs;
+ public readonly int onlyOneFunc;
public readonly string[] remind;
public TaskFeedbackConfig()
@@ -58,7 +59,9 @@
failFuncs = tables[10];
- remind = tables[11].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
+ int.TryParse(tables[11],out onlyOneFunc);
+
+ remind = tables[12].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
}
catch (Exception ex)
{
diff --git a/Core/GameEngine/Model/Config/TaskFeedbackConfig.cs.meta b/Core/GameEngine/Model/Config/TaskFeedbackConfig.cs.meta
index 641016d..01c09bf 100644
--- a/Core/GameEngine/Model/Config/TaskFeedbackConfig.cs.meta
+++ b/Core/GameEngine/Model/Config/TaskFeedbackConfig.cs.meta
@@ -1,6 +1,6 @@
fileFormatVersion: 2
guid: b80a883f246077d46ab59d6938182ec9
-timeCreated: 1560244941
+timeCreated: 1562229408
licenseType: Pro
MonoImporter:
serializedVersion: 2
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