refactor: 再次整理项目部分文件目录结构

src/MeoAssistant/ImageAnalyzer/BattleImageAnalyzer.h

@@ -1,7 +1,7 @@
 #pragma once
 #include "General/AbstractImageAnalyzer.h"
 
-#include "AsstBattleDef.h"
+#include "Utils/AsstBattleDef.h"
 
 namespace asst
 {

src/MeoAssistant/ImageAnalyzer/RoguelikeRecruitImageAnalyzer.h

@@ -1,7 +1,7 @@
 #pragma once
 #include "General/AbstractImageAnalyzer.h"
 
-#include "AsstBattleDef.h"
+#include "Utils/AsstBattleDef.h"
 
 namespace asst
 {

src/MeoAssistant/MeoAssistant.vcxproj

@@ -22,7 +22,6 @@
     <ClInclude Include="..\..\include\AsstCaller.h" />
     <ClInclude Include="..\..\include\AsstPort.h" />
     <ClInclude Include="Assistant.h" />
-    <ClInclude Include="AsstBattleDef.h" />
     <ClInclude Include="Controller.h" />
     <ClInclude Include="ImageAnalyzer\BattleImageAnalyzer.h" />
     <ClInclude Include="ImageAnalyzer\CreditShopImageAnalyzer.h" />
@@ -113,6 +112,7 @@
     <ClInclude Include="Task\Sub\ReportDataTask.h" />
     <ClInclude Include="Task\Sub\StageNavigationTask.h" />
     <ClInclude Include="Task\VisitTask.h" />
+    <ClInclude Include="Utils\AsstBattleDef.h" />
     <ClInclude Include="Utils\AsstConf.h" />
     <ClInclude Include="Utils\AsstHttp.hpp" />
     <ClInclude Include="Utils\AsstImageIo.hpp" />

src/MeoAssistant/MeoAssistant.vcxproj.filters

@@ -662,9 +662,6 @@
     <ClInclude Include="Assistant.h">
       <Filter>源文件</Filter>
     </ClInclude>
-    <ClInclude Include="AsstBattleDef.h">
-      <Filter>源文件</Filter>
-    </ClInclude>
     <ClInclude Include="Controller.h">
       <Filter>源文件</Filter>
     </ClInclude>
@@ -677,5 +674,8 @@
     <ClInclude Include="TaskData.h">
       <Filter>源文件</Filter>
     </ClInclude>
+    <ClInclude Include="Utils\AsstBattleDef.h">
+      <Filter>源文件\Utils</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>

src/MeoAssistant/PipelineTask.cpp

@@ -1,37 +0,0 @@
-#include "PipelineTask.h"
-
-#include <meojson/json.hpp>
-
-#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<ProcessTask>(callback, callback_arg, TaskType))
-{}
-
-bool asst::PipelineTask::set_params(const json::value& params)
-{
-    if (m_running) {
-        return false;
-    }
-
-    auto tasks_opt = params.find<json::array>("tasks");
-    if (!tasks_opt) {
-        return false;
-    }
-
-    std::vector<std::string> 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;
-}

src/MeoAssistant/PipelineTask.h

@@ -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<std::string> m_task_name;
-        std::shared_ptr<ProcessTask> m_task_ptr;
-    };
-}

src/MeoAssistant/Resource/BattleDataConfiger.h

@@ -3,7 +3,7 @@
 
 #include <unordered_map>
 
-#include "AsstBattleDef.h"
+#include "Utils/AsstBattleDef.h"
 #include "Utils/AsstTypes.h"
 
 namespace asst

src/MeoAssistant/Resource/CopilotConfiger.h

@@ -1,6 +1,6 @@
 #pragma once
 #include "AbstractConfiger.h"
-#include "AsstBattleDef.h"
+#include "Utils/AsstBattleDef.h"
 
 namespace asst
 {

src/MeoAssistant/Resource/RoguelikeCopilotConfiger.h

@@ -3,7 +3,7 @@
 
 #include <optional>
 
-#include "AsstBattleDef.h"
+#include "Utils/AsstBattleDef.h"
 
 namespace asst
 {

src/MeoAssistant/Resource/RoguelikeRecruitConfiger.h

@@ -6,7 +6,7 @@
 #include <unordered_map>
 #include <vector>
 
-#include "AsstBattleDef.h"
+#include "Utils/AsstBattleDef.h"
 #include "Utils/AsstTypes.h"
 
 namespace asst

src/MeoAssistant/Resource/RoguelikeShoppingConfiger.h

@@ -4,7 +4,7 @@
 
 #include <vector>
 
-#include "AsstBattleDef.h"
+#include "Utils/AsstBattleDef.h"
 
 namespace asst
 {

src/MeoAssistant/Task/Plugin/RoguelikeBattleTaskPlugin.h

@@ -3,7 +3,7 @@
 #include <queue>
 
 #include "AbstractTaskPlugin.h"
-#include "AsstBattleDef.h"
+#include "Utils/AsstBattleDef.h"
 #include "ImageAnalyzer/BattleImageAnalyzer.h"
 #include "Resource/TilePack.h"
 #include "Utils/AsstTypes.h"

src/MeoAssistant/Task/Plugin/RoguelikeRecruitTaskPlugin.h

@@ -1,7 +1,7 @@
 #pragma once
 #include "AbstractTaskPlugin.h"
 
-#include "AsstBattleDef.h"
+#include "Utils/AsstBattleDef.h"
 
 namespace asst
 {

src/MeoAssistant/Task/Sub/BattleFormationTask.h

@@ -1,6 +1,6 @@
 #pragma once
 #include "AbstractTask.h"
-#include "AsstBattleDef.h"
+#include "Utils/AsstBattleDef.h"
 
 namespace asst
 {

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"