From 3f0636ac61daa2dbd7d8c8118d8ae2091e8f0bfa Mon Sep 17 00:00:00 2001 From: zzyyyl Date: Thu, 23 Feb 2023 09:56:33 +0800 Subject: [PATCH] style: format MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 请各位开发者统一代码风格！ ``` python tools\ClangFormatter\clang-formatter.py --clang-format=YOUR\PATH\TO\clang-format.exe --input=src\MaaCore python tools\ClangFormatter\clang-formatter.py --clang-format=YOUR\PATH\TO\clang-format.exe --input=src\resource ``` 参考 https://maa.plus/docs/2.2-%E5%BC%80%E5%8F%91%E7%9B%B8%E5%85%B3.html#%E5%9C%A8-visual-studio-%E4%B8%AD%E5%90%AF%E7%94%A8-clang-format --- resource/Arknights-Tile-Pos/.clang-format | 3 -- resource/copilot/SSS_多索雷斯在建地块.json | 15 +++--- resource/global/txwy/resource/tasks.json | 42 ++++++++--------- resource/tasks.json | 43 +++++++++-------- src/MaaCore/Assistant.cpp | 4 +- .../Miscellaneous/AvatarCacheManager.cpp | 6 +-- src/MaaCore/Config/TaskData.cpp | 3 +- src/MaaCore/Controller.cpp | 7 +-- .../Task/Fight/DrGrandetTaskPlugin.cpp | 4 +- .../Task/Infrast/InfrastAbstractTask.cpp | 23 ++++++---- .../Task/Infrast/InfrastAbstractTask.h | 3 +- src/MaaCore/Task/Infrast/InfrastDormTask.cpp | 6 +-- src/MaaCore/Task/Infrast/InfrastInfoTask.cpp | 2 +- .../Task/Infrast/InfrastReceptionTask.cpp | 6 +-- src/MaaCore/Task/Interface/AwardTask.cpp | 3 +- src/MaaCore/Task/Interface/DepotTask.cpp | 3 +- .../Task/Interface/ReclamationTask.cpp | 1 - src/MaaCore/Task/Interface/SingleStepTask.cpp | 6 +-- .../Task/Miscellaneous/BattleProcessTask.cpp | 2 +- .../Task/Miscellaneous/CreditShoppingTask.cpp | 6 +-- .../Miscellaneous/DepotRecognitionTask.cpp | 4 +- .../Reclamation/ReclamationBattlePlugin.cpp | 20 ++++---- .../Reclamation/ReclamationBattlePlugin.h | 6 +-- .../ReclamationConclusionReportPlugin.cpp | 14 +++--- .../ReclamationConclusionReportPlugin.h | 1 - .../Reclamation/ReclamationControlTask.cpp | 10 ++-- .../Task/Reclamation/ReclamationControlTask.h | 46 +++++++++---------- src/MaaCore/Task/ReportDataTask.cpp | 6 +-- src/MaaCore/Task/ReportDataTask.h | 3 +- .../RoguelikeCustomStartTaskPlugin.cpp | 4 +- .../RoguelikeCustomStartTaskPlugin.h | 8 ++-- .../RoguelikeFormationTaskPlugin.cpp | 4 +- .../Roguelike/RoguelikeRecruitTaskPlugin.cpp | 3 +- .../Roguelike/RoguelikeShoppingTaskPlugin.cpp | 4 +- .../RoguelikeSkillSelectionTaskPlugin.cpp | 4 +- .../SingleStepBattleProcessTask.cpp | 2 +- .../InfrastClueVacancyImageAnalyzer.cpp | 2 +- .../Infrast/InfrastFacilityImageAnalyzer.cpp | 2 +- .../Infrast/InfrastOperImageAnalyzer.cpp | 6 +-- .../Infrast/InfrastSmileyImageAnalyzer.cpp | 2 +- .../BattleSkillReadyImageAnalyzer.cpp | 2 +- .../Miscellaneous/CreditShopImageAnalyzer.cpp | 10 ++-- .../Miscellaneous/RecruitImageAnalyzer.cpp | 4 +- .../Miscellaneous/StageDropsImageAnalyzer.h | 5 +- .../RoguelikeFormationImageAnalyzer.cpp | 2 +- .../RoguelikeSkillSelectionImageAnalyzer.cpp | 6 +-- 46 files changed, 186 insertions(+), 182 deletions(-) delete mode 100644 resource/Arknights-Tile-Pos/.clang-format diff --git a/resource/Arknights-Tile-Pos/.clang-format b/resource/Arknights-Tile-Pos/.clang-format deleted file mode 100644 index 01d0321393..0000000000 --- a/resource/Arknights-Tile-Pos/.clang-format +++ /dev/null @@ -1,3 +0,0 @@ -Language: Json -ColumnLimit: 1000 -IndentWidth: 2 diff --git a/resource/copilot/SSS_多索雷斯在建地块.json b/resource/copilot/SSS_多索雷斯在建地块.json index 8c4d5d4b72..d4994789c8 100644 --- a/resource/copilot/SSS_多索雷斯在建地块.json +++ b/resource/copilot/SSS_多索雷斯在建地块.json @@ -14,11 +14,11 @@ "A", "A", "A", "A" ], "strategy": "优选策略", - "opers":[ + "opers": [ { "name": "棘刺", "skill": 3, - "skill_usage":1 + "skill_usage": 1 }, { "name": "泥岩", @@ -41,14 +41,14 @@ "skill_usage": 0 } ], - "tool_men":{ + "tool_men": { "先锋": 1, "近卫": 2, "辅助": 7, "重装": 2, "术士": 3 }, - "drops":[ + "drops": [ "近卫", "无需增调干员", "辅助", @@ -86,7 +86,7 @@ "梅尔", "罗小黑" ], - "stages":[ + "stages": [ { "stage_name": "蜂拥而上", "strategies": [ @@ -197,7 +197,7 @@ 5, 3 ], - "direction": "Left" + "direction": "Left" }, { "core": "泥岩", @@ -268,7 +268,8 @@ "近卫": 3 }, "location": [ - 6,1 + 6, + 1 ], "direction": "Left" }, diff --git a/resource/global/txwy/resource/tasks.json b/resource/global/txwy/resource/tasks.json index 23c9799e74..d1233caf70 100644 --- a/resource/global/txwy/resource/tasks.json +++ b/resource/global/txwy/resource/tasks.json @@ -17,22 +17,22 @@ "殘陽" ] }, - "LevelOfDifficulty": { + "LevelOfDifficulty": { "text": [ "環境", "PRTS" ] - }, + }, "EnterChapterDifficultyHard": { "text": [ "進入", - "作戰" + "作戰" ] }, "EnterChapterDifficultyNormal": { "text": [ "進入", - "作戰" + "作戰" ] }, "StageEpisodeToOF": { @@ -51,7 +51,7 @@ "algorithm": "OcrDetect", "text": [ "愚人號", - "活動", + "活動", "關卡已開放" ], "roi": [ @@ -61,21 +61,21 @@ 150 ] }, - "SN-Chapter2": { - "preDelay":2000, + "SN-Chapter2": { + "preDelay": 2000, "next": [ "SN-Chapter2", "ChapterSwipeToTheRight" ] }, "SN-Chapter3": { - "preDelay":2000, + "preDelay": 2000, "next": [ "SN-Chapter3", "ChapterSwipeToTheLeft" ] }, - "BattleStartPre": { + "BattleStartPre": { "text": [ "開始行動", "開始突襲", @@ -112,11 +112,11 @@ "杰西卡" ], [ - "潔絮西卡", + "潔絮西卡", "杰西卡" ], - [ - "絮西卡", + [ + "絮西卡", "杰西卡" ], [ @@ -823,15 +823,15 @@ "澄閃", "澄闪" ], - [ + [ "風丸", "风丸" ], - [ + [ "見行者", "见行者" ], - [ + [ "菲亞梅塔", "菲亚梅塔" ], @@ -839,19 +839,19 @@ "號角", "号角" ], - [ + [ "歸溟幽靈鯊", "归溟幽灵鲨" ], - [ + [ "掠風", "掠风" ], - [ + [ "流明", "流明" ], - [ + [ "艾麗妮", "艾丽妮" ] @@ -1062,12 +1062,12 @@ "採" ] }, - "CreditShop-NoMoney": { + "CreditShop-NoMoney": { "text": [ "信用不足", "無法購買" ] - }, + }, "InfrastReward": { "text": [ "可收穫", diff --git a/resource/tasks.json b/resource/tasks.json index 6609118ea9..17cb93c156 100644 --- a/resource/tasks.json +++ b/resource/tasks.json @@ -6556,24 +6556,15 @@ "template": "empty.png", "templThreshold": 0.75 }, - "BattleOperRoleCaster": { - }, - "BattleOperRoleMedic": { - }, - "BattleOperRolePioneer": { - }, - "BattleOperRoleSniper": { - }, - "BattleOperRoleSpecial": { - }, - "BattleOperRoleSupport": { - }, - "BattleOperRoleTank": { - }, - "BattleOperRoleWarrior": { - }, - "BattleOperRoleDrone": { - }, + "BattleOperRoleCaster": {}, + "BattleOperRoleMedic": {}, + "BattleOperRolePioneer": {}, + "BattleOperRoleSniper": {}, + "BattleOperRoleSpecial": {}, + "BattleOperRoleSupport": {}, + "BattleOperRoleTank": {}, + "BattleOperRoleWarrior": {}, + "BattleOperRoleDrone": {}, "BattleOperCostRange": { "algorithm": "Hash", "hash": [], @@ -9540,7 +9531,9 @@ }, "RoguelikeRefreshSupportBtnOcr": { "algorithm": "OcrDetect", - "text": [ "更新助战列表" ], + "text": [ + "更新助战列表" + ], "roi": [ 1097, 13, @@ -9556,7 +9549,9 @@ }, "RoguelikeChooseSupportBtnOcr": { "algorithm": "OcrDetect", - "text": [ "选择助战" ], + "text": [ + "选择助战" + ], "roi": [ 1011, 9, @@ -11049,12 +11044,16 @@ "CheckNextDay@Reclamation@NextDay": { "template": "Reclamation@NextDay.png", "postDelay": 0, - "next": [ "Stop" ] + "next": [ + "Stop" + ] }, "EnterNextDay@Reclamation@Begin": { "baseTask": "Reclamation@NextDay", "template": "Reclamation@NextDay.png", - "next": [ "Stop" ] + "next": [ + "Stop" + ] }, "WaitNextDayFlag@Reclamation@BetweenDayFlag": { "template": "Reclamation@BetweenDayFlag.png", diff --git a/src/MaaCore/Assistant.cpp b/src/MaaCore/Assistant.cpp index 7ebde35da1..efc494f37f 100644 --- a/src/MaaCore/Assistant.cpp +++ b/src/MaaCore/Assistant.cpp @@ -14,12 +14,12 @@ #include "Task/Interface/DepotTask.h" #include "Task/Interface/FightTask.h" #include "Task/Interface/InfrastTask.h" -#include "Task/Interface/SingleStepTask.h" #include "Task/Interface/MallTask.h" -#include "Task/Interface/RecruitTask.h" #include "Task/Interface/ReclamationTask.h" +#include "Task/Interface/RecruitTask.h" #include "Task/Interface/RoguelikeTask.h" #include "Task/Interface/SSSCopilotTask.h" +#include "Task/Interface/SingleStepTask.h" #include "Task/Interface/StartUpTask.h" #include "Utils/Logger.hpp" #ifdef ASST_DEBUG diff --git a/src/MaaCore/Config/Miscellaneous/AvatarCacheManager.cpp b/src/MaaCore/Config/Miscellaneous/AvatarCacheManager.cpp index 5b6a92d9fd..a38d26d7e2 100644 --- a/src/MaaCore/Config/Miscellaneous/AvatarCacheManager.cpp +++ b/src/MaaCore/Config/Miscellaneous/AvatarCacheManager.cpp @@ -1,9 +1,9 @@ #include "AvatarCacheManager.h" +#include "../TaskData.h" #include "BattleDataConfig.h" #include "Utils/ImageIo.hpp" #include "Utils/Logger.hpp" -#include "../TaskData.h" bool asst::AvatarCacheManager::load(const std::filesystem::path& path) { @@ -30,10 +30,10 @@ bool asst::AvatarCacheManager::load(const std::filesystem::path& path) Log.warn("unknown oper", name); continue; } - + Log.trace(filepath); cv::Mat avatar = asst::imread(filepath); - + if (avatar.empty()) { Log.warn("failed to read", filepath); continue; diff --git a/src/MaaCore/Config/TaskData.cpp b/src/MaaCore/Config/TaskData.cpp index f0841ec3e2..bcb47eaec2 100644 --- a/src/MaaCore/Config/TaskData.cpp +++ b/src/MaaCore/Config/TaskData.cpp @@ -319,7 +319,8 @@ bool asst::TaskData::explain_tasks(tasklist_t& new_tasks, const tasklist_t& raw_ } case symbl_sharp: { if (y->empty()) { - Log.error("There is no sharp_type while perform op", symbl_table[op], "in", task_expr, "of task:", task_name); + Log.error("There is no sharp_type while perform op", symbl_table[op], "in", task_expr, + "of task:", task_name); return std::nullopt; } for (std::string_view type : *y) { diff --git a/src/MaaCore/Controller.cpp b/src/MaaCore/Controller.cpp index a26326c62d..34079b0998 100644 --- a/src/MaaCore/Controller.cpp +++ b/src/MaaCore/Controller.cpp @@ -797,7 +797,7 @@ bool asst::Controller::swipe_without_scale(const Point& p1, const Point& p2, int const auto& opt = Config.get_options(); if (m_minitouch_enabled && m_minitouch_available) { Log.trace(m_use_maa_touch ? "maatouch" : "minitouch", "swipe", p1, p2, duration, extra_swipe, slope_in, - slope_out); + slope_out); Minitoucher toucher(std::bind(&Controller::input_to_minitouch, this, std::placeholders::_1), m_minitouch_props); toucher.down(x1, y1); @@ -1600,7 +1600,7 @@ std::optional asst::Controller::call_command_posix(const std::string& cmd, if (client_socket < 0) { Log.error("accept failed:", strerror(errno)); ::kill(m_child, SIGKILL); - ::waitpid(m_child, &exit_ret, 0); + ::waitpid(m_child, &exit_ret, 0); return std::nullopt; } @@ -1621,7 +1621,8 @@ std::optional asst::Controller::call_command_posix(const std::string& cmd, } } while (::waitpid(m_child, &exit_ret, WNOHANG) == 0 && !check_timeout()); } - ::waitpid(m_child, &exit_ret, 0); // if ::waitpid(m_child, &exit_ret, WNOHANG) == 0, repeat it will cause ECHILD, so not check the return value + ::waitpid(m_child, &exit_ret, 0); // if ::waitpid(m_child, &exit_ret, WNOHANG) == 0, repeat it will cause + // ECHILD, so not check the return value } else { // failed to create child process diff --git a/src/MaaCore/Task/Fight/DrGrandetTaskPlugin.cpp b/src/MaaCore/Task/Fight/DrGrandetTaskPlugin.cpp index 56e6484bdb..39b0dedb94 100644 --- a/src/MaaCore/Task/Fight/DrGrandetTaskPlugin.cpp +++ b/src/MaaCore/Task/Fight/DrGrandetTaskPlugin.cpp @@ -1,9 +1,9 @@ #include "DrGrandetTaskPlugin.h" -#include "Controller.h" -#include "Vision/OcrImageAnalyzer.h" #include "Config/TaskData.h" +#include "Controller.h" #include "Utils/Logger.hpp" +#include "Vision/OcrImageAnalyzer.h" #include diff --git a/src/MaaCore/Task/Infrast/InfrastAbstractTask.cpp b/src/MaaCore/Task/Infrast/InfrastAbstractTask.cpp index 224d62cac4..2be908161e 100644 --- a/src/MaaCore/Task/Infrast/InfrastAbstractTask.cpp +++ b/src/MaaCore/Task/Infrast/InfrastAbstractTask.cpp @@ -5,16 +5,16 @@ #include #include "Common/AsstMsg.h" +#include "Config/TaskData.h" #include "Controller.h" +#include "Task/ProcessTask.h" +#include "Utils/Logger.hpp" +#include "Utils/Ranges.hpp" #include "Vision/Infrast/InfrastFacilityImageAnalyzer.h" #include "Vision/Infrast/InfrastOperImageAnalyzer.h" #include "Vision/MatchImageAnalyzer.h" #include "Vision/OcrImageAnalyzer.h" #include "Vision/OcrWithPreprocessImageAnalyzer.h" -#include "Config/TaskData.h" -#include "Task/ProcessTask.h" -#include "Utils/Logger.hpp" -#include "Utils/Ranges.hpp" asst::InfrastAbstractTask::InfrastAbstractTask(const AsstCallback& callback, Assistant* inst, std::string_view task_chain) @@ -242,7 +242,8 @@ bool asst::InfrastAbstractTask::swipe_and_select_custom_opers(bool is_dorm_order /// @param origin_room_config 期望的配置 /// @param num_of_opers_expect 期望选中的人数，空置则按names.size()判断 /// @return 是否符合期望 -bool asst::InfrastAbstractTask::select_opers_review(infrast::CustomRoomConfig const& origin_room_config, size_t num_of_opers_expect) +bool asst::InfrastAbstractTask::select_opers_review(infrast::CustomRoomConfig const& origin_room_config, + size_t num_of_opers_expect) { LogTraceFunction; // save_img("debug/"); @@ -250,15 +251,18 @@ bool asst::InfrastAbstractTask::select_opers_review(infrast::CustomRoomConfig co const auto image = ctrler()->get_image(); InfrastOperImageAnalyzer oper_analyzer(image); - oper_analyzer.set_to_be_calced(InfrastOperImageAnalyzer::ToBeCalced::Selected | InfrastOperImageAnalyzer::ToBeCalced::Doing); + oper_analyzer.set_to_be_calced(InfrastOperImageAnalyzer::ToBeCalced::Selected | + InfrastOperImageAnalyzer::ToBeCalced::Doing); if (!oper_analyzer.analyze()) { Log.warn("No oper"); return false; } oper_analyzer.sort_by_loc(); const auto& oper_analyzer_res = oper_analyzer.get_result(); - size_t selected_count = ranges::count_if(oper_analyzer_res, [](const infrast::Oper& info) { return info.selected; }); - Log.info("selected_count,config.names.size,num_of_opers_expect = ", selected_count, ",", room_config.names.size(), ",", num_of_opers_expect); + size_t selected_count = + ranges::count_if(oper_analyzer_res, [](const infrast::Oper& info) { return info.selected; }); + Log.info("selected_count,config.names.size,num_of_opers_expect = ", selected_count, ",", room_config.names.size(), + ",", num_of_opers_expect); if (selected_count < num_of_opers_expect) { Log.warn("select opers review fail: 选中干员数与期望不符"); @@ -289,7 +293,8 @@ bool asst::InfrastAbstractTask::select_opers_review(infrast::CustomRoomConfig co if (auto iter = ranges::find(room_config.names, name); iter != room_config.names.end()) { Log.info(name, "在\"operators\"中，且已选中"); room_config.names.erase(iter); - } else { // 备选干员或自动选择，只要不选工作中的干员即可 + } + else { // 备选干员或自动选择，只要不选工作中的干员即可 if (oper.doing == infrast::Doing::Working) { Log.warn("选了工作中的干员:", name); Log.warn("select opers review fail: 非自定义配置，却选了工作中的干员"); diff --git a/src/MaaCore/Task/Infrast/InfrastAbstractTask.h b/src/MaaCore/Task/Infrast/InfrastAbstractTask.h index 43c9667904..e188b30b17 100644 --- a/src/MaaCore/Task/Infrast/InfrastAbstractTask.h +++ b/src/MaaCore/Task/Infrast/InfrastAbstractTask.h @@ -39,7 +39,8 @@ namespace asst infrast::CustomRoomConfig& current_room_config(); bool swipe_and_select_custom_opers(bool is_dorm_order = false); bool select_custom_opers(std::vector& partial_result); - bool select_opers_review(infrast::CustomRoomConfig const& origin_room_config, size_t num_of_opers_expect = 0); // 复核干员选择是否符合期望 + bool select_opers_review(infrast::CustomRoomConfig const& origin_room_config, + size_t num_of_opers_expect = 0); // 复核干员选择是否符合期望 void order_opers_selection(const std::vector& names); virtual void click_return_button() override; diff --git a/src/MaaCore/Task/Infrast/InfrastDormTask.cpp b/src/MaaCore/Task/Infrast/InfrastDormTask.cpp index 8aab98f4ea..dc7afbb16a 100644 --- a/src/MaaCore/Task/Infrast/InfrastDormTask.cpp +++ b/src/MaaCore/Task/Infrast/InfrastDormTask.cpp @@ -2,14 +2,14 @@ #include +#include "Config/TaskData.h" #include "Controller.h" +#include "Task/ProcessTask.h" +#include "Utils/Logger.hpp" #include "Vision/Infrast/InfrastOperImageAnalyzer.h" #include "Vision/MatchImageAnalyzer.h" #include "Vision/OcrImageAnalyzer.h" #include "Vision/OcrWithPreprocessImageAnalyzer.h" -#include "Config/TaskData.h" -#include "Task/ProcessTask.h" -#include "Utils/Logger.hpp" asst::InfrastDormTask& asst::InfrastDormTask::set_notstationed_enabled(bool dorm_notstationed_enabled) noexcept { diff --git a/src/MaaCore/Task/Infrast/InfrastInfoTask.cpp b/src/MaaCore/Task/Infrast/InfrastInfoTask.cpp index 7e57a67fa4..8033058c82 100644 --- a/src/MaaCore/Task/Infrast/InfrastInfoTask.cpp +++ b/src/MaaCore/Task/Infrast/InfrastInfoTask.cpp @@ -1,9 +1,9 @@ #include "InfrastInfoTask.h" #include "Controller.h" -#include "Vision/Infrast/InfrastFacilityImageAnalyzer.h" #include "Status.h" #include "Utils/Logger.hpp" +#include "Vision/Infrast/InfrastFacilityImageAnalyzer.h" bool asst::InfrastInfoTask::_run() { diff --git a/src/MaaCore/Task/Infrast/InfrastReceptionTask.cpp b/src/MaaCore/Task/Infrast/InfrastReceptionTask.cpp index b80261c8c9..dda7c5265f 100644 --- a/src/MaaCore/Task/Infrast/InfrastReceptionTask.cpp +++ b/src/MaaCore/Task/Infrast/InfrastReceptionTask.cpp @@ -2,13 +2,13 @@ #include "Utils/Ranges.hpp" +#include "Config/TaskData.h" #include "Controller.h" +#include "Task/ProcessTask.h" +#include "Utils/Logger.hpp" #include "Vision/Infrast/InfrastClueImageAnalyzer.h" #include "Vision/Infrast/InfrastClueVacancyImageAnalyzer.h" #include "Vision/MatchImageAnalyzer.h" -#include "Config/TaskData.h" -#include "Task/ProcessTask.h" -#include "Utils/Logger.hpp" bool asst::InfrastReceptionTask::_run() { diff --git a/src/MaaCore/Task/Interface/AwardTask.cpp b/src/MaaCore/Task/Interface/AwardTask.cpp index 99472678b3..02503f708f 100644 --- a/src/MaaCore/Task/Interface/AwardTask.cpp +++ b/src/MaaCore/Task/Interface/AwardTask.cpp @@ -4,8 +4,7 @@ #include "Task/ProcessTask.h" -asst::AwardTask::AwardTask(const AsstCallback& callback, Assistant* inst) - : InterfaceTask(callback, inst, TaskType) +asst::AwardTask::AwardTask(const AsstCallback& callback, Assistant* inst) : InterfaceTask(callback, inst, TaskType) { auto award_task_ptr = std::make_shared(m_callback, m_inst, TaskType); award_task_ptr->set_tasks({ "AwardBegin" }); diff --git a/src/MaaCore/Task/Interface/DepotTask.cpp b/src/MaaCore/Task/Interface/DepotTask.cpp index 22a8f6fb2d..d47dae3ae6 100644 --- a/src/MaaCore/Task/Interface/DepotTask.cpp +++ b/src/MaaCore/Task/Interface/DepotTask.cpp @@ -3,8 +3,7 @@ #include "Task/Miscellaneous/DepotRecognitionTask.h" #include "Task/ProcessTask.h" -asst::DepotTask::DepotTask(const AsstCallback& callback, Assistant* inst) - : InterfaceTask(callback, inst, TaskType) +asst::DepotTask::DepotTask(const AsstCallback& callback, Assistant* inst) : InterfaceTask(callback, inst, TaskType) { auto enter_task = std::make_shared(m_callback, m_inst, TaskType); enter_task->set_tasks({ "DepotBegin" }).set_ignore_error(true); diff --git a/src/MaaCore/Task/Interface/ReclamationTask.cpp b/src/MaaCore/Task/Interface/ReclamationTask.cpp index c7de688f38..45b914e0b4 100644 --- a/src/MaaCore/Task/Interface/ReclamationTask.cpp +++ b/src/MaaCore/Task/Interface/ReclamationTask.cpp @@ -9,7 +9,6 @@ #include "Task/Reclamation/ReclamationConclusionReportPlugin.h" #include "Task/Reclamation/ReclamationControlTask.h" - asst::ReclamationTask::ReclamationTask(const AsstCallback& callback, Assistant* inst) : InterfaceTask(callback, inst, TaskType), m_reclamation_task_ptr(std::make_shared(callback, inst, TaskType)) diff --git a/src/MaaCore/Task/Interface/SingleStepTask.cpp b/src/MaaCore/Task/Interface/SingleStepTask.cpp index cd5528f2ff..bc931ee3e7 100644 --- a/src/MaaCore/Task/Interface/SingleStepTask.cpp +++ b/src/MaaCore/Task/Interface/SingleStepTask.cpp @@ -12,7 +12,7 @@ asst::SingleStepTask::SingleStepTask(const AsstCallback& callback, Assistant* in bool asst::SingleStepTask::set_params(const json::value& params) { LogTraceFunction; - + std::string type = params.get("type", ""); std::string subtype = params.get("subtype", ""); auto details_opt = params.find("details"); @@ -39,7 +39,7 @@ bool asst::SingleStepTask::set_copilot_stage(const json::value& details) bool asst::SingleStepTask::append_copllot_start() { LogTraceFunction; - + auto start_2_tp = std::make_shared(m_callback, m_inst, TaskType); start_2_tp->set_tasks({ "BattleStartAll" }).set_ignore_error(false); m_subtasks.emplace_back(std::move(start_2_tp)); @@ -50,7 +50,7 @@ bool asst::SingleStepTask::append_copllot_start() bool asst::SingleStepTask::append_copilot_action(const json::value& details) { LogTraceFunction; - + auto task = std::make_shared(m_callback, m_inst, TaskType); try { diff --git a/src/MaaCore/Task/Miscellaneous/BattleProcessTask.cpp b/src/MaaCore/Task/Miscellaneous/BattleProcessTask.cpp index df4f1ef22e..893e9837a0 100644 --- a/src/MaaCore/Task/Miscellaneous/BattleProcessTask.cpp +++ b/src/MaaCore/Task/Miscellaneous/BattleProcessTask.cpp @@ -247,7 +247,7 @@ bool asst::BattleProcessTask::wait_condition(const Action& action) if (image.empty()) { image = ctrler()->get_image(); check_in_battle(image); - } + } }; auto do_strategy_and_update_image = [&]() { do_strategic_action(image); diff --git a/src/MaaCore/Task/Miscellaneous/CreditShoppingTask.cpp b/src/MaaCore/Task/Miscellaneous/CreditShoppingTask.cpp index 3f99e1a911..d6b660d511 100644 --- a/src/MaaCore/Task/Miscellaneous/CreditShoppingTask.cpp +++ b/src/MaaCore/Task/Miscellaneous/CreditShoppingTask.cpp @@ -3,13 +3,13 @@ #include #include +#include "Config/TaskData.h" #include "Controller.h" +#include "Task/ProcessTask.h" +#include "Utils/Logger.hpp" #include "Vision/MatchImageAnalyzer.h" #include "Vision/Miscellaneous/CreditShopImageAnalyzer.h" #include "Vision/OcrImageAnalyzer.h" -#include "Config/TaskData.h" -#include "Task/ProcessTask.h" -#include "Utils/Logger.hpp" void asst::CreditShoppingTask::set_black_list(std::vector black_list) { diff --git a/src/MaaCore/Task/Miscellaneous/DepotRecognitionTask.cpp b/src/MaaCore/Task/Miscellaneous/DepotRecognitionTask.cpp index 27292e2cdd..e9da44e8bb 100644 --- a/src/MaaCore/Task/Miscellaneous/DepotRecognitionTask.cpp +++ b/src/MaaCore/Task/Miscellaneous/DepotRecognitionTask.cpp @@ -4,12 +4,12 @@ #include -#include "Controller.h" -#include "Vision/Miscellaneous/DepotImageAnalyzer.h" #include "Config/GeneralConfig.h" #include "Config/TaskData.h" +#include "Controller.h" #include "Task/ProcessTask.h" #include "Utils/Logger.hpp" +#include "Vision/Miscellaneous/DepotImageAnalyzer.h" bool asst::DepotRecognitionTask::_run() { diff --git a/src/MaaCore/Task/Reclamation/ReclamationBattlePlugin.cpp b/src/MaaCore/Task/Reclamation/ReclamationBattlePlugin.cpp index 9a1b73ed7d..490049f4bc 100644 --- a/src/MaaCore/Task/Reclamation/ReclamationBattlePlugin.cpp +++ b/src/MaaCore/Task/Reclamation/ReclamationBattlePlugin.cpp @@ -2,21 +2,20 @@ #include "Utils/NoWarningCV.h" +#include "Config/TaskData.h" #include "Controller.h" +#include "ReclamationControlTask.h" #include "Status.h" #include "Task/ProcessTask.h" #include "Utils/Logger.hpp" -#include "Vision/OcrImageAnalyzer.h" #include "Vision/MatchImageAnalyzer.h" #include "Vision/Miscellaneous/BattleSkillReadyImageAnalyzer.h" -#include "Config/TaskData.h" -#include "ReclamationControlTask.h" +#include "Vision/OcrImageAnalyzer.h" using namespace asst; - asst::ReclamationBattlePlugin::ReclamationBattlePlugin(const AsstCallback& callback, Assistant* inst, - std::string_view task_chain) + std::string_view task_chain) : AbstractTaskPlugin(callback, inst, task_chain), BattleHelper(inst) {} @@ -42,7 +41,7 @@ bool asst::ReclamationBattlePlugin::_run() return quit_action(); } else if (m_battle_mode == ReclamationBattleMode::BuyWater) { - sleep(1500); // 等待技能图标 + sleep(1500); // 等待技能图标 bool result = buy_water(); quit_action(); return result; @@ -121,7 +120,8 @@ bool asst::ReclamationBattlePlugin::communicate_with(const std::string& npcName) return false; } -bool asst::ReclamationBattlePlugin::communicate_with_aux(const std::string& npcName, std::function orderComp) +bool asst::ReclamationBattlePlugin::communicate_with_aux( + const std::string& npcName, std::function orderComp) { auto image = ctrler()->get_image(); BattleSkillReadyImageAnalyzer skillReadyAnalyzer(image); @@ -181,9 +181,9 @@ bool asst::ReclamationBattlePlugin::do_dialog_procedure(const std::vectorget_image(); @@ -196,7 +196,7 @@ bool asst::ReclamationBattlePlugin::do_dialog_procedure(const std::vector +#include "Config/TaskData.h" #include "Controller.h" #include "Status.h" #include "Task/ProcessTask.h" #include "Utils/Logger.hpp" -#include "Vision/OcrImageAnalyzer.h" #include "Vision/MatchImageAnalyzer.h" -#include "Config/TaskData.h" - +#include "Vision/OcrImageAnalyzer.h" bool asst::ReclamationConclusionReportPlugin::verify(AsstMsg msg, const json::value& details) const { @@ -42,10 +40,11 @@ bool asst::ReclamationConclusionReportPlugin::check_page_valid(const cv::Mat& im return pageAnalyzer.analyze(); } -void asst::ReclamationConclusionReportPlugin::analyze(const cv::Mat& image) { +void asst::ReclamationConclusionReportPlugin::analyze(const cv::Mat& image) +{ m_badges = analyze_badges(image); m_construction_points = analyze_construction_points(image); - + m_total_badges += (m_badges == -1 ? 0 : m_badges); m_total_cons_points += (m_construction_points == -1 ? 0 : m_construction_points); } @@ -89,7 +88,8 @@ int asst::ReclamationConclusionReportPlugin::analyze_construction_points(const c } } -void asst::ReclamationConclusionReportPlugin::info_callback() { +void asst::ReclamationConclusionReportPlugin::info_callback() +{ json::value info = basic_info_with_what("ReclamationReport"); json::value& details = info["details"]; details["badges"] = m_badges; diff --git a/src/MaaCore/Task/Reclamation/ReclamationConclusionReportPlugin.h b/src/MaaCore/Task/Reclamation/ReclamationConclusionReportPlugin.h index 2639a7a269..15548b5494 100644 --- a/src/MaaCore/Task/Reclamation/ReclamationConclusionReportPlugin.h +++ b/src/MaaCore/Task/Reclamation/ReclamationConclusionReportPlugin.h @@ -10,7 +10,6 @@ #include "Status.h" #include "Utils/NoWarningCVMat.h" - namespace asst { class ProcessTask; diff --git a/src/MaaCore/Task/Reclamation/ReclamationControlTask.cpp b/src/MaaCore/Task/Reclamation/ReclamationControlTask.cpp index 3bcadc26f4..0a0977a2e2 100644 --- a/src/MaaCore/Task/Reclamation/ReclamationControlTask.cpp +++ b/src/MaaCore/Task/Reclamation/ReclamationControlTask.cpp @@ -9,7 +9,7 @@ #include "ReclamationBattlePlugin.h" -#define RunCheckSuccess(func, ...) \ +#define RunCheckSuccess(func, ...) \ do { \ if (!func(__VA_ARGS__)) return false; \ } while (false); @@ -96,7 +96,7 @@ bool asst::ReclamationControlTask::run_smelt_gold_procedure() for (int i = 0; i < 2; ++i) swipe_right(); RunCheckSuccess(ProcessTask(*this, { "Reclamation@EnterSmeltGoldPage" }).run); - + if (check_manufacture_status() != 1) return false; while (!need_exit() && check_manufacture_status() == 1) { smelt_gold_callback(++m_total_gold); @@ -229,14 +229,16 @@ bool asst::ReclamationControlTask::swipe_left() return ProcessTask(*this, { "Reclamation@CmdCenterSwipeLeft" }).run(); } -void asst::ReclamationControlTask::procedure_start_callback(int times) { +void asst::ReclamationControlTask::procedure_start_callback(int times) +{ json::value info = basic_info_with_what("ReclamationProcedureStart"); json::value& details = info["details"]; details["times"] = times; callback(AsstMsg::SubTaskExtraInfo, info); } -void asst::ReclamationControlTask::smelt_gold_callback(int times) { +void asst::ReclamationControlTask::smelt_gold_callback(int times) +{ json::value info = basic_info_with_what("ReclamationSmeltGold"); json::value& details = info["details"]; details["times"] = times; diff --git a/src/MaaCore/Task/Reclamation/ReclamationControlTask.h b/src/MaaCore/Task/Reclamation/ReclamationControlTask.h index 09e1a417a3..bedef05b05 100644 --- a/src/MaaCore/Task/Reclamation/ReclamationControlTask.h +++ b/src/MaaCore/Task/Reclamation/ReclamationControlTask.h @@ -22,35 +22,35 @@ namespace asst bool run_giveup_upon_fight_procedure(); bool run_smelt_gold_procedure(); - bool navigate_to_reclamation_home(); // 导航至生息演算主界面 - bool give_up_last_algorithm_if(); // 如果有，放弃上次演算 - bool start_with_default_formation(); // 开始演算，至第一天 - bool skip_announce_report(); // 跳过每日公告 - bool start_action_enter(); // 区域交互确认 - bool battle_default_formation_start(); // 默认战斗编队并开始战斗 - bool level_complete_comfirm(); // 场景退出结算，至地图界面 - bool enter_next_day_if_useup(); // 如果决断点耗尽，进入下一天 - bool wait_between_day(); // 等待日期转换动画结束 - bool reset_scope(); // 重置地图大小 - bool enter_command_center(); // 进入侧边栏的命令中心 - bool do_manufacture(); // 点击制作按钮 + bool navigate_to_reclamation_home(); // 导航至生息演算主界面 + bool give_up_last_algorithm_if(); // 如果有，放弃上次演算 + bool start_with_default_formation(); // 开始演算，至第一天 + bool skip_announce_report(); // 跳过每日公告 + bool start_action_enter(); // 区域交互确认 + bool battle_default_formation_start(); // 默认战斗编队并开始战斗 + bool level_complete_comfirm(); // 场景退出结算，至地图界面 + bool enter_next_day_if_useup(); // 如果决断点耗尽，进入下一天 + bool wait_between_day(); // 等待日期转换动画结束 + bool reset_scope(); // 重置地图大小 + bool enter_command_center(); // 进入侧边栏的命令中心 + bool do_manufacture(); // 点击制作按钮 - bool check_next_day(); // 决断点消耗完进入下一天的标志 - bool check_emergency(); // 敌袭到达 - int check_manufacture_status(); // 制造界面是否材料充足，0不足，1充足，-1非建造页面 + bool check_next_day(); // 决断点消耗完进入下一天的标志 + bool check_emergency(); // 敌袭到达 + int check_manufacture_status(); // 制造界面是否材料充足，0不足，1充足，-1非建造页面 - bool click_center_base(); // 点击中心基地图标 - bool click_corner_black_market(); // 点击左上角黑市图标 - bool click_any_zone(); // 点击奇遇外任意区 - bool click_black_market(); // 点击黑市 - - bool swipe_right(); + bool click_center_base(); // 点击中心基地图标 + bool click_corner_black_market(); // 点击左上角黑市图标 + bool click_any_zone(); // 点击奇遇外任意区 + bool click_black_market(); // 点击黑市 + + bool swipe_right(); bool swipe_left(); - + void procedure_start_callback(int times); void smelt_gold_callback(int times); ReclamationTaskMode m_task_mode = ReclamationTaskMode::GiveupUponFight; - int m_total_gold = 0; // 制作赤金的次数 + int m_total_gold = 0; // 制作赤金的次数 }; } diff --git a/src/MaaCore/Task/ReportDataTask.cpp b/src/MaaCore/Task/ReportDataTask.cpp index b6167c8b4e..5c0efb6d5e 100644 --- a/src/MaaCore/Task/ReportDataTask.cpp +++ b/src/MaaCore/Task/ReportDataTask.cpp @@ -87,7 +87,7 @@ void asst::ReportDataTask::report_to_penguin() constexpr int DefaultBackoff = 10 * 1000; // 10s int backoff = DefaultBackoff; - + auto penguin_success_cond = [](const http::Response& response) -> bool { return response.success(); }; auto penguin_retry_cond = [&](const http::Response& response) -> bool { if (!response.status_code()) { @@ -126,7 +126,7 @@ void asst::ReportDataTask::report_to_penguin() } Log.info("Re-report to penguin-stats.cn", Penguin_CN); std::string new_cmd_format = utils::string_replace_all(cmd_format, Penguin_IO, Penguin_CN); - + backoff = DefaultBackoff; response = report(PenguinSubtaskName, new_cmd_format, penguin_success_cond, penguin_retry_cond); @@ -202,6 +202,6 @@ asst::http::Response asst::ReportDataTask::escape_and_request(const std::string& Log.info("request:\n" + cmd_line); std::string response = utils::call_command(cmd_line); Log.info("response:\n" + response); - + return response; } diff --git a/src/MaaCore/Task/ReportDataTask.h b/src/MaaCore/Task/ReportDataTask.h index bc57c9ebdd..27dedb3e79 100644 --- a/src/MaaCore/Task/ReportDataTask.h +++ b/src/MaaCore/Task/ReportDataTask.h @@ -41,7 +41,8 @@ namespace asst void report_to_penguin(); void report_to_yituliu(); http::Response escape_and_request(const std::string& format); - http::Response report(std::string_view subtask, const std::string& format, + http::Response report( + std::string_view subtask, const std::string& format, HttpResponsePred success_cond = [](const http::Response& response) -> bool { return response.success(); }, HttpResponsePred retry_cond = [](const http::Response& response) -> bool { return !response.status_code() || response.status_5xx(); diff --git a/src/MaaCore/Task/Roguelike/RoguelikeCustomStartTaskPlugin.cpp b/src/MaaCore/Task/Roguelike/RoguelikeCustomStartTaskPlugin.cpp index 009da15caa..8602dd6c6d 100644 --- a/src/MaaCore/Task/Roguelike/RoguelikeCustomStartTaskPlugin.cpp +++ b/src/MaaCore/Task/Roguelike/RoguelikeCustomStartTaskPlugin.cpp @@ -1,12 +1,12 @@ #include "RoguelikeCustomStartTaskPlugin.h" -#include "Controller.h" -#include "Vision/OcrImageAnalyzer.h" #include "Config/Miscellaneous/BattleDataConfig.h" #include "Config/TaskData.h" +#include "Controller.h" #include "Status.h" #include "Task/ProcessTask.h" #include "Utils/Logger.hpp" +#include "Vision/OcrImageAnalyzer.h" bool asst::RoguelikeCustomStartTaskPlugin::verify(AsstMsg msg, const json::value& details) const { diff --git a/src/MaaCore/Task/Roguelike/RoguelikeCustomStartTaskPlugin.h b/src/MaaCore/Task/Roguelike/RoguelikeCustomStartTaskPlugin.h index 069dc59247..809e093166 100644 --- a/src/MaaCore/Task/Roguelike/RoguelikeCustomStartTaskPlugin.h +++ b/src/MaaCore/Task/Roguelike/RoguelikeCustomStartTaskPlugin.h @@ -6,10 +6,10 @@ namespace asst enum class RoguelikeCustomType { None, - Squad, // 分队类型， like 指挥分队, 矛头分队, etc - Roles, // 职业类型， like 先手必胜, 稳扎稳打, etc - CoreChar, // 首选干员， 干员名 - UseSupport, // 使用助战 + Squad, // 分队类型， like 指挥分队, 矛头分队, etc + Roles, // 职业类型， like 先手必胜, 稳扎稳打, etc + CoreChar, // 首选干员， 干员名 + UseSupport, // 使用助战 UseNonfriendSupport // 可以使用非好友助战 // CoCoreChar, // 次选干员， 干员名 }; diff --git a/src/MaaCore/Task/Roguelike/RoguelikeFormationTaskPlugin.cpp b/src/MaaCore/Task/Roguelike/RoguelikeFormationTaskPlugin.cpp index e326433889..43f16a37f3 100644 --- a/src/MaaCore/Task/Roguelike/RoguelikeFormationTaskPlugin.cpp +++ b/src/MaaCore/Task/Roguelike/RoguelikeFormationTaskPlugin.cpp @@ -2,12 +2,12 @@ #include "Utils/Ranges.hpp" -#include "Controller.h" -#include "Vision/Roguelike/RoguelikeFormationImageAnalyzer.h" #include "Config/TaskData.h" +#include "Controller.h" #include "Status.h" #include "Task/ProcessTask.h" #include "Utils/Logger.hpp" +#include "Vision/Roguelike/RoguelikeFormationImageAnalyzer.h" bool asst::RoguelikeFormationTaskPlugin::verify(AsstMsg msg, const json::value& details) const { diff --git a/src/MaaCore/Task/Roguelike/RoguelikeRecruitTaskPlugin.cpp b/src/MaaCore/Task/Roguelike/RoguelikeRecruitTaskPlugin.cpp index 34f3b87729..e3ceb817fc 100644 --- a/src/MaaCore/Task/Roguelike/RoguelikeRecruitTaskPlugin.cpp +++ b/src/MaaCore/Task/Roguelike/RoguelikeRecruitTaskPlugin.cpp @@ -435,8 +435,7 @@ bool asst::RoguelikeRecruitTaskPlugin::check_support_char(const std::string& nam if (satisfied_chars.size()) break; } - if (page != MaxPageCnt - 1) - ProcessTask(*this, { "RoguelikeSupportSwipeRight" }).run(); + if (page != MaxPageCnt - 1) ProcessTask(*this, { "RoguelikeSupportSwipeRight" }).run(); } if (satisfied_chars.size()) break; diff --git a/src/MaaCore/Task/Roguelike/RoguelikeShoppingTaskPlugin.cpp b/src/MaaCore/Task/Roguelike/RoguelikeShoppingTaskPlugin.cpp index d5e961f062..ded7c302f8 100644 --- a/src/MaaCore/Task/Roguelike/RoguelikeShoppingTaskPlugin.cpp +++ b/src/MaaCore/Task/Roguelike/RoguelikeShoppingTaskPlugin.cpp @@ -1,12 +1,12 @@ #include "RoguelikeShoppingTaskPlugin.h" -#include "Controller.h" -#include "Vision/OcrWithFlagTemplImageAnalyzer.h" #include "Config/Miscellaneous/BattleDataConfig.h" #include "Config/Roguelike/RoguelikeShoppingConfig.h" +#include "Controller.h" #include "Status.h" #include "Task/ProcessTask.h" #include "Utils/Logger.hpp" +#include "Vision/OcrWithFlagTemplImageAnalyzer.h" bool asst::RoguelikeShoppingTaskPlugin::verify(AsstMsg msg, const json::value& details) const { diff --git a/src/MaaCore/Task/Roguelike/RoguelikeSkillSelectionTaskPlugin.cpp b/src/MaaCore/Task/Roguelike/RoguelikeSkillSelectionTaskPlugin.cpp index 92843d1392..d5994a8b74 100644 --- a/src/MaaCore/Task/Roguelike/RoguelikeSkillSelectionTaskPlugin.cpp +++ b/src/MaaCore/Task/Roguelike/RoguelikeSkillSelectionTaskPlugin.cpp @@ -1,10 +1,10 @@ #include "RoguelikeSkillSelectionTaskPlugin.h" -#include "Controller.h" -#include "Vision/Roguelike/RoguelikeSkillSelectionImageAnalyzer.h" #include "Config/Roguelike/RoguelikeRecruitConfig.h" #include "Config/TaskData.h" +#include "Controller.h" #include "Status.h" +#include "Vision/Roguelike/RoguelikeSkillSelectionImageAnalyzer.h" #include "Utils/Logger.hpp" diff --git a/src/MaaCore/Task/SingleStep/SingleStepBattleProcessTask.cpp b/src/MaaCore/Task/SingleStep/SingleStepBattleProcessTask.cpp index 3c5b521997..a7f0174244 100644 --- a/src/MaaCore/Task/SingleStep/SingleStepBattleProcessTask.cpp +++ b/src/MaaCore/Task/SingleStep/SingleStepBattleProcessTask.cpp @@ -7,7 +7,7 @@ bool asst::SingleStepBattleProcessTask::set_stage_name_cache(const std::string& stage_name) { LogTraceFunction; - + if (!Tile.contains(stage_name)) { Log.error("get stage info failed", stage_name); return false; diff --git a/src/MaaCore/Vision/Infrast/InfrastClueVacancyImageAnalyzer.cpp b/src/MaaCore/Vision/Infrast/InfrastClueVacancyImageAnalyzer.cpp index 0f007360f9..160160b3c5 100644 --- a/src/MaaCore/Vision/Infrast/InfrastClueVacancyImageAnalyzer.cpp +++ b/src/MaaCore/Vision/Infrast/InfrastClueVacancyImageAnalyzer.cpp @@ -1,8 +1,8 @@ #include "InfrastClueVacancyImageAnalyzer.h" -#include "Vision/MatchImageAnalyzer.h" #include "Utils/Logger.hpp" #include "Utils/NoWarningCV.h" +#include "Vision/MatchImageAnalyzer.h" bool asst::InfrastClueVacancyImageAnalyzer::analyze() { diff --git a/src/MaaCore/Vision/Infrast/InfrastFacilityImageAnalyzer.cpp b/src/MaaCore/Vision/Infrast/InfrastFacilityImageAnalyzer.cpp index 60aa3993cf..a974dc30a2 100644 --- a/src/MaaCore/Vision/Infrast/InfrastFacilityImageAnalyzer.cpp +++ b/src/MaaCore/Vision/Infrast/InfrastFacilityImageAnalyzer.cpp @@ -2,9 +2,9 @@ #include "Utils/NoWarningCV.h" -#include "Vision/MultiMatchImageAnalyzer.h" #include "Config/TaskData.h" #include "Utils/Logger.hpp" +#include "Vision/MultiMatchImageAnalyzer.h" bool asst::InfrastFacilityImageAnalyzer::analyze() { diff --git a/src/MaaCore/Vision/Infrast/InfrastOperImageAnalyzer.cpp b/src/MaaCore/Vision/Infrast/InfrastOperImageAnalyzer.cpp index 063ab54e61..8fc2fb736e 100644 --- a/src/MaaCore/Vision/Infrast/InfrastOperImageAnalyzer.cpp +++ b/src/MaaCore/Vision/Infrast/InfrastOperImageAnalyzer.cpp @@ -3,12 +3,12 @@ #include "Utils/NoWarningCV.h" #include "Utils/Ranges.hpp" -#include "Vision/HashImageAnalyzer.h" -#include "Vision/MatchImageAnalyzer.h" -#include "InfrastSmileyImageAnalyzer.h" #include "Config/Miscellaneous/InfrastConfig.h" #include "Config/TaskData.h" +#include "InfrastSmileyImageAnalyzer.h" #include "Utils/Logger.hpp" +#include "Vision/HashImageAnalyzer.h" +#include "Vision/MatchImageAnalyzer.h" bool asst::InfrastOperImageAnalyzer::analyze() { diff --git a/src/MaaCore/Vision/Infrast/InfrastSmileyImageAnalyzer.cpp b/src/MaaCore/Vision/Infrast/InfrastSmileyImageAnalyzer.cpp index e2fbabb0a9..75f8acf0b2 100644 --- a/src/MaaCore/Vision/Infrast/InfrastSmileyImageAnalyzer.cpp +++ b/src/MaaCore/Vision/Infrast/InfrastSmileyImageAnalyzer.cpp @@ -2,8 +2,8 @@ #include "Utils/NoWarningCV.h" -#include "Vision/MultiMatchImageAnalyzer.h" #include "Utils/StringMisc.hpp" +#include "Vision/MultiMatchImageAnalyzer.h" bool asst::InfrastSmileyImageAnalyzer::analyze() { diff --git a/src/MaaCore/Vision/Miscellaneous/BattleSkillReadyImageAnalyzer.cpp b/src/MaaCore/Vision/Miscellaneous/BattleSkillReadyImageAnalyzer.cpp index e067d77b04..510d947830 100644 --- a/src/MaaCore/Vision/Miscellaneous/BattleSkillReadyImageAnalyzer.cpp +++ b/src/MaaCore/Vision/Miscellaneous/BattleSkillReadyImageAnalyzer.cpp @@ -60,7 +60,7 @@ bool asst::BattleSkillReadyImageAnalyzer::analyze() if (iter.score > value) { iter.rect = rect; iter.score = value; - } + } need_push = false; break; } diff --git a/src/MaaCore/Vision/Miscellaneous/CreditShopImageAnalyzer.cpp b/src/MaaCore/Vision/Miscellaneous/CreditShopImageAnalyzer.cpp index 13282acc61..291649fb1c 100644 --- a/src/MaaCore/Vision/Miscellaneous/CreditShopImageAnalyzer.cpp +++ b/src/MaaCore/Vision/Miscellaneous/CreditShopImageAnalyzer.cpp @@ -5,15 +5,15 @@ #include "Utils/NoWarningCV.h" #include "Config/TaskData.h" +#include "Utils/Logger.hpp" #include "Vision/MatchImageAnalyzer.h" #include "Vision/MultiMatchImageAnalyzer.h" #include "Vision/OcrImageAnalyzer.h" -#include "Utils/Logger.hpp" void asst::CreditShopImageAnalyzer::set_black_list(std::vector black_list) { Log.info(__FUNCTION__, black_list); - + m_shopping_list = std::move(black_list); m_is_white_list = false; } @@ -21,7 +21,7 @@ void asst::CreditShopImageAnalyzer::set_black_list(std::vector blac void asst::CreditShopImageAnalyzer::set_white_list(std::vector black_list) { Log.info(__FUNCTION__, black_list); - + m_shopping_list = std::move(black_list); m_is_white_list = true; } @@ -67,7 +67,7 @@ bool asst::CreditShopImageAnalyzer::commodities_analyze() bool asst::CreditShopImageAnalyzer::whether_to_buy_analyze() { Log.info(__FUNCTION__, m_shopping_list, "mode", m_is_white_list); - + const auto product_name_task_ptr = Task.get("CreditShop-ProductName"); for (const Rect& commodity : m_commodities) { @@ -104,7 +104,7 @@ bool asst::CreditShopImageAnalyzer::whether_to_buy_analyze() ranges::sort(m_need_to_buy, std::less {}, [&](const auto& pair) { return ranges::find(m_shopping_list, pair.second); }); } - + return !m_need_to_buy.empty(); } diff --git a/src/MaaCore/Vision/Miscellaneous/RecruitImageAnalyzer.cpp b/src/MaaCore/Vision/Miscellaneous/RecruitImageAnalyzer.cpp index ad9e260d06..4ebbc7aa75 100644 --- a/src/MaaCore/Vision/Miscellaneous/RecruitImageAnalyzer.cpp +++ b/src/MaaCore/Vision/Miscellaneous/RecruitImageAnalyzer.cpp @@ -1,10 +1,10 @@ #include "RecruitImageAnalyzer.h" +#include "Config/Miscellaneous/RecruitConfig.h" +#include "Config/TaskData.h" #include "Vision/MatchImageAnalyzer.h" #include "Vision/MultiMatchImageAnalyzer.h" #include "Vision/OcrImageAnalyzer.h" -#include "Config/Miscellaneous/RecruitConfig.h" -#include "Config/TaskData.h" bool asst::RecruitImageAnalyzer::analyze() { diff --git a/src/MaaCore/Vision/Miscellaneous/StageDropsImageAnalyzer.h b/src/MaaCore/Vision/Miscellaneous/StageDropsImageAnalyzer.h index 4c8640c467..962c17cc0c 100644 --- a/src/MaaCore/Vision/Miscellaneous/StageDropsImageAnalyzer.h +++ b/src/MaaCore/Vision/Miscellaneous/StageDropsImageAnalyzer.h @@ -1,6 +1,6 @@ #pragma once -#include "Vision/AbstractImageAnalyzer.h" #include "Config/Miscellaneous/StageDropsConfig.h" +#include "Vision/AbstractImageAnalyzer.h" #include @@ -31,7 +31,8 @@ namespace asst int match_quantity(const Rect& roi, const std::string& item, bool use_word_model = false); std::optional match_quantity_string(const Rect& roi, bool use_word_model = false); - std::optional match_quantity_string(const Rect& roi, const std::string& item, bool use_word_model = false); + std::optional match_quantity_string(const Rect& roi, const std::string& item, + bool use_word_model = false); StageDropType match_droptype(const Rect& roi); std::string match_item(const Rect& roi, StageDropType type, int index, int size); diff --git a/src/MaaCore/Vision/Roguelike/RoguelikeFormationImageAnalyzer.cpp b/src/MaaCore/Vision/Roguelike/RoguelikeFormationImageAnalyzer.cpp index 902a0d77ff..d3e16dfe69 100644 --- a/src/MaaCore/Vision/Roguelike/RoguelikeFormationImageAnalyzer.cpp +++ b/src/MaaCore/Vision/Roguelike/RoguelikeFormationImageAnalyzer.cpp @@ -2,9 +2,9 @@ #include "Utils/NoWarningCV.h" -#include "Vision/MultiMatchImageAnalyzer.h" #include "Config/TaskData.h" #include "Utils/Logger.hpp" +#include "Vision/MultiMatchImageAnalyzer.h" bool asst::RoguelikeFormationImageAnalyzer::analyze() { diff --git a/src/MaaCore/Vision/Roguelike/RoguelikeSkillSelectionImageAnalyzer.cpp b/src/MaaCore/Vision/Roguelike/RoguelikeSkillSelectionImageAnalyzer.cpp index 5c8a7730af..d495ef75fb 100644 --- a/src/MaaCore/Vision/Roguelike/RoguelikeSkillSelectionImageAnalyzer.cpp +++ b/src/MaaCore/Vision/Roguelike/RoguelikeSkillSelectionImageAnalyzer.cpp @@ -2,13 +2,13 @@ #include "Utils/NoWarningCV.h" -#include "Vision/MatchImageAnalyzer.h" -#include "Vision/MultiMatchImageAnalyzer.h" -#include "Vision/OcrWithPreprocessImageAnalyzer.h" #include "Config/Roguelike/RoguelikeRecruitConfig.h" #include "Config/TaskData.h" #include "Utils/Logger.hpp" #include "Utils/StringMisc.hpp" +#include "Vision/MatchImageAnalyzer.h" +#include "Vision/MultiMatchImageAnalyzer.h" +#include "Vision/OcrWithPreprocessImageAnalyzer.h" bool asst::RoguelikeSkillSelectionImageAnalyzer::analyze() {