typo: 修改插件名以符合项目格式

src/MaaCore/MaaCore.vcxproj

@@ -71,10 +71,10 @@
     <ClInclude Include="Task\Experiment\CombatRecordRecognitionTask.h" />
     <ClInclude Include="Task\Experiment\SingleStepBattleProcessTask.h" />
     <ClInclude Include="Task\Fight\FightTimesTaskPlugin.h" />
-    <ClInclude Include="Task\Fight\MedicineCounterPlugin.h" />
-    <ClInclude Include="Task\Fight\SanityBeforeStagePlugin.h" />
+    <ClInclude Include="Task\Fight\MedicineCounterTaskPlugin.h" />
+    <ClInclude Include="Task\Fight\SanityBeforeStageTaskPlugin.h" />
     <ClInclude Include="Task\Fight\SideStoryReopenTask.h" />
-    <ClInclude Include="Task\Fight\StageQueueMissionCompletedPlugin.h" />
+    <ClInclude Include="Task\Fight\StageQueueMissionCompletedTaskPlugin.h" />
     <ClInclude Include="Task\Infrast\InfrastProcessingTask.h" />
     <ClInclude Include="Task\Interface\CustomTask.h" />
     <ClInclude Include="Task\Interface\VideoRecognitionTask.h" />
@@ -248,10 +248,10 @@
     <ClCompile Include="Task\Experiment\CombatRecordRecognitionTask.cpp" />
     <ClCompile Include="Task\Experiment\SingleStepBattleProcessTask.cpp" />
     <ClCompile Include="Task\Fight\FightTimesTaskPlugin.cpp" />
-    <ClCompile Include="Task\Fight\MedicineCounterPlugin.cpp" />
-    <ClCompile Include="Task\Fight\SanityBeforeStagePlugin.cpp" />
+    <ClCompile Include="Task\Fight\MedicineCounterTaskPlugin.cpp" />
+    <ClCompile Include="Task\Fight\SanityBeforeStageTaskPlugin.cpp" />
     <ClCompile Include="Task\Fight\SideStoryReopenTask.cpp" />
-    <ClCompile Include="Task\Fight\StageQueueMissionCompletedPlugin.cpp" />
+    <ClCompile Include="Task\Fight\StageQueueMissionCompletedTaskPlugin.cpp" />
     <ClCompile Include="Task\Infrast\InfrastProcessingTask.cpp" />
     <ClCompile Include="Task\Interface\VideoRecognitionTask.cpp" />
     <ClCompile Include="Task\Interface\OperBoxTask.cpp" />

src/MaaCore/MaaCore.vcxproj.filters

@@ -642,13 +642,13 @@
     <ClInclude Include="Vision\Config\OCRerConfig.h">
       <Filter>Source\Vision\Config</Filter>
     </ClInclude>
-    <ClInclude Include="Task\Fight\SanityBeforeStagePlugin.h">
+    <ClInclude Include="Task\Fight\SanityBeforeStageTaskPlugin.h">
       <Filter>Source\Task\Fight</Filter>
     </ClInclude>
     <ClInclude Include="Task\Fight\SideStoryReopenTask.h">
       <Filter>Source\Task\Fight</Filter>
     </ClInclude>
-    <ClInclude Include="Task\Fight\StageQueueMissionCompletedPlugin.h">
+    <ClInclude Include="Task\Fight\StageQueueMissionCompletedTaskPlugin.h">
       <Filter>Source\Task\Fight</Filter>
     </ClInclude>
     <ClInclude Include="Task\Miscellaneous\AccountSwitchTask.h">
@@ -666,7 +666,7 @@
     <ClInclude Include="Task\Roguelike\RoguelikeStrategyChangeTaskPlugin.h">
       <Filter>Source\Task\Roguelike</Filter>
     </ClInclude>
