diff --git a/src/MaaCore/MaaCore.vcxproj b/src/MaaCore/MaaCore.vcxproj
index e3fccbce63..f4324dd830 100644
--- a/src/MaaCore/MaaCore.vcxproj
+++ b/src/MaaCore/MaaCore.vcxproj
@@ -71,10 +71,10 @@
-
-
+
+
-
+
@@ -248,10 +248,10 @@
-
-
+
+
-
+
diff --git a/src/MaaCore/MaaCore.vcxproj.filters b/src/MaaCore/MaaCore.vcxproj.filters
index 91b5dd8f02..0f01efb80e 100644
--- a/src/MaaCore/MaaCore.vcxproj.filters
+++ b/src/MaaCore/MaaCore.vcxproj.filters
@@ -642,13 +642,13 @@
Source\Vision\Config
-
+
Source\Task\Fight
Source\Task\Fight
-
+
Source\Task\Fight
@@ -666,7 +666,7 @@
Source\Task\Roguelike
-
+
Source\Task\Fight
@@ -1109,13 +1109,13 @@
Source\Vision\Config
-
+
Source\Task\Fight
Source\Task\Fight
-
+
Source\Task\Fight
@@ -1130,7 +1130,7 @@
Source\Task\Miscellaneous
-
+
Source\Task\Fight
diff --git a/src/MaaCore/Task/Fight/MedicineCounterPlugin.cpp b/src/MaaCore/Task/Fight/MedicineCounterTaskPlugin.cpp
similarity index 93%
rename from src/MaaCore/Task/Fight/MedicineCounterPlugin.cpp
rename to src/MaaCore/Task/Fight/MedicineCounterTaskPlugin.cpp
index 9a5539d397..6256142f39 100644
--- a/src/MaaCore/Task/Fight/MedicineCounterPlugin.cpp
+++ b/src/MaaCore/Task/Fight/MedicineCounterTaskPlugin.cpp
@@ -1,4 +1,4 @@
-#include "MedicineCounterPlugin.h"
+#include "MedicineCounterTaskPlugin.h"
#include
@@ -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::init_count(cv::Mat image)
+std::optional asst::MedicineCounterTaskPlugin::init_count(cv::Mat image)
{
int use = 0;
MultiMatcher multi_matcher(image);
@@ -181,7 +181,7 @@ std::optional 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 asst::MedicineCounterPlugin::get_target_of_sanity(const cv::Mat& image)
+std::optional 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 asst::MedicineCounterPlugin::get_target_of_sanity(const cv::M
return num;
}
-std::optional asst::MedicineCounterPlugin::get_maximun_of_sanity(const cv::Mat& image)
+std::optional asst::MedicineCounterTaskPlugin::get_maximun_of_sanity(const cv::Mat& image)
{
RegionOCRer ocr(image);
ocr.set_bin_threshold(100, 255);
diff --git a/src/MaaCore/Task/Fight/MedicineCounterPlugin.h b/src/MaaCore/Task/Fight/MedicineCounterTaskPlugin.h
similarity index 92%
rename from src/MaaCore/Task/Fight/MedicineCounterPlugin.h
rename to src/MaaCore/Task/Fight/MedicineCounterTaskPlugin.h
index 2671f9ac8c..0d7e5e43be 100644
--- a/src/MaaCore/Task/Fight/MedicineCounterPlugin.h
+++ b/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; }
diff --git a/src/MaaCore/Task/Fight/SanityBeforeStagePlugin.cpp b/src/MaaCore/Task/Fight/SanityBeforeStageTaskPlugin.cpp
similarity index 87%
rename from src/MaaCore/Task/Fight/SanityBeforeStagePlugin.cpp
rename to src/MaaCore/Task/Fight/SanityBeforeStageTaskPlugin.cpp
index b16a847f9a..68caf1d158 100644
--- a/src/MaaCore/Task/Fight/SanityBeforeStagePlugin.cpp
+++ b/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;
diff --git a/src/MaaCore/Task/Fight/SanityBeforeStagePlugin.h b/src/MaaCore/Task/Fight/SanityBeforeStageTaskPlugin.h
similarity index 74%
rename from src/MaaCore/Task/Fight/SanityBeforeStagePlugin.h
rename to src/MaaCore/Task/Fight/SanityBeforeStageTaskPlugin.h
index b128fea39d..54fc24c984 100644
--- a/src/MaaCore/Task/Fight/SanityBeforeStagePlugin.h
+++ b/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:
diff --git a/src/MaaCore/Task/Fight/SideStoryReopenTask.cpp b/src/MaaCore/Task/Fight/SideStoryReopenTask.cpp
index 97cbb82198..c26f7e342b 100644
--- a/src/MaaCore/Task/Fight/SideStoryReopenTask.cpp
+++ b/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();
+ auto medicine_plugin = fight_task.register_plugin();
medicine_plugin->set_count(use_medicine ? 1 : 0);
medicine_plugin->set_use_expiring(m_expiring_medicine);
- auto plugin = fight_task.register_plugin();
+ auto plugin = fight_task.register_plugin();
plugin->set_drop_stats(std::move(m_drop_stats));
plugin->set_enable_penguin(m_enable_penguin);
plugin->set_enable_yituliu(m_enable_yituliu);
diff --git a/src/MaaCore/Task/Fight/StageQueueMissionCompletedPlugin.cpp b/src/MaaCore/Task/Fight/StageQueueMissionCompletedTaskPlugin.cpp
similarity index 85%
rename from src/MaaCore/Task/Fight/StageQueueMissionCompletedPlugin.cpp
rename to src/MaaCore/Task/Fight/StageQueueMissionCompletedTaskPlugin.cpp
index 2f93ecf456..238c1df022 100644
--- a/src/MaaCore/Task/Fight/StageQueueMissionCompletedPlugin.cpp
+++ b/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 drop_stats)
+void asst::StageQueueMissionCompletedTaskPlugin::set_drop_stats(std::unordered_map drop_stats)
{
m_drop_stats = std::move(drop_stats);
}
-std::unordered_map asst::StageQueueMissionCompletedPlugin::get_drop_stats()
+std::unordered_map 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()
///
/// 识别关卡是否为三星完成
///
-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(task_ptr);
+ auto p_this = dynamic_cast(task_ptr);
if (!p_this) {
return;
}
diff --git a/src/MaaCore/Task/Fight/StageQueueMissionCompletedPlugin.h b/src/MaaCore/Task/Fight/StageQueueMissionCompletedTaskPlugin.h
similarity index 91%
rename from src/MaaCore/Task/Fight/StageQueueMissionCompletedPlugin.h
rename to src/MaaCore/Task/Fight/StageQueueMissionCompletedTaskPlugin.h
index 7e56e1706f..7aade61e2f 100644
--- a/src/MaaCore/Task/Fight/StageQueueMissionCompletedPlugin.h
+++ b/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 m_drop_stats);
std::unordered_map get_drop_stats();
diff --git a/src/MaaCore/Task/Interface/CopilotTask.cpp b/src/MaaCore/Task/Interface/CopilotTask.cpp
index 3b5bd9be77..f9a4f0b021 100644
--- a/src/MaaCore/Task/Interface/CopilotTask.cpp
+++ b/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(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()->set_count(999999);
+ m_medicine_task_ptr->register_plugin()->set_count(999999);
m_subtasks.emplace_back(m_medicine_task_ptr);
m_subtasks.emplace_back(m_formation_task_ptr)->set_retry_times(0);
diff --git a/src/MaaCore/Task/Interface/FightTask.cpp b/src/MaaCore/Task/Interface/FightTask.cpp
index a7944a7263..6f0076b009 100644
--- a/src/MaaCore/Task/Interface/FightTask.cpp
+++ b/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();
m_dr_grandet_task_plugin_ptr->set_enable(false);
- m_fight_task_ptr->register_plugin();
+ m_fight_task_ptr->register_plugin();
m_fight_task_ptr->register_plugin();
- m_medicine_plugin = m_fight_task_ptr->register_plugin();
+ m_medicine_plugin = m_fight_task_ptr->register_plugin();
m_subtasks.emplace_back(m_start_up_task_ptr);
m_subtasks.emplace_back(m_stage_navigation_task_ptr);
diff --git a/src/MaaCore/Task/Interface/FightTask.h b/src/MaaCore/Task/Interface/FightTask.h
index d3f11c1fbc..8de81bbb5a 100644
--- a/src/MaaCore/Task/Interface/FightTask.h
+++ b/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 m_start_up_task_ptr = nullptr;
std::shared_ptr m_stage_navigation_task_ptr = nullptr;
std::shared_ptr m_fight_task_ptr = nullptr;
- std::shared_ptr m_medicine_plugin = nullptr;
+ std::shared_ptr m_medicine_plugin = nullptr;
std::shared_ptr m_stage_drops_plugin_ptr = nullptr;
std::shared_ptr m_dr_grandet_task_plugin_ptr = nullptr;
std::shared_ptr m_sidestory_reopen_task_ptr = nullptr;