From 51df29db640f58b1aa0f7cbcafc25b592ff84178 Mon Sep 17 00:00:00 2001 From: MistEO Date: Mon, 16 Jan 2023 01:38:17 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E4=BF=9D=E5=85=A8?= =?UTF-8?q?=E7=95=8C=E9=9D=A2=E6=89=93=E5=8D=B0=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/MaaCore/Task/SSS/SSSStageManagerTask.cpp | 2 +- src/MaaWpfGui/Main/AsstProxy.cs | 7 ++----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/MaaCore/Task/SSS/SSSStageManagerTask.cpp b/src/MaaCore/Task/SSS/SSSStageManagerTask.cpp index f07992d3bc..3e874c8a6f 100644 --- a/src/MaaCore/Task/SSS/SSSStageManagerTask.cpp +++ b/src/MaaCore/Task/SSS/SSSStageManagerTask.cpp @@ -45,7 +45,7 @@ bool asst::SSSStageManagerTask::_run() break; } } - if (!success) { + if (!need_exit() && !success) { Log.warn("Can't win, run!"); auto info = basic_info_with_what("SSSSettlement"); diff --git a/src/MaaWpfGui/Main/AsstProxy.cs b/src/MaaWpfGui/Main/AsstProxy.cs index e916ff5afc..1c851c6588 100644 --- a/src/MaaWpfGui/Main/AsstProxy.cs +++ b/src/MaaWpfGui/Main/AsstProxy.cs @@ -961,17 +961,14 @@ namespace MaaWpfGui case "SSSStage": { - copilotModel.AddLog( - string.Format(Localization.GetString("CurrentStage"), - subTaskDetails["stage"].ToString())); + copilotModel.AddLog("CurrentStage: " + subTaskDetails["stage"].ToString(), UILogColor.Info); } break; case "SSSSettlement": { - copilotModel.AddLog( - string.Format(details["why"].ToString())); + copilotModel.AddLog(details["why"].ToString(), UILogColor.Info); } break;