Skip to content

Commit 111deb3

Browse files
committed
fix: 再次尝试解决切换账号在1440p下的异常问题
1 parent 63c3ac4 commit 111deb3

File tree

3 files changed

+71
-8
lines changed

3 files changed

+71
-8
lines changed
Binary file not shown.
Binary file not shown.

assets/resource/base/pipeline/switch_account.json

+71-8
Original file line numberDiff line numberDiff line change
@@ -80,17 +80,18 @@
8080
158
8181
],
8282
"next": [
83-
"SwitchAccountMainExpandFlag"
83+
"SwitchAccountMainExpandFlag",
84+
"SwitchAccountMainExpandFlag_1440p"
8485
],
8586
"interrupt": [
86-
"SwitchAccountMainExpand"
87+
"SwitchAccountMainExpand",
88+
"SwitchAccountMainExpand_1440p"
8789
]
8890
},
8991
"SwitchAccountMainExpandFlag": {
9092
"recognition": "TemplateMatch",
9193
"template": [
92-
"./SwitchAccount/AccountDel.png",
93-
"./SwitchAccount/AccountDel1.png"
94+
"./SwitchAccount/AccountDel.png"
9495
],
9596
"roi": [
9697
682,
@@ -105,6 +106,22 @@
105106
"SwitchLastAccount"
106107
]
107108
},
109+
"SwitchAccountMainExpandFlag_1440p": {
110+
"recognition": "OCR",
111+
"expected": "[×xX✕✖]",
112+
"roi": [
113+
686,
114+
370,
115+
25,
116+
77
117+
],
118+
"next": [
119+
"SwitchLastAccountComplete"
120+
],
121+
"interrupt": [
122+
"SwitchLastAccount_1440p"
123+
]
124+
},
108125
"SwitchLastAccountComplete": {
109126
"recognition": "OCR",
110127
"expected": "(登|.)录",
@@ -142,8 +159,7 @@
142159
"SwitchLastAccount": {
143160
"recognition": "TemplateMatch",
144161
"template": [
145-
"./SwitchAccount/AccountDel.png",
146-
"./SwitchAccount/AccountDel1.png"
162+
"./SwitchAccount/AccountDel.png"
147163
],
148164
"roi": [
149165
682,
@@ -170,11 +186,38 @@
170186
]
171187
}
172188
},
189+
"SwitchLastAccount_1440p": {
190+
"recognition": "OCR",
191+
"expected": "[×xX✕✖]",
192+
"roi": [
193+
686,
194+
370,
195+
25,
196+
77
197+
],
198+
"order_by": "Vertical",
199+
"index": -1,
200+
"target_offset": [
201+
-150,
202+
0,
203+
0,
204+
0
205+
],
206+
"action": "Click",
207+
"post_wait_freezes": {
208+
"time": 300,
209+
"target": [
210+
437,
211+
297,
212+
408,
213+
246
214+
]
215+
}
216+
},
173217
"SwitchAccountMainExpand": {
174218
"recognition": "TemplateMatch",
175219
"template": [
176-
"./SwitchAccount/AccountMainExpand.png",
177-
"./SwitchAccount/AccountMainExpand1.png"
220+
"./SwitchAccount/AccountMainExpand.png"
178221
],
179222
"roi": [
180223
682,
@@ -193,6 +236,26 @@
193236
]
194237
}
195238
},
239+
"SwitchAccountMainExpand_1440p": {
240+
"recognition": "OCR",
241+
"expected": "v√V",
242+
"roi": [
243+
685,
244+
344,
245+
25,
246+
22
247+
],
248+
"action": "Click",
249+
"post_wait_freezes": {
250+
"time": 300,
251+
"target": [
252+
437,
253+
297,
254+
408,
255+
246
256+
]
257+
}
258+
},
196259
"AccountExitButtonConfirm": {
197260
"recognition": "OCR",
198261
"expected": "确认",

0 commit comments

Comments
 (0)