From 87d68bb37a2098f6ed32777ae3d724b8d386eacf Mon Sep 17 00:00:00 2001
From: Windsland52 <86581225+Windsland52@users.noreply.github.com>
Date: Sun, 22 Dec 2024 19:49:52 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=88=87=E6=8D=A2?=
 =?UTF-8?q?=E8=B4=A6=E5=8F=B7=E4=B8=BB=E9=A1=B5=E9=9D=A2=E8=BF=87=E5=B0=8F?=
 =?UTF-8?q?=E5=AF=BC=E8=87=B4=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

fix https://github.com/MaaXYZ/M9A/issues/287
---
 .../base/image/SwitchAccount/AccountDel1.png  | Bin 0 -> 542 bytes
 .../SwitchAccount/AccountMainExpand1.png      | Bin 0 -> 385 bytes
 .../base/pipeline/switch_account.json         |  31 +++++++++++-------
 3 files changed, 20 insertions(+), 11 deletions(-)
 create mode 100644 assets/resource/base/image/SwitchAccount/AccountDel1.png
 create mode 100644 assets/resource/base/image/SwitchAccount/AccountMainExpand1.png

diff --git a/assets/resource/base/image/SwitchAccount/AccountDel1.png b/assets/resource/base/image/SwitchAccount/AccountDel1.png
new file mode 100644
index 0000000000000000000000000000000000000000..9dd4b04fa354a27fc07cbf590bb21b260bb72c68
GIT binary patch
literal 542
zcmV+(0^$9MP)<h;3K|Lk000e1NJLTq000;O000;W0{{R3*Qw3Q0002(P)t-s|NsB~
z{{H>_{rvp=`}_O)`uh3#`S|$w_xJbq_V)Gl_4M@g^Yioa^78QT@bB;M?d|RC?Ck67
z>)YGg+1c6D)YQ|{)6dV(&CSir%ge~f$i>CQ#KgqH!otD9!N9=4zP`S@ySuu&y12Nw
zx3{;nw6w9Yv9PePt*x!BtgNc4s;Q}|sHmu?r>CZ-rlqB&q@<*yqobmtqM@OoprD|i
zpP!zdo}HbYo12?^dwX(na&d8SaBy&LZf<RDZE0y~XlQ6>XJ=()Wn*JwVq#)pVPRii
zUshIDR8&+<OiV*VLqbAAKtMn~K0Z1+I)ZA=f&c&j>`6pHRCwB*lGhf3Fbswf6fHP#
zZ;|8PfXHzVgo6v;|7k=8tOf4KO_RULNxvpo5YxuETL=}d)>(XZNL0tO#@tD`&A?xe
zlx`!!c8Q8E&`_`Gd=v&vZS35HtEx;P<&D!Y`E|(ZQA(f<BdjuIFbuGYVC&Fg+)iWw
zx0e_%4b|F;-L;(db5iZKy3D{3fqsQ>)ASbrZnNlbL|+S%-N_lcwVx%S<Zvncr!Un!
zPiPlL?ZBt(!XqC?^tvh}ex#ZJ;LA$74AaQQWe|1dlDp5*e=9$FHblX&QlJreV`4cg
giSUfJtOr?<H_dJthV<n}E&u=k07*qoM6N<$f--|AtpET3

literal 0
HcmV?d00001

diff --git a/assets/resource/base/image/SwitchAccount/AccountMainExpand1.png b/assets/resource/base/image/SwitchAccount/AccountMainExpand1.png
new file mode 100644
index 0000000000000000000000000000000000000000..dfc1b84d3dc64e4c78a86616ba99bc4bc692765a
GIT binary patch
literal 385
zcmV-{0e=38P)<h;3K|Lk000e1NJLTq0012T000yS0{{R3MncB*0002DP)t-s|NsB~
z{{H;@{QCO(`1ttu_xJSl^ziWT>+9?4>gws~>FDU_<>lq%<mBSw;^5%m-{0Ta+1b|C
z*3r??%F4>d#>U0P#lphEz`(%0y}h`&xVN{rv$M0Zva+kItEHu-q@<*xqN1OlpPikZ
zoSdAOmzR{3l#!8<kB^Uvii(GahlYlRfq{X0dwY3#d3Serc6N4kb#-xZacymFYinz0
zXlP|+Wn^SzV`F1tVq#%oVP0NdU0q!V$B5|w004zaL_t(|+Re*H5`sVgM9~JrV9o(^
z&SD0HzW=#gj8riQYk9k_u8%+JtTTwxSA9rxZgWs&H(cUt=I?d2-1!Rxv<XiLJ94Up
z=8#u`K>o}z6ecevNQT7$B6`kE-UZ7w@uTfL1ORb&yNJ>BScdWTT8LGrJ+j$Ag5r~}
f3KCThHKf4@cJm8DQSDjE00000NkvXXu0mjfVWG=T

literal 0
HcmV?d00001

diff --git a/assets/resource/base/pipeline/switch_account.json b/assets/resource/base/pipeline/switch_account.json
index eeccb1a..fab65cc 100644
--- a/assets/resource/base/pipeline/switch_account.json
+++ b/assets/resource/base/pipeline/switch_account.json
@@ -88,11 +88,14 @@
     },
     "SwitchAccountMainExpandFlag": {
         "recognition": "TemplateMatch",
-        "template": "./SwitchAccount/AccountDel.png",
+        "template": [
+            "./SwitchAccount/AccountDel.png",
+            "./SwitchAccount/AccountDel1.png"
+        ],
         "roi": [
-            725,
+            682,
             353,
-            141,
+            184,
             278
         ],
         "next": [
@@ -104,7 +107,7 @@
     },
     "SwitchLastAccountComplete": {
         "recognition": "OCR",
-        "expected": "登录",
+        "expected": "(登|.)录",
         "roi": [
             567,
             355,
@@ -122,7 +125,7 @@
     },
     "LogIn": {
         "recognition": "OCR",
-        "expected": "登录",
+        "expected": "(登|.)录",
         "roi": "SwitchLastAccountComplete",
         "only_rec": true,
         "action": "Click",
@@ -138,11 +141,14 @@
     },
     "SwitchLastAccount": {
         "recognition": "TemplateMatch",
-        "template": "./SwitchAccount/AccountDel.png",
+        "template": [
+            "./SwitchAccount/AccountDel.png",
+            "./SwitchAccount/AccountDel1.png"
+        ],
         "roi": [
-            725,
+            682,
             353,
-            141,
+            184,
             278
         ],
         "order_by": "Vertical",
@@ -166,11 +172,14 @@
     },
     "SwitchAccountMainExpand": {
         "recognition": "TemplateMatch",
-        "template": "./SwitchAccount/AccountMainExpand.png",
+        "template": [
+            "./SwitchAccount/AccountMainExpand.png",
+            "./SwitchAccount/AccountMainExpand1.png"
+        ],
         "roi": [
-            723,
+            682,
             278,
-            138,
+            179,
             130
         ],
         "action": "Click",