fix: 再次尝试解决切换账号在1440p下的异常问题

MaaXYZ · Dec 24, 2024 · 111deb3 · 111deb3
1 parent 63c3ac4
commit 111deb3
Show file tree

Hide file tree

Showing 3 changed files with 71 additions and 8 deletions.
diff --git a/assets/resource/base/image/SwitchAccount/AccountDel1.png b/assets/resource/base/image/SwitchAccount/AccountDel1.png
diff --git a/assets/resource/base/image/SwitchAccount/AccountMainExpand1.png b/assets/resource/base/image/SwitchAccount/AccountMainExpand1.png
diff --git a/assets/resource/base/pipeline/switch_account.json b/assets/resource/base/pipeline/switch_account.json
@@ -80,17 +80,18 @@
             158
         ],
         "next": [
-            "SwitchAccountMainExpandFlag"
+            "SwitchAccountMainExpandFlag",
+            "SwitchAccountMainExpandFlag_1440p"
         ],
         "interrupt": [
-            "SwitchAccountMainExpand"
+            "SwitchAccountMainExpand",
+            "SwitchAccountMainExpand_1440p"
         ]
     },
     "SwitchAccountMainExpandFlag": {
         "recognition": "TemplateMatch",
         "template": [
-            "./SwitchAccount/AccountDel.png",
-            "./SwitchAccount/AccountDel1.png"
+            "./SwitchAccount/AccountDel.png"
         ],
         "roi": [
             682,
@@ -105,6 +106,22 @@
             "SwitchLastAccount"
         ]
     },
+    "SwitchAccountMainExpandFlag_1440p": {
+        "recognition": "OCR",
+        "expected": "[×xX✕✖]",
+        "roi": [
+            686,
+            370,
+            25,
+            77
+        ],
+        "next": [
+            "SwitchLastAccountComplete"
+        ],
+        "interrupt": [
+            "SwitchLastAccount_1440p"
+        ]
+    },
     "SwitchLastAccountComplete": {
         "recognition": "OCR",
         "expected": "(登|.)录",
@@ -142,8 +159,7 @@
     "SwitchLastAccount": {
         "recognition": "TemplateMatch",
         "template": [
-            "./SwitchAccount/AccountDel.png",
-            "./SwitchAccount/AccountDel1.png"
+            "./SwitchAccount/AccountDel.png"
         ],
         "roi": [
             682,
@@ -170,11 +186,38 @@
             ]
         }
     },
+    "SwitchLastAccount_1440p": {
+        "recognition": "OCR",
+        "expected": "[×xX✕✖]",
+        "roi": [
+            686,
+            370,
+            25,
+            77
+        ],
+        "order_by": "Vertical",
+        "index": -1,
+        "target_offset": [
+            -150,
+            0,
+            0,
+            0
+        ],
+        "action": "Click",
+        "post_wait_freezes": {
+            "time": 300,
+            "target": [
+                437,
+                297,
+                408,
+                246
+            ]
+        }
+    },
     "SwitchAccountMainExpand": {
         "recognition": "TemplateMatch",
         "template": [
-            "./SwitchAccount/AccountMainExpand.png",
-            "./SwitchAccount/AccountMainExpand1.png"
+            "./SwitchAccount/AccountMainExpand.png"
         ],
         "roi": [
             682,
@@ -193,6 +236,26 @@
             ]
         }
     },
+    "SwitchAccountMainExpand_1440p": {
+        "recognition": "OCR",
+        "expected": "v√V",
+        "roi": [
+            685,
+            344,
+            25,
+            22
+        ],
+        "action": "Click",
+        "post_wait_freezes": {
+            "time": 300,
+            "target": [
+                437,
+                297,
+                408,
+                246
+            ]
+        }
+    },
     "AccountExitButtonConfirm": {
         "recognition": "OCR",
         "expected": "确认",