From f74034c961b84299b69070da134f7944799dc9f4 Mon Sep 17 00:00:00 2001 From: lumina37 Date: Mon, 30 Dec 2024 14:01:11 +0800 Subject: [PATCH] =?UTF-8?q?perf:=20ODR=E9=A6=96=E6=AC=A1=E8=BF=9B=E5=85=A5?= =?UTF-8?q?=E5=9C=B0=E5=9B=BE=E7=9B=B4=E6=8E=A5=E5=B0=9D=E8=AF=95=E6=88=98?= =?UTF-8?q?=E6=96=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../activity/outside_deduction_rapid.json | 135 ++++++------------ 1 file changed, 40 insertions(+), 95 deletions(-) diff --git a/assets/resource/base/pipeline/activity/outside_deduction_rapid.json b/assets/resource/base/pipeline/activity/outside_deduction_rapid.json index 7a04f69..205bc9c 100644 --- a/assets/resource/base/pipeline/activity/outside_deduction_rapid.json +++ b/assets/resource/base/pipeline/activity/outside_deduction_rapid.json @@ -16,7 +16,6 @@ ], "interrupt": [ "ODR_Start_Difficulty_Confirm", - "ODR_Start_Gift_Confirm", "ODR_Start_Gift", "SOD_SwipeLeft" ] @@ -48,11 +47,11 @@ ], "only_rec": true, "next": [ - "ODR_Start_Gift_ConfirmFlag", - "ODR_Start_GiftSelect" + "ODR_Start_Gift_Confirm", + "ODR_Start_Gift_Select" ] }, - "ODR_Start_GiftSelect": { + "ODR_Start_Gift_Select": { "recognition": "OCR", "expected": [ "造物", @@ -70,11 +69,11 @@ ], "action": "Click", "next": [ - "ODR_Start_Gift_ConfirmFlag", - "ODR_Start_GiftSelect_2" + "ODR_Start_Gift_Confirm", + "ODR_Start_Gift_Select_2" ] }, - "ODR_Start_GiftSelect_2": { + "ODR_Start_Gift_Select_2": { "recognition": "OCR", "expected": [ "造物", @@ -93,8 +92,8 @@ ], "action": "Click", "next": [ - "ODR_Start_Gift_ConfirmFlag", - "ODR_Start_GiftSelect_2" + "ODR_Start_Gift_Confirm", + "ODR_Start_Gift_Select_2" ] }, "ODR_Start_Gift_Confirm": { @@ -109,20 +108,8 @@ ], "only_rec": true, "action": "Click", - "post_wait_freezes": 1 - }, - "ODR_Start_Gift_ConfirmFlag": { - "doc": "镜的馈赠确认", - "recognition": "OCR", - "expected": "确认", - "roi": [ - 1030, - 616, - 76, - 44 - ], - "only_rec": true, - "post_wait_freezes": 1 + "post_wait_freezes": 1, + "next": "ODR_Start" }, "ODR_Start_MediaSelect": { "doc": "触媒选择", @@ -137,12 +124,10 @@ "action": "Click", "pre_wait_freezes": 1, "next": [ - "ODR_Start_TeamBuild", + "ODR_Start_MediaSelect_Confirm", "ODR_Start_MediaSelect" ], - "interrupt": [ - "ODR_Start_MediaSelect_Confirm" - ] + "interrupt": "SOD_SwipeLeft" }, "ODR_Start_MediaSelect_Confirm": { "doc": "触媒确认", @@ -164,7 +149,11 @@ 85 ] }, - "action": "Click" + "action": "Click", + "next": [ + "ODR_Start_TeamBuild", + "ODR_Start_MediaSelect_Confirm" + ] }, "ODR_Start_TeamBuild": { "doc": "编队", @@ -249,13 +238,10 @@ }, "action": "Click", "next": [ - "ODR_MainLoop", + "ODR_SelectCombat", "ODR_Start_Teambuild_Confirm" ], - "interrupt": [ - "SOD_Acquire_NoNext", - "HomeLoading" - ] + "interrupt": "SOD_Acquire_NoNext" }, "ODR_SelectCombat": { "recognition": "TemplateMatch", @@ -263,11 +249,12 @@ "green_mask": true, "threshold": 0.85, "index": -1, - "roi": [ - 303, - 196, - 392, - 307 + "roi": "ODR_QueryChessLocation", + "roi_offset": [ + 10, + -1080, + 1920, + 1080 ], "post_wait_freezes": { "time": 500, @@ -762,23 +749,6 @@ "ODR_QueryChessLocation" ] }, - "ODR_FirstFloorFlag": { - "doc": "当前位于第一层，且前置任务“ODR_QueryChessLocation”失败，说明为最开始准备进入combat节点的情况", - "recognition": "OCR", - "expected": "环城大道", - "roi": [ - 585, - 19, - 91, - 25 - ], - "next": [ - "ODR_SelectCombat", - "ODR_QueryChessLocation", - "ODR_FirstFloorFlag", - "ODR_Exit" - ] - }, "ODR_Levelup": { "recognition": "OCR", "expected": [ @@ -805,9 +775,7 @@ "ODR_SkipAddChar", "ODR_Levelup" ], - "interrupt": [ - "SOD_Acquire_NoNext" - ] + "interrupt": "SOD_Acquire_NoNext" }, "ODR_ItemSelect": { "recognition": "OCR", @@ -821,12 +789,8 @@ 44 ], "only_rec": true, - "next": [ - "ODR_ItemSelect_Confirm" - ], - "interrupt": [ - "ODR_ItemSelect_2" - ] + "next": "ODR_ItemSelect_Confirm", + "interrupt": "ODR_ItemSelect_2" }, "ODR_ItemSelect_NoNext": { "recognition": "OCR", @@ -840,12 +804,8 @@ 44 ], "only_rec": true, - "next": [ - "ODR_ItemSelect_Confirm_NoNext" - ], - "interrupt": [ - "ODR_ItemSelect_2" - ] + "next": "ODR_ItemSelect_Confirm_NoNext", + "interrupt": "ODR_ItemSelect_2" }, "ODR_ItemSelect_1": { "action": "Click", @@ -855,9 +815,7 @@ 20, 20 ], - "next": [ - "ODR_ItemSelect_ConfirmFlag" - ] + "next": "ODR_ItemSelect_ConfirmFlag" }, "ODR_ItemSelect_2": { "action": "Click", @@ -867,12 +825,8 @@ 20, 20 ], - "next": [ - "ODR_ItemSelect_ConfirmFlag" - ], - "interrupt": [ - "ODR_ItemSelect_3" - ] + "next": "ODR_ItemSelect_ConfirmFlag", + "interrupt": "ODR_ItemSelect_3" }, "ODR_ItemSelect_3": { "action": "Click", @@ -882,12 +836,8 @@ 20, 20 ], - "next": [ - "ODR_ItemSelect_ConfirmFlag" - ], - "interrupt": [ - "ODR_ItemSelect_4" - ] + "next": "ODR_ItemSelect_ConfirmFlag", + "interrupt": "ODR_ItemSelect_4" }, "ODR_ItemSelect_4": { "action": "Click", @@ -898,12 +848,8 @@ 20 ], "timeout": 10000, - "next": [ - "ODR_ItemSelect_ConfirmFlag" - ], - "interrupt": [ - "ODR_ItemSelect_1" - ] + "next": "ODR_ItemSelect_ConfirmFlag", + "interrupt": "ODR_ItemSelect_1" }, "ODR_ItemSelect_Confirm": { "recognition": "OCR", @@ -1353,7 +1299,7 @@ "interrupt": [ "ODR_Event_Confirm", "ODR_OptionSelectAll", - "ODR_Windows&Doors_CreationContract_ChangeRound", + "ODR_Windows&Doors_CreationContract_Refresh", "SOD_Acquire_NoNext", "ODR_Windows&Doors_Merge", "BackButton" @@ -1389,7 +1335,7 @@ "BackButton" ] }, - "ODR_Windows&Doors_CreationContract_ChangeRound": { + "ODR_Windows&Doors_CreationContract_Refresh": { "doc": "换一批", "recognition": "OCR", "expected": [ @@ -1520,8 +1466,7 @@ "post_wait_freezes": 1000, "next": [ "ODR_Exit", - "ODR_QueryChessLocation", - "ODR_FirstFloorFlag" + "ODR_QueryChessLocation" ], "interrupt": [ "ODR_ItemSelect_NoNext",