From f54f904b2c084b5dc89f8fa0e1725dd986dc7ac1 Mon Sep 17 00:00:00 2001 From: Windsland <86581225+Windsland52@users.noreply.github.com> Date: Thu, 23 Jan 2025 08:06:40 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E6=84=8F=E5=BF=97=E8=A7=A3=E6=9E=90?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=BF=9B=E5=85=A5=E6=97=B6flag=EF=BC=8C?= =?UTF-8?q?=E4=BB=A5=E9=98=B2=E6=AD=A2=E5=90=8E=E7=BB=AD=E5=8F=AF=E8=83=BD?= =?UTF-8?q?=E5=8F=91=E7=94=9F=E7=9A=84=E8=AF=AF=E8=A7=A6=20(#316)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit fix https://github.com/MaaXYZ/M9A/issues/298 --- .../resource/base/image/Combat/Entering.png | Bin 0 -> 9562 bytes assets/resource/base/pipeline/psychube.json | 25 +++++++++++++----- 2 files changed, 19 insertions(+), 6 deletions(-) create mode 100644 assets/resource/base/image/Combat/Entering.png diff --git a/assets/resource/base/image/Combat/Entering.png b/assets/resource/base/image/Combat/Entering.png new file mode 100644 index 0000000000000000000000000000000000000000..30352302aee050a42de27a07b1f45a03a50ea874 GIT binary patch literal 9562 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 He*Av{z#NJ? literal 0 HcmV?d00001 diff --git a/assets/resource/base/pipeline/psychube.json b/assets/resource/base/pipeline/psychube.json index d8b35e3..082b5e6 100644 --- a/assets/resource/base/pipeline/psychube.json +++ b/assets/resource/base/pipeline/psychube.json @@ -99,6 +99,24 @@ 136 ], "action": "Click", + "next": [ + "PsychubeSwitchToReplay", + "PsychubeSetReplaysTimes", + "StartReplay" + ], + "interrupt": [ + "CombatEntering" + ] + }, + "CombatEntering": { + "recognition": "TemplateMatch", + "template": "Combat/Entering.png", + "roi": [ + 1106, + 0, + 174, + 311 + ], "post_wait_freezes": { "time": 1000, "target": [ @@ -107,12 +125,7 @@ 1091, 345 ] - }, - "next": [ - "PsychubeSwitchToReplay", - "PsychubeSetReplaysTimes", - "StartReplay" - ] + } }, "PsychubeSwitchToReplay": { "recognition": "TemplateMatch",