From ebef538ed1b5d3c116becad0adead87bd61771df Mon Sep 17 00:00:00 2001 From: MistEO Date: Tue, 27 Dec 2022 00:55:20 +0800 Subject: [PATCH] =?UTF-8?q?perf:=20=E7=AE=80=E5=8D=95=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E4=B8=8B=E6=88=98=E6=96=97=E5=A4=B4=E5=83=8F=E7=BC=93=E5=AD=98?= =?UTF-8?q?=E8=B7=AF=E5=BE=84=E7=9A=84=E8=8E=B7=E5=8F=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/MaaCore/Task/BattleHelper.cpp | 8 ++++++++ src/MaaCore/Task/BattleHelper.h | 11 +++-------- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/src/MaaCore/Task/BattleHelper.cpp b/src/MaaCore/Task/BattleHelper.cpp index 6cc36c05a8..ec29e28207 100644 --- a/src/MaaCore/Task/BattleHelper.cpp +++ b/src/MaaCore/Task/BattleHelper.cpp @@ -574,3 +574,11 @@ std::optional asst::BattleHelper::get_oper_rect_on_deployment(const return oper_iter->second.rect; } + +const std::filesystem::path& asst::BattleHelper::avatar_cache_dir() +{ + using namespace asst::utils::path_literals; + + static const auto dir = UserDir.get() / "cache"_p / "avatars"_p; + return dir; +} diff --git a/src/MaaCore/Task/BattleHelper.h b/src/MaaCore/Task/BattleHelper.h index cea8c552e0..7cdd87be90 100644 --- a/src/MaaCore/Task/BattleHelper.h +++ b/src/MaaCore/Task/BattleHelper.h @@ -21,12 +21,6 @@ namespace asst public: ~BattleHelper() = default; - inline static const std::filesystem::path& avatar_cache_dir() - { - static const auto dir = UserDir.get() / utils::path("cache") / utils::path("avatars"); - return dir; - } - protected: BattleHelper(Assistant* inst); @@ -61,8 +55,8 @@ namespace asst bool click_oper_on_deployment(const Rect& rect); bool click_oper_on_battlefiled(const std::string& name); bool click_oper_on_battlefiled(const Point& loc); - bool click_retreat(); // 这个是不带识别的,直接点 - bool click_skill(bool keep_waiting = true); // 这个是带识别的,转好了才点 + bool click_retreat(); // 这个是不带识别的,直接点 + bool click_skill(bool keep_waiting = true); // 这个是带识别的,转好了才点 bool cancel_oper_selection(); bool is_name_invaild(const std::string& name); @@ -87,6 +81,7 @@ namespace asst private: virtual AbstractTask& this_task() = 0; + static const std::filesystem::path& avatar_cache_dir(); InstHelper m_inst_helper; };