From f552bdc79dc682dbf6df0e34895ca203e0272d5f Mon Sep 17 00:00:00 2001 From: MistEO Date: Fri, 30 Sep 2022 13:41:38 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20=E5=86=8D=E6=AC=A1=E6=95=B4?= =?UTF-8?q?=E7=90=86=E9=A1=B9=E7=9B=AE=E9=83=A8=E5=88=86=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E7=9B=AE=E5=BD=95=E7=BB=93=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ImageAnalyzer/BattleImageAnalyzer.h | 2 +- .../RoguelikeRecruitImageAnalyzer.h | 2 +- src/MeoAssistant/MeoAssistant.vcxproj | 2 +- src/MeoAssistant/MeoAssistant.vcxproj.filters | 6 +-- src/MeoAssistant/PipelineTask.cpp | 37 ------------------- src/MeoAssistant/PipelineTask.h | 22 ----------- .../Resource/BattleDataConfiger.h | 2 +- src/MeoAssistant/Resource/CopilotConfiger.h | 2 +- .../Resource/RoguelikeCopilotConfiger.h | 2 +- .../Resource/RoguelikeRecruitConfiger.h | 2 +- .../Resource/RoguelikeShoppingConfiger.h | 2 +- .../Task/Plugin/RoguelikeBattleTaskPlugin.h | 2 +- .../Task/Plugin/RoguelikeRecruitTaskPlugin.h | 2 +- .../Task/Sub/BattleFormationTask.h | 2 +- src/MeoAssistant/Task/Sub/BattleProcessTask.h | 2 +- src/MeoAssistant/{ => Utils}/AsstBattleDef.h | 0 16 files changed, 15 insertions(+), 74 deletions(-) delete mode 100644 src/MeoAssistant/PipelineTask.cpp delete mode 100644 src/MeoAssistant/PipelineTask.h rename src/MeoAssistant/{ => Utils}/AsstBattleDef.h (100%) diff --git a/src/MeoAssistant/ImageAnalyzer/BattleImageAnalyzer.h b/src/MeoAssistant/ImageAnalyzer/BattleImageAnalyzer.h index 75617232e3..61c12c9ad4 100644 --- a/src/MeoAssistant/ImageAnalyzer/BattleImageAnalyzer.h +++ b/src/MeoAssistant/ImageAnalyzer/BattleImageAnalyzer.h @@ -1,7 +1,7 @@ #pragma once #include "General/AbstractImageAnalyzer.h" -#include "AsstBattleDef.h" +#include "Utils/AsstBattleDef.h" namespace asst { diff --git a/src/MeoAssistant/ImageAnalyzer/RoguelikeRecruitImageAnalyzer.h b/src/MeoAssistant/ImageAnalyzer/RoguelikeRecruitImageAnalyzer.h index 388b34ddc9..0e2445bc09 100644 --- a/src/MeoAssistant/ImageAnalyzer/RoguelikeRecruitImageAnalyzer.h +++ b/src/MeoAssistant/ImageAnalyzer/RoguelikeRecruitImageAnalyzer.h @@ -1,7 +1,7 @@ #pragma once #include "General/AbstractImageAnalyzer.h" -#include "AsstBattleDef.h" +#include "Utils/AsstBattleDef.h" namespace asst { diff --git a/src/MeoAssistant/MeoAssistant.vcxproj b/src/MeoAssistant/MeoAssistant.vcxproj index d6f80e7d5c..5303ecea71 100644 --- a/src/MeoAssistant/MeoAssistant.vcxproj +++ b/src/MeoAssistant/MeoAssistant.vcxproj @@ -22,7 +22,6 @@ - @@ -113,6 +112,7 @@ + diff --git a/src/MeoAssistant/MeoAssistant.vcxproj.filters b/src/MeoAssistant/MeoAssistant.vcxproj.filters index 6c40cd39ec..fb172f768b 100644 --- a/src/MeoAssistant/MeoAssistant.vcxproj.filters +++ b/src/MeoAssistant/MeoAssistant.vcxproj.filters @@ -662,9 +662,6 @@ 源文件 - - 源文件 - 源文件 @@ -677,5 +674,8 @@ 源文件 + + 源文件\Utils + \ No newline at end of file diff --git a/src/MeoAssistant/PipelineTask.cpp b/src/MeoAssistant/PipelineTask.cpp deleted file mode 100644 index dd5ee34df3..0000000000 --- a/src/MeoAssistant/PipelineTask.cpp +++ /dev/null @@ -1,37 +0,0 @@ -#include "PipelineTask.h" - -#include - -#include "Task/Sub/ProcessTask.h" -#include "TaskData.h" - -asst::PipelineTask::PipelineTask(const AsstCallback& callback, void* callback_arg) - : PackageTask(callback, callback_arg, TaskType), - m_task_ptr(std::make_shared(callback, callback_arg, TaskType)) -{} - -bool asst::PipelineTask::set_params(const json::value& params) -{ - if (m_running) { - return false; - } - - auto tasks_opt = params.find("tasks"); - if (!tasks_opt) { - return false; - } - - std::vector tasks_vec; - for (const auto& task_json : tasks_opt.value()) { - std::string task_name = task_json.as_string(); - if (!Task.get(task_name)) { // check task name exists - return false; - } - tasks_vec.emplace_back(task_name); - } - if (tasks_vec.empty()) { - return false; - } - m_task_ptr->set_tasks(tasks_vec); - return true; -} diff --git a/src/MeoAssistant/PipelineTask.h b/src/MeoAssistant/PipelineTask.h deleted file mode 100644 index e0e5146208..0000000000 --- a/src/MeoAssistant/PipelineTask.h +++ /dev/null @@ -1,22 +0,0 @@ -#pragma once -#include "Task/PackageTask.h" - -namespace asst -{ - class ProcessTask; - - class PipelineTask final : public PackageTask - { - public: - PipelineTask(const AsstCallback& callback, void* callback_arg); - virtual ~PipelineTask() override = default; - - virtual bool set_params(const json::value& params) override; - - static constexpr const char* TaskType = "Pipeline"; - - private: - std::vector m_task_name; - std::shared_ptr m_task_ptr; - }; -} diff --git a/src/MeoAssistant/Resource/BattleDataConfiger.h b/src/MeoAssistant/Resource/BattleDataConfiger.h index d0e3232ba9..93817dc8c7 100644 --- a/src/MeoAssistant/Resource/BattleDataConfiger.h +++ b/src/MeoAssistant/Resource/BattleDataConfiger.h @@ -3,7 +3,7 @@ #include -#include "AsstBattleDef.h" +#include "Utils/AsstBattleDef.h" #include "Utils/AsstTypes.h" namespace asst diff --git a/src/MeoAssistant/Resource/CopilotConfiger.h b/src/MeoAssistant/Resource/CopilotConfiger.h index e1c27b581e..05ea70b3fc 100644 --- a/src/MeoAssistant/Resource/CopilotConfiger.h +++ b/src/MeoAssistant/Resource/CopilotConfiger.h @@ -1,6 +1,6 @@ #pragma once #include "AbstractConfiger.h" -#include "AsstBattleDef.h" +#include "Utils/AsstBattleDef.h" namespace asst { diff --git a/src/MeoAssistant/Resource/RoguelikeCopilotConfiger.h b/src/MeoAssistant/Resource/RoguelikeCopilotConfiger.h index 1d1d46beb1..2160a5bd53 100644 --- a/src/MeoAssistant/Resource/RoguelikeCopilotConfiger.h +++ b/src/MeoAssistant/Resource/RoguelikeCopilotConfiger.h @@ -3,7 +3,7 @@ #include -#include "AsstBattleDef.h" +#include "Utils/AsstBattleDef.h" namespace asst { diff --git a/src/MeoAssistant/Resource/RoguelikeRecruitConfiger.h b/src/MeoAssistant/Resource/RoguelikeRecruitConfiger.h index 0eee5dd8d9..e9cd6f385b 100644 --- a/src/MeoAssistant/Resource/RoguelikeRecruitConfiger.h +++ b/src/MeoAssistant/Resource/RoguelikeRecruitConfiger.h @@ -6,7 +6,7 @@ #include #include -#include "AsstBattleDef.h" +#include "Utils/AsstBattleDef.h" #include "Utils/AsstTypes.h" namespace asst diff --git a/src/MeoAssistant/Resource/RoguelikeShoppingConfiger.h b/src/MeoAssistant/Resource/RoguelikeShoppingConfiger.h index 9d342ee1d0..52ccfe338a 100644 --- a/src/MeoAssistant/Resource/RoguelikeShoppingConfiger.h +++ b/src/MeoAssistant/Resource/RoguelikeShoppingConfiger.h @@ -4,7 +4,7 @@ #include -#include "AsstBattleDef.h" +#include "Utils/AsstBattleDef.h" namespace asst { diff --git a/src/MeoAssistant/Task/Plugin/RoguelikeBattleTaskPlugin.h b/src/MeoAssistant/Task/Plugin/RoguelikeBattleTaskPlugin.h index 4444f5cd52..bb38fe872d 100644 --- a/src/MeoAssistant/Task/Plugin/RoguelikeBattleTaskPlugin.h +++ b/src/MeoAssistant/Task/Plugin/RoguelikeBattleTaskPlugin.h @@ -3,7 +3,7 @@ #include #include "AbstractTaskPlugin.h" -#include "AsstBattleDef.h" +#include "Utils/AsstBattleDef.h" #include "ImageAnalyzer/BattleImageAnalyzer.h" #include "Resource/TilePack.h" #include "Utils/AsstTypes.h" diff --git a/src/MeoAssistant/Task/Plugin/RoguelikeRecruitTaskPlugin.h b/src/MeoAssistant/Task/Plugin/RoguelikeRecruitTaskPlugin.h index 0a6b1b26b2..cefcc232ee 100644 --- a/src/MeoAssistant/Task/Plugin/RoguelikeRecruitTaskPlugin.h +++ b/src/MeoAssistant/Task/Plugin/RoguelikeRecruitTaskPlugin.h @@ -1,7 +1,7 @@ #pragma once #include "AbstractTaskPlugin.h" -#include "AsstBattleDef.h" +#include "Utils/AsstBattleDef.h" namespace asst { diff --git a/src/MeoAssistant/Task/Sub/BattleFormationTask.h b/src/MeoAssistant/Task/Sub/BattleFormationTask.h index ec2301c3b5..ae92f96de8 100644 --- a/src/MeoAssistant/Task/Sub/BattleFormationTask.h +++ b/src/MeoAssistant/Task/Sub/BattleFormationTask.h @@ -1,6 +1,6 @@ #pragma once #include "AbstractTask.h" -#include "AsstBattleDef.h" +#include "Utils/AsstBattleDef.h" namespace asst { diff --git a/src/MeoAssistant/Task/Sub/BattleProcessTask.h b/src/MeoAssistant/Task/Sub/BattleProcessTask.h index 79272ce148..6e482d3b01 100644 --- a/src/MeoAssistant/Task/Sub/BattleProcessTask.h +++ b/src/MeoAssistant/Task/Sub/BattleProcessTask.h @@ -1,7 +1,7 @@ #pragma once #include "AbstractTask.h" -#include "AsstBattleDef.h" +#include "Utils/AsstBattleDef.h" #include "ImageAnalyzer/BattleImageAnalyzer.h" #include "Resource/TilePack.h" #include "Utils/AsstTypes.h" diff --git a/src/MeoAssistant/AsstBattleDef.h b/src/MeoAssistant/Utils/AsstBattleDef.h similarity index 100% rename from src/MeoAssistant/AsstBattleDef.h rename to src/MeoAssistant/Utils/AsstBattleDef.h