From dbfd86e9d3fe33b2f5b0ceeb32652baae7ecdb6e Mon Sep 17 00:00:00 2001 From: zzyyyl Date: Wed, 18 Oct 2023 00:37:39 +0800 Subject: [PATCH] =?UTF-8?q?perf:=20m=5Fplugins=20=E4=BD=BF=E7=94=A8=20vect?= =?UTF-8?q?or=20=E8=80=8C=E9=9D=9E=20set?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/MaaCore/Task/AbstractTask.h | 7 ++++--- src/MaaCore/Task/Infrast/InfrastAbstractTask.h | 2 ++ src/MaaCore/Task/Miscellaneous/BattleFormationTask.h | 2 ++ 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/MaaCore/Task/AbstractTask.h b/src/MaaCore/Task/AbstractTask.h index a9f0023e12..db84bef84d 100644 --- a/src/MaaCore/Task/AbstractTask.h +++ b/src/MaaCore/Task/AbstractTask.h @@ -2,8 +2,8 @@ #include #include -#include #include +#include #include "Common/AsstMsg.h" #include "InstHelper.h" @@ -44,7 +44,7 @@ namespace asst std::shared_ptr register_plugin() { auto plugin = std::make_shared(m_callback, m_inst, m_task_chain); - m_plugins.emplace(plugin); + m_plugins.emplace_back(plugin); return plugin; } void clear_plugin() noexcept; @@ -52,6 +52,7 @@ namespace asst bool get_enable() const noexcept { return m_enable; } bool get_ignore_error() const noexcept { return m_ignore_error; } std::string_view get_task_chain() const noexcept { return m_task_chain; } + std::vector get_plugins() const noexcept { return m_plugins; } int get_task_id() const noexcept { return m_task_id; } virtual json::value basic_info() const; @@ -77,7 +78,7 @@ namespace asst mutable json::value m_basic_info_cache; int m_task_id = 0; - std::set m_plugins; + std::vector m_plugins; std::map m_save_file_cnt; }; } // namespace asst diff --git a/src/MaaCore/Task/Infrast/InfrastAbstractTask.h b/src/MaaCore/Task/Infrast/InfrastAbstractTask.h index c5b5a9d316..ce0b21225b 100644 --- a/src/MaaCore/Task/Infrast/InfrastAbstractTask.h +++ b/src/MaaCore/Task/Infrast/InfrastAbstractTask.h @@ -1,4 +1,6 @@ #pragma once +#include + #include "Common/AsstInfrastDef.h" #include "Common/AsstTypes.h" #include "Task/AbstractTask.h" diff --git a/src/MaaCore/Task/Miscellaneous/BattleFormationTask.h b/src/MaaCore/Task/Miscellaneous/BattleFormationTask.h index ca3b07a307..39053954f6 100644 --- a/src/MaaCore/Task/Miscellaneous/BattleFormationTask.h +++ b/src/MaaCore/Task/Miscellaneous/BattleFormationTask.h @@ -1,4 +1,6 @@ #pragma once +#include + #include "Common/AsstBattleDef.h" #include "Task/AbstractTask.h"