diff --git a/assets/resource/base/image/SwitchAccount/AccountDel1.png b/assets/resource/base/image/SwitchAccount/AccountDel1.png new file mode 100644 index 0000000..9dd4b04 Binary files /dev/null and b/assets/resource/base/image/SwitchAccount/AccountDel1.png differ diff --git a/assets/resource/base/image/SwitchAccount/AccountMainExpand1.png b/assets/resource/base/image/SwitchAccount/AccountMainExpand1.png new file mode 100644 index 0000000..dfc1b84 Binary files /dev/null and b/assets/resource/base/image/SwitchAccount/AccountMainExpand1.png differ 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",