From aa6df8bbcbd598b9f6f3d0d44c63dbfb07c1785f Mon Sep 17 00:00:00 2001 From: MistEO Date: Sun, 13 Nov 2022 23:56:59 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=BB=91=E5=8A=A8?= =?UTF-8?q?=E9=94=99=E8=AF=AF=EF=BC=8C=E4=BC=98=E5=8C=96=E8=82=89=E9=B8=BD?= =?UTF-8?q?=E6=93=8D=E4=BD=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/MeoAssistant/Controller.cpp | 2 +- src/MeoAssistant/ImageAnalyzer/BattleImageAnalyzer.h | 2 +- src/MeoAssistant/Task/Plugin/RoguelikeBattleTaskPlugin.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/MeoAssistant/Controller.cpp b/src/MeoAssistant/Controller.cpp index 968d1a595b..94b907e5bf 100644 --- a/src/MeoAssistant/Controller.cpp +++ b/src/MeoAssistant/Controller.cpp @@ -1159,7 +1159,7 @@ bool asst::Controller::swipe_without_scale(const Point& p1, const Point& p2, int bool ret = call_command(cur_cmd).has_value(); // 额外的滑动：adb有bug，同样的参数，偶尔会划得非常远。额外做一个短程滑动，把之前的停下来 - if (!m_minitouch_avaiable && extra_swipe && opt.adb_extra_swipe_duration > 0) { + if (extra_swipe && opt.adb_extra_swipe_duration > 0) { std::string extra_cmd = utils::string_replace_all( m_adb.swipe, { { "[x1]", std::to_string(x2) }, diff --git a/src/MeoAssistant/ImageAnalyzer/BattleImageAnalyzer.h b/src/MeoAssistant/ImageAnalyzer/BattleImageAnalyzer.h index 61c12c9ad4..018cd9651c 100644 --- a/src/MeoAssistant/ImageAnalyzer/BattleImageAnalyzer.h +++ b/src/MeoAssistant/ImageAnalyzer/BattleImageAnalyzer.h @@ -19,7 +19,7 @@ namespace asst Cost = 32, // 费用 Vacancies = 64, // 剩余可部署干员数 // 肉鸽模式需要用到的识别 - Roguelike = Home | Oper + Roguelike = Oper }; public: diff --git a/src/MeoAssistant/Task/Plugin/RoguelikeBattleTaskPlugin.cpp b/src/MeoAssistant/Task/Plugin/RoguelikeBattleTaskPlugin.cpp index 7eb91a553a..ae2c5005e6 100644 --- a/src/MeoAssistant/Task/Plugin/RoguelikeBattleTaskPlugin.cpp +++ b/src/MeoAssistant/Task/Plugin/RoguelikeBattleTaskPlugin.cpp @@ -354,7 +354,7 @@ bool asst::RoguelikeBattleTaskPlugin::auto_battle() } const cv::Mat& image = m_ctrler->get_image(); - if (try_possible_skill(image)) { + if (!m_first_deploy && try_possible_skill(image)) { return true; }