From 02d2f0aadcfc5ac606c32aa19d96a8f858a9652b Mon Sep 17 00:00:00 2001 From: sunyink Date: Sat, 9 May 2026 16:30:10 +0800 Subject: [PATCH 1/3] =?UTF-8?q?fix:=E7=8B=A9=E7=8C=8E=E5=9C=BA.max?= =?UTF-8?q?=E5=9D=90=E6=A0=87=E5=8F=98=E6=9B=B4=E7=9A=84=E6=BC=8F=E7=BD=91?= =?UTF-8?q?=E4=B9=8B=E9=B1=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- assets/resource/base/pipeline/Battle.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/assets/resource/base/pipeline/Battle.json b/assets/resource/base/pipeline/Battle.json index 2f6ad2fd..330d640b 100644 --- a/assets/resource/base/pipeline/Battle.json +++ b/assets/resource/base/pipeline/Battle.json @@ -352,14 +352,14 @@ "node": "QuickHunt_FastBattleMAXTouchHuntingGrounds", "patch": { "target": [ - 800, - 390 + 810, + 330 ] }, "origin": { "target": [ - 470, - 390 + 465, + 330 ] } }, From 5da6a20391f991197b5062de86e249c369737899 Mon Sep 17 00:00:00 2001 From: sunyink Date: Sat, 9 May 2026 17:14:16 +0800 Subject: [PATCH 2/3] =?UTF-8?q?chore:adb=E7=AB=AF=E6=94=AF=E4=BB=98?= =?UTF-8?q?=E5=A4=B1=E8=B4=A5=E5=A4=84=E7=90=86=E5=8A=A8=E4=BD=9C,?= =?UTF-8?q?=E7=BB=99=E8=BF=98=E5=8E=9F=E6=97=B6=E5=A2=9E=E5=8A=A0=E4=B8=80?= =?UTF-8?q?=E4=B8=AAerr=E5=85=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- assets/resource/base/pipeline/Dummy.json | 24 +++++++++++++++++++++++ assets/resource/base/pipeline/Global.json | 1 + 2 files changed, 25 insertions(+) diff --git a/assets/resource/base/pipeline/Dummy.json b/assets/resource/base/pipeline/Dummy.json index 6013477c..2e1e4e0f 100644 --- a/assets/resource/base/pipeline/Dummy.json +++ b/assets/resource/base/pipeline/Dummy.json @@ -63,5 +63,29 @@ 100, 255 ] + }, + "Dummy_Err_GetProductsFail": { + "desc": "adb,任何时候都可能跳出来的支付错误", + "max_hit": 3, + "recognition": "OCR", + "roi": [ + 421, + 168, + 446, + 385 + ], + "expected": ["支付失败"], + "next": ["Dummy_Err_GetProductsFail_Ck"] + }, + "Dummy_Err_GetProductsFail_Ck": { + "recognition": "OCR", + "roi": [ + 421, + 168, + 446, + 385 + ], + "expected": ["确认"], + "action": "Click" } } diff --git a/assets/resource/base/pipeline/Global.json b/assets/resource/base/pipeline/Global.json index 8e8cf0d7..e5a90999 100644 --- a/assets/resource/base/pipeline/Global.json +++ b/assets/resource/base/pipeline/Global.json @@ -132,6 +132,7 @@ "[JumpBack]StartGame_PVPSet", "[JumpBack]PVP_PerOperationsMain_Error", "[JumpBack]Global_ERR_AtFish", + "[JumpBack]Dummy_Err_GetProductsFail", "Global_Null_Exception", "Global_Null_Panic" ] From f5f28f345d70d6208ae2c64d9e362ef73fb44b71 Mon Sep 17 00:00:00 2001 From: sunyink Date: Sat, 9 May 2026 17:16:43 +0800 Subject: [PATCH 3/3] =?UTF-8?q?fix:pvp.=E8=BF=9B=E5=85=A5=E8=87=AA?= =?UTF-8?q?=E5=8A=A8=E6=88=98=E6=96=97=E8=8F=9C=E5=8D=95=E6=8C=89=E9=92=AE?= =?UTF-8?q?=E4=BD=8D=E7=BD=AE=E6=94=B9=E4=B8=BA=E7=A1=AC=E7=BC=96=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- assets/resource/base/pipeline/PVP.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/assets/resource/base/pipeline/PVP.json b/assets/resource/base/pipeline/PVP.json index fb2bffdf..c49e25c9 100644 --- a/assets/resource/base/pipeline/PVP.json +++ b/assets/resource/base/pipeline/PVP.json @@ -284,11 +284,11 @@ ], "pre_delay": 1000, "action": "Click", - "target_offset": [ - -5, - -45, - 0, - 0 + "target": [ + 953, + 631, + 14, + 8 ], "post_delay": 1000, "next": [