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; }