Skip to content

Commit

Permalink
perf: ODR首次进入地图直接尝试战斗
Browse files Browse the repository at this point in the history
  • Loading branch information
@lumina37
lumina37 committed Dec 30, 2024
1 parent 35f2031 commit f74034c
Showing 1 changed file with 40 additions and 95 deletions.
135 changes: 40 additions & 95 deletions assets/resource/base/pipeline/activity/outside_deduction_rapid.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
],
"interrupt": [
"ODR_Start_Difficulty_Confirm",
"ODR_Start_Gift_Confirm",
"ODR_Start_Gift",
"SOD_SwipeLeft"
]
Expand Down Expand Up @@ -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": [
"造物",
Expand All @@ -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": [
"造物",
Expand All @@ -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": {
Expand All @@ -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": "触媒选择",
Expand All @@ -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": "触媒确认",
Expand All @@ -164,7 +149,11 @@
85
]
},
"action": "Click"
"action": "Click",
"next": [
"ODR_Start_TeamBuild",
"ODR_Start_MediaSelect_Confirm"
]
},
"ODR_Start_TeamBuild": {
"doc": "编队",
Expand Down Expand Up @@ -249,25 +238,23 @@
},
"action": "Click",
"next": [
"ODR_MainLoop",
"ODR_SelectCombat",
"ODR_Start_Teambuild_Confirm"
],
"interrupt": [
"SOD_Acquire_NoNext",
"HomeLoading"
]
"interrupt": "SOD_Acquire_NoNext"
},
"ODR_SelectCombat": {
"recognition": "TemplateMatch",
"template": "OutsideDeductionRapid/Combat.png",
"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,
Expand Down Expand Up @@ -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": [
Expand All @@ -805,9 +775,7 @@
"ODR_SkipAddChar",
"ODR_Levelup"
],
"interrupt": [
"SOD_Acquire_NoNext"
]
"interrupt": "SOD_Acquire_NoNext"
},
"ODR_ItemSelect": {
"recognition": "OCR",
Expand All @@ -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",
Expand All @@ -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",
Expand All @@ -855,9 +815,7 @@
20,
20
],
"next": [
"ODR_ItemSelect_ConfirmFlag"
]
"next": "ODR_ItemSelect_ConfirmFlag"
},
"ODR_ItemSelect_2": {
"action": "Click",
Expand All @@ -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",
Expand All @@ -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",
Expand All @@ -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",
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -1389,7 +1335,7 @@
"BackButton"
]
},
"ODR_Windows&Doors_CreationContract_ChangeRound": {
"ODR_Windows&Doors_CreationContract_Refresh": {
"doc": "换一批",
"recognition": "OCR",
"expected": [
Expand Down Expand Up @@ -1520,8 +1466,7 @@
"post_wait_freezes": 1000,
"next": [
"ODR_Exit",
"ODR_QueryChessLocation",
"ODR_FirstFloorFlag"
"ODR_QueryChessLocation"
],
"interrupt": [
"ODR_ItemSelect_NoNext",
Expand Down

0 comments on commit f74034c

Please sign in to comment.