diff --git a/resource/roguelike/Sami/autopilot/禁区.json b/resource/roguelike/Sami/autopilot/禁区.json index 780c0f19a2..603574f4ba 100644 --- a/resource/roguelike/Sami/autopilot/禁区.json +++ b/resource/roguelike/Sami/autopilot/禁区.json @@ -201,8 +201,7 @@ 2 ], "direction": "down" - } - , + }, { "groups": [ "支援陷阱", diff --git a/src/MaaCore/Task/Fight/MedicineCounterPlugin.cpp b/src/MaaCore/Task/Fight/MedicineCounterPlugin.cpp index 26eadc95c1..917ec10f4c 100644 --- a/src/MaaCore/Task/Fight/MedicineCounterPlugin.cpp +++ b/src/MaaCore/Task/Fight/MedicineCounterPlugin.cpp @@ -57,7 +57,8 @@ bool asst::MedicineCounterPlugin::_run() } else if (m_using_count >= m_max_count && m_use_expiring) { bool changed = false; - for (const auto& [use, inventory, rect, is_expiring] : initial_count->medicines | asst::ranges::views::reverse) { + for (const auto& [use, inventory, rect, is_expiring] : + initial_count->medicines | asst::ranges::views::reverse) { if (use > 0 && is_expiring != ExpiringStatus::Expiring) { ctrler()->click(rect); sleep(Config.get_options().task_delay); diff --git a/src/MaaCore/Task/Fight/SanityBeforeStagePlugin.h b/src/MaaCore/Task/Fight/SanityBeforeStagePlugin.h index 2603f6c98d..b128fea39d 100644 --- a/src/MaaCore/Task/Fight/SanityBeforeStagePlugin.h +++ b/src/MaaCore/Task/Fight/SanityBeforeStagePlugin.h @@ -12,7 +12,6 @@ namespace asst private: virtual bool _run() override; - // 获取 当前理智/最大理智 // 返回 是否获取成功 bool get_sanity_before_stage(); diff --git a/src/MaaCore/Task/Interface/FightTask.cpp b/src/MaaCore/Task/Interface/FightTask.cpp index fd0c50e229..b834178e4e 100644 --- a/src/MaaCore/Task/Interface/FightTask.cpp +++ b/src/MaaCore/Task/Interface/FightTask.cpp @@ -4,11 +4,11 @@ #include "Config/TaskData.h" #include "Task/Fight/DrGrandetTaskPlugin.h" +#include "Task/Fight/MedicineCounterPlugin.h" #include "Task/Fight/SanityBeforeStagePlugin.h" #include "Task/Fight/SideStoryReopenTask.h" #include "Task/Fight/StageDropsTaskPlugin.h" #include "Task/Fight/StageNavigationTask.h" -#include "Task/Fight/MedicineCounterPlugin.h" #include "Task/ProcessTask.h" #include "Utils/Logger.hpp" #include "Utils/Ranges.hpp" diff --git a/src/MaaCore/Task/Miscellaneous/CreditFightTask.cpp b/src/MaaCore/Task/Miscellaneous/CreditFightTask.cpp index 0de6335931..5a172d4599 100644 --- a/src/MaaCore/Task/Miscellaneous/CreditFightTask.cpp +++ b/src/MaaCore/Task/Miscellaneous/CreditFightTask.cpp @@ -45,7 +45,7 @@ asst::CreditFightTask::CreditFightTask(const AsstCallback& callback, Assistant* void asst::CreditFightTask::set_select_formation(int index) { - json::value copilot_params = json::object{ + json::value copilot_params = json::object { { "filename", utils::path_to_utf8_string(ResDir.get() / "copilot" / "OF-1_credit_fight.json") }, { "formation", true }, { "support_unit_name", "_RANDOM_" }, diff --git a/src/MaaCore/Task/Miscellaneous/CreditFightTask.h b/src/MaaCore/Task/Miscellaneous/CreditFightTask.h index 436a24b94d..1d21c7412f 100644 --- a/src/MaaCore/Task/Miscellaneous/CreditFightTask.h +++ b/src/MaaCore/Task/Miscellaneous/CreditFightTask.h @@ -5,8 +5,8 @@ #include "Task/Interface/CopilotTask.h" #include "Utils/WorkingDir.hpp" -#include #include +#include namespace asst { @@ -19,6 +19,7 @@ namespace asst virtual ~CreditFightTask() override = default; void set_select_formation(int index); + private: std::shared_ptr m_copilot_task_ptr = nullptr; };