-    <ClInclude Include="Task\Fight\MedicineCounterPlugin.h">
+    <ClInclude Include="Task\Fight\MedicineCounterTaskPlugin.h">
       <Filter>Source\Task\Fight</Filter>
     </ClInclude>
     <ClInclude Include="Task\Miscellaneous\ScreenshotTaskPlugin.h">
@@ -1109,13 +1109,13 @@
     <ClCompile Include="Vision\Config\OCRerConfig.cpp">
       <Filter>Source\Vision\Config</Filter>
     </ClCompile>
-    <ClCompile Include="Task\Fight\SanityBeforeStagePlugin.cpp">
+    <ClCompile Include="Task\Fight\SanityBeforeStageTaskPlugin.cpp">
       <Filter>Source\Task\Fight</Filter>
     </ClCompile>
     <ClCompile Include="Task\Fight\SideStoryReopenTask.cpp">
       <Filter>Source\Task\Fight</Filter>
     </ClCompile>
-    <ClCompile Include="Task\Fight\StageQueueMissionCompletedPlugin.cpp">
+    <ClCompile Include="Task\Fight\StageQueueMissionCompletedTaskPlugin.cpp">
       <Filter>Source\Task\Fight</Filter>
     </ClCompile>
     <ClCompile Include="Task\Miscellaneous\AccountSwitchTask.cpp">
@@ -1130,7 +1130,7 @@
     <ClCompile Include="Task\Miscellaneous\ScreenshotTaskPlugin.cpp">
       <Filter>Source\Task\Miscellaneous</Filter>
     </ClCompile>
-    <ClCompile Include="Task\Fight\MedicineCounterPlugin.cpp">
+    <ClCompile Include="Task\Fight\MedicineCounterTaskPlugin.cpp">
       <Filter>Source\Task\Fight</Filter>
     </ClCompile>
     <ClCompile Include="Task\Fight\FightTimesTaskPlugin.cpp">

src/MaaCore/Task/Fight/MedicineCounterTaskPlugin.cpp

@@ -1,4 +1,4 @@
-#include "MedicineCounterPlugin.h"
+#include "MedicineCounterTaskPlugin.h"
 
 #include <ranges>
 
@@ -13,7 +13,7 @@
 #include "Vision/MultiMatcher.h"
 #include "Vision/RegionOCRer.h"
 
