From 80b3f2f8a0439a375c9844b58a431ff487ad100e Mon Sep 17 00:00:00 2001 From: Windsland52 <86581225+Windsland52@users.noreply.github.com> Date: Wed, 11 Dec 2024 23:27:31 +0800 Subject: [PATCH] =?UTF-8?q?perf:=20=E5=B0=8F=E7=BB=86=E8=8A=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pipeline/activity/outside_deduction.json | 3 ++- .../activity/outside_deduction_rapid.json | 25 +++++++++++++------ 2 files changed, 19 insertions(+), 9 deletions(-) diff --git a/assets/resource/base/pipeline/activity/outside_deduction.json b/assets/resource/base/pipeline/activity/outside_deduction.json index f8ff346..a7eeeb6 100644 --- a/assets/resource/base/pipeline/activity/outside_deduction.json +++ b/assets/resource/base/pipeline/activity/outside_deduction.json @@ -2514,7 +2514,8 @@ 642, 20, 20 - ] + ], + "post_wait_freezes": 500 }, "SOD_Main": { "recognition": "TemplateMatch", diff --git a/assets/resource/base/pipeline/activity/outside_deduction_rapid.json b/assets/resource/base/pipeline/activity/outside_deduction_rapid.json index f7bcf6f..aaf1c16 100644 --- a/assets/resource/base/pipeline/activity/outside_deduction_rapid.json +++ b/assets/resource/base/pipeline/activity/outside_deduction_rapid.json @@ -319,7 +319,7 @@ 1080 ], "action": "Click", - "next": "ODR_Event_Select_SkipText_First", + "next": "ODR_Event_Select_SkipText", "interrupt": "ODR_Move" }, "ODR_SelectShop": { @@ -558,7 +558,10 @@ ] }, "next": "ODR_MainLoop", - "interrupt": "ODR_Levelup" + "interrupt": [ + "ODR_Levelup", + "SOD_Acquire_NoNext" + ] }, "ODR_ItemSelect_Confirm_NoNext": { "recognition": "OCR", @@ -1145,10 +1148,10 @@ "recognition": "TemplateMatch", "template": "OutsideDeductionRapid/Event.png", "roi": [ - 760, - 70, - 520, - 640 + 694, + 84, + 586, + 596 ], "order_by": "Vertical", "index": 1, @@ -1166,7 +1169,13 @@ }, "ODR_Event_Windows&Doors_Completed": { "recognition": "TemplateMatch", - "template": "./OutsideDeductionRapid/WindowsCompleted.png" + "template": "./OutsideDeductionRapid/WindowsCompleted.png", + "roi": [ + 441, + 418, + 150, + 172 + ] }, "ODR_Windows&Doors_ChangeRound": { "doc": "换一批", @@ -1238,7 +1247,7 @@ 69 ], "post_wait_freezes": { - "time": 700, + "time": 200, "target": [ 33, 430,