From 960fe3d379405bc313a5f16c8424a282fe7d6464 Mon Sep 17 00:00:00 2001 From: status102 Date: Wed, 15 Nov 2023 14:35:05 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E8=82=89=E9=B8=BD?= =?UTF-8?q?=E4=B8=BB=E9=A2=98=E8=BF=81=E7=A7=BB=E5=AF=BC=E8=87=B4=E7=9A=84?= =?UTF-8?q?=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/MaaCore/Task/Interface/RoguelikeTask.cpp | 5 +++-- src/MaaCore/Task/Roguelike/RoguelikeResetTaskPlugin.cpp | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/MaaCore/Task/Interface/RoguelikeTask.cpp b/src/MaaCore/Task/Interface/RoguelikeTask.cpp index 7e0122561a..0141bfb3f1 100644 --- a/src/MaaCore/Task/Interface/RoguelikeTask.cpp +++ b/src/MaaCore/Task/Interface/RoguelikeTask.cpp @@ -76,12 +76,13 @@ bool asst::RoguelikeTask::set_params(const json::value& params) LogTraceFunction; std::string theme = params.get("theme", std::string(RoguelikeTheme::Phantom)); - if (RoguelikeConfig::is_valid_theme(theme)) { + if (!RoguelikeConfig::is_valid_theme(theme)) { m_roguelike_task_ptr->set_tasks({ "Stop" }); Log.error("Unknown roguelike theme", theme); return false; } + // 迁移完RoguelikeConfig后,这里可以去掉 if (status() == nullptr) { m_roguelike_task_ptr->set_tasks({ "Stop" }); Log.error(__FUNCTION__, "status() is null"); @@ -89,7 +90,7 @@ bool asst::RoguelikeTask::set_params(const json::value& params) } auto mode = static_cast(params.get("mode", 0)); - if (RoguelikeConfig::is_valid_mode(mode)) { + if (!RoguelikeConfig::is_valid_mode(mode)) { m_roguelike_task_ptr->set_tasks({ "Stop" }); Log.error(__FUNCTION__, "| Unknown mode", static_cast(mode)); return false; diff --git a/src/MaaCore/Task/Roguelike/RoguelikeResetTaskPlugin.cpp b/src/MaaCore/Task/Roguelike/RoguelikeResetTaskPlugin.cpp index c88b35937e..05cee32c9e 100644 --- a/src/MaaCore/Task/Roguelike/RoguelikeResetTaskPlugin.cpp +++ b/src/MaaCore/Task/Roguelike/RoguelikeResetTaskPlugin.cpp @@ -29,7 +29,7 @@ bool asst::RoguelikeResetTaskPlugin::verify(AsstMsg msg, const json::value& deta bool asst::RoguelikeResetTaskPlugin::_run() { - // 改完全部肉鸽数据之后一起删掉! + // 迁移完RoguelikeConfig后,这里可以去掉 // 简单粗暴,后面如果多任务间有联动可能要改改 status()->clear_number(); status()->clear_str();