From c8dce2e908dc7e62e79a0daf4a677df0e3a243f3 Mon Sep 17 00:00:00 2001 From: MistEO Date: Mon, 5 Dec 2022 01:17:28 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=96=B0=E5=A2=9E=E4=BB=85MaaTouch?= =?UTF-8?q?=E6=94=AF=E6=8C=81=E7=9A=84=E6=9A=82=E5=81=9C=E4=B8=8B=E5=B9=B2?= =?UTF-8?q?=E5=91=98=E4=BC=98=E5=8C=96=E3=80=82=E4=B8=8B=E7=9A=84=E6=9B=B4?= =?UTF-8?q?=E5=BF=AB=EF=BC=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resource/minitouch/maatouch/minitouch | Bin 10891 -> 11535 bytes resource/config.json | 2 +- src/MaaCore/Controller.cpp | 9 +++++- src/MaaCore/Controller.h | 29 ++++++++++++++++++ .../ConnectSettingsUserControl.xaml | 10 ++++++ .../RoguelikeSettingsUserControl.xaml | 12 -------- 6 files changed, 48 insertions(+), 14 deletions(-) diff --git a/3rdparty/resource/minitouch/maatouch/minitouch b/3rdparty/resource/minitouch/maatouch/minitouch index 02db3af473258fae9a24f29079f3da32ca3c5460..3673f3ff0aa57b2802d7af2666b0ed29512a1b4e 100644 GIT binary patch delta 10658 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 ID*ylh0MJcCF8}}l delta 10001 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 opt.swipe_with_pause_required_distance) { need_pause = false; - pause_future = std::async(std::launch::async, [&]() { press_esc(); }); + if (m_use_maa_touch) { + constexpr int EscKeyCode = 111; + toucher.key_down(EscKeyCode); + toucher.key_up(EscKeyCode, 0); + } + else { + pause_future = std::async(std::launch::async, [&]() { press_esc(); }); + } } if (cur_x < 0 || cur_x > m_minitouch_props.max_x || cur_y < 0 || cur_y > m_minitouch_props.max_y) { continue; diff --git a/src/MaaCore/Controller.h b/src/MaaCore/Controller.h index 69c7d10cbb..719ddc1561 100644 --- a/src/MaaCore/Controller.h +++ b/src/MaaCore/Controller.h @@ -243,6 +243,13 @@ namespace asst { return m_input_func(up_cmd(wait_ms, with_commit, contact)); } + bool key_down(int key_code, int wait_ms = DefaultClickDelay, bool with_commit = true) { + return m_input_func(key_down_cmd(key_code, wait_ms, with_commit)); + } + bool key_up(int key_code, int wait_ms = DefaultClickDelay, bool with_commit = true) + { + return m_input_func(key_up_cmd(key_code, wait_ms, with_commit)); + } bool wait(int ms) { return m_input_func(wait_cmd(ms)); } void clear() noexcept { m_wait_ms_count = 0; } @@ -293,6 +300,28 @@ namespace asst return str; } + [[nodiscard]] std::string key_down_cmd(int key_code, int wait_ms = DefaultClickDelay, bool with_commit = true) + { + char buff[64] = { 0 }; + sprintf(buff, "k %d d\n", key_code); + std::string str = buff; + + if (with_commit) str += commit_cmd(); + if (wait_ms) str += wait_cmd(wait_ms); + return str; + } + + [[nodiscard]] std::string key_up_cmd(int key_code, int wait_ms = DefaultClickDelay, bool with_commit = true) + { + char buff[64] = { 0 }; + sprintf(buff, "k %d u\n", key_code); + std::string str = buff; + + if (with_commit) str += commit_cmd(); + if (wait_ms) str += wait_cmd(wait_ms); + return str; + } + [[nodiscard]] std::string wait_cmd(int ms) { m_wait_ms_count += ms; diff --git a/src/MaaWpfGui/Views/UserControl/ConnectSettingsUserControl.xaml b/src/MaaWpfGui/Views/UserControl/ConnectSettingsUserControl.xaml index 19b8a4cef0..262e1bd0af 100644 --- a/src/MaaWpfGui/Views/UserControl/ConnectSettingsUserControl.xaml +++ b/src/MaaWpfGui/Views/UserControl/ConnectSettingsUserControl.xaml @@ -25,6 +25,7 @@ + + \ No newline at end of file diff --git a/src/MaaWpfGui/Views/UserControl/RoguelikeSettingsUserControl.xaml b/src/MaaWpfGui/Views/UserControl/RoguelikeSettingsUserControl.xaml index cec1c95ca4..99975350eb 100644 --- a/src/MaaWpfGui/Views/UserControl/RoguelikeSettingsUserControl.xaml +++ b/src/MaaWpfGui/Views/UserControl/RoguelikeSettingsUserControl.xaml @@ -15,7 +15,6 @@ - - - - \ No newline at end of file