diff --git a/src/MeoAssistant/Controller.cpp b/src/MeoAssistant/Controller.cpp index 5ce58dc21a..5c0fdf2005 100644 --- a/src/MeoAssistant/Controller.cpp +++ b/src/MeoAssistant/Controller.cpp @@ -747,7 +747,8 @@ bool asst::Controller::screencap(bool allow_reconnect) clear_lf_info(); auto start_time = high_resolution_clock::now(); - if (m_support_socket && m_server_started && screencap(m_adb.screencap_raw_by_nc, decode_raw, allow_reconnect, true)) { + if (m_support_socket && m_server_started && + screencap(m_adb.screencap_raw_by_nc, decode_raw, allow_reconnect, true)) { auto duration = duration_cast(high_resolution_clock::now() - start_time); if (duration < min_cost) { m_adb.screencap_method = AdbProperty::ScreencapMethod::RawByNc; diff --git a/src/MeoAssistant/ImageAnalyzer/RecruitImageAnalyzer.cpp b/src/MeoAssistant/ImageAnalyzer/RecruitImageAnalyzer.cpp index a85331cedc..fbbf51ebbe 100644 --- a/src/MeoAssistant/ImageAnalyzer/RecruitImageAnalyzer.cpp +++ b/src/MeoAssistant/ImageAnalyzer/RecruitImageAnalyzer.cpp @@ -24,7 +24,7 @@ bool asst::RecruitImageAnalyzer::tags_analyze() if (!analyzer_inited) { tags_analyzer.set_task_info("RecruitTags"); auto& all_tags_set = RecruitData.get_all_tags(); - + // 已经 fullMatch,不会再把 `支援机械` 匹配成 `支援`、`高级资深干员` 匹配成 `资深干员` 了,因此不必再排序。 tags_analyzer.set_required(std::vector(all_tags_set.begin(), all_tags_set.end())); analyzer_inited = true; diff --git a/src/MeoAssistant/Task/Plugin/RoguelikeBattleTaskPlugin.h b/src/MeoAssistant/Task/Plugin/RoguelikeBattleTaskPlugin.h index bb38fe872d..147a0886bc 100644 --- a/src/MeoAssistant/Task/Plugin/RoguelikeBattleTaskPlugin.h +++ b/src/MeoAssistant/Task/Plugin/RoguelikeBattleTaskPlugin.h @@ -3,9 +3,9 @@ #include #include "AbstractTaskPlugin.h" -#include "Utils/AsstBattleDef.h" #include "ImageAnalyzer/BattleImageAnalyzer.h" #include "Resource/TilePack.h" +#include "Utils/AsstBattleDef.h" #include "Utils/AsstTypes.h" namespace asst diff --git a/src/MeoAssistant/Task/Sub/BattleProcessTask.h b/src/MeoAssistant/Task/Sub/BattleProcessTask.h index 6e482d3b01..99f075d265 100644 --- a/src/MeoAssistant/Task/Sub/BattleProcessTask.h +++ b/src/MeoAssistant/Task/Sub/BattleProcessTask.h @@ -1,9 +1,9 @@ #pragma once #include "AbstractTask.h" -#include "Utils/AsstBattleDef.h" #include "ImageAnalyzer/BattleImageAnalyzer.h" #include "Resource/TilePack.h" +#include "Utils/AsstBattleDef.h" #include "Utils/AsstTypes.h" namespace asst