Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

perf: ODR首次进入地图直接尝试战斗 #294

Merged
merged 3 commits into from
Dec 31, 2024
Merged

perf: ODR首次进入地图直接尝试战斗 #294

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
79238f9
perf: ODR首次进入地图直接尝试战斗
lumina37 Dec 30, 2024
2487d2d
squash me: response to ODR review
lumina37 Dec 31, 2024
b11c930
squash me: response to ODR review
lumina37 Dec 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
106 changes: 46 additions & 60 deletions assets/resource/base/pipeline/activity/outside_deduction_rapid.json
View file
Open in desktop
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 @@ -111,19 +110,6 @@
"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
},
"ODR_Start_MediaSelect": {
"doc": "触媒选择",
"recognition": "TemplateMatch",
Expand Down Expand Up @@ -208,7 +194,9 @@
30
],
"only_rec": true,
"next": "ODR_Start_AddChar_Confirm"
"next": [
"ODR_Start_AddChar_Confirm"
]
},
"ODR_Start_AddChar_Confirm": {
"doc": "确认添加角色",
Expand Down Expand Up @@ -249,12 +237,11 @@
},
"action": "Click",
"next": [
"ODR_MainLoop",
"ODR_SelectCombat",
"ODR_Start_Teambuild_Confirm"
],
"interrupt": [
"SOD_Acquire_NoNext",
"HomeLoading"
"SOD_Acquire_NoNext"
]
},
"ODR_SelectCombat": {
Expand All @@ -263,11 +250,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,
Expand All @@ -279,7 +267,9 @@
]
},
"action": "Click",
"next": "ODR_ItemSelect",
"next": [
"ODR_ItemSelect"
],
"interrupt": [
"ODR_Move",
"ODR_SelectCombat_NoNext"
Expand Down Expand Up @@ -372,7 +362,9 @@
]
},
"action": "Click",
"next": "ODR_Event_Select_SkipText",
"next": [
"ODR_Event_Select_SkipText"
],
"interrupt": [
"ODR_Move",
"ODR_SelectTreasure_NoNext"
Expand Down Expand Up @@ -416,7 +408,9 @@
]
},
"action": "Click",
"next": "ODR_Event_Select_SkipText",
"next": [
"ODR_Event_Select_SkipText"
],
"interrupt": [
"ODR_Move",
"ODR_SelectRestSite_NoNext"
Expand Down Expand Up @@ -691,7 +685,9 @@
]
},
"action": "Click",
"next": "ODR_ItemSelect",
"next": [
"ODR_ItemSelect"
],
"interrupt": [
"ODR_Move",
"ODR_SelectImminent_NoNext"
Expand Down Expand Up @@ -762,23 +758,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 Down Expand Up @@ -1271,7 +1250,9 @@
"ODR_Event_Select",
"ODR_MainFlag"
],
"interrupt": "ODR_SkipText"
"interrupt": [
"ODR_SkipText"
]
},
"ODR_Event_Select_First": {
"doc": "选择选项（第一）",
Expand All @@ -1291,7 +1272,9 @@
"ODR_Event_Select_First",
"ODR_MainFlag"
],
"interrupt": "ODR_SkipText"
"interrupt": [
"ODR_SkipText"
]
},
"ODR_Event_Select_Second2Last": {
"doc": "选择选项（倒数第二）",
Expand All @@ -1311,7 +1294,9 @@
"ODR_Event_Select_Second2Last",
"ODR_MainFlag"
],
"interrupt": "ODR_SkipText"
"interrupt": [
"ODR_SkipText"
]
},
"ODR_Event_Select_Second": {
"doc": "选择选项（第二）",
Expand All @@ -1331,7 +1316,9 @@
"ODR_Event_Select_Second",
"ODR_MainFlag"
],
"interrupt": "ODR_SkipText"
"interrupt": [
"ODR_SkipText"
]
},
"ODR_Windows&Doors_CreationContract": {
"doc": "造物典契",
Expand All @@ -1353,7 +1340,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 +1376,7 @@
"BackButton"
]
},
"ODR_Windows&Doors_CreationContract_ChangeRound": {
"ODR_Windows&Doors_CreationContract_Refresh": {
"doc": "换一批",
"recognition": "OCR",
"expected": [
Expand Down Expand Up @@ -1520,8 +1507,7 @@
"post_wait_freezes": 1000,
"next": [
"ODR_Exit",
"ODR_QueryChessLocation",
"ODR_FirstFloorFlag"
"ODR_QueryChessLocation"
],
"interrupt": [
"ODR_ItemSelect_NoNext",
Expand Down
Loading