From 677aa3f90cb5419b80645ea70e561ae0971291c8 Mon Sep 17 00:00:00 2001 From: zzyyyl Date: Tue, 11 Oct 2022 19:36:24 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=8A=A0=E7=82=B9=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: MistEO --- src/MeoAssistant/Task/Plugin/RoguelikeBattleTaskPlugin.cpp | 1 + src/MeoAssistant/Task/Plugin/RoguelikeControlTaskPlugin.cpp | 2 ++ .../Task/Plugin/RoguelikeCustomStartTaskPlugin.cpp | 1 + src/MeoAssistant/Task/Plugin/RoguelikeDebugTaskPlugin.cpp | 2 ++ .../Task/Plugin/RoguelikeFormationTaskPlugin.cpp | 3 ++- src/MeoAssistant/Task/Plugin/RoguelikeRecruitTaskPlugin.cpp | 1 + src/MeoAssistant/Task/Plugin/RoguelikeResetTaskPlugin.cpp | 2 ++ src/MeoAssistant/Task/Plugin/RoguelikeShoppingTaskPlugin.cpp | 1 + .../Task/Plugin/RoguelikeSkillSelectionTaskPlugin.cpp | 1 + src/MeoAssistant/Task/RoguelikeTask.cpp | 5 +---- 10 files changed, 14 insertions(+), 5 deletions(-) diff --git a/src/MeoAssistant/Task/Plugin/RoguelikeBattleTaskPlugin.cpp b/src/MeoAssistant/Task/Plugin/RoguelikeBattleTaskPlugin.cpp index ad71f5de85..67e57f2ac6 100644 --- a/src/MeoAssistant/Task/Plugin/RoguelikeBattleTaskPlugin.cpp +++ b/src/MeoAssistant/Task/Plugin/RoguelikeBattleTaskPlugin.cpp @@ -27,6 +27,7 @@ bool asst::RoguelikeBattleTaskPlugin::verify(AsstMsg msg, const json::value& det auto roguelike_name_opt = m_status->get_properties("roguelike_name"); if (!roguelike_name_opt) { + Log.error("Roguelike name doesn't exist!"); return false; } const std::string roguelike_name = std::move(roguelike_name_opt.value()) + "@"; diff --git a/src/MeoAssistant/Task/Plugin/RoguelikeControlTaskPlugin.cpp b/src/MeoAssistant/Task/Plugin/RoguelikeControlTaskPlugin.cpp index b9a7a679fe..3ebb74069f 100644 --- a/src/MeoAssistant/Task/Plugin/RoguelikeControlTaskPlugin.cpp +++ b/src/MeoAssistant/Task/Plugin/RoguelikeControlTaskPlugin.cpp @@ -1,6 +1,7 @@ #include "RoguelikeControlTaskPlugin.h" #include "RuntimeStatus.h" +#include "Utils/Logger.hpp" bool asst::RoguelikeControlTaskPlugin::verify(AsstMsg msg, const json::value& details) const { @@ -14,6 +15,7 @@ bool asst::RoguelikeControlTaskPlugin::verify(AsstMsg msg, const json::value& de auto roguelike_name_opt = m_status->get_properties("roguelike_name"); if (!roguelike_name_opt) { + Log.error("Roguelike name doesn't exist!"); return false; } const std::string roguelike_name = std::move(roguelike_name_opt.value()) + "@"; diff --git a/src/MeoAssistant/Task/Plugin/RoguelikeCustomStartTaskPlugin.cpp b/src/MeoAssistant/Task/Plugin/RoguelikeCustomStartTaskPlugin.cpp index 3462535474..35a4a88321 100644 --- a/src/MeoAssistant/Task/Plugin/RoguelikeCustomStartTaskPlugin.cpp +++ b/src/MeoAssistant/Task/Plugin/RoguelikeCustomStartTaskPlugin.cpp @@ -16,6 +16,7 @@ bool asst::RoguelikeCustomStartTaskPlugin::verify(AsstMsg msg, const json::value auto roguelike_name_opt = m_status->get_properties("roguelike_name"); if (!roguelike_name_opt) { + Log.error("Roguelike name doesn't exist!"); return false; } const std::string roguelike_name = std::move(roguelike_name_opt.value()) + "@"; diff --git a/src/MeoAssistant/Task/Plugin/RoguelikeDebugTaskPlugin.cpp b/src/MeoAssistant/Task/Plugin/RoguelikeDebugTaskPlugin.cpp index 34ff99e3f3..b6b1f09b3f 100644 --- a/src/MeoAssistant/Task/Plugin/RoguelikeDebugTaskPlugin.cpp +++ b/src/MeoAssistant/Task/Plugin/RoguelikeDebugTaskPlugin.cpp @@ -2,6 +2,7 @@ #include "Controller.h" #include "RuntimeStatus.h" +#include "Utils/Logger.hpp" bool asst::RoguelikeDebugTaskPlugin::verify(AsstMsg msg, const json::value& details) const { @@ -15,6 +16,7 @@ bool asst::RoguelikeDebugTaskPlugin::verify(AsstMsg msg, const json::value& deta auto roguelike_name_opt = m_status->get_properties("roguelike_name"); if (!roguelike_name_opt) { + Log.error("Roguelike name doesn't exist!"); return false; } const std::string roguelike_name = std::move(roguelike_name_opt.value()) + "@"; diff --git a/src/MeoAssistant/Task/Plugin/RoguelikeFormationTaskPlugin.cpp b/src/MeoAssistant/Task/Plugin/RoguelikeFormationTaskPlugin.cpp index 073d5d67a8..e65e24d033 100644 --- a/src/MeoAssistant/Task/Plugin/RoguelikeFormationTaskPlugin.cpp +++ b/src/MeoAssistant/Task/Plugin/RoguelikeFormationTaskPlugin.cpp @@ -5,8 +5,8 @@ #include "../Sub/ProcessTask.h" #include "Controller.h" #include "ImageAnalyzer/RoguelikeFormationImageAnalyzer.h" -#include "TaskData.h" #include "RuntimeStatus.h" +#include "TaskData.h" #include "Utils/Logger.hpp" bool asst::RoguelikeFormationTaskPlugin::verify(AsstMsg msg, const json::value& details) const @@ -17,6 +17,7 @@ bool asst::RoguelikeFormationTaskPlugin::verify(AsstMsg msg, const json::value& auto roguelike_name_opt = m_status->get_properties("roguelike_name"); if (!roguelike_name_opt) { + Log.error("Roguelike name doesn't exist!"); return false; } const std::string roguelike_name = std::move(roguelike_name_opt.value()) + "@"; diff --git a/src/MeoAssistant/Task/Plugin/RoguelikeRecruitTaskPlugin.cpp b/src/MeoAssistant/Task/Plugin/RoguelikeRecruitTaskPlugin.cpp index 1370c97a7a..0cd29eb6f2 100644 --- a/src/MeoAssistant/Task/Plugin/RoguelikeRecruitTaskPlugin.cpp +++ b/src/MeoAssistant/Task/Plugin/RoguelikeRecruitTaskPlugin.cpp @@ -16,6 +16,7 @@ bool asst::RoguelikeRecruitTaskPlugin::verify(AsstMsg msg, const json::value& de auto roguelike_name_opt = m_status->get_properties("roguelike_name"); if (!roguelike_name_opt) { + Log.error("Roguelike name doesn't exist!"); return false; } const std::string roguelike_name = std::move(roguelike_name_opt.value()) + "@"; diff --git a/src/MeoAssistant/Task/Plugin/RoguelikeResetTaskPlugin.cpp b/src/MeoAssistant/Task/Plugin/RoguelikeResetTaskPlugin.cpp index 710ee55f9a..fbb8a46c9d 100644 --- a/src/MeoAssistant/Task/Plugin/RoguelikeResetTaskPlugin.cpp +++ b/src/MeoAssistant/Task/Plugin/RoguelikeResetTaskPlugin.cpp @@ -1,6 +1,7 @@ #include "RoguelikeResetTaskPlugin.h" #include "RuntimeStatus.h" +#include "Utils/Logger.hpp" bool asst::RoguelikeResetTaskPlugin::verify(AsstMsg msg, const json::value& details) const { @@ -10,6 +11,7 @@ bool asst::RoguelikeResetTaskPlugin::verify(AsstMsg msg, const json::value& deta auto roguelike_name_opt = m_status->get_properties("roguelike_name"); if (!roguelike_name_opt) { + Log.error("Roguelike name doesn't exist!"); return false; } const std::string roguelike_name = std::move(roguelike_name_opt.value()) + "@"; diff --git a/src/MeoAssistant/Task/Plugin/RoguelikeShoppingTaskPlugin.cpp b/src/MeoAssistant/Task/Plugin/RoguelikeShoppingTaskPlugin.cpp index 6dc59fcdb5..5a376f7cee 100644 --- a/src/MeoAssistant/Task/Plugin/RoguelikeShoppingTaskPlugin.cpp +++ b/src/MeoAssistant/Task/Plugin/RoguelikeShoppingTaskPlugin.cpp @@ -16,6 +16,7 @@ bool asst::RoguelikeShoppingTaskPlugin::verify(AsstMsg msg, const json::value& d auto roguelike_name_opt = m_status->get_properties("roguelike_name"); if (!roguelike_name_opt) { + Log.error("Roguelike name doesn't exist!"); return false; } const std::string roguelike_name = std::move(roguelike_name_opt.value()) + "@"; diff --git a/src/MeoAssistant/Task/Plugin/RoguelikeSkillSelectionTaskPlugin.cpp b/src/MeoAssistant/Task/Plugin/RoguelikeSkillSelectionTaskPlugin.cpp index 21d36c475f..70e193e5b9 100644 --- a/src/MeoAssistant/Task/Plugin/RoguelikeSkillSelectionTaskPlugin.cpp +++ b/src/MeoAssistant/Task/Plugin/RoguelikeSkillSelectionTaskPlugin.cpp @@ -16,6 +16,7 @@ bool asst::RoguelikeSkillSelectionTaskPlugin::verify(AsstMsg msg, const json::va auto roguelike_name_opt = m_status->get_properties("roguelike_name"); if (!roguelike_name_opt) { + Log.error("Roguelike name doesn't exist!"); return false; } const std::string roguelike_name = std::move(roguelike_name_opt.value()) + "@"; diff --git a/src/MeoAssistant/Task/RoguelikeTask.cpp b/src/MeoAssistant/Task/RoguelikeTask.cpp index c854116f17..0f53decd2a 100644 --- a/src/MeoAssistant/Task/RoguelikeTask.cpp +++ b/src/MeoAssistant/Task/RoguelikeTask.cpp @@ -17,8 +17,6 @@ asst::RoguelikeTask::RoguelikeTask(const AsstCallback& callback, void* callback_ : PackageTask(callback, callback_arg, TaskType), m_roguelike_task_ptr(std::make_shared(callback, callback_arg, TaskType)) { - m_roguelike_task_ptr->set_tasks({ "Stop" }); - m_roguelike_task_ptr->register_plugin(); m_roguelike_task_ptr->register_plugin(); m_roguelike_task_ptr->register_plugin(); @@ -60,8 +58,7 @@ bool asst::RoguelikeTask::set_params(const json::value& params) case 0: break; case 1: - m_roguelike_task_ptr->set_times_limit("StageTraderLeaveConfirm", 0, - ProcessTask::TimesLimitType::Post); + m_roguelike_task_ptr->set_times_limit("StageTraderLeaveConfirm", 0, ProcessTask::TimesLimitType::Post); break; case 2: [[unlikely]] m_roguelike_task_ptr->set_times_limit("StageTraderInvestCancel", 0);