-bool asst::MedicineCounterPlugin::verify(AsstMsg msg, const json::value& details) const
+bool asst::MedicineCounterTaskPlugin::verify(AsstMsg msg, const json::value& details) const
 {
     if (msg != AsstMsg::SubTaskStart || details.get("subtask", std::string()) != "ProcessTask") {
         return false;
@@ -22,7 +22,7 @@ bool asst::MedicineCounterPlugin::verify(AsstMsg msg, const json::value& details
     return details.get("details", "task", "").ends_with("UseMedicine");
 }
 
-bool asst::MedicineCounterPlugin::_run()
+bool asst::MedicineCounterTaskPlugin::_run()
 {
     LogTraceFunction;
 
@@ -112,7 +112,7 @@ bool asst::MedicineCounterPlugin::_run()
     return true;
 }
 
-std::optional<asst::MedicineCounterPlugin::MedicineResult> asst::MedicineCounterPlugin::init_count(cv::Mat image)
+std::optional<asst::MedicineCounterTaskPlugin::MedicineResult> asst::MedicineCounterTaskPlugin::init_count(cv::Mat image)
 {
     int use = 0;
     MultiMatcher multi_matcher(image);
@@ -181,7 +181,7 @@ std::optional<asst::MedicineCounterPlugin::MedicineResult> asst::MedicineCounter
     return MedicineResult { .using_count = use, .medicines = medicines };
 }
 
-void asst::MedicineCounterPlugin::reduce_excess(const MedicineResult& using_medicine)
+void asst::MedicineCounterTaskPlugin::reduce_excess(const MedicineResult& using_medicine)
 {
     auto reduce = m_used_count + using_medicine.using_count - m_max_count;
     for (const auto& [use, inventory, rect, is_expiring] : using_medicine.medicines | views::reverse) {
@@ -201,7 +201,7 @@ void asst::MedicineCounterPlugin::reduce_excess(const MedicineResult& using_medi
     }
 }
 
-std::optional<int> asst::MedicineCounterPlugin::get_target_of_sanity(const cv::Mat& image)
+std::optional<int> asst::MedicineCounterTaskPlugin::get_target_of_sanity(const cv::Mat& image)
 {
     RegionOCRer ocr(image);
     ocr.set_bin_threshold(100, 255);
@@ -218,7 +218,7 @@ std::optional<int> asst::MedicineCounterPlugin::get_target_of_sanity(const cv::M
     return num;
 }
 
-std::optional<int> asst::MedicineCounterPlugin::get_maximun_of_sanity(const cv::Mat& image)
+std::optional<int> asst::MedicineCounterTaskPlugin::get_maximun_of_sanity(const cv::Mat& image)
 {
     RegionOCRer ocr(image);
     ocr.set_bin_threshold(100, 255);

src/MaaCore/Task/Fight/MedicineCounterTaskPlugin.h

@@ -5,11 +5,11 @@
 
 namespace asst
 {
-    class MedicineCounterPlugin final : public AbstractTaskPlugin
+    class MedicineCounterTaskPlugin final : public AbstractTaskPlugin
     {
     public:
         using AbstractTaskPlugin::AbstractTaskPlugin;
-        virtual ~MedicineCounterPlugin() override = default;
+        virtual ~MedicineCounterTaskPlugin() override = default;
         virtual bool verify(AsstMsg msg, const json::value& details) const override;
         void set_dr_grandet(bool dr_grandet) { m_dr_grandet = dr_grandet; };
         void set_count(int count) { m_max_count = count; }

src/MaaCore/Task/Fight/SanityBeforeStageTaskPlugin.cpp

@@ -1,13 +1,12 @@
-#include "SanityBeforeStagePlugin.h"
+#include "SanityBeforeStageTaskPlugin.h"
 
 #include "Controller/Controller.h"
 #include "Utils/Logger.hpp"
 #include "Utils/StringMisc.hpp"
 #include "Vision/RegionOCRer.h"
 
-bool asst::SanityBeforeStagePlugin::verify(AsstMsg msg, const json::value& details) const
+bool asst::SanityBeforeStageTaskPlugin::verify(AsstMsg msg, const json::value& details) const
 {
-    // SubTaskStart会在主任务的操作部分之前触发，想不通，但是如果哪天改了记得来这里修
     if (msg != AsstMsg::SubTaskStart || details.get("subtask", std::string()) != "ProcessTask") {
         return false;
     }
@@ -25,12 +24,12 @@ bool asst::SanityBeforeStagePlugin::verify(AsstMsg msg, const json::value& detai
     }
 }
 
-bool asst::SanityBeforeStagePlugin::_run()
+bool asst::SanityBeforeStageTaskPlugin::_run()
 {
     return get_sanity_before_stage();
 }
 
-bool asst::SanityBeforeStagePlugin::get_sanity_before_stage()
+bool asst::SanityBeforeStageTaskPlugin::get_sanity_before_stage()
 {
     LogTraceFunction;
 

src/MaaCore/Task/Fight/SanityBeforeStageTaskPlugin.h

@@ -2,11 +2,11 @@
 #include "Task/AbstractTaskPlugin.h"
 namespace asst
 {
-    class SanityBeforeStagePlugin final : public AbstractTaskPlugin
+    class SanityBeforeStageTaskPlugin final : public AbstractTaskPlugin
     {
     public:
         using AbstractTaskPlugin::AbstractTaskPlugin;
-        virtual ~SanityBeforeStagePlugin() override = default;
+        virtual ~SanityBeforeStageTaskPlugin() override = default;
         virtual bool verify(AsstMsg msg, const json::value& details) const override;
 
     private:

src/MaaCore/Task/Fight/SideStoryReopenTask.cpp

@@ -1,8 +1,8 @@
 #include "SideStoryReopenTask.h"
 
 #include "Config/TaskData.h"
-#include "Task/Fight/MedicineCounterPlugin.h"
-#include "Task/Fight/StageQueueMissionCompletedPlugin.h"
+#include "Task/Fight/MedicineCounterTaskPlugin.h"
+#include "Task/Fight/StageQueueMissionCompletedTaskPlugin.h"
 #include "Task/ProcessTask.h"
 #include "Utils/Logger.hpp"
 
@@ -189,11 +189,11 @@ bool asst::SideStoryReopenTask::fight(bool use_medicine, bool use_stone)
         .set_times_limit("StageQueue@StartButton1", 1)
         .set_times_limit("StageQueue@StartButton2", 1);
 
-    auto medicine_plugin = fight_task.register_plugin<MedicineCounterPlugin>();
+    auto medicine_plugin = fight_task.register_plugin<MedicineCounterTaskPlugin>();
     medicine_plugin->set_count(use_medicine ? 1 : 0);
     medicine_plugin->set_use_expiring(m_expiring_medicine);
 
-    auto plugin = fight_task.register_plugin<StageQueueMissionCompletedPlugin>();
+    auto plugin = fight_task.register_plugin<StageQueueMissionCompletedTaskPlugin>();
     plugin->set_drop_stats(std::move(m_drop_stats));
     plugin->set_enable_penguin(m_enable_penguin);
     plugin->set_enable_yituliu(m_enable_yituliu);

src/MaaCore/Task/Fight/StageQueueMissionCompletedTaskPlugin.cpp

@@ -1,4 +1,4 @@
-#include "StageQueueMissionCompletedPlugin.h"
+#include "StageQueueMissionCompletedTaskPlugin.h"
 
 #include "Config/Miscellaneous/ItemConfig.h"
 #include "Config/TaskData.h"
@@ -10,7 +10,7 @@
 #include "Vision/Miscellaneous/StageDropsImageAnalyzer.h"
 #include "Vision/RegionOCRer.h"
 
-bool asst::StageQueueMissionCompletedPlugin::verify(AsstMsg msg, const json::value& details) const
+bool asst::StageQueueMissionCompletedTaskPlugin::verify(AsstMsg msg, const json::value& details) const
 {
     if (msg != AsstMsg::SubTaskStart || details.get("subtask", std::string()) != "ProcessTask") {
         return false;
@@ -19,17 +19,17 @@ bool asst::StageQueueMissionCompletedPlugin::verify(AsstMsg msg, const json::val
     return details.get("details", "task", "") == "StageQueue@EndOfAction";
 }
 
-void asst::StageQueueMissionCompletedPlugin::set_drop_stats(std::unordered_map<std::string, int> drop_stats)
+void asst::StageQueueMissionCompletedTaskPlugin::set_drop_stats(std::unordered_map<std::string, int> drop_stats)
 {
     m_drop_stats = std::move(drop_stats);
 }
 
-std::unordered_map<std::string, int> asst::StageQueueMissionCompletedPlugin::get_drop_stats()
+std::unordered_map<std::string, int> asst::StageQueueMissionCompletedTaskPlugin::get_drop_stats()
 {
     return m_drop_stats;
 }
 
-bool asst::StageQueueMissionCompletedPlugin::_run()
+bool asst::StageQueueMissionCompletedTaskPlugin::_run()
 {
     LogTraceFunction;
 
@@ -40,7 +40,7 @@ bool asst::StageQueueMissionCompletedPlugin::_run()
 /// <summary>
 /// 识别关卡是否为三星完成
 /// </summary>
-void asst::StageQueueMissionCompletedPlugin::mission_completed()
+void asst::StageQueueMissionCompletedTaskPlugin::mission_completed()
 {
     LogTraceFunction;
 
@@ -69,7 +69,7 @@ void asst::StageQueueMissionCompletedPlugin::mission_completed()
     drop_info_callback(stage_code, difficulty, analyzer);
 }
 // 抄自StageDropsTaskPlugin
-void asst::StageQueueMissionCompletedPlugin::drop_info_callback(std::string stage_code,
+void asst::StageQueueMissionCompletedTaskPlugin::drop_info_callback(std::string stage_code,
                                                                 StageDifficulty stage_difficulty,
                                                                 StageDropsImageAnalyzer analyzer)
 {
@@ -122,28 +122,28 @@ void asst::StageQueueMissionCompletedPlugin::drop_info_callback(std::string stag
         upload_to_penguin(stage_code, analyzer.get_stars());
     }
 }
-bool asst::StageQueueMissionCompletedPlugin::set_server(std::string server)
+bool asst::StageQueueMissionCompletedTaskPlugin::set_server(std::string server)
 {
     m_server = std::move(server);
     return true;
 }
-bool asst::StageQueueMissionCompletedPlugin::set_enable_penguin(bool enable)
+bool asst::StageQueueMissionCompletedTaskPlugin::set_enable_penguin(bool enable)
 {
     m_enable_penguin = enable;
     return true;
 }
-bool asst::StageQueueMissionCompletedPlugin::set_penguin_id(std::string id)
+bool asst::StageQueueMissionCompletedTaskPlugin::set_penguin_id(std::string id)
 {
     m_penguin_id = std::move(id);
     return true;
 }
-bool asst::StageQueueMissionCompletedPlugin::set_enable_yituliu(bool enable)
+bool asst::StageQueueMissionCompletedTaskPlugin::set_enable_yituliu(bool enable)
 {
     // 暂时没用上，其他地方加了这里也加一个
     m_enable_yituliu = enable;
     return true;
 }
-void asst::StageQueueMissionCompletedPlugin::upload_to_penguin(std::string stage_code, int stars)
+void asst::StageQueueMissionCompletedTaskPlugin::upload_to_penguin(std::string stage_code, int stars)
 {
     LogTraceFunction;
 
@@ -214,12 +214,12 @@ void asst::StageQueueMissionCompletedPlugin::upload_to_penguin(std::string stage
         .set_retry_times(5)
         .run();
 }
-void asst::StageQueueMissionCompletedPlugin::report_penguin_callback(AsstMsg msg, const json::value& detail,
+void asst::StageQueueMissionCompletedTaskPlugin::report_penguin_callback(AsstMsg msg, const json::value& detail,
                                                                      AbstractTask* task_ptr)
 {
     LogTraceFunction;
 
-    auto p_this = dynamic_cast<StageQueueMissionCompletedPlugin*>(task_ptr);
+    auto p_this = dynamic_cast<StageQueueMissionCompletedTaskPlugin*>(task_ptr);
     if (!p_this) {
         return;
     }

src/MaaCore/Task/Fight/StageQueueMissionCompletedTaskPlugin.h

@@ -13,11 +13,11 @@
 
 namespace asst
 {
-    class StageQueueMissionCompletedPlugin : public AbstractTaskPlugin
+    class StageQueueMissionCompletedTaskPlugin : public AbstractTaskPlugin
     {
     public:
         using AbstractTaskPlugin::AbstractTaskPlugin;
-        virtual ~StageQueueMissionCompletedPlugin() override = default;
+        virtual ~StageQueueMissionCompletedTaskPlugin() override = default;
         virtual bool verify(AsstMsg msg, const json::value& details) const override;
         void set_drop_stats(std::unordered_map<std::string, int> m_drop_stats);
         std::unordered_map<std::string, int> get_drop_stats();

src/MaaCore/Task/Interface/CopilotTask.cpp

@@ -4,7 +4,7 @@
 
 #include "Config/Miscellaneous/CopilotConfig.h"
 #include "Config/TaskData.h"
-#include "Task/Fight/MedicineCounterPlugin.h"
+#include "Task/Fight/MedicineCounterTaskPlugin.h"
 #include "Task/Miscellaneous/BattleFormationTask.h"
 #include "Task/Miscellaneous/BattleProcessTask.h"
 #include "Task/Miscellaneous/TaskFileReloadTask.h"
@@ -40,7 +40,7 @@ asst::CopilotTask::CopilotTask(const AsstCallback& callback, Assistant* inst)
 
     m_medicine_task_ptr = std::make_shared<ProcessTask>(callback, inst, TaskType);
     m_medicine_task_ptr->set_tasks({ "BattleStartPre@UseMedicine" }).set_retry_times(0).set_ignore_error(true);
-    m_medicine_task_ptr->register_plugin<MedicineCounterPlugin>()->set_count(999999);
+    m_medicine_task_ptr->register_plugin<MedicineCounterTaskPlugin>()->set_count(999999);
     m_subtasks.emplace_back(m_medicine_task_ptr);
 
     m_subtasks.emplace_back(m_formation_task_ptr)->set_retry_times(0);

src/MaaCore/Task/Interface/FightTask.cpp

@@ -5,8 +5,8 @@
 #include "Config/TaskData.h"
 #include "Task/Fight/DrGrandetTaskPlugin.h"
 #include "Task/Fight/FightTimesTaskPlugin.h"
-#include "Task/Fight/MedicineCounterPlugin.h"
-#include "Task/Fight/SanityBeforeStagePlugin.h"
+#include "Task/Fight/MedicineCounterTaskPlugin.h"
+#include "Task/Fight/SanityBeforeStageTaskPlugin.h"
 #include "Task/Fight/SideStoryReopenTask.h"
 #include "Task/Fight/StageDropsTaskPlugin.h"
 #include "Task/Fight/StageNavigationTask.h"
@@ -50,9 +50,9 @@ asst::FightTask::FightTask(const AsstCallback& callback, Assistant* inst)
     m_stage_drops_plugin_ptr->set_retry_times(0);
     m_dr_grandet_task_plugin_ptr = m_fight_task_ptr->register_plugin<DrGrandetTaskPlugin>();
     m_dr_grandet_task_plugin_ptr->set_enable(false);
-    m_fight_task_ptr->register_plugin<SanityBeforeStagePlugin>();
+    m_fight_task_ptr->register_plugin<SanityBeforeStageTaskPlugin>();
     m_fight_task_ptr->register_plugin<FightTimesTaskPlugin>();
-    m_medicine_plugin = m_fight_task_ptr->register_plugin<MedicineCounterPlugin>();
+    m_medicine_plugin = m_fight_task_ptr->register_plugin<MedicineCounterTaskPlugin>();
 
     m_subtasks.emplace_back(m_start_up_task_ptr);
     m_subtasks.emplace_back(m_stage_navigation_task_ptr);

src/MaaCore/Task/Interface/FightTask.h

@@ -10,7 +10,7 @@ namespace asst
     class StageNavigationTask;
     class DrGrandetTaskPlugin;
     class SideStoryReopenTask;
-    class MedicineCounterPlugin;
+    class MedicineCounterTaskPlugin;
 
     class FightTask final : public InterfaceTask
     {
@@ -26,7 +26,7 @@ namespace asst
         std::shared_ptr<ProcessTask> m_start_up_task_ptr = nullptr;
         std::shared_ptr<StageNavigationTask> m_stage_navigation_task_ptr = nullptr;
         std::shared_ptr<ProcessTask> m_fight_task_ptr = nullptr;
-        std::shared_ptr<MedicineCounterPlugin> m_medicine_plugin = nullptr;
+        std::shared_ptr<MedicineCounterTaskPlugin> m_medicine_plugin = nullptr;
         std::shared_ptr<StageDropsTaskPlugin> m_stage_drops_plugin_ptr = nullptr;
         std::shared_ptr<DrGrandetTaskPlugin> m_dr_grandet_task_plugin_ptr = nullptr;
         std::shared_ptr<SideStoryReopenTask> m_sidestory_reopen_task_ptr = nullptr;