diff --git a/src/MeoAssistant/Assistant.cpp b/src/MeoAssistant/Assistant.cpp index 400be5fca5..03ca59c8fb 100644 --- a/src/MeoAssistant/Assistant.cpp +++ b/src/MeoAssistant/Assistant.cpp @@ -7,7 +7,6 @@ #include "Controller.h" #include "Resource/GeneralConfiger.h" #include "RuntimeStatus.h" -#include "Utils/AsstUtils.hpp" #include "Utils/Logger.hpp" #include "Task/AwardTask.h" diff --git a/src/MeoAssistant/Controller.cpp b/src/MeoAssistant/Controller.cpp index 7c698dafda..c45e3a4400 100644 --- a/src/MeoAssistant/Controller.cpp +++ b/src/MeoAssistant/Controller.cpp @@ -32,6 +32,7 @@ #include "Resource/GeneralConfiger.h" #include "Utils/AsstTypes.h" #include "Utils/Logger.hpp" +#include "Utils/StringMisc.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/ImageAnalyzer/CreditShopImageAnalyzer.cpp b/src/MeoAssistant/ImageAnalyzer/CreditShopImageAnalyzer.cpp index c88e19af8b..a1252d1f83 100644 --- a/src/MeoAssistant/ImageAnalyzer/CreditShopImageAnalyzer.cpp +++ b/src/MeoAssistant/ImageAnalyzer/CreditShopImageAnalyzer.cpp @@ -8,7 +8,6 @@ #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 5758f259b1..cad83cdeb7 100644 --- a/src/MeoAssistant/ImageAnalyzer/DepotImageAnalyzer.cpp +++ b/src/MeoAssistant/ImageAnalyzer/DepotImageAnalyzer.cpp @@ -6,7 +6,6 @@ #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 fa0baea003..81f27aae01 100644 --- a/src/MeoAssistant/ImageAnalyzer/General/AbstractImageAnalyzer.cpp +++ b/src/MeoAssistant/ImageAnalyzer/General/AbstractImageAnalyzer.cpp @@ -4,8 +4,9 @@ #include "Controller.h" #include "Utils/AsstImageIo.hpp" -#include "Utils/AsstUtils.hpp" #include "Utils/Logger.hpp" +#include "Utils/StringMisc.hpp" +#include "Utils/Time.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/HashImageAnalyzer.cpp b/src/MeoAssistant/ImageAnalyzer/General/HashImageAnalyzer.cpp index 2af63173ed..74243f9a03 100644 --- a/src/MeoAssistant/ImageAnalyzer/General/HashImageAnalyzer.cpp +++ b/src/MeoAssistant/ImageAnalyzer/General/HashImageAnalyzer.cpp @@ -2,7 +2,6 @@ #include "Utils/NoWarningCV.h" -#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 2588e1a6be..465f34ae3c 100644 --- a/src/MeoAssistant/ImageAnalyzer/General/MatchImageAnalyzer.cpp +++ b/src/MeoAssistant/ImageAnalyzer/General/MatchImageAnalyzer.cpp @@ -4,8 +4,8 @@ #include "Resource/TemplResource.h" #include "TaskData.h" -#include "Utils/AsstUtils.hpp" #include "Utils/Logger.hpp" +#include "Utils/StringMisc.hpp" asst::MatchImageAnalyzer::MatchImageAnalyzer(const cv::Mat& image, const Rect& roi, std::string templ_name, double templ_thres) diff --git a/src/MeoAssistant/ImageAnalyzer/General/OcrWithPreprocessImageAnalyzer.cpp b/src/MeoAssistant/ImageAnalyzer/General/OcrWithPreprocessImageAnalyzer.cpp index d8cde3d84f..db719137a7 100644 --- a/src/MeoAssistant/ImageAnalyzer/General/OcrWithPreprocessImageAnalyzer.cpp +++ b/src/MeoAssistant/ImageAnalyzer/General/OcrWithPreprocessImageAnalyzer.cpp @@ -2,8 +2,6 @@ #include "Utils/NoWarningCV.h" -#include "Utils/AsstUtils.hpp" - bool asst::OcrWithPreprocessImageAnalyzer::analyze() { m_without_det = true; diff --git a/src/MeoAssistant/ImageAnalyzer/InfrastClueVacancyImageAnalyzer.cpp b/src/MeoAssistant/ImageAnalyzer/InfrastClueVacancyImageAnalyzer.cpp index 1dbd55abe1..00253d3661 100644 --- a/src/MeoAssistant/ImageAnalyzer/InfrastClueVacancyImageAnalyzer.cpp +++ b/src/MeoAssistant/ImageAnalyzer/InfrastClueVacancyImageAnalyzer.cpp @@ -3,7 +3,6 @@ #include "Utils/NoWarningCV.h" #include "General/MatchImageAnalyzer.h" -#include "Utils/AsstUtils.hpp" #include "Utils/Logger.hpp" bool asst::InfrastClueVacancyImageAnalyzer::analyze() diff --git a/src/MeoAssistant/ImageAnalyzer/InfrastFacilityImageAnalyzer.cpp b/src/MeoAssistant/ImageAnalyzer/InfrastFacilityImageAnalyzer.cpp index 95ace60af0..7a41440e35 100644 --- a/src/MeoAssistant/ImageAnalyzer/InfrastFacilityImageAnalyzer.cpp +++ b/src/MeoAssistant/ImageAnalyzer/InfrastFacilityImageAnalyzer.cpp @@ -4,7 +4,6 @@ #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/InfrastSmileyImageAnalyzer.cpp b/src/MeoAssistant/ImageAnalyzer/InfrastSmileyImageAnalyzer.cpp index 9083748a28..c4f5bed3af 100644 --- a/src/MeoAssistant/ImageAnalyzer/InfrastSmileyImageAnalyzer.cpp +++ b/src/MeoAssistant/ImageAnalyzer/InfrastSmileyImageAnalyzer.cpp @@ -3,7 +3,7 @@ #include "Utils/NoWarningCV.h" #include "General/MultiMatchImageAnalyzer.h" -#include "Utils/AsstUtils.hpp" +#include "Utils/StringMisc.hpp" bool asst::InfrastSmileyImageAnalyzer::analyze() { diff --git a/src/MeoAssistant/ImageAnalyzer/ProcessTaskImageAnalyzer.cpp b/src/MeoAssistant/ImageAnalyzer/ProcessTaskImageAnalyzer.cpp index 970a623727..7919ba974e 100644 --- a/src/MeoAssistant/ImageAnalyzer/ProcessTaskImageAnalyzer.cpp +++ b/src/MeoAssistant/ImageAnalyzer/ProcessTaskImageAnalyzer.cpp @@ -7,7 +7,6 @@ #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) diff --git a/src/MeoAssistant/ImageAnalyzer/RoguelikeFormationImageAnalyzer.cpp b/src/MeoAssistant/ImageAnalyzer/RoguelikeFormationImageAnalyzer.cpp index 45e82c6455..c83f78c508 100644 --- a/src/MeoAssistant/ImageAnalyzer/RoguelikeFormationImageAnalyzer.cpp +++ b/src/MeoAssistant/ImageAnalyzer/RoguelikeFormationImageAnalyzer.cpp @@ -4,7 +4,6 @@ #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/RoguelikeSkillSelectionImageAnalyzer.cpp b/src/MeoAssistant/ImageAnalyzer/RoguelikeSkillSelectionImageAnalyzer.cpp index 09a93c3eae..c307d972d6 100644 --- a/src/MeoAssistant/ImageAnalyzer/RoguelikeSkillSelectionImageAnalyzer.cpp +++ b/src/MeoAssistant/ImageAnalyzer/RoguelikeSkillSelectionImageAnalyzer.cpp @@ -7,8 +7,8 @@ #include "General/OcrWithPreprocessImageAnalyzer.h" #include "Resource/RoguelikeRecruitConfiger.h" #include "TaskData.h" -#include "Utils/AsstUtils.hpp" #include "Utils/Logger.hpp" +#include "Utils/StringMisc.hpp" bool asst::RoguelikeSkillSelectionImageAnalyzer::analyze() { diff --git a/src/MeoAssistant/ImageAnalyzer/StageDropsImageAnalyzer.cpp b/src/MeoAssistant/ImageAnalyzer/StageDropsImageAnalyzer.cpp index 9538d5faaa..fb76d1386c 100644 --- a/src/MeoAssistant/ImageAnalyzer/StageDropsImageAnalyzer.cpp +++ b/src/MeoAssistant/ImageAnalyzer/StageDropsImageAnalyzer.cpp @@ -10,7 +10,6 @@ #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/MeoAssistant.vcxproj b/src/MeoAssistant/MeoAssistant.vcxproj index 41d8261839..6f7ef74f4a 100644 --- a/src/MeoAssistant/MeoAssistant.vcxproj +++ b/src/MeoAssistant/MeoAssistant.vcxproj @@ -125,7 +125,6 @@ - diff --git a/src/MeoAssistant/MeoAssistant.vcxproj.filters b/src/MeoAssistant/MeoAssistant.vcxproj.filters index 32797e753e..87d0752fd8 100644 --- a/src/MeoAssistant/MeoAssistant.vcxproj.filters +++ b/src/MeoAssistant/MeoAssistant.vcxproj.filters @@ -626,9 +626,6 @@ 源文件\Utils - - 源文件\Utils - 源文件\Utils diff --git a/src/MeoAssistant/Resource/AbstractConfiger.cpp b/src/MeoAssistant/Resource/AbstractConfiger.cpp index 26f3812396..28d8c31fcb 100644 --- a/src/MeoAssistant/Resource/AbstractConfiger.cpp +++ b/src/MeoAssistant/Resource/AbstractConfiger.cpp @@ -2,7 +2,6 @@ #include -#include "Utils/AsstUtils.hpp" #include "Utils/Logger.hpp" bool asst::AbstractConfiger::load(const std::filesystem::path& path) diff --git a/src/MeoAssistant/Resource/OcrPack.cpp b/src/MeoAssistant/Resource/OcrPack.cpp index d6740987ab..d82d340430 100644 --- a/src/MeoAssistant/Resource/OcrPack.cpp +++ b/src/MeoAssistant/Resource/OcrPack.cpp @@ -5,8 +5,9 @@ #include "Utils/NoWarningCV.h" #include -#include "Utils/AsstUtils.hpp" #include "Utils/Logger.hpp" +#include "Utils/Platform.hpp" +#include "Utils/StringMisc.hpp" #ifdef _WIN32 #include "Utils/Platform/AsstPlatformWin32.h" diff --git a/src/MeoAssistant/Resource/RoguelikeCopilotConfiger.cpp b/src/MeoAssistant/Resource/RoguelikeCopilotConfiger.cpp index 874ae95c76..9374171a78 100644 --- a/src/MeoAssistant/Resource/RoguelikeCopilotConfiger.cpp +++ b/src/MeoAssistant/Resource/RoguelikeCopilotConfiger.cpp @@ -2,7 +2,6 @@ #include -#include "Utils/AsstUtils.hpp" #include "Utils/Logger.hpp" std::optional asst::RoguelikeCopilotConfiger::get_stage_data( diff --git a/src/MeoAssistant/Task/CopilotTask.cpp b/src/MeoAssistant/Task/CopilotTask.cpp index 1b17a152d4..291fbdcecd 100644 --- a/src/MeoAssistant/Task/CopilotTask.cpp +++ b/src/MeoAssistant/Task/CopilotTask.cpp @@ -4,8 +4,8 @@ #include "Sub/BattleFormationTask.h" #include "Sub/BattleProcessTask.h" #include "Sub/ProcessTask.h" -#include "Utils/AsstUtils.hpp" #include "Utils/Logger.hpp" +#include "Utils/Platform.hpp" asst::CopilotTask::CopilotTask(const AsstCallback& callback, void* callback_arg) : PackageTask(callback, callback_arg, TaskType), diff --git a/src/MeoAssistant/Task/Plugin/StageDropsTaskPlugin.cpp b/src/MeoAssistant/Task/Plugin/StageDropsTaskPlugin.cpp index f31accd811..07295a9731 100644 --- a/src/MeoAssistant/Task/Plugin/StageDropsTaskPlugin.cpp +++ b/src/MeoAssistant/Task/Plugin/StageDropsTaskPlugin.cpp @@ -12,7 +12,6 @@ #include "Resource/StageDropsConfiger.h" #include "RuntimeStatus.h" #include "TaskData.h" -#include "Utils/AsstUtils.hpp" #include "Utils/Logger.hpp" #include "Utils/Version.h" diff --git a/src/MeoAssistant/Task/Sub/AbstractTask.cpp b/src/MeoAssistant/Task/Sub/AbstractTask.cpp index a5e359d865..c8babbb2e7 100644 --- a/src/MeoAssistant/Task/Sub/AbstractTask.cpp +++ b/src/MeoAssistant/Task/Sub/AbstractTask.cpp @@ -14,8 +14,8 @@ #include "ProcessTask.h" #include "Resource/GeneralConfiger.h" #include "Utils/AsstImageIo.hpp" -#include "Utils/AsstUtils.hpp" #include "Utils/Logger.hpp" +#include "Utils/StringMisc.hpp" using namespace asst; diff --git a/src/MeoAssistant/Task/Sub/ProcessTask.cpp b/src/MeoAssistant/Task/Sub/ProcessTask.cpp index 7711bfea70..650d9cd67d 100644 --- a/src/MeoAssistant/Task/Sub/ProcessTask.cpp +++ b/src/MeoAssistant/Task/Sub/ProcessTask.cpp @@ -10,7 +10,6 @@ #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 3f2a6bb6e3..2f26954f43 100644 --- a/src/MeoAssistant/Task/Sub/ReportDataTask.cpp +++ b/src/MeoAssistant/Task/Sub/ReportDataTask.cpp @@ -1,7 +1,7 @@ #include "ReportDataTask.h" #include "Resource/GeneralConfiger.h" -#include "Utils/AsstUtils.hpp" +#include "Utils/Locale.hpp" #include "Utils/Logger.hpp" #include "Utils/StringMisc.hpp" diff --git a/src/MeoAssistant/Task/Sub/ReportDataTask.h b/src/MeoAssistant/Task/Sub/ReportDataTask.h index 85ce05d6d4..9f50ec8bd3 100644 --- a/src/MeoAssistant/Task/Sub/ReportDataTask.h +++ b/src/MeoAssistant/Task/Sub/ReportDataTask.h @@ -2,7 +2,6 @@ #include "AbstractTask.h" #include "Utils/AsstHttp.hpp" -#include "Utils/AsstUtils.hpp" #include #include diff --git a/src/MeoAssistant/TaskData.cpp b/src/MeoAssistant/TaskData.cpp index ac02a89e98..1bfc492a08 100644 --- a/src/MeoAssistant/TaskData.cpp +++ b/src/MeoAssistant/TaskData.cpp @@ -7,8 +7,8 @@ #include "Resource/TemplResource.h" #include "Utils/AsstRanges.hpp" #include "Utils/AsstTypes.h" -#include "Utils/AsstUtils.hpp" #include "Utils/Logger.hpp" +#include "Utils/StringMisc.hpp" const std::unordered_set& asst::TaskData::get_templ_required() const noexcept { diff --git a/src/MeoAssistant/Utils/AsstHttp.hpp b/src/MeoAssistant/Utils/AsstHttp.hpp index 115e60f221..6e638090bc 100644 --- a/src/MeoAssistant/Utils/AsstHttp.hpp +++ b/src/MeoAssistant/Utils/AsstHttp.hpp @@ -1,9 +1,10 @@ #pragma once #include "AsstRanges.hpp" -#include "AsstUtils.hpp" +#include "Utils/StringMisc.hpp" #include +#include #include #include #include diff --git a/src/MeoAssistant/Utils/AsstImageIo.hpp b/src/MeoAssistant/Utils/AsstImageIo.hpp index 90ac0420aa..d557cdd7bd 100644 --- a/src/MeoAssistant/Utils/AsstImageIo.hpp +++ b/src/MeoAssistant/Utils/AsstImageIo.hpp @@ -1,13 +1,14 @@ #pragma once #include +#include #include #include #include "NoWarningCV.h" #include "NoWarningCVMat.h" -#include "AsstUtils.hpp" +#include "Platform.hpp" #include "UserDir.hpp" namespace asst diff --git a/src/MeoAssistant/Utils/AsstUtils.hpp b/src/MeoAssistant/Utils/AsstUtils.hpp deleted file mode 100644 index a0d079a5fb..0000000000 --- a/src/MeoAssistant/Utils/AsstUtils.hpp +++ /dev/null @@ -1,13 +0,0 @@ -#pragma once - -#include "AsstConf.h" -#include "AsstRanges.hpp" - -#include - -#include "Platform/AsstPlatform.h" - -#include "Locale.hpp" -#include "Meta.hpp" -#include "StringMisc.hpp" -#include "Time.hpp" diff --git a/src/MeoAssistant/Utils/Demangle.hpp b/src/MeoAssistant/Utils/Demangle.hpp index d632c7af24..c18691a000 100644 --- a/src/MeoAssistant/Utils/Demangle.hpp +++ b/src/MeoAssistant/Utils/Demangle.hpp @@ -5,9 +5,6 @@ #include #endif -#include "Utils/AsstRanges.hpp" -#include "Utils/AsstUtils.hpp" - namespace asst::utils { inline std::string demangle(const char* name_from_typeid) diff --git a/src/MeoAssistant/Utils/Logger.hpp b/src/MeoAssistant/Utils/Logger.hpp index b0041e8a03..14751c0aac 100644 --- a/src/MeoAssistant/Utils/Logger.hpp +++ b/src/MeoAssistant/Utils/Logger.hpp @@ -10,9 +10,11 @@ #include #include "AsstRanges.hpp" -#include "AsstUtils.hpp" +#include "Locale.hpp" #include "Meta.hpp" +#include "Platform.hpp" #include "SingletonHolder.hpp" +#include "Time.hpp" #include "UserDir.hpp" #include "Version.h" diff --git a/src/MeoAssistant/Utils/Platform/AsstPlatformWin32.cpp b/src/MeoAssistant/Utils/Platform/AsstPlatformWin32.cpp index d52e145ec7..f8af1a6f53 100644 --- a/src/MeoAssistant/Utils/Platform/AsstPlatformWin32.cpp +++ b/src/MeoAssistant/Utils/Platform/AsstPlatformWin32.cpp @@ -6,8 +6,8 @@ #include #include -#include "Utils/AsstUtils.hpp" #include "Utils/Logger.hpp" +#include "Utils/StringMisc.hpp" static size_t get_page_size() { diff --git a/src/MeoAssistant/Utils/SingletonHolder.hpp b/src/MeoAssistant/Utils/SingletonHolder.hpp index 2f95de7c1e..77ccb0db45 100644 --- a/src/MeoAssistant/Utils/SingletonHolder.hpp +++ b/src/MeoAssistant/Utils/SingletonHolder.hpp @@ -1,5 +1,7 @@ #pragma once +#include + namespace asst { template diff --git a/src/MeoAssistant/Utils/UserDir.hpp b/src/MeoAssistant/Utils/UserDir.hpp index 4bcdc4c419..272e124cba 100644 --- a/src/MeoAssistant/Utils/UserDir.hpp +++ b/src/MeoAssistant/Utils/UserDir.hpp @@ -1,6 +1,6 @@ #pragma once -#include "Utils/AsstUtils.hpp" +#include "Utils/Platform.hpp" #include "Utils/SingletonHolder.hpp" namespace asst