diff --git a/src/MaaCore/MaaCore.vcxproj b/src/MaaCore/MaaCore.vcxproj index f5ed68d8ea..e3fccbce63 100644 --- a/src/MaaCore/MaaCore.vcxproj +++ b/src/MaaCore/MaaCore.vcxproj @@ -70,7 +70,7 @@ - + @@ -247,7 +247,7 @@ - + diff --git a/src/MaaCore/MaaCore.vcxproj.filters b/src/MaaCore/MaaCore.vcxproj.filters index bdba56d8c1..91b5dd8f02 100644 --- a/src/MaaCore/MaaCore.vcxproj.filters +++ b/src/MaaCore/MaaCore.vcxproj.filters @@ -672,7 +672,7 @@ Source\Task\Miscellaneous - + Source\Task\Fight @@ -1133,7 +1133,7 @@ Source\Task\Fight - + Source\Task\Fight diff --git a/src/MaaCore/Task/Fight/FightTimesPlugin.cpp b/src/MaaCore/Task/Fight/FightTimesTaskPlugin.cpp similarity index 87% rename from src/MaaCore/Task/Fight/FightTimesPlugin.cpp rename to src/MaaCore/Task/Fight/FightTimesTaskPlugin.cpp index e2cf3d4260..c1a15bb594 100644 --- a/src/MaaCore/Task/Fight/FightTimesPlugin.cpp +++ b/src/MaaCore/Task/Fight/FightTimesTaskPlugin.cpp @@ -1,9 +1,9 @@ -#include "FightTimesPlugin.h" +#include "FightTimesTaskPlugin.h" #include "Controller/Controller.h" #include "Task/ProcessTask.h" -bool asst::FightTimesPlugin::verify(AsstMsg msg, const json::value& details) const +bool asst::FightTimesTaskPlugin::verify(AsstMsg msg, const json::value& details) const { if (msg != AsstMsg::SubTaskStart || details.get("subtask", std::string()) != "ProcessTask") { return false; @@ -12,7 +12,7 @@ bool asst::FightTimesPlugin::verify(AsstMsg msg, const json::value& details) con return !inited && details.get("details", "task", "").ends_with("StartButton1"); } -bool asst::FightTimesPlugin::_run() +bool asst::FightTimesTaskPlugin::_run() { const static std::string FightSeriesOpenTask = "FightSeries-Indicator"; const static std::string FightSeriesValidTask = "FightSeries-Icon"; diff --git a/src/MaaCore/Task/Fight/FightTimesPlugin.h b/src/MaaCore/Task/Fight/FightTimesTaskPlugin.h similarity index 78% rename from src/MaaCore/Task/Fight/FightTimesPlugin.h rename to src/MaaCore/Task/Fight/FightTimesTaskPlugin.h index a636927e0c..42dd0f63fb 100644 --- a/src/MaaCore/Task/Fight/FightTimesPlugin.h +++ b/src/MaaCore/Task/Fight/FightTimesTaskPlugin.h @@ -2,11 +2,11 @@ #include "Task/AbstractTaskPlugin.h" namespace asst { - class FightTimesPlugin : public AbstractTaskPlugin + class FightTimesTaskPlugin : public AbstractTaskPlugin { public: using AbstractTaskPlugin::AbstractTaskPlugin; - virtual ~FightTimesPlugin() override = default; + virtual ~FightTimesTaskPlugin() override = default; virtual bool verify(AsstMsg msg, const json::value& details) const override; diff --git a/src/MaaCore/Task/Interface/FightTask.cpp b/src/MaaCore/Task/Interface/FightTask.cpp index 250c00bfaa..a7944a7263 100644 --- a/src/MaaCore/Task/Interface/FightTask.cpp +++ b/src/MaaCore/Task/Interface/FightTask.cpp @@ -4,7 +4,7 @@ #include "Config/TaskData.h" #include "Task/Fight/DrGrandetTaskPlugin.h" -#include "Task/Fight/FightTimesPlugin.h" +#include "Task/Fight/FightTimesTaskPlugin.h" #include "Task/Fight/MedicineCounterPlugin.h" #include "Task/Fight/SanityBeforeStagePlugin.h" #include "Task/Fight/SideStoryReopenTask.h" @@ -51,7 +51,7 @@ asst::FightTask::FightTask(const AsstCallback& callback, Assistant* inst) 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_subtasks.emplace_back(m_start_up_task_ptr);