From 0ff6dd4b429d9e449fb3494abe229b5fb78cc9cb Mon Sep 17 00:00:00 2001 From: zzyyyl Date: Thu, 29 Sep 2022 23:06:36 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20=E7=BB=99=E5=A4=B4=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E5=8A=A0=E4=B8=8A=E8=B7=AF=E5=BE=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 直接在上一个 commit 里改的话可能会导致 history 消失 --- src/MeoAssistant/Assistant.cpp | 32 +++++++++---------- src/MeoAssistant/Assistant.h | 4 +-- src/MeoAssistant/AsstBattleDef.h | 4 +-- src/MeoAssistant/AsstCaller.cpp | 6 ++-- src/MeoAssistant/Controller.cpp | 14 ++++---- src/MeoAssistant/Controller.h | 12 +++---- .../ImageAnalyzer/BattleImageAnalyzer.cpp | 14 ++++---- .../ImageAnalyzer/BattleImageAnalyzer.h | 2 +- .../ImageAnalyzer/CreditShopImageAnalyzer.cpp | 12 +++---- .../ImageAnalyzer/CreditShopImageAnalyzer.h | 2 +- .../ImageAnalyzer/DepotImageAnalyzer.cpp | 12 +++---- .../ImageAnalyzer/DepotImageAnalyzer.h | 2 +- .../General/AbstractImageAnalyzer.cpp | 8 ++--- .../General/AbstractImageAnalyzer.h | 4 +-- .../General/HashImageAnalyzer.cpp | 6 ++-- .../General/MatchImageAnalyzer.cpp | 8 ++--- .../General/MultiMatchImageAnalyzer.cpp | 8 ++--- .../General/OcrImageAnalyzer.cpp | 4 +-- .../ImageAnalyzer/General/OcrImageAnalyzer.h | 2 +- .../OcrWithPreprocessImageAnalyzer.cpp | 4 +-- .../InfrastClueImageAnalyzer.cpp | 2 +- .../ImageAnalyzer/InfrastClueImageAnalyzer.h | 2 +- .../InfrastClueVacancyImageAnalyzer.cpp | 8 ++--- .../InfrastClueVacancyImageAnalyzer.h | 2 +- .../InfrastFacilityImageAnalyzer.cpp | 8 ++--- .../InfrastFacilityImageAnalyzer.h | 2 +- .../InfrastOperImageAnalyzer.cpp | 12 +++---- .../ImageAnalyzer/InfrastOperImageAnalyzer.h | 4 +-- .../InfrastSmileyImageAnalyzer.cpp | 6 ++-- .../InfrastSmileyImageAnalyzer.h | 4 +-- .../ProcessTaskImageAnalyzer.cpp | 8 ++--- .../ImageAnalyzer/ProcessTaskImageAnalyzer.h | 4 +-- .../ImageAnalyzer/RecruitImageAnalyzer.cpp | 8 ++--- .../ImageAnalyzer/RecruitImageAnalyzer.h | 4 +-- .../RoguelikeFormationImageAnalyzer.cpp | 8 ++--- .../RoguelikeFormationImageAnalyzer.h | 2 +- .../RoguelikeRecruitImageAnalyzer.cpp | 6 ++-- .../RoguelikeRecruitImageAnalyzer.h | 2 +- .../RoguelikeSkillSelectionImageAnalyzer.cpp | 12 +++---- .../RoguelikeSkillSelectionImageAnalyzer.h | 2 +- .../ImageAnalyzer/StageDropsImageAnalyzer.cpp | 18 +++++------ .../ImageAnalyzer/StageDropsImageAnalyzer.h | 4 +-- .../Resource/AbstractConfiger.cpp | 4 +-- src/MeoAssistant/Resource/AbstractResource.h | 2 +- .../Resource/BattleDataConfiger.cpp | 2 +- .../Resource/BattleDataConfiger.h | 2 +- src/MeoAssistant/Resource/CopilotConfiger.cpp | 2 +- src/MeoAssistant/Resource/GeneralConfiger.cpp | 2 +- src/MeoAssistant/Resource/GeneralConfiger.h | 2 +- src/MeoAssistant/Resource/InfrastConfiger.cpp | 2 +- src/MeoAssistant/Resource/InfrastConfiger.h | 2 +- src/MeoAssistant/Resource/ItemConfiger.cpp | 4 +-- src/MeoAssistant/Resource/OcrPack.cpp | 10 +++--- src/MeoAssistant/Resource/OcrPack.h | 2 +- src/MeoAssistant/Resource/RecruitConfiger.cpp | 2 +- src/MeoAssistant/Resource/RecruitConfiger.h | 4 +-- .../Resource/RoguelikeCopilotConfiger.cpp | 2 +- .../Resource/RoguelikeRecruitConfiger.h | 2 +- src/MeoAssistant/Resource/TemplResource.cpp | 6 ++-- src/MeoAssistant/Resource/TemplResource.h | 4 +-- src/MeoAssistant/Resource/TilePack.cpp | 4 +-- src/MeoAssistant/Resource/TilePack.h | 2 +- src/MeoAssistant/ResourceLoader.cpp | 28 ++++++++-------- src/MeoAssistant/ResourceLoader.h | 8 ++--- src/MeoAssistant/RuntimeStatus.h | 2 +- src/MeoAssistant/Task/AwardTask.cpp | 2 +- src/MeoAssistant/Task/CloseDownTask.cpp | 2 +- src/MeoAssistant/Task/CloseDownTask.h | 2 +- src/MeoAssistant/Task/CopilotTask.cpp | 12 +++---- src/MeoAssistant/Task/DebugTask.cpp | 12 +++---- src/MeoAssistant/Task/DepotTask.cpp | 4 +-- src/MeoAssistant/Task/FightTask.cpp | 10 +++--- src/MeoAssistant/Task/InfrastTask.cpp | 24 +++++++------- src/MeoAssistant/Task/MallTask.cpp | 4 +-- src/MeoAssistant/Task/PackageTask.cpp | 4 +-- src/MeoAssistant/Task/PackageTask.h | 2 +- .../Task/Plugin/AbstractTaskPlugin.h | 4 +-- .../Task/Plugin/DrGrandetTaskPlugin.cpp | 4 +-- .../Plugin/DronesForShamareTaskPlugin.cpp | 4 +-- .../ReplenishOriginiumShardTaskPlugin.cpp | 2 +- .../Task/Plugin/RoguelikeBattleTaskPlugin.cpp | 22 ++++++------- .../Task/Plugin/RoguelikeBattleTaskPlugin.h | 6 ++-- .../Plugin/RoguelikeCustomStartTaskPlugin.cpp | 8 ++--- .../Plugin/RoguelikeFormationTaskPlugin.cpp | 8 ++--- .../Plugin/RoguelikeRecruitTaskPlugin.cpp | 8 ++--- .../Plugin/RoguelikeShoppingTaskPlugin.cpp | 10 +++--- .../RoguelikeSkillSelectionTaskPlugin.cpp | 6 ++-- .../Task/Plugin/StageDropsTaskPlugin.cpp | 16 +++++----- .../Task/Plugin/StageDropsTaskPlugin.h | 2 +- .../Task/Plugin/StartGameTaskPlugin.h | 2 +- .../Task/Plugin/StopGameTaskPlugin.h | 2 +- src/MeoAssistant/Task/RecruitTask.cpp | 4 +-- src/MeoAssistant/Task/RoguelikeTask.cpp | 22 ++++++------- src/MeoAssistant/Task/StartUpTask.cpp | 2 +- src/MeoAssistant/Task/StartUpTask.h | 2 +- src/MeoAssistant/Task/Sub/AbstractTask.cpp | 12 +++---- src/MeoAssistant/Task/Sub/AbstractTask.h | 2 +- src/MeoAssistant/Task/Sub/AutoRecruitTask.cpp | 14 ++++---- src/MeoAssistant/Task/Sub/AutoRecruitTask.h | 4 +-- .../Task/Sub/BattleFormationTask.cpp | 10 +++--- .../Task/Sub/BattleProcessTask.cpp | 20 ++++++------ src/MeoAssistant/Task/Sub/BattleProcessTask.h | 6 ++-- .../Task/Sub/CreditShoppingTask.cpp | 8 ++--- .../Task/Sub/CreditShoppingTask.h | 2 +- .../Task/Sub/DepotRecognitionTask.cpp | 6 ++-- .../Task/Sub/DepotRecognitionTask.h | 2 +- .../Task/Sub/InfrastAbstractTask.cpp | 16 +++++----- .../Task/Sub/InfrastAbstractTask.h | 4 +-- .../Task/Sub/InfrastControlTask.cpp | 2 +- src/MeoAssistant/Task/Sub/InfrastDormTask.cpp | 10 +++--- src/MeoAssistant/Task/Sub/InfrastInfoTask.cpp | 4 +-- src/MeoAssistant/Task/Sub/InfrastMfgTask.cpp | 2 +- .../Task/Sub/InfrastOfficeTask.cpp | 4 +-- .../Task/Sub/InfrastPowerTask.cpp | 4 +-- .../Task/Sub/InfrastProductionTask.cpp | 16 +++++----- .../Task/Sub/InfrastProductionTask.h | 2 +- .../Task/Sub/InfrastReceptionTask.cpp | 10 +++--- src/MeoAssistant/Task/Sub/ProcessTask.cpp | 8 ++--- src/MeoAssistant/Task/Sub/ProcessTask.h | 2 +- src/MeoAssistant/Task/Sub/ReportDataTask.cpp | 6 ++-- src/MeoAssistant/Task/Sub/ReportDataTask.h | 4 +-- .../Task/Sub/StageNavigationTask.cpp | 4 +-- src/MeoAssistant/Task/VisitTask.cpp | 2 +- src/MeoAssistant/TaskData.cpp | 10 +++--- src/MeoAssistant/TaskData.h | 2 +- 125 files changed, 399 insertions(+), 399 deletions(-) diff --git a/src/MeoAssistant/Assistant.cpp b/src/MeoAssistant/Assistant.cpp index ae815cc80a..a2e720628b 100644 --- a/src/MeoAssistant/Assistant.cpp +++ b/src/MeoAssistant/Assistant.cpp @@ -1,28 +1,28 @@ #include "Assistant.h" -#include "AsstRanges.hpp" +#include "Utils/AsstRanges.hpp" #include -#include "AsstUtils.hpp" +#include "Utils/AsstUtils.hpp" #include "Controller.h" -#include "GeneralConfiger.h" -#include "Logger.hpp" +#include "Resource/GeneralConfiger.h" +#include "Utils/Logger.hpp" #include "RuntimeStatus.h" -#include "AwardTask.h" -#include "CloseDownTask.h" -#include "CopilotTask.h" -#include "DepotTask.h" -#include "FightTask.h" -#include "InfrastTask.h" -#include "MallTask.h" -#include "RecruitTask.h" -#include "RoguelikeTask.h" -#include "StartUpTask.h" -#include "VisitTask.h" +#include "Task/AwardTask.h" +#include "Task/CloseDownTask.h" +#include "Task/CopilotTask.h" +#include "Task/DepotTask.h" +#include "Task/FightTask.h" +#include "Task/InfrastTask.h" +#include "Task/MallTask.h" +#include "Task/RecruitTask.h" +#include "Task/RoguelikeTask.h" +#include "Task/StartUpTask.h" +#include "Task/VisitTask.h" #ifdef ASST_DEBUG -#include "DebugTask.h" +#include "Task/DebugTask.h" #endif using namespace asst; diff --git a/src/MeoAssistant/Assistant.h b/src/MeoAssistant/Assistant.h index fdf71cc3b0..15f259f5b1 100644 --- a/src/MeoAssistant/Assistant.h +++ b/src/MeoAssistant/Assistant.h @@ -7,8 +7,8 @@ #include #include -#include "AsstMsg.h" -#include "AsstTypes.h" +#include "Utils/AsstMsg.h" +#include "Utils/AsstTypes.h" typedef unsigned char uchar; diff --git a/src/MeoAssistant/AsstBattleDef.h b/src/MeoAssistant/AsstBattleDef.h index 8af9d01323..aeb66d3c2a 100644 --- a/src/MeoAssistant/AsstBattleDef.h +++ b/src/MeoAssistant/AsstBattleDef.h @@ -4,9 +4,9 @@ #include #include -#include "NoWarningCVMat.h" +#include "Utils/NoWarningCVMat.h" -#include "AsstTypes.h" +#include "Utils/AsstTypes.h" namespace asst { diff --git a/src/MeoAssistant/AsstCaller.cpp b/src/MeoAssistant/AsstCaller.cpp index 4dc13eba20..0abd68b0ab 100644 --- a/src/MeoAssistant/AsstCaller.cpp +++ b/src/MeoAssistant/AsstCaller.cpp @@ -7,10 +7,10 @@ #include #include "Assistant.h" -#include "AsstTypes.h" -#include "Logger.hpp" +#include "Utils/AsstTypes.h" +#include "Utils/Logger.hpp" #include "ResourceLoader.h" -#include "Version.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 7996d43697..13158dc3dc 100644 --- a/src/MeoAssistant/Controller.cpp +++ b/src/MeoAssistant/Controller.cpp @@ -1,9 +1,9 @@ #include "Controller.h" -#include "AsstConf.h" -#include "AsstPlatform.h" +#include "Utils/AsstConf.h" +#include "Utils/AsstPlatform.h" #ifdef _WIN32 -#include "AsstPlatformWin32.h" +#include "Utils/AsstPlatformWin32.h" #include #else #include @@ -18,7 +18,7 @@ #include #include -#include "NoWarningCV.h" +#include "Utils/NoWarningCV.h" #ifdef _MSC_VER #pragma warning(push) @@ -29,9 +29,9 @@ #pragma warning(pop) #endif -#include "AsstTypes.h" -#include "GeneralConfiger.h" -#include "Logger.hpp" +#include "Utils/AsstTypes.h" +#include "Resource/GeneralConfiger.h" +#include "Utils/Logger.hpp" asst::Controller::Controller(AsstCallback callback, void* callback_arg) : m_callback(std::move(callback)), m_callback_arg(callback_arg), m_rand_engine(std::random_device {}()) diff --git a/src/MeoAssistant/Controller.h b/src/MeoAssistant/Controller.h index bdc7c1c98f..6c400b0f70 100644 --- a/src/MeoAssistant/Controller.h +++ b/src/MeoAssistant/Controller.h @@ -1,11 +1,11 @@ #pragma once #ifdef _WIN32 -#include "SafeWindows.h" +#include "Utils/SafeWindows.h" #include #endif -#include "AsstConf.h" +#include "Utils/AsstConf.h" #include #include @@ -18,11 +18,11 @@ #include #include -#include "NoWarningCVMat.h" +#include "Utils/NoWarningCVMat.h" -#include "AsstMsg.h" -#include "AsstTypes.h" -#include "SingletonHolder.hpp" +#include "Utils/AsstMsg.h" +#include "Utils/AsstTypes.h" +#include "Utils/SingletonHolder.hpp" namespace asst { diff --git a/src/MeoAssistant/ImageAnalyzer/BattleImageAnalyzer.cpp b/src/MeoAssistant/ImageAnalyzer/BattleImageAnalyzer.cpp index 5b57c8ba68..139d9cfcc0 100644 --- a/src/MeoAssistant/ImageAnalyzer/BattleImageAnalyzer.cpp +++ b/src/MeoAssistant/ImageAnalyzer/BattleImageAnalyzer.cpp @@ -1,15 +1,15 @@ #include "BattleImageAnalyzer.h" -#include "AsstRanges.hpp" +#include "Utils/AsstRanges.hpp" #include -#include "NoWarningCV.h" +#include "Utils/NoWarningCV.h" -#include "HashImageAnalyzer.h" -#include "Logger.hpp" -#include "MatchImageAnalyzer.h" -#include "MultiMatchImageAnalyzer.h" -#include "OcrWithFlagTemplImageAnalyzer.h" +#include "General/HashImageAnalyzer.h" +#include "Utils/Logger.hpp" +#include "General/MatchImageAnalyzer.h" +#include "General/MultiMatchImageAnalyzer.h" +#include "General/OcrWithFlagTemplImageAnalyzer.h" #include "TaskData.h" bool asst::BattleImageAnalyzer::set_target(int target) diff --git a/src/MeoAssistant/ImageAnalyzer/BattleImageAnalyzer.h b/src/MeoAssistant/ImageAnalyzer/BattleImageAnalyzer.h index 8e73f32247..75617232e3 100644 --- a/src/MeoAssistant/ImageAnalyzer/BattleImageAnalyzer.h +++ b/src/MeoAssistant/ImageAnalyzer/BattleImageAnalyzer.h @@ -1,5 +1,5 @@ #pragma once -#include "AbstractImageAnalyzer.h" +#include "General/AbstractImageAnalyzer.h" #include "AsstBattleDef.h" diff --git a/src/MeoAssistant/ImageAnalyzer/CreditShopImageAnalyzer.cpp b/src/MeoAssistant/ImageAnalyzer/CreditShopImageAnalyzer.cpp index ec53980abc..daffc27ef6 100644 --- a/src/MeoAssistant/ImageAnalyzer/CreditShopImageAnalyzer.cpp +++ b/src/MeoAssistant/ImageAnalyzer/CreditShopImageAnalyzer.cpp @@ -1,13 +1,13 @@ #include "CreditShopImageAnalyzer.h" -#include "AsstRanges.hpp" +#include "Utils/AsstRanges.hpp" -#include "NoWarningCV.h" +#include "Utils/NoWarningCV.h" -#include "AsstUtils.hpp" -#include "MatchImageAnalyzer.h" -#include "MultiMatchImageAnalyzer.h" -#include "OcrImageAnalyzer.h" +#include "Utils/AsstUtils.hpp" +#include "General/MatchImageAnalyzer.h" +#include "General/MultiMatchImageAnalyzer.h" +#include "General/OcrImageAnalyzer.h" #include "TaskData.h" void asst::CreditShopImageAnalyzer::set_black_list(std::vector black_list) diff --git a/src/MeoAssistant/ImageAnalyzer/CreditShopImageAnalyzer.h b/src/MeoAssistant/ImageAnalyzer/CreditShopImageAnalyzer.h index 763cd22a21..e86184f2eb 100644 --- a/src/MeoAssistant/ImageAnalyzer/CreditShopImageAnalyzer.h +++ b/src/MeoAssistant/ImageAnalyzer/CreditShopImageAnalyzer.h @@ -1,5 +1,5 @@ #pragma once -#include "AbstractImageAnalyzer.h" +#include "General/AbstractImageAnalyzer.h" namespace asst { diff --git a/src/MeoAssistant/ImageAnalyzer/DepotImageAnalyzer.cpp b/src/MeoAssistant/ImageAnalyzer/DepotImageAnalyzer.cpp index 9de239091d..1f020509d9 100644 --- a/src/MeoAssistant/ImageAnalyzer/DepotImageAnalyzer.cpp +++ b/src/MeoAssistant/ImageAnalyzer/DepotImageAnalyzer.cpp @@ -1,12 +1,12 @@ #include "DepotImageAnalyzer.h" -#include "NoWarningCV.h" +#include "Utils/NoWarningCV.h" -#include "AsstUtils.hpp" -#include "ItemConfiger.h" -#include "Logger.hpp" -#include "MatchImageAnalyzer.h" -#include "OcrWithPreprocessImageAnalyzer.h" +#include "Utils/AsstUtils.hpp" +#include "Resource/ItemConfiger.h" +#include "Utils/Logger.hpp" +#include "General/MatchImageAnalyzer.h" +#include "General/OcrWithPreprocessImageAnalyzer.h" #include "TaskData.h" bool asst::DepotImageAnalyzer::analyze() diff --git a/src/MeoAssistant/ImageAnalyzer/DepotImageAnalyzer.h b/src/MeoAssistant/ImageAnalyzer/DepotImageAnalyzer.h index 942b170f92..6a79b337cf 100644 --- a/src/MeoAssistant/ImageAnalyzer/DepotImageAnalyzer.h +++ b/src/MeoAssistant/ImageAnalyzer/DepotImageAnalyzer.h @@ -1,5 +1,5 @@ #pragma once -#include "AbstractImageAnalyzer.h" +#include "General/AbstractImageAnalyzer.h" namespace asst { diff --git a/src/MeoAssistant/ImageAnalyzer/General/AbstractImageAnalyzer.cpp b/src/MeoAssistant/ImageAnalyzer/General/AbstractImageAnalyzer.cpp index 76fb0644cf..a1b0e29068 100644 --- a/src/MeoAssistant/ImageAnalyzer/General/AbstractImageAnalyzer.cpp +++ b/src/MeoAssistant/ImageAnalyzer/General/AbstractImageAnalyzer.cpp @@ -1,11 +1,11 @@ #include "AbstractImageAnalyzer.h" -#include "NoWarningCV.h" +#include "Utils/NoWarningCV.h" -#include "AsstImageIo.hpp" -#include "AsstUtils.hpp" +#include "Utils/AsstImageIo.hpp" +#include "Utils/AsstUtils.hpp" #include "Controller.h" -#include "Logger.hpp" +#include "Utils/Logger.hpp" asst::AbstractImageAnalyzer::AbstractImageAnalyzer(const cv::Mat& image) : m_image(image), m_roi(empty_rect_to_full(Rect(), image)) diff --git a/src/MeoAssistant/ImageAnalyzer/General/AbstractImageAnalyzer.h b/src/MeoAssistant/ImageAnalyzer/General/AbstractImageAnalyzer.h index 162267a16c..20da65619c 100644 --- a/src/MeoAssistant/ImageAnalyzer/General/AbstractImageAnalyzer.h +++ b/src/MeoAssistant/ImageAnalyzer/General/AbstractImageAnalyzer.h @@ -1,7 +1,7 @@ #pragma once -#include "AsstTypes.h" -#include "NoWarningCVMat.h" +#include "Utils/AsstTypes.h" +#include "Utils/NoWarningCVMat.h" // #ifndef ASST_DEBUG // #define ASST_DEBUG diff --git a/src/MeoAssistant/ImageAnalyzer/General/HashImageAnalyzer.cpp b/src/MeoAssistant/ImageAnalyzer/General/HashImageAnalyzer.cpp index a6f146dc08..17d2af8be8 100644 --- a/src/MeoAssistant/ImageAnalyzer/General/HashImageAnalyzer.cpp +++ b/src/MeoAssistant/ImageAnalyzer/General/HashImageAnalyzer.cpp @@ -1,9 +1,9 @@ #include "HashImageAnalyzer.h" -#include "NoWarningCV.h" +#include "Utils/NoWarningCV.h" -#include "AsstUtils.hpp" -#include "Logger.hpp" +#include "Utils/AsstUtils.hpp" +#include "Utils/Logger.hpp" bool asst::HashImageAnalyzer::analyze() { diff --git a/src/MeoAssistant/ImageAnalyzer/General/MatchImageAnalyzer.cpp b/src/MeoAssistant/ImageAnalyzer/General/MatchImageAnalyzer.cpp index 919360dd58..b7ec2f6bbe 100644 --- a/src/MeoAssistant/ImageAnalyzer/General/MatchImageAnalyzer.cpp +++ b/src/MeoAssistant/ImageAnalyzer/General/MatchImageAnalyzer.cpp @@ -1,11 +1,11 @@ #include "MatchImageAnalyzer.h" -#include "NoWarningCV.h" +#include "Utils/NoWarningCV.h" -#include "AsstUtils.hpp" -#include "Logger.hpp" +#include "Utils/AsstUtils.hpp" +#include "Utils/Logger.hpp" #include "TaskData.h" -#include "TemplResource.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 185d2d78e0..db0a856c15 100644 --- a/src/MeoAssistant/ImageAnalyzer/General/MultiMatchImageAnalyzer.cpp +++ b/src/MeoAssistant/ImageAnalyzer/General/MultiMatchImageAnalyzer.cpp @@ -1,13 +1,13 @@ #include "MultiMatchImageAnalyzer.h" -#include "AsstRanges.hpp" +#include "Utils/AsstRanges.hpp" #include -#include "NoWarningCV.h" +#include "Utils/NoWarningCV.h" -#include "Logger.hpp" +#include "Utils/Logger.hpp" #include "TaskData.h" -#include "TemplResource.h" +#include "Resource/TemplResource.h" 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 a8a866070b..0eab8a0164 100644 --- a/src/MeoAssistant/ImageAnalyzer/General/OcrImageAnalyzer.cpp +++ b/src/MeoAssistant/ImageAnalyzer/General/OcrImageAnalyzer.cpp @@ -3,8 +3,8 @@ #include #include -#include "Logger.hpp" -#include "OcrPack.h" +#include "Utils/Logger.hpp" +#include "Resource/OcrPack.h" #include "TaskData.h" bool asst::OcrImageAnalyzer::analyze() diff --git a/src/MeoAssistant/ImageAnalyzer/General/OcrImageAnalyzer.h b/src/MeoAssistant/ImageAnalyzer/General/OcrImageAnalyzer.h index 6384bbd1df..1b9a494902 100644 --- a/src/MeoAssistant/ImageAnalyzer/General/OcrImageAnalyzer.h +++ b/src/MeoAssistant/ImageAnalyzer/General/OcrImageAnalyzer.h @@ -5,7 +5,7 @@ #include #include -#include "AsstTypes.h" +#include "Utils/AsstTypes.h" namespace asst { diff --git a/src/MeoAssistant/ImageAnalyzer/General/OcrWithPreprocessImageAnalyzer.cpp b/src/MeoAssistant/ImageAnalyzer/General/OcrWithPreprocessImageAnalyzer.cpp index a0879e7b24..59cda452bb 100644 --- a/src/MeoAssistant/ImageAnalyzer/General/OcrWithPreprocessImageAnalyzer.cpp +++ b/src/MeoAssistant/ImageAnalyzer/General/OcrWithPreprocessImageAnalyzer.cpp @@ -1,8 +1,8 @@ #include "OcrWithPreprocessImageAnalyzer.h" -#include "NoWarningCV.h" +#include "Utils/NoWarningCV.h" -#include "AsstUtils.hpp" +#include "Utils/AsstUtils.hpp" bool asst::OcrWithPreprocessImageAnalyzer::analyze() { diff --git a/src/MeoAssistant/ImageAnalyzer/InfrastClueImageAnalyzer.cpp b/src/MeoAssistant/ImageAnalyzer/InfrastClueImageAnalyzer.cpp index e592d8a1ee..670c920010 100644 --- a/src/MeoAssistant/ImageAnalyzer/InfrastClueImageAnalyzer.cpp +++ b/src/MeoAssistant/ImageAnalyzer/InfrastClueImageAnalyzer.cpp @@ -1,6 +1,6 @@ #include "InfrastClueImageAnalyzer.h" -#include "MultiMatchImageAnalyzer.h" +#include "General/MultiMatchImageAnalyzer.h" bool asst::InfrastClueImageAnalyzer::analyze() { diff --git a/src/MeoAssistant/ImageAnalyzer/InfrastClueImageAnalyzer.h b/src/MeoAssistant/ImageAnalyzer/InfrastClueImageAnalyzer.h index 9b67ae70d4..e4d5f4b3e2 100644 --- a/src/MeoAssistant/ImageAnalyzer/InfrastClueImageAnalyzer.h +++ b/src/MeoAssistant/ImageAnalyzer/InfrastClueImageAnalyzer.h @@ -1,5 +1,5 @@ #pragma once -#include "AbstractImageAnalyzer.h" +#include "General/AbstractImageAnalyzer.h" namespace asst { diff --git a/src/MeoAssistant/ImageAnalyzer/InfrastClueVacancyImageAnalyzer.cpp b/src/MeoAssistant/ImageAnalyzer/InfrastClueVacancyImageAnalyzer.cpp index 3f260b3ba8..f0d21ed902 100644 --- a/src/MeoAssistant/ImageAnalyzer/InfrastClueVacancyImageAnalyzer.cpp +++ b/src/MeoAssistant/ImageAnalyzer/InfrastClueVacancyImageAnalyzer.cpp @@ -1,10 +1,10 @@ #include "InfrastClueVacancyImageAnalyzer.h" -#include "NoWarningCV.h" +#include "Utils/NoWarningCV.h" -#include "AsstUtils.hpp" -#include "Logger.hpp" -#include "MatchImageAnalyzer.h" +#include "Utils/AsstUtils.hpp" +#include "Utils/Logger.hpp" +#include "General/MatchImageAnalyzer.h" bool asst::InfrastClueVacancyImageAnalyzer::analyze() { diff --git a/src/MeoAssistant/ImageAnalyzer/InfrastClueVacancyImageAnalyzer.h b/src/MeoAssistant/ImageAnalyzer/InfrastClueVacancyImageAnalyzer.h index 2eb214034f..00b8104fd1 100644 --- a/src/MeoAssistant/ImageAnalyzer/InfrastClueVacancyImageAnalyzer.h +++ b/src/MeoAssistant/ImageAnalyzer/InfrastClueVacancyImageAnalyzer.h @@ -1,5 +1,5 @@ #pragma once -#include "AbstractImageAnalyzer.h" +#include "General/AbstractImageAnalyzer.h" namespace asst { diff --git a/src/MeoAssistant/ImageAnalyzer/InfrastFacilityImageAnalyzer.cpp b/src/MeoAssistant/ImageAnalyzer/InfrastFacilityImageAnalyzer.cpp index e827a981b4..03006889d2 100644 --- a/src/MeoAssistant/ImageAnalyzer/InfrastFacilityImageAnalyzer.cpp +++ b/src/MeoAssistant/ImageAnalyzer/InfrastFacilityImageAnalyzer.cpp @@ -1,10 +1,10 @@ #include "InfrastFacilityImageAnalyzer.h" -#include "NoWarningCV.h" +#include "Utils/NoWarningCV.h" -#include "AsstUtils.hpp" -#include "Logger.hpp" -#include "MultiMatchImageAnalyzer.h" +#include "Utils/AsstUtils.hpp" +#include "Utils/Logger.hpp" +#include "General/MultiMatchImageAnalyzer.h" #include "TaskData.h" bool asst::InfrastFacilityImageAnalyzer::analyze() diff --git a/src/MeoAssistant/ImageAnalyzer/InfrastFacilityImageAnalyzer.h b/src/MeoAssistant/ImageAnalyzer/InfrastFacilityImageAnalyzer.h index c3c8902712..45050e31b5 100644 --- a/src/MeoAssistant/ImageAnalyzer/InfrastFacilityImageAnalyzer.h +++ b/src/MeoAssistant/ImageAnalyzer/InfrastFacilityImageAnalyzer.h @@ -1,5 +1,5 @@ #pragma once -#include "AbstractImageAnalyzer.h" +#include "General/AbstractImageAnalyzer.h" namespace asst { diff --git a/src/MeoAssistant/ImageAnalyzer/InfrastOperImageAnalyzer.cpp b/src/MeoAssistant/ImageAnalyzer/InfrastOperImageAnalyzer.cpp index 39d57243c9..09c91b8d17 100644 --- a/src/MeoAssistant/ImageAnalyzer/InfrastOperImageAnalyzer.cpp +++ b/src/MeoAssistant/ImageAnalyzer/InfrastOperImageAnalyzer.cpp @@ -1,13 +1,13 @@ #include "InfrastOperImageAnalyzer.h" -#include "AsstRanges.hpp" -#include "NoWarningCV.h" +#include "Utils/AsstRanges.hpp" +#include "Utils/NoWarningCV.h" -#include "HashImageAnalyzer.h" -#include "InfrastConfiger.h" +#include "General/HashImageAnalyzer.h" +#include "Resource/InfrastConfiger.h" #include "InfrastSmileyImageAnalyzer.h" -#include "Logger.hpp" -#include "MatchImageAnalyzer.h" +#include "Utils/Logger.hpp" +#include "General/MatchImageAnalyzer.h" #include "TaskData.h" bool asst::InfrastOperImageAnalyzer::analyze() diff --git a/src/MeoAssistant/ImageAnalyzer/InfrastOperImageAnalyzer.h b/src/MeoAssistant/ImageAnalyzer/InfrastOperImageAnalyzer.h index ad9c7b0fae..dbbd76eb39 100644 --- a/src/MeoAssistant/ImageAnalyzer/InfrastOperImageAnalyzer.h +++ b/src/MeoAssistant/ImageAnalyzer/InfrastOperImageAnalyzer.h @@ -1,7 +1,7 @@ #pragma once -#include "AbstractImageAnalyzer.h" +#include "General/AbstractImageAnalyzer.h" -#include "AsstInfrastDef.h" +#include "Utils/AsstInfrastDef.h" namespace asst { diff --git a/src/MeoAssistant/ImageAnalyzer/InfrastSmileyImageAnalyzer.cpp b/src/MeoAssistant/ImageAnalyzer/InfrastSmileyImageAnalyzer.cpp index 951cabf9e7..a74b22adea 100644 --- a/src/MeoAssistant/ImageAnalyzer/InfrastSmileyImageAnalyzer.cpp +++ b/src/MeoAssistant/ImageAnalyzer/InfrastSmileyImageAnalyzer.cpp @@ -1,9 +1,9 @@ #include "InfrastSmileyImageAnalyzer.h" -#include "NoWarningCV.h" +#include "Utils/NoWarningCV.h" -#include "AsstUtils.hpp" -#include "MultiMatchImageAnalyzer.h" +#include "Utils/AsstUtils.hpp" +#include "General/MultiMatchImageAnalyzer.h" bool asst::InfrastSmileyImageAnalyzer::analyze() { diff --git a/src/MeoAssistant/ImageAnalyzer/InfrastSmileyImageAnalyzer.h b/src/MeoAssistant/ImageAnalyzer/InfrastSmileyImageAnalyzer.h index 3db7ce4b58..2544e63217 100644 --- a/src/MeoAssistant/ImageAnalyzer/InfrastSmileyImageAnalyzer.h +++ b/src/MeoAssistant/ImageAnalyzer/InfrastSmileyImageAnalyzer.h @@ -1,7 +1,7 @@ #pragma once -#include "AbstractImageAnalyzer.h" +#include "General/AbstractImageAnalyzer.h" -#include "AsstInfrastDef.h" +#include "Utils/AsstInfrastDef.h" namespace asst { diff --git a/src/MeoAssistant/ImageAnalyzer/ProcessTaskImageAnalyzer.cpp b/src/MeoAssistant/ImageAnalyzer/ProcessTaskImageAnalyzer.cpp index 93d56dc58a..93652a942b 100644 --- a/src/MeoAssistant/ImageAnalyzer/ProcessTaskImageAnalyzer.cpp +++ b/src/MeoAssistant/ImageAnalyzer/ProcessTaskImageAnalyzer.cpp @@ -3,10 +3,10 @@ #include #include -#include "AsstUtils.hpp" -#include "Logger.hpp" -#include "MatchImageAnalyzer.h" -#include "OcrImageAnalyzer.h" +#include "Utils/AsstUtils.hpp" +#include "Utils/Logger.hpp" +#include "General/MatchImageAnalyzer.h" +#include "General/OcrImageAnalyzer.h" #include "RuntimeStatus.h" #include "TaskData.h" diff --git a/src/MeoAssistant/ImageAnalyzer/ProcessTaskImageAnalyzer.h b/src/MeoAssistant/ImageAnalyzer/ProcessTaskImageAnalyzer.h index 337022df38..6c13e5cb6d 100644 --- a/src/MeoAssistant/ImageAnalyzer/ProcessTaskImageAnalyzer.h +++ b/src/MeoAssistant/ImageAnalyzer/ProcessTaskImageAnalyzer.h @@ -1,11 +1,11 @@ #pragma once -#include "AbstractImageAnalyzer.h" +#include "General/AbstractImageAnalyzer.h" #include #include #include -#include "AsstTypes.h" +#include "Utils/AsstTypes.h" namespace asst { diff --git a/src/MeoAssistant/ImageAnalyzer/RecruitImageAnalyzer.cpp b/src/MeoAssistant/ImageAnalyzer/RecruitImageAnalyzer.cpp index 0229ac5e56..4dad5bb819 100644 --- a/src/MeoAssistant/ImageAnalyzer/RecruitImageAnalyzer.cpp +++ b/src/MeoAssistant/ImageAnalyzer/RecruitImageAnalyzer.cpp @@ -1,9 +1,9 @@ #include "RecruitImageAnalyzer.h" -#include "MatchImageAnalyzer.h" -#include "MultiMatchImageAnalyzer.h" -#include "OcrImageAnalyzer.h" -#include "RecruitConfiger.h" +#include "General/MatchImageAnalyzer.h" +#include "General/MultiMatchImageAnalyzer.h" +#include "General/OcrImageAnalyzer.h" +#include "Resource/RecruitConfiger.h" #include "TaskData.h" bool asst::RecruitImageAnalyzer::analyze() diff --git a/src/MeoAssistant/ImageAnalyzer/RecruitImageAnalyzer.h b/src/MeoAssistant/ImageAnalyzer/RecruitImageAnalyzer.h index f3a71904a2..f204538b5c 100644 --- a/src/MeoAssistant/ImageAnalyzer/RecruitImageAnalyzer.h +++ b/src/MeoAssistant/ImageAnalyzer/RecruitImageAnalyzer.h @@ -1,7 +1,7 @@ #pragma once -#include "AbstractImageAnalyzer.h" +#include "General/AbstractImageAnalyzer.h" -#include "AsstTypes.h" +#include "Utils/AsstTypes.h" namespace asst { diff --git a/src/MeoAssistant/ImageAnalyzer/RoguelikeFormationImageAnalyzer.cpp b/src/MeoAssistant/ImageAnalyzer/RoguelikeFormationImageAnalyzer.cpp index e6a081e2eb..451ef022d0 100644 --- a/src/MeoAssistant/ImageAnalyzer/RoguelikeFormationImageAnalyzer.cpp +++ b/src/MeoAssistant/ImageAnalyzer/RoguelikeFormationImageAnalyzer.cpp @@ -1,10 +1,10 @@ #include "RoguelikeFormationImageAnalyzer.h" -#include "NoWarningCV.h" +#include "Utils/NoWarningCV.h" -#include "AsstUtils.hpp" -#include "Logger.hpp" -#include "MultiMatchImageAnalyzer.h" +#include "Utils/AsstUtils.hpp" +#include "Utils/Logger.hpp" +#include "General/MultiMatchImageAnalyzer.h" #include "TaskData.h" bool asst::RoguelikeFormationImageAnalyzer::analyze() diff --git a/src/MeoAssistant/ImageAnalyzer/RoguelikeFormationImageAnalyzer.h b/src/MeoAssistant/ImageAnalyzer/RoguelikeFormationImageAnalyzer.h index 077a9f0570..ad2e0375c7 100644 --- a/src/MeoAssistant/ImageAnalyzer/RoguelikeFormationImageAnalyzer.h +++ b/src/MeoAssistant/ImageAnalyzer/RoguelikeFormationImageAnalyzer.h @@ -1,5 +1,5 @@ #pragma once -#include "AbstractImageAnalyzer.h" +#include "General/AbstractImageAnalyzer.h" namespace asst { diff --git a/src/MeoAssistant/ImageAnalyzer/RoguelikeRecruitImageAnalyzer.cpp b/src/MeoAssistant/ImageAnalyzer/RoguelikeRecruitImageAnalyzer.cpp index 4a0effab50..6532be3574 100644 --- a/src/MeoAssistant/ImageAnalyzer/RoguelikeRecruitImageAnalyzer.cpp +++ b/src/MeoAssistant/ImageAnalyzer/RoguelikeRecruitImageAnalyzer.cpp @@ -1,8 +1,8 @@ #include "RoguelikeRecruitImageAnalyzer.h" -#include "Logger.hpp" -#include "MatchImageAnalyzer.h" -#include "OcrWithFlagTemplImageAnalyzer.h" +#include "Utils/Logger.hpp" +#include "General/MatchImageAnalyzer.h" +#include "General/OcrWithFlagTemplImageAnalyzer.h" #include "TaskData.h" bool asst::RoguelikeRecruitImageAnalyzer::analyze() diff --git a/src/MeoAssistant/ImageAnalyzer/RoguelikeRecruitImageAnalyzer.h b/src/MeoAssistant/ImageAnalyzer/RoguelikeRecruitImageAnalyzer.h index 09ce2108e7..388b34ddc9 100644 --- a/src/MeoAssistant/ImageAnalyzer/RoguelikeRecruitImageAnalyzer.h +++ b/src/MeoAssistant/ImageAnalyzer/RoguelikeRecruitImageAnalyzer.h @@ -1,5 +1,5 @@ #pragma once -#include "AbstractImageAnalyzer.h" +#include "General/AbstractImageAnalyzer.h" #include "AsstBattleDef.h" diff --git a/src/MeoAssistant/ImageAnalyzer/RoguelikeSkillSelectionImageAnalyzer.cpp b/src/MeoAssistant/ImageAnalyzer/RoguelikeSkillSelectionImageAnalyzer.cpp index a02037067f..855ed21869 100644 --- a/src/MeoAssistant/ImageAnalyzer/RoguelikeSkillSelectionImageAnalyzer.cpp +++ b/src/MeoAssistant/ImageAnalyzer/RoguelikeSkillSelectionImageAnalyzer.cpp @@ -1,12 +1,12 @@ #include "RoguelikeSkillSelectionImageAnalyzer.h" -#include "NoWarningCV.h" +#include "Utils/NoWarningCV.h" -#include "AsstUtils.hpp" -#include "Logger.hpp" -#include "MultiMatchImageAnalyzer.h" -#include "OcrWithPreprocessImageAnalyzer.h" -#include "RoguelikeRecruitConfiger.h" +#include "Utils/AsstUtils.hpp" +#include "Utils/Logger.hpp" +#include "General/MultiMatchImageAnalyzer.h" +#include "General/OcrWithPreprocessImageAnalyzer.h" +#include "Resource/RoguelikeRecruitConfiger.h" #include "TaskData.h" bool asst::RoguelikeSkillSelectionImageAnalyzer::analyze() diff --git a/src/MeoAssistant/ImageAnalyzer/RoguelikeSkillSelectionImageAnalyzer.h b/src/MeoAssistant/ImageAnalyzer/RoguelikeSkillSelectionImageAnalyzer.h index eacc64c782..253f996517 100644 --- a/src/MeoAssistant/ImageAnalyzer/RoguelikeSkillSelectionImageAnalyzer.h +++ b/src/MeoAssistant/ImageAnalyzer/RoguelikeSkillSelectionImageAnalyzer.h @@ -1,5 +1,5 @@ #pragma once -#include "AbstractImageAnalyzer.h" +#include "General/AbstractImageAnalyzer.h" namespace asst { diff --git a/src/MeoAssistant/ImageAnalyzer/StageDropsImageAnalyzer.cpp b/src/MeoAssistant/ImageAnalyzer/StageDropsImageAnalyzer.cpp index db8cf04458..d5af7ec3bc 100644 --- a/src/MeoAssistant/ImageAnalyzer/StageDropsImageAnalyzer.cpp +++ b/src/MeoAssistant/ImageAnalyzer/StageDropsImageAnalyzer.cpp @@ -1,16 +1,16 @@ #include "StageDropsImageAnalyzer.h" -#include "AsstRanges.hpp" +#include "Utils/AsstRanges.hpp" -#include "NoWarningCV.h" +#include "Utils/NoWarningCV.h" -#include "AsstImageIo.hpp" -#include "AsstUtils.hpp" -#include "ItemConfiger.h" -#include "Logger.hpp" -#include "MatchImageAnalyzer.h" -#include "OcrWithPreprocessImageAnalyzer.h" -#include "StageDropsConfiger.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/StageDropsConfiger.h" #include "TaskData.h" #include diff --git a/src/MeoAssistant/ImageAnalyzer/StageDropsImageAnalyzer.h b/src/MeoAssistant/ImageAnalyzer/StageDropsImageAnalyzer.h index 0a6a78b74d..00fc7ec10b 100644 --- a/src/MeoAssistant/ImageAnalyzer/StageDropsImageAnalyzer.h +++ b/src/MeoAssistant/ImageAnalyzer/StageDropsImageAnalyzer.h @@ -1,6 +1,6 @@ #pragma once -#include "AbstractImageAnalyzer.h" -#include "StageDropsConfiger.h" +#include "General/AbstractImageAnalyzer.h" +#include "Resource/StageDropsConfiger.h" namespace asst { diff --git a/src/MeoAssistant/Resource/AbstractConfiger.cpp b/src/MeoAssistant/Resource/AbstractConfiger.cpp index fc36aa9926..2b748b669c 100644 --- a/src/MeoAssistant/Resource/AbstractConfiger.cpp +++ b/src/MeoAssistant/Resource/AbstractConfiger.cpp @@ -2,8 +2,8 @@ #include -#include "AsstUtils.hpp" -#include "Logger.hpp" +#include "Utils/AsstUtils.hpp" +#include "Utils/Logger.hpp" bool asst::AbstractConfiger::load(const std::filesystem::path& path) { diff --git a/src/MeoAssistant/Resource/AbstractResource.h b/src/MeoAssistant/Resource/AbstractResource.h index dd27da354b..c6f4cb09f2 100644 --- a/src/MeoAssistant/Resource/AbstractResource.h +++ b/src/MeoAssistant/Resource/AbstractResource.h @@ -2,7 +2,7 @@ #include -#include "SingletonHolder.hpp" +#include "Utils/SingletonHolder.hpp" namespace asst { diff --git a/src/MeoAssistant/Resource/BattleDataConfiger.cpp b/src/MeoAssistant/Resource/BattleDataConfiger.cpp index cc0ad036b3..898aa384b0 100644 --- a/src/MeoAssistant/Resource/BattleDataConfiger.cpp +++ b/src/MeoAssistant/Resource/BattleDataConfiger.cpp @@ -1,6 +1,6 @@ #include "BattleDataConfiger.h" -#include "AsstRanges.hpp" +#include "Utils/AsstRanges.hpp" #include bool asst::BattleDataConfiger::parse(const json::value& json) diff --git a/src/MeoAssistant/Resource/BattleDataConfiger.h b/src/MeoAssistant/Resource/BattleDataConfiger.h index 7316f88f1a..d0e3232ba9 100644 --- a/src/MeoAssistant/Resource/BattleDataConfiger.h +++ b/src/MeoAssistant/Resource/BattleDataConfiger.h @@ -4,7 +4,7 @@ #include #include "AsstBattleDef.h" -#include "AsstTypes.h" +#include "Utils/AsstTypes.h" namespace asst { diff --git a/src/MeoAssistant/Resource/CopilotConfiger.cpp b/src/MeoAssistant/Resource/CopilotConfiger.cpp index b4dc677ad7..cd9e743989 100644 --- a/src/MeoAssistant/Resource/CopilotConfiger.cpp +++ b/src/MeoAssistant/Resource/CopilotConfiger.cpp @@ -2,7 +2,7 @@ #include -#include "Logger.hpp" +#include "Utils/Logger.hpp" bool asst::CopilotConfiger::parse(const json::value& json) { diff --git a/src/MeoAssistant/Resource/GeneralConfiger.cpp b/src/MeoAssistant/Resource/GeneralConfiger.cpp index 866fa1701f..2ca676a397 100644 --- a/src/MeoAssistant/Resource/GeneralConfiger.cpp +++ b/src/MeoAssistant/Resource/GeneralConfiger.cpp @@ -1,6 +1,6 @@ #include "GeneralConfiger.h" -#include "Logger.hpp" +#include "Utils/Logger.hpp" #include bool asst::GeneralConfiger::parse(const json::value& json) diff --git a/src/MeoAssistant/Resource/GeneralConfiger.h b/src/MeoAssistant/Resource/GeneralConfiger.h index 35dd2e6fb0..61e723fc01 100644 --- a/src/MeoAssistant/Resource/GeneralConfiger.h +++ b/src/MeoAssistant/Resource/GeneralConfiger.h @@ -7,7 +7,7 @@ #include #include -#include "AsstTypes.h" +#include "Utils/AsstTypes.h" namespace asst { diff --git a/src/MeoAssistant/Resource/InfrastConfiger.cpp b/src/MeoAssistant/Resource/InfrastConfiger.cpp index 28ec52d8d3..6b132c60ac 100644 --- a/src/MeoAssistant/Resource/InfrastConfiger.cpp +++ b/src/MeoAssistant/Resource/InfrastConfiger.cpp @@ -2,7 +2,7 @@ #include -#include "Logger.hpp" +#include "Utils/Logger.hpp" bool asst::InfrastConfiger::parse(const json::value& json) { diff --git a/src/MeoAssistant/Resource/InfrastConfiger.h b/src/MeoAssistant/Resource/InfrastConfiger.h index bde39ce01e..d9461b88dd 100644 --- a/src/MeoAssistant/Resource/InfrastConfiger.h +++ b/src/MeoAssistant/Resource/InfrastConfiger.h @@ -4,7 +4,7 @@ #include #include -#include "AsstInfrastDef.h" +#include "Utils/AsstInfrastDef.h" namespace asst { diff --git a/src/MeoAssistant/Resource/ItemConfiger.cpp b/src/MeoAssistant/Resource/ItemConfiger.cpp index 871993021f..4bc9dfafef 100644 --- a/src/MeoAssistant/Resource/ItemConfiger.cpp +++ b/src/MeoAssistant/Resource/ItemConfiger.cpp @@ -1,9 +1,9 @@ #include "ItemConfiger.h" -#include "AsstRanges.hpp" +#include "Utils/AsstRanges.hpp" #include -#include "Logger.hpp" +#include "Utils/Logger.hpp" bool asst::ItemConfiger::parse(const json::value& json) { diff --git a/src/MeoAssistant/Resource/OcrPack.cpp b/src/MeoAssistant/Resource/OcrPack.cpp index 74b978df87..92819767a7 100644 --- a/src/MeoAssistant/Resource/OcrPack.cpp +++ b/src/MeoAssistant/Resource/OcrPack.cpp @@ -2,15 +2,15 @@ #include -#include "NoWarningCV.h" +#include "Utils/NoWarningCV.h" #include -#include "AsstUtils.hpp" -#include "Logger.hpp" +#include "Utils/AsstUtils.hpp" +#include "Utils/Logger.hpp" #ifdef _WIN32 -#include "AsstPlatformWin32.h" -#include "SafeWindows.h" +#include "Utils/AsstPlatformWin32.h" +#include "Utils/SafeWindows.h" #include static std::filesystem::path prepare_paddle_dir(const std::filesystem::path& dir, bool* is_temp); #else diff --git a/src/MeoAssistant/Resource/OcrPack.h b/src/MeoAssistant/Resource/OcrPack.h index fd313de5f1..158c6cc670 100644 --- a/src/MeoAssistant/Resource/OcrPack.h +++ b/src/MeoAssistant/Resource/OcrPack.h @@ -3,7 +3,7 @@ #include -#include "AsstTypes.h" +#include "Utils/AsstTypes.h" namespace cv { diff --git a/src/MeoAssistant/Resource/RecruitConfiger.cpp b/src/MeoAssistant/Resource/RecruitConfiger.cpp index 7cf8d8b513..35f16ab2b0 100644 --- a/src/MeoAssistant/Resource/RecruitConfiger.cpp +++ b/src/MeoAssistant/Resource/RecruitConfiger.cpp @@ -4,7 +4,7 @@ #include -#include "Logger.hpp" +#include "Utils/Logger.hpp" std::string asst::RecruitConfiger::get_tag_name(const TagId& id) const noexcept { diff --git a/src/MeoAssistant/Resource/RecruitConfiger.h b/src/MeoAssistant/Resource/RecruitConfiger.h index 48d06e1c82..a602279aa0 100644 --- a/src/MeoAssistant/Resource/RecruitConfiger.h +++ b/src/MeoAssistant/Resource/RecruitConfiger.h @@ -2,14 +2,14 @@ #include "AbstractConfiger.h" -#include "AsstRanges.hpp" +#include "Utils/AsstRanges.hpp" #include #include #include #include #include -#include "AsstTypes.h" +#include "Utils/AsstTypes.h" namespace asst { diff --git a/src/MeoAssistant/Resource/RoguelikeCopilotConfiger.cpp b/src/MeoAssistant/Resource/RoguelikeCopilotConfiger.cpp index 3c440d30d8..533c4b35bb 100644 --- a/src/MeoAssistant/Resource/RoguelikeCopilotConfiger.cpp +++ b/src/MeoAssistant/Resource/RoguelikeCopilotConfiger.cpp @@ -2,7 +2,7 @@ #include -#include "Logger.hpp" +#include "Utils/Logger.hpp" std::optional asst::RoguelikeCopilotConfiger::get_stage_data( const std::string& stage_name) const diff --git a/src/MeoAssistant/Resource/RoguelikeRecruitConfiger.h b/src/MeoAssistant/Resource/RoguelikeRecruitConfiger.h index 37ce61bd06..0eee5dd8d9 100644 --- a/src/MeoAssistant/Resource/RoguelikeRecruitConfiger.h +++ b/src/MeoAssistant/Resource/RoguelikeRecruitConfiger.h @@ -7,7 +7,7 @@ #include #include "AsstBattleDef.h" -#include "AsstTypes.h" +#include "Utils/AsstTypes.h" namespace asst { diff --git a/src/MeoAssistant/Resource/TemplResource.cpp b/src/MeoAssistant/Resource/TemplResource.cpp index 143f94abf0..8677583c7b 100644 --- a/src/MeoAssistant/Resource/TemplResource.cpp +++ b/src/MeoAssistant/Resource/TemplResource.cpp @@ -4,10 +4,10 @@ #include #include -#include "NoWarningCV.h" +#include "Utils/NoWarningCV.h" -#include "AsstImageIo.hpp" -#include "Logger.hpp" +#include "Utils/AsstImageIo.hpp" +#include "Utils/Logger.hpp" void asst::TemplResource::set_load_required(std::unordered_set required) noexcept { diff --git a/src/MeoAssistant/Resource/TemplResource.h b/src/MeoAssistant/Resource/TemplResource.h index 8a9d8aff77..893a891d82 100644 --- a/src/MeoAssistant/Resource/TemplResource.h +++ b/src/MeoAssistant/Resource/TemplResource.h @@ -1,12 +1,12 @@ #pragma once #include "AbstractResource.h" -#include "SingletonHolder.hpp" +#include "Utils/SingletonHolder.hpp" #include #include -#include "NoWarningCVMat.h" +#include "Utils/NoWarningCVMat.h" namespace asst { diff --git a/src/MeoAssistant/Resource/TilePack.cpp b/src/MeoAssistant/Resource/TilePack.cpp index 010f2862a3..cdf0978a91 100644 --- a/src/MeoAssistant/Resource/TilePack.cpp +++ b/src/MeoAssistant/Resource/TilePack.cpp @@ -1,11 +1,11 @@ #include "TilePack.h" -#include "AsstConf.h" +#include "Utils/AsstConf.h" ASST_SUPPRESS_CV_WARNINGS_START #include ASST_SUPPRESS_CV_WARNINGS_END -#include "Logger.hpp" +#include "Utils/Logger.hpp" asst::TilePack::~TilePack() = default; diff --git a/src/MeoAssistant/Resource/TilePack.h b/src/MeoAssistant/Resource/TilePack.h index ad25319d0c..4fde80d361 100644 --- a/src/MeoAssistant/Resource/TilePack.h +++ b/src/MeoAssistant/Resource/TilePack.h @@ -1,7 +1,7 @@ #pragma once #include "AbstractResource.h" -#include "AsstTypes.h" +#include "Utils/AsstTypes.h" #include diff --git a/src/MeoAssistant/ResourceLoader.cpp b/src/MeoAssistant/ResourceLoader.cpp index c630f2d402..392fce9741 100644 --- a/src/MeoAssistant/ResourceLoader.cpp +++ b/src/MeoAssistant/ResourceLoader.cpp @@ -2,22 +2,22 @@ #include -#include "Logger.hpp" +#include "Utils/Logger.hpp" -#include "BattleDataConfiger.h" -#include "CopilotConfiger.h" -#include "GeneralConfiger.h" -#include "InfrastConfiger.h" -#include "ItemConfiger.h" -#include "OcrPack.h" -#include "RecruitConfiger.h" -#include "RoguelikeCopilotConfiger.h" -#include "RoguelikeRecruitConfiger.h" -#include "RoguelikeShoppingConfiger.h" -#include "StageDropsConfiger.h" +#include "Resource/BattleDataConfiger.h" +#include "Resource/CopilotConfiger.h" +#include "Resource/GeneralConfiger.h" +#include "Resource/InfrastConfiger.h" +#include "Resource/ItemConfiger.h" +#include "Resource/OcrPack.h" +#include "Resource/RecruitConfiger.h" +#include "Resource/RoguelikeCopilotConfiger.h" +#include "Resource/RoguelikeRecruitConfiger.h" +#include "Resource/RoguelikeShoppingConfiger.h" +#include "Resource/StageDropsConfiger.h" #include "TaskData.h" -#include "TemplResource.h" -#include "TilePack.h" +#include "Resource/TemplResource.h" +#include "Resource/TilePack.h" bool asst::ResourceLoader::load(const std::filesystem::path& path) { diff --git a/src/MeoAssistant/ResourceLoader.h b/src/MeoAssistant/ResourceLoader.h index b12a5a3d4f..5f8e8e6444 100644 --- a/src/MeoAssistant/ResourceLoader.h +++ b/src/MeoAssistant/ResourceLoader.h @@ -1,12 +1,12 @@ #pragma once -#include "AbstractResource.h" -#include "SingletonHolder.hpp" +#include "Resource/AbstractResource.h" +#include "Utils/SingletonHolder.hpp" #include -#include "AbstractConfigerWithTempl.h" -#include "TemplResource.h" +#include "Resource/AbstractConfigerWithTempl.h" +#include "Resource/TemplResource.h" namespace asst { diff --git a/src/MeoAssistant/RuntimeStatus.h b/src/MeoAssistant/RuntimeStatus.h index 01079af9d6..2f5f4deede 100644 --- a/src/MeoAssistant/RuntimeStatus.h +++ b/src/MeoAssistant/RuntimeStatus.h @@ -5,7 +5,7 @@ #include #include -#include "AsstTypes.h" +#include "Utils/AsstTypes.h" namespace asst { diff --git a/src/MeoAssistant/Task/AwardTask.cpp b/src/MeoAssistant/Task/AwardTask.cpp index 6e783a7cec..f696889c0c 100644 --- a/src/MeoAssistant/Task/AwardTask.cpp +++ b/src/MeoAssistant/Task/AwardTask.cpp @@ -2,7 +2,7 @@ #include -#include "ProcessTask.h" +#include "Sub/ProcessTask.h" asst::AwardTask::AwardTask(AsstCallback callback, void* callback_arg) : PackageTask(std::move(callback), callback_arg, TaskType), diff --git a/src/MeoAssistant/Task/CloseDownTask.cpp b/src/MeoAssistant/Task/CloseDownTask.cpp index cc1548aa02..7b8e896f0b 100644 --- a/src/MeoAssistant/Task/CloseDownTask.cpp +++ b/src/MeoAssistant/Task/CloseDownTask.cpp @@ -2,7 +2,7 @@ #include -#include "ProcessTask.h" +#include "Sub/ProcessTask.h" asst::CloseDownTask::CloseDownTask(AsstCallback callback, void* callback_arg) : PackageTask(std::move(callback), callback_arg, TaskType), diff --git a/src/MeoAssistant/Task/CloseDownTask.h b/src/MeoAssistant/Task/CloseDownTask.h index 77ecb08771..348b5b5618 100644 --- a/src/MeoAssistant/Task/CloseDownTask.h +++ b/src/MeoAssistant/Task/CloseDownTask.h @@ -1,6 +1,6 @@ #pragma once #include "PackageTask.h" -#include "StopGameTaskPlugin.h" +#include "Plugin/StopGameTaskPlugin.h" namespace asst { diff --git a/src/MeoAssistant/Task/CopilotTask.cpp b/src/MeoAssistant/Task/CopilotTask.cpp index 7c30f21aaa..e455d94a65 100644 --- a/src/MeoAssistant/Task/CopilotTask.cpp +++ b/src/MeoAssistant/Task/CopilotTask.cpp @@ -1,11 +1,11 @@ #include "CopilotTask.h" -#include "AsstUtils.hpp" -#include "BattleFormationTask.h" -#include "BattleProcessTask.h" -#include "CopilotConfiger.h" -#include "Logger.hpp" -#include "ProcessTask.h" +#include "Utils/AsstUtils.hpp" +#include "Sub/BattleFormationTask.h" +#include "Sub/BattleProcessTask.h" +#include "Resource/CopilotConfiger.h" +#include "Utils/Logger.hpp" +#include "Sub/ProcessTask.h" asst::CopilotTask::CopilotTask(const AsstCallback& callback, void* callback_arg) : PackageTask(callback, callback_arg, TaskType), diff --git a/src/MeoAssistant/Task/DebugTask.cpp b/src/MeoAssistant/Task/DebugTask.cpp index e24086f980..c0bee4bde6 100644 --- a/src/MeoAssistant/Task/DebugTask.cpp +++ b/src/MeoAssistant/Task/DebugTask.cpp @@ -2,14 +2,14 @@ #include -#include "NoWarningCV.h" +#include "Utils/NoWarningCV.h" -// #include "RoguelikeSkillSelectionTaskPlugin.h" +// #include "Plugin/RoguelikeSkillSelectionTaskPlugin.h" -#include "AsstImageIo.hpp" -#include "DepotImageAnalyzer.h" -#include "Logger.hpp" -#include "StageDropsImageAnalyzer.h" +#include "Utils/AsstImageIo.hpp" +#include "ImageAnalyzer/DepotImageAnalyzer.h" +#include "Utils/Logger.hpp" +#include "ImageAnalyzer/StageDropsImageAnalyzer.h" asst::DebugTask::DebugTask(const AsstCallback& callback, void* callback_arg) : PackageTask(callback, callback_arg, TaskType) diff --git a/src/MeoAssistant/Task/DepotTask.cpp b/src/MeoAssistant/Task/DepotTask.cpp index 34ec68656b..113c657790 100644 --- a/src/MeoAssistant/Task/DepotTask.cpp +++ b/src/MeoAssistant/Task/DepotTask.cpp @@ -1,7 +1,7 @@ #include "DepotTask.h" -#include "DepotRecognitionTask.h" -#include "ProcessTask.h" +#include "Sub/DepotRecognitionTask.h" +#include "Sub/ProcessTask.h" asst::DepotTask::DepotTask(AsstCallback callback, void* callback_arg) : PackageTask(std::move(callback), callback_arg, TaskType) diff --git a/src/MeoAssistant/Task/FightTask.cpp b/src/MeoAssistant/Task/FightTask.cpp index f368d96d1e..2773886449 100644 --- a/src/MeoAssistant/Task/FightTask.cpp +++ b/src/MeoAssistant/Task/FightTask.cpp @@ -2,11 +2,11 @@ #include -#include "DrGrandetTaskPlugin.h" -#include "GameCrashRestartTaskPlugin.h" -#include "ProcessTask.h" -#include "StageDropsTaskPlugin.h" -#include "StageNavigationTask.h" +#include "Plugin/DrGrandetTaskPlugin.h" +#include "Plugin/GameCrashRestartTaskPlugin.h" +#include "Sub/ProcessTask.h" +#include "Plugin/StageDropsTaskPlugin.h" +#include "Sub/StageNavigationTask.h" asst::FightTask::FightTask(AsstCallback callback, void* callback_arg) : PackageTask(std::move(callback), callback_arg, TaskType), diff --git a/src/MeoAssistant/Task/InfrastTask.cpp b/src/MeoAssistant/Task/InfrastTask.cpp index 8357d0516f..472f2f9f64 100644 --- a/src/MeoAssistant/Task/InfrastTask.cpp +++ b/src/MeoAssistant/Task/InfrastTask.cpp @@ -1,18 +1,18 @@ #include "InfrastTask.h" -#include "Logger.hpp" +#include "Utils/Logger.hpp" -#include "DronesForShamareTaskPlugin.h" -#include "InfrastControlTask.h" -#include "InfrastDormTask.h" -#include "InfrastInfoTask.h" -#include "InfrastMfgTask.h" -#include "InfrastOfficeTask.h" -#include "InfrastPowerTask.h" -#include "InfrastReceptionTask.h" -#include "InfrastTradeTask.h" -#include "ProcessTask.h" -#include "ReplenishOriginiumShardTaskPlugin.h" +#include "Plugin/DronesForShamareTaskPlugin.h" +#include "Sub/InfrastControlTask.h" +#include "Sub/InfrastDormTask.h" +#include "Sub/InfrastInfoTask.h" +#include "Sub/InfrastMfgTask.h" +#include "Sub/InfrastOfficeTask.h" +#include "Sub/InfrastPowerTask.h" +#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 df52385cfc..2c07a3ef2a 100644 --- a/src/MeoAssistant/Task/MallTask.cpp +++ b/src/MeoAssistant/Task/MallTask.cpp @@ -1,7 +1,7 @@ #include "MallTask.h" -#include "CreditShoppingTask.h" -#include "ProcessTask.h" +#include "Sub/CreditShoppingTask.h" +#include "Sub/ProcessTask.h" asst::MallTask::MallTask(const AsstCallback& callback, void* callback_arg) : PackageTask(callback, callback_arg, TaskType), diff --git a/src/MeoAssistant/Task/PackageTask.cpp b/src/MeoAssistant/Task/PackageTask.cpp index 73f561ad56..7fd5ac9313 100644 --- a/src/MeoAssistant/Task/PackageTask.cpp +++ b/src/MeoAssistant/Task/PackageTask.cpp @@ -1,7 +1,7 @@ #include "PackageTask.h" -#include "GeneralConfiger.h" -#include "Logger.hpp" +#include "Resource/GeneralConfiger.h" +#include "Utils/Logger.hpp" bool asst::PackageTask::run() { diff --git a/src/MeoAssistant/Task/PackageTask.h b/src/MeoAssistant/Task/PackageTask.h index a93922b7f8..002fede442 100644 --- a/src/MeoAssistant/Task/PackageTask.h +++ b/src/MeoAssistant/Task/PackageTask.h @@ -1,6 +1,6 @@ #pragma once -#include "AbstractTask.h" +#include "Sub/AbstractTask.h" #include #include diff --git a/src/MeoAssistant/Task/Plugin/AbstractTaskPlugin.h b/src/MeoAssistant/Task/Plugin/AbstractTaskPlugin.h index c753ce236c..9199e2833e 100644 --- a/src/MeoAssistant/Task/Plugin/AbstractTaskPlugin.h +++ b/src/MeoAssistant/Task/Plugin/AbstractTaskPlugin.h @@ -2,8 +2,8 @@ #include -#include "AbstractTask.h" -#include "AsstMsg.h" +#include "../Sub/AbstractTask.h" +#include "Utils/AsstMsg.h" namespace asst { diff --git a/src/MeoAssistant/Task/Plugin/DrGrandetTaskPlugin.cpp b/src/MeoAssistant/Task/Plugin/DrGrandetTaskPlugin.cpp index 759fb70cbf..8776cb1a73 100644 --- a/src/MeoAssistant/Task/Plugin/DrGrandetTaskPlugin.cpp +++ b/src/MeoAssistant/Task/Plugin/DrGrandetTaskPlugin.cpp @@ -1,8 +1,8 @@ #include "DrGrandetTaskPlugin.h" #include "Controller.h" -#include "Logger.hpp" -#include "OcrImageAnalyzer.h" +#include "Utils/Logger.hpp" +#include "ImageAnalyzer/General/OcrImageAnalyzer.h" #include "TaskData.h" #include diff --git a/src/MeoAssistant/Task/Plugin/DronesForShamareTaskPlugin.cpp b/src/MeoAssistant/Task/Plugin/DronesForShamareTaskPlugin.cpp index 2260dfe37a..4cfdfa8cce 100644 --- a/src/MeoAssistant/Task/Plugin/DronesForShamareTaskPlugin.cpp +++ b/src/MeoAssistant/Task/Plugin/DronesForShamareTaskPlugin.cpp @@ -1,7 +1,7 @@ #include "DronesForShamareTaskPlugin.h" -#include "InfrastProductionTask.h" -#include "ProcessTask.h" +#include "../Sub/InfrastProductionTask.h" +#include "../Sub/ProcessTask.h" bool asst::DronesForShamareTaskPlugin::verify(AsstMsg msg, const json::value& details) const { diff --git a/src/MeoAssistant/Task/Plugin/ReplenishOriginiumShardTaskPlugin.cpp b/src/MeoAssistant/Task/Plugin/ReplenishOriginiumShardTaskPlugin.cpp index aa2edfc4eb..6917cc520c 100644 --- a/src/MeoAssistant/Task/Plugin/ReplenishOriginiumShardTaskPlugin.cpp +++ b/src/MeoAssistant/Task/Plugin/ReplenishOriginiumShardTaskPlugin.cpp @@ -1,6 +1,6 @@ #include "ReplenishOriginiumShardTaskPlugin.h" -#include "ProcessTask.h" +#include "../Sub/ProcessTask.h" bool asst::ReplenishOriginiumShardTaskPlugin::verify(AsstMsg msg, const json::value& details) const { diff --git a/src/MeoAssistant/Task/Plugin/RoguelikeBattleTaskPlugin.cpp b/src/MeoAssistant/Task/Plugin/RoguelikeBattleTaskPlugin.cpp index 88061a818f..e998ac26a2 100644 --- a/src/MeoAssistant/Task/Plugin/RoguelikeBattleTaskPlugin.cpp +++ b/src/MeoAssistant/Task/Plugin/RoguelikeBattleTaskPlugin.cpp @@ -1,23 +1,23 @@ #include "RoguelikeBattleTaskPlugin.h" -#include "AsstRanges.hpp" +#include "Utils/AsstRanges.hpp" #include #include -#include "NoWarningCV.h" +#include "Utils/NoWarningCV.h" -#include "AsstImageIo.hpp" -#include "BattleDataConfiger.h" -#include "BattleImageAnalyzer.h" +#include "Utils/AsstImageIo.hpp" +#include "Resource/BattleDataConfiger.h" +#include "ImageAnalyzer/BattleImageAnalyzer.h" #include "Controller.h" -#include "Logger.hpp" -#include "MatchImageAnalyzer.h" -#include "OcrWithPreprocessImageAnalyzer.h" -#include "ProcessTask.h" -#include "RoguelikeCopilotConfiger.h" +#include "Utils/Logger.hpp" +#include "ImageAnalyzer/General/MatchImageAnalyzer.h" +#include "ImageAnalyzer/General/OcrWithPreprocessImageAnalyzer.h" +#include "../Sub/ProcessTask.h" +#include "Resource/RoguelikeCopilotConfiger.h" #include "RuntimeStatus.h" #include "TaskData.h" -#include "TilePack.h" +#include "Resource/TilePack.h" 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 fc28149e90..1fb7d0ae0e 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 "AsstTypes.h" -#include "BattleImageAnalyzer.h" -#include "TilePack.h" +#include "Utils/AsstTypes.h" +#include "ImageAnalyzer/BattleImageAnalyzer.h" +#include "Resource/TilePack.h" namespace asst { diff --git a/src/MeoAssistant/Task/Plugin/RoguelikeCustomStartTaskPlugin.cpp b/src/MeoAssistant/Task/Plugin/RoguelikeCustomStartTaskPlugin.cpp index cd9bb423a8..781e2cf8d4 100644 --- a/src/MeoAssistant/Task/Plugin/RoguelikeCustomStartTaskPlugin.cpp +++ b/src/MeoAssistant/Task/Plugin/RoguelikeCustomStartTaskPlugin.cpp @@ -1,10 +1,10 @@ #include "RoguelikeCustomStartTaskPlugin.h" -#include "BattleDataConfiger.h" +#include "Resource/BattleDataConfiger.h" #include "Controller.h" -#include "Logger.hpp" -#include "OcrImageAnalyzer.h" -#include "ProcessTask.h" +#include "Utils/Logger.hpp" +#include "ImageAnalyzer/General/OcrImageAnalyzer.h" +#include "../Sub/ProcessTask.h" #include "RuntimeStatus.h" #include "TaskData.h" diff --git a/src/MeoAssistant/Task/Plugin/RoguelikeFormationTaskPlugin.cpp b/src/MeoAssistant/Task/Plugin/RoguelikeFormationTaskPlugin.cpp index 00f6c04062..c3cc642830 100644 --- a/src/MeoAssistant/Task/Plugin/RoguelikeFormationTaskPlugin.cpp +++ b/src/MeoAssistant/Task/Plugin/RoguelikeFormationTaskPlugin.cpp @@ -1,11 +1,11 @@ #include "RoguelikeFormationTaskPlugin.h" -#include "AsstRanges.hpp" +#include "Utils/AsstRanges.hpp" #include "Controller.h" -#include "Logger.hpp" -#include "ProcessTask.h" -#include "RoguelikeFormationImageAnalyzer.h" +#include "Utils/Logger.hpp" +#include "../Sub/ProcessTask.h" +#include "ImageAnalyzer/RoguelikeFormationImageAnalyzer.h" #include "TaskData.h" 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 a00285084f..60eb47f704 100644 --- a/src/MeoAssistant/Task/Plugin/RoguelikeRecruitTaskPlugin.cpp +++ b/src/MeoAssistant/Task/Plugin/RoguelikeRecruitTaskPlugin.cpp @@ -1,10 +1,10 @@ #include "RoguelikeRecruitTaskPlugin.h" #include "Controller.h" -#include "Logger.hpp" -#include "ProcessTask.h" -#include "RoguelikeRecruitConfiger.h" -#include "RoguelikeRecruitImageAnalyzer.h" +#include "Utils/Logger.hpp" +#include "../Sub/ProcessTask.h" +#include "Resource/RoguelikeRecruitConfiger.h" +#include "ImageAnalyzer/RoguelikeRecruitImageAnalyzer.h" #include "RuntimeStatus.h" #include "TaskData.h" diff --git a/src/MeoAssistant/Task/Plugin/RoguelikeShoppingTaskPlugin.cpp b/src/MeoAssistant/Task/Plugin/RoguelikeShoppingTaskPlugin.cpp index c55e5ac2b2..e49529995a 100644 --- a/src/MeoAssistant/Task/Plugin/RoguelikeShoppingTaskPlugin.cpp +++ b/src/MeoAssistant/Task/Plugin/RoguelikeShoppingTaskPlugin.cpp @@ -1,11 +1,11 @@ #include "RoguelikeShoppingTaskPlugin.h" -#include "BattleDataConfiger.h" +#include "Resource/BattleDataConfiger.h" #include "Controller.h" -#include "Logger.hpp" -#include "OcrWithFlagTemplImageAnalyzer.h" -#include "ProcessTask.h" -#include "RoguelikeShoppingConfiger.h" +#include "Utils/Logger.hpp" +#include "ImageAnalyzer/General/OcrWithFlagTemplImageAnalyzer.h" +#include "../Sub/ProcessTask.h" +#include "Resource/RoguelikeShoppingConfiger.h" #include "RuntimeStatus.h" 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 2933f139c9..6b19db556d 100644 --- a/src/MeoAssistant/Task/Plugin/RoguelikeSkillSelectionTaskPlugin.cpp +++ b/src/MeoAssistant/Task/Plugin/RoguelikeSkillSelectionTaskPlugin.cpp @@ -1,12 +1,12 @@ #include "RoguelikeSkillSelectionTaskPlugin.h" #include "Controller.h" -#include "RoguelikeRecruitConfiger.h" -#include "RoguelikeSkillSelectionImageAnalyzer.h" +#include "Resource/RoguelikeRecruitConfiger.h" +#include "ImageAnalyzer/RoguelikeSkillSelectionImageAnalyzer.h" #include "RuntimeStatus.h" #include "TaskData.h" -#include "Logger.hpp" +#include "Utils/Logger.hpp" bool asst::RoguelikeSkillSelectionTaskPlugin::verify(AsstMsg msg, const json::value& details) const { diff --git a/src/MeoAssistant/Task/Plugin/StageDropsTaskPlugin.cpp b/src/MeoAssistant/Task/Plugin/StageDropsTaskPlugin.cpp index e586095a63..f0d5ceaffb 100644 --- a/src/MeoAssistant/Task/Plugin/StageDropsTaskPlugin.cpp +++ b/src/MeoAssistant/Task/Plugin/StageDropsTaskPlugin.cpp @@ -4,17 +4,17 @@ #include #include -#include "AsstUtils.hpp" +#include "Utils/AsstUtils.hpp" #include "Controller.h" -#include "ItemConfiger.h" -#include "Logger.hpp" -#include "ProcessTask.h" -#include "ReportDataTask.h" +#include "Resource/ItemConfiger.h" +#include "Utils/Logger.hpp" +#include "../Sub/ProcessTask.h" +#include "../Sub/ReportDataTask.h" #include "RuntimeStatus.h" -#include "StageDropsConfiger.h" -#include "StageDropsImageAnalyzer.h" +#include "Resource/StageDropsConfiger.h" +#include "ImageAnalyzer/StageDropsImageAnalyzer.h" #include "TaskData.h" -#include "Version.h" +#include "Utils/Version.h" bool asst::StageDropsTaskPlugin::verify(AsstMsg msg, const json::value& details) const { diff --git a/src/MeoAssistant/Task/Plugin/StageDropsTaskPlugin.h b/src/MeoAssistant/Task/Plugin/StageDropsTaskPlugin.h index 85557221fc..cb9ddd4e15 100644 --- a/src/MeoAssistant/Task/Plugin/StageDropsTaskPlugin.h +++ b/src/MeoAssistant/Task/Plugin/StageDropsTaskPlugin.h @@ -6,7 +6,7 @@ #include -#include "StageDropsConfiger.h" +#include "Resource/StageDropsConfiger.h" namespace asst { diff --git a/src/MeoAssistant/Task/Plugin/StartGameTaskPlugin.h b/src/MeoAssistant/Task/Plugin/StartGameTaskPlugin.h index a36c04830d..87e2b04c76 100644 --- a/src/MeoAssistant/Task/Plugin/StartGameTaskPlugin.h +++ b/src/MeoAssistant/Task/Plugin/StartGameTaskPlugin.h @@ -1,7 +1,7 @@ #pragma once #include "AbstractTaskPlugin.h" -#include "AsstTypes.h" +#include "Utils/AsstTypes.h" namespace asst { diff --git a/src/MeoAssistant/Task/Plugin/StopGameTaskPlugin.h b/src/MeoAssistant/Task/Plugin/StopGameTaskPlugin.h index 262350ad3f..c444675a23 100644 --- a/src/MeoAssistant/Task/Plugin/StopGameTaskPlugin.h +++ b/src/MeoAssistant/Task/Plugin/StopGameTaskPlugin.h @@ -1,7 +1,7 @@ #pragma once #include "AbstractTaskPlugin.h" -#include "AsstTypes.h" +#include "Utils/AsstTypes.h" namespace asst { diff --git a/src/MeoAssistant/Task/RecruitTask.cpp b/src/MeoAssistant/Task/RecruitTask.cpp index fd62d2d431..deb563daf7 100644 --- a/src/MeoAssistant/Task/RecruitTask.cpp +++ b/src/MeoAssistant/Task/RecruitTask.cpp @@ -1,7 +1,7 @@ #include "RecruitTask.h" -#include "AutoRecruitTask.h" -#include "ProcessTask.h" +#include "Sub/AutoRecruitTask.h" +#include "Sub/ProcessTask.h" asst::RecruitTask::RecruitTask(const AsstCallback& callback, void* callback_arg) : PackageTask(callback, callback_arg, TaskType), diff --git a/src/MeoAssistant/Task/RoguelikeTask.cpp b/src/MeoAssistant/Task/RoguelikeTask.cpp index 913689a3a5..cd57b10437 100644 --- a/src/MeoAssistant/Task/RoguelikeTask.cpp +++ b/src/MeoAssistant/Task/RoguelikeTask.cpp @@ -1,17 +1,17 @@ #include "RoguelikeTask.h" -#include "ProcessTask.h" -#include "RoguelikeBattleTaskPlugin.h" -#include "RoguelikeControlTaskPlugin.h" -#include "RoguelikeCustomStartTaskPlugin.h" -#include "RoguelikeDebugTaskPlugin.h" -#include "RoguelikeFormationTaskPlugin.h" -#include "RoguelikeRecruitTaskPlugin.h" -#include "RoguelikeResetTaskPlugin.h" -#include "RoguelikeShoppingTaskPlugin.h" -#include "RoguelikeSkillSelectionTaskPlugin.h" +#include "Sub/ProcessTask.h" +#include "Plugin/RoguelikeBattleTaskPlugin.h" +#include "Plugin/RoguelikeControlTaskPlugin.h" +#include "Plugin/RoguelikeCustomStartTaskPlugin.h" +#include "Plugin/RoguelikeDebugTaskPlugin.h" +#include "Plugin/RoguelikeFormationTaskPlugin.h" +#include "Plugin/RoguelikeRecruitTaskPlugin.h" +#include "Plugin/RoguelikeResetTaskPlugin.h" +#include "Plugin/RoguelikeShoppingTaskPlugin.h" +#include "Plugin/RoguelikeSkillSelectionTaskPlugin.h" -#include "Logger.hpp" +#include "Utils/Logger.hpp" asst::RoguelikeTask::RoguelikeTask(const AsstCallback& callback, void* callback_arg) : PackageTask(callback, callback_arg, TaskType), diff --git a/src/MeoAssistant/Task/StartUpTask.cpp b/src/MeoAssistant/Task/StartUpTask.cpp index bee3ae135f..6fa9ca4c8e 100644 --- a/src/MeoAssistant/Task/StartUpTask.cpp +++ b/src/MeoAssistant/Task/StartUpTask.cpp @@ -2,7 +2,7 @@ #include -#include "ProcessTask.h" +#include "Sub/ProcessTask.h" asst::StartUpTask::StartUpTask(AsstCallback callback, void* callback_arg) : PackageTask(std::move(callback), callback_arg, TaskType), diff --git a/src/MeoAssistant/Task/StartUpTask.h b/src/MeoAssistant/Task/StartUpTask.h index f9a392668e..c62981f43d 100644 --- a/src/MeoAssistant/Task/StartUpTask.h +++ b/src/MeoAssistant/Task/StartUpTask.h @@ -1,6 +1,6 @@ #pragma once #include "PackageTask.h" -#include "StartGameTaskPlugin.h" +#include "Plugin/StartGameTaskPlugin.h" namespace asst { diff --git a/src/MeoAssistant/Task/Sub/AbstractTask.cpp b/src/MeoAssistant/Task/Sub/AbstractTask.cpp index 0dc28d68b8..bf958c3181 100644 --- a/src/MeoAssistant/Task/Sub/AbstractTask.cpp +++ b/src/MeoAssistant/Task/Sub/AbstractTask.cpp @@ -6,14 +6,14 @@ #include #include -#include "NoWarningCV.h" +#include "Utils/NoWarningCV.h" -#include "AbstractTaskPlugin.h" -#include "AsstImageIo.hpp" -#include "AsstUtils.hpp" +#include "../Plugin/AbstractTaskPlugin.h" +#include "Utils/AsstImageIo.hpp" +#include "Utils/AsstUtils.hpp" #include "Controller.h" -#include "GeneralConfiger.h" -#include "Logger.hpp" +#include "Resource/GeneralConfiger.h" +#include "Utils/Logger.hpp" #include "ProcessTask.h" using namespace asst; diff --git a/src/MeoAssistant/Task/Sub/AbstractTask.h b/src/MeoAssistant/Task/Sub/AbstractTask.h index 2d4bd9a983..1a1e8caf32 100644 --- a/src/MeoAssistant/Task/Sub/AbstractTask.h +++ b/src/MeoAssistant/Task/Sub/AbstractTask.h @@ -5,7 +5,7 @@ #include #include -#include "AsstMsg.h" +#include "Utils/AsstMsg.h" namespace cv { diff --git a/src/MeoAssistant/Task/Sub/AutoRecruitTask.cpp b/src/MeoAssistant/Task/Sub/AutoRecruitTask.cpp index ee17eec1c4..24cfcf1d17 100644 --- a/src/MeoAssistant/Task/Sub/AutoRecruitTask.cpp +++ b/src/MeoAssistant/Task/Sub/AutoRecruitTask.cpp @@ -1,17 +1,17 @@ #include "AutoRecruitTask.h" #include "Controller.h" -#include "GeneralConfiger.h" -#include "Logger.hpp" -#include "MultiMatchImageAnalyzer.h" -#include "OcrImageAnalyzer.h" +#include "Resource/GeneralConfiger.h" +#include "Utils/Logger.hpp" +#include "ImageAnalyzer/General/MultiMatchImageAnalyzer.h" +#include "ImageAnalyzer/General/OcrImageAnalyzer.h" #include "ProcessTask.h" -#include "RecruitConfiger.h" -#include "RecruitImageAnalyzer.h" +#include "Resource/RecruitConfiger.h" +#include "ImageAnalyzer/RecruitImageAnalyzer.h" #include "ReportDataTask.h" #include "TaskData.h" -#include "AsstRanges.hpp" +#include "Utils/AsstRanges.hpp" #include #include diff --git a/src/MeoAssistant/Task/Sub/AutoRecruitTask.h b/src/MeoAssistant/Task/Sub/AutoRecruitTask.h index 944d7376f5..0ee9a788ed 100644 --- a/src/MeoAssistant/Task/Sub/AutoRecruitTask.h +++ b/src/MeoAssistant/Task/Sub/AutoRecruitTask.h @@ -5,8 +5,8 @@ #include #include -#include "AsstTypes.h" -#include "RecruitConfiger.h" +#include "Utils/AsstTypes.h" +#include "Resource/RecruitConfiger.h" namespace asst { diff --git a/src/MeoAssistant/Task/Sub/BattleFormationTask.cpp b/src/MeoAssistant/Task/Sub/BattleFormationTask.cpp index c02c7ebda3..b7485dfe12 100644 --- a/src/MeoAssistant/Task/Sub/BattleFormationTask.cpp +++ b/src/MeoAssistant/Task/Sub/BattleFormationTask.cpp @@ -1,12 +1,12 @@ #include "BattleFormationTask.h" -#include "AsstRanges.hpp" +#include "Utils/AsstRanges.hpp" -#include "BattleDataConfiger.h" +#include "Resource/BattleDataConfiger.h" #include "Controller.h" -#include "CopilotConfiger.h" -#include "Logger.hpp" -#include "OcrWithFlagTemplImageAnalyzer.h" +#include "Resource/CopilotConfiger.h" +#include "Utils/Logger.hpp" +#include "ImageAnalyzer/General/OcrWithFlagTemplImageAnalyzer.h" #include "ProcessTask.h" #include "TaskData.h" diff --git a/src/MeoAssistant/Task/Sub/BattleProcessTask.cpp b/src/MeoAssistant/Task/Sub/BattleProcessTask.cpp index 4ed55b3bc5..0c3463304c 100644 --- a/src/MeoAssistant/Task/Sub/BattleProcessTask.cpp +++ b/src/MeoAssistant/Task/Sub/BattleProcessTask.cpp @@ -1,24 +1,24 @@ #include "BattleProcessTask.h" -#include "AsstRanges.hpp" +#include "Utils/AsstRanges.hpp" #include #include #include -#include "AsstRanges.hpp" -#include "NoWarningCV.h" +#include "Utils/AsstRanges.hpp" +#include "Utils/NoWarningCV.h" -#include "BattleImageAnalyzer.h" +#include "ImageAnalyzer/BattleImageAnalyzer.h" #include "Controller.h" -#include "CopilotConfiger.h" -#include "Logger.hpp" -#include "MatchImageAnalyzer.h" -#include "OcrWithPreprocessImageAnalyzer.h" +#include "Resource/CopilotConfiger.h" +#include "Utils/Logger.hpp" +#include "ImageAnalyzer/General/MatchImageAnalyzer.h" +#include "ImageAnalyzer/General/OcrWithPreprocessImageAnalyzer.h" #include "ProcessTask.h" #include "TaskData.h" -#include "TilePack.h" +#include "Resource/TilePack.h" -#include "AsstImageIo.hpp" +#include "Utils/AsstImageIo.hpp" void asst::BattleProcessTask::set_stage_name(std::string name) { diff --git a/src/MeoAssistant/Task/Sub/BattleProcessTask.h b/src/MeoAssistant/Task/Sub/BattleProcessTask.h index c1d48c818a..73b4fc75a3 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 "AsstTypes.h" -#include "BattleImageAnalyzer.h" -#include "TilePack.h" +#include "Utils/AsstTypes.h" +#include "ImageAnalyzer/BattleImageAnalyzer.h" +#include "Resource/TilePack.h" namespace asst { diff --git a/src/MeoAssistant/Task/Sub/CreditShoppingTask.cpp b/src/MeoAssistant/Task/Sub/CreditShoppingTask.cpp index b9bef48107..b28d184239 100644 --- a/src/MeoAssistant/Task/Sub/CreditShoppingTask.cpp +++ b/src/MeoAssistant/Task/Sub/CreditShoppingTask.cpp @@ -4,11 +4,11 @@ #include #include "Controller.h" -#include "CreditShopImageAnalyzer.h" -#include "MatchImageAnalyzer.h" -#include "OcrImageAnalyzer.h" +#include "ImageAnalyzer/CreditShopImageAnalyzer.h" +#include "ImageAnalyzer/General/MatchImageAnalyzer.h" +#include "ImageAnalyzer/General/OcrImageAnalyzer.h" #include "TaskData.h" -#include "Logger.hpp" +#include "Utils/Logger.hpp" void asst::CreditShoppingTask::set_black_list(std::vector black_list) { diff --git a/src/MeoAssistant/Task/Sub/CreditShoppingTask.h b/src/MeoAssistant/Task/Sub/CreditShoppingTask.h index 3ef2c9cadc..d72c10d8f8 100644 --- a/src/MeoAssistant/Task/Sub/CreditShoppingTask.h +++ b/src/MeoAssistant/Task/Sub/CreditShoppingTask.h @@ -4,7 +4,7 @@ #include -#include "AsstTypes.h" +#include "Utils/AsstTypes.h" namespace asst { diff --git a/src/MeoAssistant/Task/Sub/DepotRecognitionTask.cpp b/src/MeoAssistant/Task/Sub/DepotRecognitionTask.cpp index 11af70247a..38ad5b4f51 100644 --- a/src/MeoAssistant/Task/Sub/DepotRecognitionTask.cpp +++ b/src/MeoAssistant/Task/Sub/DepotRecognitionTask.cpp @@ -5,9 +5,9 @@ #include #include "Controller.h" -#include "DepotImageAnalyzer.h" -#include "GeneralConfiger.h" -#include "Logger.hpp" +#include "ImageAnalyzer/DepotImageAnalyzer.h" +#include "Resource/GeneralConfiger.h" +#include "Utils/Logger.hpp" #include "ProcessTask.h" #include "TaskData.h" diff --git a/src/MeoAssistant/Task/Sub/DepotRecognitionTask.h b/src/MeoAssistant/Task/Sub/DepotRecognitionTask.h index 9919a36b20..56faf6ca04 100644 --- a/src/MeoAssistant/Task/Sub/DepotRecognitionTask.h +++ b/src/MeoAssistant/Task/Sub/DepotRecognitionTask.h @@ -3,7 +3,7 @@ #include -#include "DepotImageAnalyzer.h" +#include "ImageAnalyzer/DepotImageAnalyzer.h" namespace asst { diff --git a/src/MeoAssistant/Task/Sub/InfrastAbstractTask.cpp b/src/MeoAssistant/Task/Sub/InfrastAbstractTask.cpp index d31df11e64..93eda60330 100644 --- a/src/MeoAssistant/Task/Sub/InfrastAbstractTask.cpp +++ b/src/MeoAssistant/Task/Sub/InfrastAbstractTask.cpp @@ -4,15 +4,15 @@ #include #include -#include "AsstMsg.h" -#include "AsstRanges.hpp" +#include "Utils/AsstMsg.h" +#include "Utils/AsstRanges.hpp" #include "Controller.h" -#include "InfrastFacilityImageAnalyzer.h" -#include "InfrastOperImageAnalyzer.h" -#include "Logger.hpp" -#include "MatchImageAnalyzer.h" -#include "OcrImageAnalyzer.h" -#include "OcrWithPreprocessImageAnalyzer.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 "ProcessTask.h" #include "TaskData.h" diff --git a/src/MeoAssistant/Task/Sub/InfrastAbstractTask.h b/src/MeoAssistant/Task/Sub/InfrastAbstractTask.h index e650bb6f96..97d0a844ad 100644 --- a/src/MeoAssistant/Task/Sub/InfrastAbstractTask.h +++ b/src/MeoAssistant/Task/Sub/InfrastAbstractTask.h @@ -1,7 +1,7 @@ #pragma once #include "AbstractTask.h" -#include "AsstInfrastDef.h" -#include "AsstTypes.h" +#include "Utils/AsstInfrastDef.h" +#include "Utils/AsstTypes.h" namespace asst { diff --git a/src/MeoAssistant/Task/Sub/InfrastControlTask.cpp b/src/MeoAssistant/Task/Sub/InfrastControlTask.cpp index e33cc4c382..98fd60dd34 100644 --- a/src/MeoAssistant/Task/Sub/InfrastControlTask.cpp +++ b/src/MeoAssistant/Task/Sub/InfrastControlTask.cpp @@ -1,6 +1,6 @@ #include "InfrastControlTask.h" -#include "Logger.hpp" +#include "Utils/Logger.hpp" bool asst::InfrastControlTask::_run() { diff --git a/src/MeoAssistant/Task/Sub/InfrastDormTask.cpp b/src/MeoAssistant/Task/Sub/InfrastDormTask.cpp index f76b67c425..3dabbec98f 100644 --- a/src/MeoAssistant/Task/Sub/InfrastDormTask.cpp +++ b/src/MeoAssistant/Task/Sub/InfrastDormTask.cpp @@ -3,11 +3,11 @@ #include #include "Controller.h" -#include "InfrastOperImageAnalyzer.h" -#include "Logger.hpp" -#include "MatchImageAnalyzer.h" -#include "OcrImageAnalyzer.h" -#include "OcrWithPreprocessImageAnalyzer.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 "ProcessTask.h" #include "TaskData.h" diff --git a/src/MeoAssistant/Task/Sub/InfrastInfoTask.cpp b/src/MeoAssistant/Task/Sub/InfrastInfoTask.cpp index 346755c528..796ca97367 100644 --- a/src/MeoAssistant/Task/Sub/InfrastInfoTask.cpp +++ b/src/MeoAssistant/Task/Sub/InfrastInfoTask.cpp @@ -1,8 +1,8 @@ #include "InfrastInfoTask.h" #include "Controller.h" -#include "InfrastFacilityImageAnalyzer.h" -#include "Logger.hpp" +#include "ImageAnalyzer/InfrastFacilityImageAnalyzer.h" +#include "Utils/Logger.hpp" #include "RuntimeStatus.h" bool asst::InfrastInfoTask::_run() diff --git a/src/MeoAssistant/Task/Sub/InfrastMfgTask.cpp b/src/MeoAssistant/Task/Sub/InfrastMfgTask.cpp index e695be9ccd..611f91ba18 100644 --- a/src/MeoAssistant/Task/Sub/InfrastMfgTask.cpp +++ b/src/MeoAssistant/Task/Sub/InfrastMfgTask.cpp @@ -1,7 +1,7 @@ #include "InfrastMfgTask.h" #include "Controller.h" -#include "MatchImageAnalyzer.h" +#include "ImageAnalyzer/General/MatchImageAnalyzer.h" bool asst::InfrastMfgTask::_run() { diff --git a/src/MeoAssistant/Task/Sub/InfrastOfficeTask.cpp b/src/MeoAssistant/Task/Sub/InfrastOfficeTask.cpp index 68951396c9..8e0f397729 100644 --- a/src/MeoAssistant/Task/Sub/InfrastOfficeTask.cpp +++ b/src/MeoAssistant/Task/Sub/InfrastOfficeTask.cpp @@ -1,8 +1,8 @@ #include "InfrastOfficeTask.h" -#include "AsstRanges.hpp" +#include "Utils/AsstRanges.hpp" #include "Controller.h" -#include "Logger.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 e14ade67c7..424874456f 100644 --- a/src/MeoAssistant/Task/Sub/InfrastPowerTask.cpp +++ b/src/MeoAssistant/Task/Sub/InfrastPowerTask.cpp @@ -1,8 +1,8 @@ #include "InfrastPowerTask.h" -#include "AsstRanges.hpp" +#include "Utils/AsstRanges.hpp" #include "Controller.h" -#include "Logger.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 9d5a53a3a7..22175a592c 100644 --- a/src/MeoAssistant/Task/Sub/InfrastProductionTask.cpp +++ b/src/MeoAssistant/Task/Sub/InfrastProductionTask.cpp @@ -1,18 +1,18 @@ #include "InfrastProductionTask.h" -#include "AsstRanges.hpp" +#include "Utils/AsstRanges.hpp" #include #include #include "Controller.h" -#include "HashImageAnalyzer.h" -#include "InfrastConfiger.h" -#include "InfrastOperImageAnalyzer.h" -#include "Logger.hpp" -#include "MatchImageAnalyzer.h" -#include "MultiMatchImageAnalyzer.h" -#include "OcrWithPreprocessImageAnalyzer.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 "ProcessTask.h" #include "RuntimeStatus.h" #include "TaskData.h" diff --git a/src/MeoAssistant/Task/Sub/InfrastProductionTask.h b/src/MeoAssistant/Task/Sub/InfrastProductionTask.h index b7b3fdb60e..f5524764f0 100644 --- a/src/MeoAssistant/Task/Sub/InfrastProductionTask.h +++ b/src/MeoAssistant/Task/Sub/InfrastProductionTask.h @@ -2,7 +2,7 @@ #include "InfrastAbstractTask.h" -#include "AsstInfrastDef.h" +#include "Utils/AsstInfrastDef.h" namespace asst { diff --git a/src/MeoAssistant/Task/Sub/InfrastReceptionTask.cpp b/src/MeoAssistant/Task/Sub/InfrastReceptionTask.cpp index 8c291aaa36..fe122b81aa 100644 --- a/src/MeoAssistant/Task/Sub/InfrastReceptionTask.cpp +++ b/src/MeoAssistant/Task/Sub/InfrastReceptionTask.cpp @@ -1,12 +1,12 @@ #include "InfrastReceptionTask.h" -#include "AsstRanges.hpp" +#include "Utils/AsstRanges.hpp" #include "Controller.h" -#include "InfrastClueImageAnalyzer.h" -#include "InfrastClueVacancyImageAnalyzer.h" -#include "Logger.hpp" -#include "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" diff --git a/src/MeoAssistant/Task/Sub/ProcessTask.cpp b/src/MeoAssistant/Task/Sub/ProcessTask.cpp index 666d9ce994..c6a0306574 100644 --- a/src/MeoAssistant/Task/Sub/ProcessTask.cpp +++ b/src/MeoAssistant/Task/Sub/ProcessTask.cpp @@ -5,11 +5,11 @@ #include -#include "AsstUtils.hpp" +#include "Utils/AsstUtils.hpp" #include "Controller.h" -#include "GeneralConfiger.h" -#include "Logger.hpp" -#include "ProcessTaskImageAnalyzer.h" +#include "Resource/GeneralConfiger.h" +#include "Utils/Logger.hpp" +#include "ImageAnalyzer/ProcessTaskImageAnalyzer.h" #include "RuntimeStatus.h" #include "TaskData.h" diff --git a/src/MeoAssistant/Task/Sub/ProcessTask.h b/src/MeoAssistant/Task/Sub/ProcessTask.h index 73ce336018..c3c438b75e 100644 --- a/src/MeoAssistant/Task/Sub/ProcessTask.h +++ b/src/MeoAssistant/Task/Sub/ProcessTask.h @@ -1,7 +1,7 @@ #pragma once #include "AbstractTask.h" -#include "AsstTypes.h" +#include "Utils/AsstTypes.h" namespace asst { diff --git a/src/MeoAssistant/Task/Sub/ReportDataTask.cpp b/src/MeoAssistant/Task/Sub/ReportDataTask.cpp index 1a32b70d6b..c1646bb363 100644 --- a/src/MeoAssistant/Task/Sub/ReportDataTask.cpp +++ b/src/MeoAssistant/Task/Sub/ReportDataTask.cpp @@ -1,8 +1,8 @@ #include "ReportDataTask.h" -#include "AsstUtils.hpp" -#include "GeneralConfiger.h" -#include "Logger.hpp" +#include "Utils/AsstUtils.hpp" +#include "Resource/GeneralConfiger.h" +#include "Utils/Logger.hpp" #include diff --git a/src/MeoAssistant/Task/Sub/ReportDataTask.h b/src/MeoAssistant/Task/Sub/ReportDataTask.h index cc3c8bac5c..85ce05d6d4 100644 --- a/src/MeoAssistant/Task/Sub/ReportDataTask.h +++ b/src/MeoAssistant/Task/Sub/ReportDataTask.h @@ -1,8 +1,8 @@ #pragma once #include "AbstractTask.h" -#include "AsstHttp.hpp" -#include "AsstUtils.hpp" +#include "Utils/AsstHttp.hpp" +#include "Utils/AsstUtils.hpp" #include #include diff --git a/src/MeoAssistant/Task/Sub/StageNavigationTask.cpp b/src/MeoAssistant/Task/Sub/StageNavigationTask.cpp index 1e8cebee75..14ab58227f 100644 --- a/src/MeoAssistant/Task/Sub/StageNavigationTask.cpp +++ b/src/MeoAssistant/Task/Sub/StageNavigationTask.cpp @@ -3,8 +3,8 @@ #include #include "Controller.h" -#include "Logger.hpp" -#include "OcrImageAnalyzer.h" +#include "Utils/Logger.hpp" +#include "ImageAnalyzer/General/OcrImageAnalyzer.h" #include "ProcessTask.h" #include "TaskData.h" diff --git a/src/MeoAssistant/Task/VisitTask.cpp b/src/MeoAssistant/Task/VisitTask.cpp index a9180e0ca3..2062a0a9eb 100644 --- a/src/MeoAssistant/Task/VisitTask.cpp +++ b/src/MeoAssistant/Task/VisitTask.cpp @@ -2,7 +2,7 @@ #include -#include "ProcessTask.h" +#include "Sub/ProcessTask.h" asst::VisitTask::VisitTask(AsstCallback callback, void* callback_arg) : PackageTask(std::move(callback), callback_arg, TaskType), diff --git a/src/MeoAssistant/TaskData.cpp b/src/MeoAssistant/TaskData.cpp index 3a01766ede..ed5274e14b 100644 --- a/src/MeoAssistant/TaskData.cpp +++ b/src/MeoAssistant/TaskData.cpp @@ -1,14 +1,14 @@ #include "TaskData.h" -#include "AsstRanges.hpp" +#include "Utils/AsstRanges.hpp" #include #include -#include "AsstTypes.h" -#include "GeneralConfiger.h" -#include "Logger.hpp" -#include "TemplResource.h" +#include "Utils/AsstTypes.h" +#include "Resource/GeneralConfiger.h" +#include "Utils/Logger.hpp" +#include "Resource/TemplResource.h" const std::unordered_set& asst::TaskData::get_templ_required() const noexcept { diff --git a/src/MeoAssistant/TaskData.h b/src/MeoAssistant/TaskData.h index 3779a3ec2a..0abf09509c 100644 --- a/src/MeoAssistant/TaskData.h +++ b/src/MeoAssistant/TaskData.h @@ -1,6 +1,6 @@ #pragma once -#include "AbstractConfigerWithTempl.h" +#include "Resource/AbstractConfigerWithTempl.h" #include #include