From 559c913fca0dd0966896396e251be13f76ea3e52 Mon Sep 17 00:00:00 2001 From: zzyyyl Date: Thu, 29 Sep 2022 23:08:00 +0800 Subject: [PATCH] style: format --- src/MeoAssistant/Assistant.cpp | 4 ++-- src/MeoAssistant/AsstCaller.cpp | 2 +- src/MeoAssistant/Controller.cpp | 2 +- .../ImageAnalyzer/BattleImageAnalyzer.cpp | 2 +- .../ImageAnalyzer/CreditShopImageAnalyzer.cpp | 2 +- .../ImageAnalyzer/DepotImageAnalyzer.cpp | 6 +++--- .../ImageAnalyzer/General/AbstractImageAnalyzer.cpp | 2 +- .../ImageAnalyzer/General/MatchImageAnalyzer.cpp | 4 ++-- .../General/MultiMatchImageAnalyzer.cpp | 4 ++-- .../ImageAnalyzer/General/OcrImageAnalyzer.cpp | 2 +- .../InfrastClueVacancyImageAnalyzer.cpp | 2 +- .../ImageAnalyzer/InfrastFacilityImageAnalyzer.cpp | 4 ++-- .../ImageAnalyzer/InfrastOperImageAnalyzer.cpp | 6 +++--- .../ImageAnalyzer/InfrastSmileyImageAnalyzer.cpp | 2 +- .../ImageAnalyzer/ProcessTaskImageAnalyzer.cpp | 4 ++-- .../RoguelikeFormationImageAnalyzer.cpp | 4 ++-- .../ImageAnalyzer/RoguelikeRecruitImageAnalyzer.cpp | 2 +- .../RoguelikeSkillSelectionImageAnalyzer.cpp | 4 ++-- .../ImageAnalyzer/StageDropsImageAnalyzer.cpp | 8 ++++---- src/MeoAssistant/Resource/RecruitConfiger.h | 1 + src/MeoAssistant/ResourceLoader.cpp | 2 +- src/MeoAssistant/Task/CopilotTask.cpp | 8 ++++---- src/MeoAssistant/Task/DebugTask.cpp | 4 ++-- src/MeoAssistant/Task/FightTask.cpp | 2 +- src/MeoAssistant/Task/InfrastTask.cpp | 2 +- src/MeoAssistant/Task/MallTask.cpp | 8 ++++---- .../Task/Plugin/DrGrandetTaskPlugin.cpp | 2 +- .../Task/Plugin/RoguelikeBattleTaskPlugin.cpp | 12 ++++++------ .../Task/Plugin/RoguelikeBattleTaskPlugin.h | 2 +- .../Task/Plugin/RoguelikeCustomStartTaskPlugin.cpp | 8 ++++---- .../Task/Plugin/RoguelikeFormationTaskPlugin.cpp | 4 ++-- .../Task/Plugin/RoguelikeRecruitTaskPlugin.cpp | 6 +++--- .../Task/Plugin/RoguelikeShoppingTaskPlugin.cpp | 8 ++++---- .../Plugin/RoguelikeSkillSelectionTaskPlugin.cpp | 2 +- .../Task/Plugin/StageDropsTaskPlugin.cpp | 12 ++++++------ src/MeoAssistant/Task/RoguelikeTask.cpp | 2 +- src/MeoAssistant/Task/Sub/AbstractTask.cpp | 6 +++--- src/MeoAssistant/Task/Sub/AutoRecruitTask.cpp | 8 ++++---- src/MeoAssistant/Task/Sub/AutoRecruitTask.h | 2 +- src/MeoAssistant/Task/Sub/BattleFormationTask.cpp | 6 +++--- src/MeoAssistant/Task/Sub/BattleProcessTask.cpp | 8 ++++---- src/MeoAssistant/Task/Sub/BattleProcessTask.h | 2 +- src/MeoAssistant/Task/Sub/CreditShoppingTask.cpp | 13 +++++++------ src/MeoAssistant/Task/Sub/CreditShoppingTask.h | 2 +- src/MeoAssistant/Task/Sub/DepotRecognitionTask.cpp | 4 ++-- src/MeoAssistant/Task/Sub/InfrastAbstractTask.cpp | 10 +++++----- src/MeoAssistant/Task/Sub/InfrastDormTask.cpp | 4 ++-- src/MeoAssistant/Task/Sub/InfrastInfoTask.cpp | 2 +- src/MeoAssistant/Task/Sub/InfrastOfficeTask.cpp | 2 +- src/MeoAssistant/Task/Sub/InfrastPowerTask.cpp | 2 +- src/MeoAssistant/Task/Sub/InfrastProductionTask.cpp | 6 +++--- src/MeoAssistant/Task/Sub/InfrastReceptionTask.cpp | 4 ++-- src/MeoAssistant/Task/Sub/ProcessTask.cpp | 6 +++--- src/MeoAssistant/Task/Sub/ReportDataTask.cpp | 2 +- src/MeoAssistant/Task/Sub/StageNavigationTask.cpp | 2 +- src/MeoAssistant/TaskData.cpp | 4 ++-- 56 files changed, 124 insertions(+), 122 deletions(-) diff --git a/src/MeoAssistant/Assistant.cpp b/src/MeoAssistant/Assistant.cpp index a2e720628b..0c4c8d9efa 100644 --- a/src/MeoAssistant/Assistant.cpp +++ b/src/MeoAssistant/Assistant.cpp @@ -4,11 +4,11 @@ #include -#include "Utils/AsstUtils.hpp" #include "Controller.h" #include "Resource/GeneralConfiger.h" -#include "Utils/Logger.hpp" #include "RuntimeStatus.h" +#include "Utils/AsstUtils.hpp" +#include "Utils/Logger.hpp" #include "Task/AwardTask.h" #include "Task/CloseDownTask.h" diff --git a/src/MeoAssistant/AsstCaller.cpp b/src/MeoAssistant/AsstCaller.cpp index 0abd68b0ab..41aac54711 100644 --- a/src/MeoAssistant/AsstCaller.cpp +++ b/src/MeoAssistant/AsstCaller.cpp @@ -7,9 +7,9 @@ #include #include "Assistant.h" +#include "ResourceLoader.h" #include "Utils/AsstTypes.h" #include "Utils/Logger.hpp" -#include "ResourceLoader.h" #include "Utils/Version.h" static constexpr unsigned long long NullSize = static_cast(-1); diff --git a/src/MeoAssistant/Controller.cpp b/src/MeoAssistant/Controller.cpp index 13158dc3dc..dd86536ed4 100644 --- a/src/MeoAssistant/Controller.cpp +++ b/src/MeoAssistant/Controller.cpp @@ -29,8 +29,8 @@ #pragma warning(pop) #endif -#include "Utils/AsstTypes.h" #include "Resource/GeneralConfiger.h" +#include "Utils/AsstTypes.h" #include "Utils/Logger.hpp" asst::Controller::Controller(AsstCallback callback, void* callback_arg) diff --git a/src/MeoAssistant/ImageAnalyzer/BattleImageAnalyzer.cpp b/src/MeoAssistant/ImageAnalyzer/BattleImageAnalyzer.cpp index 139d9cfcc0..eb6cb66f51 100644 --- a/src/MeoAssistant/ImageAnalyzer/BattleImageAnalyzer.cpp +++ b/src/MeoAssistant/ImageAnalyzer/BattleImageAnalyzer.cpp @@ -6,11 +6,11 @@ #include "Utils/NoWarningCV.h" #include "General/HashImageAnalyzer.h" -#include "Utils/Logger.hpp" #include "General/MatchImageAnalyzer.h" #include "General/MultiMatchImageAnalyzer.h" #include "General/OcrWithFlagTemplImageAnalyzer.h" #include "TaskData.h" +#include "Utils/Logger.hpp" bool asst::BattleImageAnalyzer::set_target(int target) { diff --git a/src/MeoAssistant/ImageAnalyzer/CreditShopImageAnalyzer.cpp b/src/MeoAssistant/ImageAnalyzer/CreditShopImageAnalyzer.cpp index daffc27ef6..bd517f15ad 100644 --- a/src/MeoAssistant/ImageAnalyzer/CreditShopImageAnalyzer.cpp +++ b/src/MeoAssistant/ImageAnalyzer/CreditShopImageAnalyzer.cpp @@ -4,11 +4,11 @@ #include "Utils/NoWarningCV.h" -#include "Utils/AsstUtils.hpp" #include "General/MatchImageAnalyzer.h" #include "General/MultiMatchImageAnalyzer.h" #include "General/OcrImageAnalyzer.h" #include "TaskData.h" +#include "Utils/AsstUtils.hpp" void asst::CreditShopImageAnalyzer::set_black_list(std::vector black_list) { diff --git a/src/MeoAssistant/ImageAnalyzer/DepotImageAnalyzer.cpp b/src/MeoAssistant/ImageAnalyzer/DepotImageAnalyzer.cpp index 1f020509d9..c76f5f958e 100644 --- a/src/MeoAssistant/ImageAnalyzer/DepotImageAnalyzer.cpp +++ b/src/MeoAssistant/ImageAnalyzer/DepotImageAnalyzer.cpp @@ -2,12 +2,12 @@ #include "Utils/NoWarningCV.h" -#include "Utils/AsstUtils.hpp" -#include "Resource/ItemConfiger.h" -#include "Utils/Logger.hpp" #include "General/MatchImageAnalyzer.h" #include "General/OcrWithPreprocessImageAnalyzer.h" +#include "Resource/ItemConfiger.h" #include "TaskData.h" +#include "Utils/AsstUtils.hpp" +#include "Utils/Logger.hpp" bool asst::DepotImageAnalyzer::analyze() { diff --git a/src/MeoAssistant/ImageAnalyzer/General/AbstractImageAnalyzer.cpp b/src/MeoAssistant/ImageAnalyzer/General/AbstractImageAnalyzer.cpp index a1b0e29068..fa0baea003 100644 --- a/src/MeoAssistant/ImageAnalyzer/General/AbstractImageAnalyzer.cpp +++ b/src/MeoAssistant/ImageAnalyzer/General/AbstractImageAnalyzer.cpp @@ -2,9 +2,9 @@ #include "Utils/NoWarningCV.h" +#include "Controller.h" #include "Utils/AsstImageIo.hpp" #include "Utils/AsstUtils.hpp" -#include "Controller.h" #include "Utils/Logger.hpp" asst::AbstractImageAnalyzer::AbstractImageAnalyzer(const cv::Mat& image) diff --git a/src/MeoAssistant/ImageAnalyzer/General/MatchImageAnalyzer.cpp b/src/MeoAssistant/ImageAnalyzer/General/MatchImageAnalyzer.cpp index b7ec2f6bbe..affcc30614 100644 --- a/src/MeoAssistant/ImageAnalyzer/General/MatchImageAnalyzer.cpp +++ b/src/MeoAssistant/ImageAnalyzer/General/MatchImageAnalyzer.cpp @@ -2,10 +2,10 @@ #include "Utils/NoWarningCV.h" +#include "Resource/TemplResource.h" +#include "TaskData.h" #include "Utils/AsstUtils.hpp" #include "Utils/Logger.hpp" -#include "TaskData.h" -#include "Resource/TemplResource.h" asst::MatchImageAnalyzer::MatchImageAnalyzer(const cv::Mat& image, const Rect& roi, std::string templ_name, double templ_thres) diff --git a/src/MeoAssistant/ImageAnalyzer/General/MultiMatchImageAnalyzer.cpp b/src/MeoAssistant/ImageAnalyzer/General/MultiMatchImageAnalyzer.cpp index db0a856c15..291bf5f0c2 100644 --- a/src/MeoAssistant/ImageAnalyzer/General/MultiMatchImageAnalyzer.cpp +++ b/src/MeoAssistant/ImageAnalyzer/General/MultiMatchImageAnalyzer.cpp @@ -5,9 +5,9 @@ #include "Utils/NoWarningCV.h" -#include "Utils/Logger.hpp" -#include "TaskData.h" #include "Resource/TemplResource.h" +#include "TaskData.h" +#include "Utils/Logger.hpp" asst::MultiMatchImageAnalyzer::MultiMatchImageAnalyzer(const cv::Mat& image, const Rect& roi, std::string templ_name, double templ_thres) diff --git a/src/MeoAssistant/ImageAnalyzer/General/OcrImageAnalyzer.cpp b/src/MeoAssistant/ImageAnalyzer/General/OcrImageAnalyzer.cpp index 0eab8a0164..311782a8cd 100644 --- a/src/MeoAssistant/ImageAnalyzer/General/OcrImageAnalyzer.cpp +++ b/src/MeoAssistant/ImageAnalyzer/General/OcrImageAnalyzer.cpp @@ -3,9 +3,9 @@ #include #include -#include "Utils/Logger.hpp" #include "Resource/OcrPack.h" #include "TaskData.h" +#include "Utils/Logger.hpp" bool asst::OcrImageAnalyzer::analyze() { diff --git a/src/MeoAssistant/ImageAnalyzer/InfrastClueVacancyImageAnalyzer.cpp b/src/MeoAssistant/ImageAnalyzer/InfrastClueVacancyImageAnalyzer.cpp index f0d21ed902..e711a548b4 100644 --- a/src/MeoAssistant/ImageAnalyzer/InfrastClueVacancyImageAnalyzer.cpp +++ b/src/MeoAssistant/ImageAnalyzer/InfrastClueVacancyImageAnalyzer.cpp @@ -2,9 +2,9 @@ #include "Utils/NoWarningCV.h" +#include "General/MatchImageAnalyzer.h" #include "Utils/AsstUtils.hpp" #include "Utils/Logger.hpp" -#include "General/MatchImageAnalyzer.h" bool asst::InfrastClueVacancyImageAnalyzer::analyze() { diff --git a/src/MeoAssistant/ImageAnalyzer/InfrastFacilityImageAnalyzer.cpp b/src/MeoAssistant/ImageAnalyzer/InfrastFacilityImageAnalyzer.cpp index 03006889d2..4c4b3017c2 100644 --- a/src/MeoAssistant/ImageAnalyzer/InfrastFacilityImageAnalyzer.cpp +++ b/src/MeoAssistant/ImageAnalyzer/InfrastFacilityImageAnalyzer.cpp @@ -2,10 +2,10 @@ #include "Utils/NoWarningCV.h" -#include "Utils/AsstUtils.hpp" -#include "Utils/Logger.hpp" #include "General/MultiMatchImageAnalyzer.h" #include "TaskData.h" +#include "Utils/AsstUtils.hpp" +#include "Utils/Logger.hpp" bool asst::InfrastFacilityImageAnalyzer::analyze() { diff --git a/src/MeoAssistant/ImageAnalyzer/InfrastOperImageAnalyzer.cpp b/src/MeoAssistant/ImageAnalyzer/InfrastOperImageAnalyzer.cpp index 09c91b8d17..5b1e67fb4c 100644 --- a/src/MeoAssistant/ImageAnalyzer/InfrastOperImageAnalyzer.cpp +++ b/src/MeoAssistant/ImageAnalyzer/InfrastOperImageAnalyzer.cpp @@ -4,11 +4,11 @@ #include "Utils/NoWarningCV.h" #include "General/HashImageAnalyzer.h" -#include "Resource/InfrastConfiger.h" -#include "InfrastSmileyImageAnalyzer.h" -#include "Utils/Logger.hpp" #include "General/MatchImageAnalyzer.h" +#include "InfrastSmileyImageAnalyzer.h" +#include "Resource/InfrastConfiger.h" #include "TaskData.h" +#include "Utils/Logger.hpp" bool asst::InfrastOperImageAnalyzer::analyze() { diff --git a/src/MeoAssistant/ImageAnalyzer/InfrastSmileyImageAnalyzer.cpp b/src/MeoAssistant/ImageAnalyzer/InfrastSmileyImageAnalyzer.cpp index a74b22adea..0e4e08aae6 100644 --- a/src/MeoAssistant/ImageAnalyzer/InfrastSmileyImageAnalyzer.cpp +++ b/src/MeoAssistant/ImageAnalyzer/InfrastSmileyImageAnalyzer.cpp @@ -2,8 +2,8 @@ #include "Utils/NoWarningCV.h" -#include "Utils/AsstUtils.hpp" #include "General/MultiMatchImageAnalyzer.h" +#include "Utils/AsstUtils.hpp" bool asst::InfrastSmileyImageAnalyzer::analyze() { diff --git a/src/MeoAssistant/ImageAnalyzer/ProcessTaskImageAnalyzer.cpp b/src/MeoAssistant/ImageAnalyzer/ProcessTaskImageAnalyzer.cpp index 93652a942b..e9ee1c4a05 100644 --- a/src/MeoAssistant/ImageAnalyzer/ProcessTaskImageAnalyzer.cpp +++ b/src/MeoAssistant/ImageAnalyzer/ProcessTaskImageAnalyzer.cpp @@ -3,12 +3,12 @@ #include #include -#include "Utils/AsstUtils.hpp" -#include "Utils/Logger.hpp" #include "General/MatchImageAnalyzer.h" #include "General/OcrImageAnalyzer.h" #include "RuntimeStatus.h" #include "TaskData.h" +#include "Utils/AsstUtils.hpp" +#include "Utils/Logger.hpp" asst::ProcessTaskImageAnalyzer::ProcessTaskImageAnalyzer(const cv::Mat& image, std::vector tasks_name) : AbstractImageAnalyzer(image), m_tasks_name(std::move(tasks_name)) diff --git a/src/MeoAssistant/ImageAnalyzer/RoguelikeFormationImageAnalyzer.cpp b/src/MeoAssistant/ImageAnalyzer/RoguelikeFormationImageAnalyzer.cpp index 451ef022d0..9e645c2adf 100644 --- a/src/MeoAssistant/ImageAnalyzer/RoguelikeFormationImageAnalyzer.cpp +++ b/src/MeoAssistant/ImageAnalyzer/RoguelikeFormationImageAnalyzer.cpp @@ -2,10 +2,10 @@ #include "Utils/NoWarningCV.h" -#include "Utils/AsstUtils.hpp" -#include "Utils/Logger.hpp" #include "General/MultiMatchImageAnalyzer.h" #include "TaskData.h" +#include "Utils/AsstUtils.hpp" +#include "Utils/Logger.hpp" bool asst::RoguelikeFormationImageAnalyzer::analyze() { diff --git a/src/MeoAssistant/ImageAnalyzer/RoguelikeRecruitImageAnalyzer.cpp b/src/MeoAssistant/ImageAnalyzer/RoguelikeRecruitImageAnalyzer.cpp index 6532be3574..717b209716 100644 --- a/src/MeoAssistant/ImageAnalyzer/RoguelikeRecruitImageAnalyzer.cpp +++ b/src/MeoAssistant/ImageAnalyzer/RoguelikeRecruitImageAnalyzer.cpp @@ -1,9 +1,9 @@ #include "RoguelikeRecruitImageAnalyzer.h" -#include "Utils/Logger.hpp" #include "General/MatchImageAnalyzer.h" #include "General/OcrWithFlagTemplImageAnalyzer.h" #include "TaskData.h" +#include "Utils/Logger.hpp" bool asst::RoguelikeRecruitImageAnalyzer::analyze() { diff --git a/src/MeoAssistant/ImageAnalyzer/RoguelikeSkillSelectionImageAnalyzer.cpp b/src/MeoAssistant/ImageAnalyzer/RoguelikeSkillSelectionImageAnalyzer.cpp index 855ed21869..41ad93940d 100644 --- a/src/MeoAssistant/ImageAnalyzer/RoguelikeSkillSelectionImageAnalyzer.cpp +++ b/src/MeoAssistant/ImageAnalyzer/RoguelikeSkillSelectionImageAnalyzer.cpp @@ -2,12 +2,12 @@ #include "Utils/NoWarningCV.h" -#include "Utils/AsstUtils.hpp" -#include "Utils/Logger.hpp" #include "General/MultiMatchImageAnalyzer.h" #include "General/OcrWithPreprocessImageAnalyzer.h" #include "Resource/RoguelikeRecruitConfiger.h" #include "TaskData.h" +#include "Utils/AsstUtils.hpp" +#include "Utils/Logger.hpp" bool asst::RoguelikeSkillSelectionImageAnalyzer::analyze() { diff --git a/src/MeoAssistant/ImageAnalyzer/StageDropsImageAnalyzer.cpp b/src/MeoAssistant/ImageAnalyzer/StageDropsImageAnalyzer.cpp index d5af7ec3bc..118ae64660 100644 --- a/src/MeoAssistant/ImageAnalyzer/StageDropsImageAnalyzer.cpp +++ b/src/MeoAssistant/ImageAnalyzer/StageDropsImageAnalyzer.cpp @@ -4,14 +4,14 @@ #include "Utils/NoWarningCV.h" -#include "Utils/AsstImageIo.hpp" -#include "Utils/AsstUtils.hpp" -#include "Resource/ItemConfiger.h" -#include "Utils/Logger.hpp" #include "General/MatchImageAnalyzer.h" #include "General/OcrWithPreprocessImageAnalyzer.h" +#include "Resource/ItemConfiger.h" #include "Resource/StageDropsConfiger.h" #include "TaskData.h" +#include "Utils/AsstImageIo.hpp" +#include "Utils/AsstUtils.hpp" +#include "Utils/Logger.hpp" #include diff --git a/src/MeoAssistant/Resource/RecruitConfiger.h b/src/MeoAssistant/Resource/RecruitConfiger.h index a602279aa0..683bbd38b0 100644 --- a/src/MeoAssistant/Resource/RecruitConfiger.h +++ b/src/MeoAssistant/Resource/RecruitConfiger.h @@ -83,6 +83,7 @@ namespace asst { public: using TagId = std::string; + public: virtual ~RecruitConfiger() override = default; static constexpr int CorrectNumberOfTags = 5; diff --git a/src/MeoAssistant/ResourceLoader.cpp b/src/MeoAssistant/ResourceLoader.cpp index 392fce9741..4f844b243c 100644 --- a/src/MeoAssistant/ResourceLoader.cpp +++ b/src/MeoAssistant/ResourceLoader.cpp @@ -15,9 +15,9 @@ #include "Resource/RoguelikeRecruitConfiger.h" #include "Resource/RoguelikeShoppingConfiger.h" #include "Resource/StageDropsConfiger.h" -#include "TaskData.h" #include "Resource/TemplResource.h" #include "Resource/TilePack.h" +#include "TaskData.h" bool asst::ResourceLoader::load(const std::filesystem::path& path) { diff --git a/src/MeoAssistant/Task/CopilotTask.cpp b/src/MeoAssistant/Task/CopilotTask.cpp index e455d94a65..1b17a152d4 100644 --- a/src/MeoAssistant/Task/CopilotTask.cpp +++ b/src/MeoAssistant/Task/CopilotTask.cpp @@ -1,11 +1,11 @@ #include "CopilotTask.h" -#include "Utils/AsstUtils.hpp" +#include "Resource/CopilotConfiger.h" #include "Sub/BattleFormationTask.h" #include "Sub/BattleProcessTask.h" -#include "Resource/CopilotConfiger.h" -#include "Utils/Logger.hpp" #include "Sub/ProcessTask.h" +#include "Utils/AsstUtils.hpp" +#include "Utils/Logger.hpp" asst::CopilotTask::CopilotTask(const AsstCallback& callback, void* callback_arg) : PackageTask(callback, callback_arg, TaskType), @@ -46,6 +46,6 @@ bool asst::CopilotTask::set_params(const json::value& params) bool with_formation = params.get("formation", false); m_formation_task_ptr->set_enable(with_formation); - const std::string& filename =filename_opt.value(); + const std::string& filename = filename_opt.value(); return Copilot.load(utils::path(filename)); } diff --git a/src/MeoAssistant/Task/DebugTask.cpp b/src/MeoAssistant/Task/DebugTask.cpp index c0bee4bde6..c024769736 100644 --- a/src/MeoAssistant/Task/DebugTask.cpp +++ b/src/MeoAssistant/Task/DebugTask.cpp @@ -6,10 +6,10 @@ // #include "Plugin/RoguelikeSkillSelectionTaskPlugin.h" -#include "Utils/AsstImageIo.hpp" #include "ImageAnalyzer/DepotImageAnalyzer.h" -#include "Utils/Logger.hpp" #include "ImageAnalyzer/StageDropsImageAnalyzer.h" +#include "Utils/AsstImageIo.hpp" +#include "Utils/Logger.hpp" asst::DebugTask::DebugTask(const AsstCallback& callback, void* callback_arg) : PackageTask(callback, callback_arg, TaskType) diff --git a/src/MeoAssistant/Task/FightTask.cpp b/src/MeoAssistant/Task/FightTask.cpp index 2773886449..4621e5d8dc 100644 --- a/src/MeoAssistant/Task/FightTask.cpp +++ b/src/MeoAssistant/Task/FightTask.cpp @@ -4,8 +4,8 @@ #include "Plugin/DrGrandetTaskPlugin.h" #include "Plugin/GameCrashRestartTaskPlugin.h" -#include "Sub/ProcessTask.h" #include "Plugin/StageDropsTaskPlugin.h" +#include "Sub/ProcessTask.h" #include "Sub/StageNavigationTask.h" asst::FightTask::FightTask(AsstCallback callback, void* callback_arg) diff --git a/src/MeoAssistant/Task/InfrastTask.cpp b/src/MeoAssistant/Task/InfrastTask.cpp index 472f2f9f64..5946e73ec7 100644 --- a/src/MeoAssistant/Task/InfrastTask.cpp +++ b/src/MeoAssistant/Task/InfrastTask.cpp @@ -3,6 +3,7 @@ #include "Utils/Logger.hpp" #include "Plugin/DronesForShamareTaskPlugin.h" +#include "Plugin/ReplenishOriginiumShardTaskPlugin.h" #include "Sub/InfrastControlTask.h" #include "Sub/InfrastDormTask.h" #include "Sub/InfrastInfoTask.h" @@ -12,7 +13,6 @@ #include "Sub/InfrastReceptionTask.h" #include "Sub/InfrastTradeTask.h" #include "Sub/ProcessTask.h" -#include "Plugin/ReplenishOriginiumShardTaskPlugin.h" asst::InfrastTask::InfrastTask(const AsstCallback& callback, void* callback_arg) : PackageTask(callback, callback_arg, TaskType), diff --git a/src/MeoAssistant/Task/MallTask.cpp b/src/MeoAssistant/Task/MallTask.cpp index 2c07a3ef2a..a8bea5b610 100644 --- a/src/MeoAssistant/Task/MallTask.cpp +++ b/src/MeoAssistant/Task/MallTask.cpp @@ -5,10 +5,10 @@ asst::MallTask::MallTask(const AsstCallback& callback, void* callback_arg) : PackageTask(callback, callback_arg, TaskType), - m_mall_task_ptr(std::make_shared(callback, callback_arg, TaskType)), - m_shopping_first_task_ptr(std::make_shared(callback, callback_arg, TaskType)), - m_shopping_task_ptr(std::make_shared(callback, callback_arg, TaskType)), - m_shopping_force_task_ptr(std::make_shared(callback, callback_arg, TaskType)) + m_mall_task_ptr(std::make_shared(callback, callback_arg, TaskType)), + m_shopping_first_task_ptr(std::make_shared(callback, callback_arg, TaskType)), + m_shopping_task_ptr(std::make_shared(callback, callback_arg, TaskType)), + m_shopping_force_task_ptr(std::make_shared(callback, callback_arg, TaskType)) { m_mall_task_ptr->set_tasks({ "MallBegin" }); m_shopping_first_task_ptr->set_enable(false).set_retry_times(1); diff --git a/src/MeoAssistant/Task/Plugin/DrGrandetTaskPlugin.cpp b/src/MeoAssistant/Task/Plugin/DrGrandetTaskPlugin.cpp index 8776cb1a73..5a8dc30596 100644 --- a/src/MeoAssistant/Task/Plugin/DrGrandetTaskPlugin.cpp +++ b/src/MeoAssistant/Task/Plugin/DrGrandetTaskPlugin.cpp @@ -1,9 +1,9 @@ #include "DrGrandetTaskPlugin.h" #include "Controller.h" -#include "Utils/Logger.hpp" #include "ImageAnalyzer/General/OcrImageAnalyzer.h" #include "TaskData.h" +#include "Utils/Logger.hpp" #include diff --git a/src/MeoAssistant/Task/Plugin/RoguelikeBattleTaskPlugin.cpp b/src/MeoAssistant/Task/Plugin/RoguelikeBattleTaskPlugin.cpp index e998ac26a2..e5da94ccbd 100644 --- a/src/MeoAssistant/Task/Plugin/RoguelikeBattleTaskPlugin.cpp +++ b/src/MeoAssistant/Task/Plugin/RoguelikeBattleTaskPlugin.cpp @@ -6,18 +6,18 @@ #include "Utils/NoWarningCV.h" -#include "Utils/AsstImageIo.hpp" -#include "Resource/BattleDataConfiger.h" -#include "ImageAnalyzer/BattleImageAnalyzer.h" +#include "../Sub/ProcessTask.h" #include "Controller.h" -#include "Utils/Logger.hpp" +#include "ImageAnalyzer/BattleImageAnalyzer.h" #include "ImageAnalyzer/General/MatchImageAnalyzer.h" #include "ImageAnalyzer/General/OcrWithPreprocessImageAnalyzer.h" -#include "../Sub/ProcessTask.h" +#include "Resource/BattleDataConfiger.h" #include "Resource/RoguelikeCopilotConfiger.h" +#include "Resource/TilePack.h" #include "RuntimeStatus.h" #include "TaskData.h" -#include "Resource/TilePack.h" +#include "Utils/AsstImageIo.hpp" +#include "Utils/Logger.hpp" bool asst::RoguelikeBattleTaskPlugin::verify(AsstMsg msg, const json::value& details) const { diff --git a/src/MeoAssistant/Task/Plugin/RoguelikeBattleTaskPlugin.h b/src/MeoAssistant/Task/Plugin/RoguelikeBattleTaskPlugin.h index 1fb7d0ae0e..4444f5cd52 100644 --- a/src/MeoAssistant/Task/Plugin/RoguelikeBattleTaskPlugin.h +++ b/src/MeoAssistant/Task/Plugin/RoguelikeBattleTaskPlugin.h @@ -4,9 +4,9 @@ #include "AbstractTaskPlugin.h" #include "AsstBattleDef.h" -#include "Utils/AsstTypes.h" #include "ImageAnalyzer/BattleImageAnalyzer.h" #include "Resource/TilePack.h" +#include "Utils/AsstTypes.h" namespace asst { diff --git a/src/MeoAssistant/Task/Plugin/RoguelikeCustomStartTaskPlugin.cpp b/src/MeoAssistant/Task/Plugin/RoguelikeCustomStartTaskPlugin.cpp index 781e2cf8d4..b26068d5c2 100644 --- a/src/MeoAssistant/Task/Plugin/RoguelikeCustomStartTaskPlugin.cpp +++ b/src/MeoAssistant/Task/Plugin/RoguelikeCustomStartTaskPlugin.cpp @@ -1,12 +1,12 @@ #include "RoguelikeCustomStartTaskPlugin.h" -#include "Resource/BattleDataConfiger.h" -#include "Controller.h" -#include "Utils/Logger.hpp" -#include "ImageAnalyzer/General/OcrImageAnalyzer.h" #include "../Sub/ProcessTask.h" +#include "Controller.h" +#include "ImageAnalyzer/General/OcrImageAnalyzer.h" +#include "Resource/BattleDataConfiger.h" #include "RuntimeStatus.h" #include "TaskData.h" +#include "Utils/Logger.hpp" bool asst::RoguelikeCustomStartTaskPlugin::verify(AsstMsg msg, const json::value& details) const { diff --git a/src/MeoAssistant/Task/Plugin/RoguelikeFormationTaskPlugin.cpp b/src/MeoAssistant/Task/Plugin/RoguelikeFormationTaskPlugin.cpp index c3cc642830..fc71c04d76 100644 --- a/src/MeoAssistant/Task/Plugin/RoguelikeFormationTaskPlugin.cpp +++ b/src/MeoAssistant/Task/Plugin/RoguelikeFormationTaskPlugin.cpp @@ -2,11 +2,11 @@ #include "Utils/AsstRanges.hpp" -#include "Controller.h" -#include "Utils/Logger.hpp" #include "../Sub/ProcessTask.h" +#include "Controller.h" #include "ImageAnalyzer/RoguelikeFormationImageAnalyzer.h" #include "TaskData.h" +#include "Utils/Logger.hpp" bool asst::RoguelikeFormationTaskPlugin::verify(AsstMsg msg, const json::value& details) const { diff --git a/src/MeoAssistant/Task/Plugin/RoguelikeRecruitTaskPlugin.cpp b/src/MeoAssistant/Task/Plugin/RoguelikeRecruitTaskPlugin.cpp index 60eb47f704..1695da6937 100644 --- a/src/MeoAssistant/Task/Plugin/RoguelikeRecruitTaskPlugin.cpp +++ b/src/MeoAssistant/Task/Plugin/RoguelikeRecruitTaskPlugin.cpp @@ -1,12 +1,12 @@ #include "RoguelikeRecruitTaskPlugin.h" -#include "Controller.h" -#include "Utils/Logger.hpp" #include "../Sub/ProcessTask.h" -#include "Resource/RoguelikeRecruitConfiger.h" +#include "Controller.h" #include "ImageAnalyzer/RoguelikeRecruitImageAnalyzer.h" +#include "Resource/RoguelikeRecruitConfiger.h" #include "RuntimeStatus.h" #include "TaskData.h" +#include "Utils/Logger.hpp" bool asst::RoguelikeRecruitTaskPlugin::verify(AsstMsg msg, const json::value& details) const { diff --git a/src/MeoAssistant/Task/Plugin/RoguelikeShoppingTaskPlugin.cpp b/src/MeoAssistant/Task/Plugin/RoguelikeShoppingTaskPlugin.cpp index e49529995a..69b1d830eb 100644 --- a/src/MeoAssistant/Task/Plugin/RoguelikeShoppingTaskPlugin.cpp +++ b/src/MeoAssistant/Task/Plugin/RoguelikeShoppingTaskPlugin.cpp @@ -1,12 +1,12 @@ #include "RoguelikeShoppingTaskPlugin.h" -#include "Resource/BattleDataConfiger.h" -#include "Controller.h" -#include "Utils/Logger.hpp" -#include "ImageAnalyzer/General/OcrWithFlagTemplImageAnalyzer.h" #include "../Sub/ProcessTask.h" +#include "Controller.h" +#include "ImageAnalyzer/General/OcrWithFlagTemplImageAnalyzer.h" +#include "Resource/BattleDataConfiger.h" #include "Resource/RoguelikeShoppingConfiger.h" #include "RuntimeStatus.h" +#include "Utils/Logger.hpp" bool asst::RoguelikeShoppingTaskPlugin::verify(AsstMsg msg, const json::value& details) const { diff --git a/src/MeoAssistant/Task/Plugin/RoguelikeSkillSelectionTaskPlugin.cpp b/src/MeoAssistant/Task/Plugin/RoguelikeSkillSelectionTaskPlugin.cpp index 6b19db556d..36141cf8c4 100644 --- a/src/MeoAssistant/Task/Plugin/RoguelikeSkillSelectionTaskPlugin.cpp +++ b/src/MeoAssistant/Task/Plugin/RoguelikeSkillSelectionTaskPlugin.cpp @@ -1,8 +1,8 @@ #include "RoguelikeSkillSelectionTaskPlugin.h" #include "Controller.h" -#include "Resource/RoguelikeRecruitConfiger.h" #include "ImageAnalyzer/RoguelikeSkillSelectionImageAnalyzer.h" +#include "Resource/RoguelikeRecruitConfiger.h" #include "RuntimeStatus.h" #include "TaskData.h" diff --git a/src/MeoAssistant/Task/Plugin/StageDropsTaskPlugin.cpp b/src/MeoAssistant/Task/Plugin/StageDropsTaskPlugin.cpp index f0d5ceaffb..9dc96dfbbb 100644 --- a/src/MeoAssistant/Task/Plugin/StageDropsTaskPlugin.cpp +++ b/src/MeoAssistant/Task/Plugin/StageDropsTaskPlugin.cpp @@ -4,16 +4,16 @@ #include #include -#include "Utils/AsstUtils.hpp" -#include "Controller.h" -#include "Resource/ItemConfiger.h" -#include "Utils/Logger.hpp" #include "../Sub/ProcessTask.h" #include "../Sub/ReportDataTask.h" -#include "RuntimeStatus.h" -#include "Resource/StageDropsConfiger.h" +#include "Controller.h" #include "ImageAnalyzer/StageDropsImageAnalyzer.h" +#include "Resource/ItemConfiger.h" +#include "Resource/StageDropsConfiger.h" +#include "RuntimeStatus.h" #include "TaskData.h" +#include "Utils/AsstUtils.hpp" +#include "Utils/Logger.hpp" #include "Utils/Version.h" bool asst::StageDropsTaskPlugin::verify(AsstMsg msg, const json::value& details) const diff --git a/src/MeoAssistant/Task/RoguelikeTask.cpp b/src/MeoAssistant/Task/RoguelikeTask.cpp index cd57b10437..fd4e41c2da 100644 --- a/src/MeoAssistant/Task/RoguelikeTask.cpp +++ b/src/MeoAssistant/Task/RoguelikeTask.cpp @@ -1,6 +1,5 @@ #include "RoguelikeTask.h" -#include "Sub/ProcessTask.h" #include "Plugin/RoguelikeBattleTaskPlugin.h" #include "Plugin/RoguelikeControlTaskPlugin.h" #include "Plugin/RoguelikeCustomStartTaskPlugin.h" @@ -10,6 +9,7 @@ #include "Plugin/RoguelikeResetTaskPlugin.h" #include "Plugin/RoguelikeShoppingTaskPlugin.h" #include "Plugin/RoguelikeSkillSelectionTaskPlugin.h" +#include "Sub/ProcessTask.h" #include "Utils/Logger.hpp" diff --git a/src/MeoAssistant/Task/Sub/AbstractTask.cpp b/src/MeoAssistant/Task/Sub/AbstractTask.cpp index bf958c3181..62f359f77e 100644 --- a/src/MeoAssistant/Task/Sub/AbstractTask.cpp +++ b/src/MeoAssistant/Task/Sub/AbstractTask.cpp @@ -9,12 +9,12 @@ #include "Utils/NoWarningCV.h" #include "../Plugin/AbstractTaskPlugin.h" +#include "Controller.h" +#include "ProcessTask.h" +#include "Resource/GeneralConfiger.h" #include "Utils/AsstImageIo.hpp" #include "Utils/AsstUtils.hpp" -#include "Controller.h" -#include "Resource/GeneralConfiger.h" #include "Utils/Logger.hpp" -#include "ProcessTask.h" using namespace asst; diff --git a/src/MeoAssistant/Task/Sub/AutoRecruitTask.cpp b/src/MeoAssistant/Task/Sub/AutoRecruitTask.cpp index 24cfcf1d17..f6fdddab13 100644 --- a/src/MeoAssistant/Task/Sub/AutoRecruitTask.cpp +++ b/src/MeoAssistant/Task/Sub/AutoRecruitTask.cpp @@ -1,15 +1,15 @@ #include "AutoRecruitTask.h" #include "Controller.h" -#include "Resource/GeneralConfiger.h" -#include "Utils/Logger.hpp" #include "ImageAnalyzer/General/MultiMatchImageAnalyzer.h" #include "ImageAnalyzer/General/OcrImageAnalyzer.h" -#include "ProcessTask.h" -#include "Resource/RecruitConfiger.h" #include "ImageAnalyzer/RecruitImageAnalyzer.h" +#include "ProcessTask.h" #include "ReportDataTask.h" +#include "Resource/GeneralConfiger.h" +#include "Resource/RecruitConfiger.h" #include "TaskData.h" +#include "Utils/Logger.hpp" #include "Utils/AsstRanges.hpp" #include diff --git a/src/MeoAssistant/Task/Sub/AutoRecruitTask.h b/src/MeoAssistant/Task/Sub/AutoRecruitTask.h index 0ee9a788ed..e50c09932c 100644 --- a/src/MeoAssistant/Task/Sub/AutoRecruitTask.h +++ b/src/MeoAssistant/Task/Sub/AutoRecruitTask.h @@ -5,8 +5,8 @@ #include #include -#include "Utils/AsstTypes.h" #include "Resource/RecruitConfiger.h" +#include "Utils/AsstTypes.h" namespace asst { diff --git a/src/MeoAssistant/Task/Sub/BattleFormationTask.cpp b/src/MeoAssistant/Task/Sub/BattleFormationTask.cpp index b7485dfe12..fc044be73a 100644 --- a/src/MeoAssistant/Task/Sub/BattleFormationTask.cpp +++ b/src/MeoAssistant/Task/Sub/BattleFormationTask.cpp @@ -2,13 +2,13 @@ #include "Utils/AsstRanges.hpp" -#include "Resource/BattleDataConfiger.h" #include "Controller.h" -#include "Resource/CopilotConfiger.h" -#include "Utils/Logger.hpp" #include "ImageAnalyzer/General/OcrWithFlagTemplImageAnalyzer.h" #include "ProcessTask.h" +#include "Resource/BattleDataConfiger.h" +#include "Resource/CopilotConfiger.h" #include "TaskData.h" +#include "Utils/Logger.hpp" void asst::BattleFormationTask::set_stage_name(std::string name) { diff --git a/src/MeoAssistant/Task/Sub/BattleProcessTask.cpp b/src/MeoAssistant/Task/Sub/BattleProcessTask.cpp index 0c3463304c..99dc370ea6 100644 --- a/src/MeoAssistant/Task/Sub/BattleProcessTask.cpp +++ b/src/MeoAssistant/Task/Sub/BattleProcessTask.cpp @@ -8,15 +8,15 @@ #include "Utils/AsstRanges.hpp" #include "Utils/NoWarningCV.h" -#include "ImageAnalyzer/BattleImageAnalyzer.h" #include "Controller.h" -#include "Resource/CopilotConfiger.h" -#include "Utils/Logger.hpp" +#include "ImageAnalyzer/BattleImageAnalyzer.h" #include "ImageAnalyzer/General/MatchImageAnalyzer.h" #include "ImageAnalyzer/General/OcrWithPreprocessImageAnalyzer.h" #include "ProcessTask.h" -#include "TaskData.h" +#include "Resource/CopilotConfiger.h" #include "Resource/TilePack.h" +#include "TaskData.h" +#include "Utils/Logger.hpp" #include "Utils/AsstImageIo.hpp" diff --git a/src/MeoAssistant/Task/Sub/BattleProcessTask.h b/src/MeoAssistant/Task/Sub/BattleProcessTask.h index 73b4fc75a3..79272ce148 100644 --- a/src/MeoAssistant/Task/Sub/BattleProcessTask.h +++ b/src/MeoAssistant/Task/Sub/BattleProcessTask.h @@ -2,9 +2,9 @@ #include "AbstractTask.h" #include "AsstBattleDef.h" -#include "Utils/AsstTypes.h" #include "ImageAnalyzer/BattleImageAnalyzer.h" #include "Resource/TilePack.h" +#include "Utils/AsstTypes.h" namespace asst { diff --git a/src/MeoAssistant/Task/Sub/CreditShoppingTask.cpp b/src/MeoAssistant/Task/Sub/CreditShoppingTask.cpp index b28d184239..0e0e081241 100644 --- a/src/MeoAssistant/Task/Sub/CreditShoppingTask.cpp +++ b/src/MeoAssistant/Task/Sub/CreditShoppingTask.cpp @@ -22,7 +22,8 @@ void asst::CreditShoppingTask::set_white_list(std::vector black_lis m_is_white_list = true; } -asst::CreditShoppingTask& asst::CreditShoppingTask::set_force_shopping_if_credit_full(bool force_shopping_if_credit_full) noexcept +asst::CreditShoppingTask& asst::CreditShoppingTask::set_force_shopping_if_credit_full( + bool force_shopping_if_credit_full) noexcept { m_force_shopping_if_credit_full = force_shopping_if_credit_full; return *this; @@ -122,11 +123,10 @@ bool asst::CreditShoppingTask::credit_shopping(bool white_list_enabled, bool cre if (credit_ocr_enabled) { int credit = credit_ocr(); - if (credit <= MaxCredit) {//信用值不再溢出，停止购物 + if (credit <= MaxCredit) { // 信用值不再溢出，停止购物 break; } } - } return true; @@ -134,15 +134,16 @@ bool asst::CreditShoppingTask::credit_shopping(bool white_list_enabled, bool cre bool asst::CreditShoppingTask::_run() { - Log.trace("CreditShopping: m_is_white_list:", m_is_white_list, " m_force_shopping_if_credit_full: ", m_force_shopping_if_credit_full); + Log.trace("CreditShopping: m_is_white_list:", m_is_white_list, + " m_force_shopping_if_credit_full: ", m_force_shopping_if_credit_full); if (!m_force_shopping_if_credit_full) { return credit_shopping(true, false); } else { - int credit = credit_ocr();//识别信用值，防止信用值溢出 + int credit = credit_ocr(); // 识别信用值，防止信用值溢出 - if (credit > MaxCredit) {//信用值溢出 + if (credit > MaxCredit) { // 信用值溢出 return credit_shopping(false, true); } } diff --git a/src/MeoAssistant/Task/Sub/CreditShoppingTask.h b/src/MeoAssistant/Task/Sub/CreditShoppingTask.h index d72c10d8f8..6bce077cf0 100644 --- a/src/MeoAssistant/Task/Sub/CreditShoppingTask.h +++ b/src/MeoAssistant/Task/Sub/CreditShoppingTask.h @@ -23,7 +23,7 @@ namespace asst protected: virtual bool _run() override; - bool m_force_shopping_if_credit_full = false; // 设置是否防止信用值溢出 + bool m_force_shopping_if_credit_full = false; // 设置是否防止信用值溢出 int credit_ocr(); bool credit_shopping(bool white_list_enabled, bool credit_ocr_enabled); diff --git a/src/MeoAssistant/Task/Sub/DepotRecognitionTask.cpp b/src/MeoAssistant/Task/Sub/DepotRecognitionTask.cpp index 38ad5b4f51..24eef7f9e8 100644 --- a/src/MeoAssistant/Task/Sub/DepotRecognitionTask.cpp +++ b/src/MeoAssistant/Task/Sub/DepotRecognitionTask.cpp @@ -6,10 +6,10 @@ #include "Controller.h" #include "ImageAnalyzer/DepotImageAnalyzer.h" -#include "Resource/GeneralConfiger.h" -#include "Utils/Logger.hpp" #include "ProcessTask.h" +#include "Resource/GeneralConfiger.h" #include "TaskData.h" +#include "Utils/Logger.hpp" bool asst::DepotRecognitionTask::_run() { diff --git a/src/MeoAssistant/Task/Sub/InfrastAbstractTask.cpp b/src/MeoAssistant/Task/Sub/InfrastAbstractTask.cpp index 93eda60330..0375e6d370 100644 --- a/src/MeoAssistant/Task/Sub/InfrastAbstractTask.cpp +++ b/src/MeoAssistant/Task/Sub/InfrastAbstractTask.cpp @@ -4,17 +4,17 @@ #include #include -#include "Utils/AsstMsg.h" -#include "Utils/AsstRanges.hpp" #include "Controller.h" -#include "ImageAnalyzer/InfrastFacilityImageAnalyzer.h" -#include "ImageAnalyzer/InfrastOperImageAnalyzer.h" -#include "Utils/Logger.hpp" #include "ImageAnalyzer/General/MatchImageAnalyzer.h" #include "ImageAnalyzer/General/OcrImageAnalyzer.h" #include "ImageAnalyzer/General/OcrWithPreprocessImageAnalyzer.h" +#include "ImageAnalyzer/InfrastFacilityImageAnalyzer.h" +#include "ImageAnalyzer/InfrastOperImageAnalyzer.h" #include "ProcessTask.h" #include "TaskData.h" +#include "Utils/AsstMsg.h" +#include "Utils/AsstRanges.hpp" +#include "Utils/Logger.hpp" asst::InfrastAbstractTask::InfrastAbstractTask(AsstCallback callback, void* callback_arg, std::string task_chain) : AbstractTask(std::move(callback), callback_arg, std::move(task_chain)) diff --git a/src/MeoAssistant/Task/Sub/InfrastDormTask.cpp b/src/MeoAssistant/Task/Sub/InfrastDormTask.cpp index 3dabbec98f..62ebe47772 100644 --- a/src/MeoAssistant/Task/Sub/InfrastDormTask.cpp +++ b/src/MeoAssistant/Task/Sub/InfrastDormTask.cpp @@ -3,13 +3,13 @@ #include #include "Controller.h" -#include "ImageAnalyzer/InfrastOperImageAnalyzer.h" -#include "Utils/Logger.hpp" #include "ImageAnalyzer/General/MatchImageAnalyzer.h" #include "ImageAnalyzer/General/OcrImageAnalyzer.h" #include "ImageAnalyzer/General/OcrWithPreprocessImageAnalyzer.h" +#include "ImageAnalyzer/InfrastOperImageAnalyzer.h" #include "ProcessTask.h" #include "TaskData.h" +#include "Utils/Logger.hpp" asst::InfrastDormTask& asst::InfrastDormTask::set_notstationed_enabled(bool dorm_notstationed_enabled) noexcept { diff --git a/src/MeoAssistant/Task/Sub/InfrastInfoTask.cpp b/src/MeoAssistant/Task/Sub/InfrastInfoTask.cpp index 796ca97367..6a45dd8abf 100644 --- a/src/MeoAssistant/Task/Sub/InfrastInfoTask.cpp +++ b/src/MeoAssistant/Task/Sub/InfrastInfoTask.cpp @@ -2,8 +2,8 @@ #include "Controller.h" #include "ImageAnalyzer/InfrastFacilityImageAnalyzer.h" -#include "Utils/Logger.hpp" #include "RuntimeStatus.h" +#include "Utils/Logger.hpp" bool asst::InfrastInfoTask::_run() { diff --git a/src/MeoAssistant/Task/Sub/InfrastOfficeTask.cpp b/src/MeoAssistant/Task/Sub/InfrastOfficeTask.cpp index 8e0f397729..f56a1f77f3 100644 --- a/src/MeoAssistant/Task/Sub/InfrastOfficeTask.cpp +++ b/src/MeoAssistant/Task/Sub/InfrastOfficeTask.cpp @@ -1,7 +1,7 @@ #include "InfrastOfficeTask.h" -#include "Utils/AsstRanges.hpp" #include "Controller.h" +#include "Utils/AsstRanges.hpp" #include "Utils/Logger.hpp" bool asst::InfrastOfficeTask::_run() diff --git a/src/MeoAssistant/Task/Sub/InfrastPowerTask.cpp b/src/MeoAssistant/Task/Sub/InfrastPowerTask.cpp index 424874456f..1733e9925c 100644 --- a/src/MeoAssistant/Task/Sub/InfrastPowerTask.cpp +++ b/src/MeoAssistant/Task/Sub/InfrastPowerTask.cpp @@ -1,7 +1,7 @@ #include "InfrastPowerTask.h" -#include "Utils/AsstRanges.hpp" #include "Controller.h" +#include "Utils/AsstRanges.hpp" #include "Utils/Logger.hpp" bool asst::InfrastPowerTask::_run() diff --git a/src/MeoAssistant/Task/Sub/InfrastProductionTask.cpp b/src/MeoAssistant/Task/Sub/InfrastProductionTask.cpp index 22175a592c..2a792ea4c7 100644 --- a/src/MeoAssistant/Task/Sub/InfrastProductionTask.cpp +++ b/src/MeoAssistant/Task/Sub/InfrastProductionTask.cpp @@ -7,15 +7,15 @@ #include "Controller.h" #include "ImageAnalyzer/General/HashImageAnalyzer.h" -#include "Resource/InfrastConfiger.h" -#include "ImageAnalyzer/InfrastOperImageAnalyzer.h" -#include "Utils/Logger.hpp" #include "ImageAnalyzer/General/MatchImageAnalyzer.h" #include "ImageAnalyzer/General/MultiMatchImageAnalyzer.h" #include "ImageAnalyzer/General/OcrWithPreprocessImageAnalyzer.h" +#include "ImageAnalyzer/InfrastOperImageAnalyzer.h" #include "ProcessTask.h" +#include "Resource/InfrastConfiger.h" #include "RuntimeStatus.h" #include "TaskData.h" +#include "Utils/Logger.hpp" asst::InfrastProductionTask& asst::InfrastProductionTask::set_uses_of_drone(std::string uses_of_drones) noexcept { diff --git a/src/MeoAssistant/Task/Sub/InfrastReceptionTask.cpp b/src/MeoAssistant/Task/Sub/InfrastReceptionTask.cpp index fe122b81aa..61f8f2112d 100644 --- a/src/MeoAssistant/Task/Sub/InfrastReceptionTask.cpp +++ b/src/MeoAssistant/Task/Sub/InfrastReceptionTask.cpp @@ -3,12 +3,12 @@ #include "Utils/AsstRanges.hpp" #include "Controller.h" +#include "ImageAnalyzer/General/MatchImageAnalyzer.h" #include "ImageAnalyzer/InfrastClueImageAnalyzer.h" #include "ImageAnalyzer/InfrastClueVacancyImageAnalyzer.h" -#include "Utils/Logger.hpp" -#include "ImageAnalyzer/General/MatchImageAnalyzer.h" #include "ProcessTask.h" #include "TaskData.h" +#include "Utils/Logger.hpp" bool asst::InfrastReceptionTask::_run() { diff --git a/src/MeoAssistant/Task/Sub/ProcessTask.cpp b/src/MeoAssistant/Task/Sub/ProcessTask.cpp index c6a0306574..daebf809dd 100644 --- a/src/MeoAssistant/Task/Sub/ProcessTask.cpp +++ b/src/MeoAssistant/Task/Sub/ProcessTask.cpp @@ -5,13 +5,13 @@ #include -#include "Utils/AsstUtils.hpp" #include "Controller.h" -#include "Resource/GeneralConfiger.h" -#include "Utils/Logger.hpp" #include "ImageAnalyzer/ProcessTaskImageAnalyzer.h" +#include "Resource/GeneralConfiger.h" #include "RuntimeStatus.h" #include "TaskData.h" +#include "Utils/AsstUtils.hpp" +#include "Utils/Logger.hpp" using namespace asst; diff --git a/src/MeoAssistant/Task/Sub/ReportDataTask.cpp b/src/MeoAssistant/Task/Sub/ReportDataTask.cpp index c1646bb363..767df178b9 100644 --- a/src/MeoAssistant/Task/Sub/ReportDataTask.cpp +++ b/src/MeoAssistant/Task/Sub/ReportDataTask.cpp @@ -1,7 +1,7 @@ #include "ReportDataTask.h" -#include "Utils/AsstUtils.hpp" #include "Resource/GeneralConfiger.h" +#include "Utils/AsstUtils.hpp" #include "Utils/Logger.hpp" #include diff --git a/src/MeoAssistant/Task/Sub/StageNavigationTask.cpp b/src/MeoAssistant/Task/Sub/StageNavigationTask.cpp index 14ab58227f..f14504c71f 100644 --- a/src/MeoAssistant/Task/Sub/StageNavigationTask.cpp +++ b/src/MeoAssistant/Task/Sub/StageNavigationTask.cpp @@ -3,10 +3,10 @@ #include #include "Controller.h" -#include "Utils/Logger.hpp" #include "ImageAnalyzer/General/OcrImageAnalyzer.h" #include "ProcessTask.h" #include "TaskData.h" +#include "Utils/Logger.hpp" void asst::StageNavigationTask::set_stage_name(std::string stage_name) { diff --git a/src/MeoAssistant/TaskData.cpp b/src/MeoAssistant/TaskData.cpp index ed5274e14b..9f14d18c3e 100644 --- a/src/MeoAssistant/TaskData.cpp +++ b/src/MeoAssistant/TaskData.cpp @@ -5,10 +5,10 @@ #include -#include "Utils/AsstTypes.h" #include "Resource/GeneralConfiger.h" -#include "Utils/Logger.hpp" #include "Resource/TemplResource.h" +#include "Utils/AsstTypes.h" +#include "Utils/Logger.hpp" const std::unordered_set& asst::TaskData::get_templ_required() const noexcept {