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 ] } }, 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" ] 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": [