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 优化棋子被挡住时的识别 #278

Merged
merged 2 commits into from
Dec 13, 2024
Merged

perf: ODR 优化棋子被挡住时的识别 #278

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
47cb124
chore: `CloseRewardPage`post_wait_freezes改为post_delay
Windsland52 Dec 13, 2024
52e6631
perf: 优化棋子被挡住时的识别
Windsland52 Dec 13, 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
Binary file removed assets/resource/base/image/OutsideDeductionRapid/Chess1.png
View file
Open in desktop
Binary file not shown.
60 changes: 34 additions & 26 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 @@ -260,12 +260,11 @@
"green_mask": true,
"threshold": 0.85,
"index": -1,
"roi": "ODR_QueryChessLocation",
"roi_offset": [
10,
-1080,
1920,
1080
"roi": [
303,
196,
392,
307
],
"action": "Click",
"next": "ODR_ItemSelect",
Expand Down Expand Up @@ -495,7 +494,11 @@
"ODR_QueryChessLocation": {
"doc": "查询棋子位置",
"recognition": "TemplateMatch",
"template": "OutsideDeductionRapid/Chess.png",
"template": [
"OutsideDeductionRapid/Chess.png"
],
"threshold": 0.75,
"order_by": "Score",
"next": [
"ODR_SelectRestSite",
"ODR_SelectTreasure",
Expand All @@ -507,28 +510,20 @@
"ODR_QueryChessLocation"
]
},
"ODR_QueryChessLocation2": {
"doc": "查询棋子位置(棋子位于左边界被遮挡)",
"recognition": "TemplateMatch",
"template": [
"OutsideDeductionRapid/Chess1.png"
],
"ODR_FirstFloorFlag": {
"doc": "当前位于第一层，且前置任务“ODR_QueryChessLocation”失败，说明为最开始准备进入combat节点的情况",
"recognition": "OCR",
"expected": "环城大道",
"roi": [
0,
262,
176,
215
585,
19,
91,
25
],
"next": [
"ODR_SelectRestSite",
"ODR_SelectTreasure",
"ODR_SelectDiscovery",
"ODR_SelectCombat",
"ODR_SelectImminent",
"ODR_SelectShop",
"ODR_QueryChessLocation",
"ODR_Exit",
"ODR_QueryChessLocation2"
"ODR_FirstFloorFlag"
]
},
"ODR_Levelup": {
Expand Down Expand Up @@ -1156,6 +1151,19 @@
"post_wait_freezes": 300,
"action": "Click"
},
"ODR_Event_Confirm_CreationContract": {
"doc": "确认选项",
"recognition": "TemplateMatch",
"template": "OutsideDeduction/SOD_EndEvent_OK.png",
"roi": [
932,
82,
344,
600
],
"post_delay": 1000,
"action": "Click"
},
"ODR_QuitShop": {
"recognition": "TemplateMatch",
"template": "OutsideDeduction/SOD_Shopping_Leave.png",
Expand Down Expand Up @@ -1210,11 +1218,11 @@
82,
85
],
"post_wait_freezes": 300,
"post_wait_freezes": 1000,
"next": [
"ODR_Exit",
"ODR_QueryChessLocation",
"ODR_QueryChessLocation2"
"ODR_FirstFloorFlag"
],
"interrupt": [
"ODR_ItemSelect_NoNext",
Expand Down
2 changes: 1 addition & 1 deletion assets/resource/base/pipeline/startup.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -370,6 +370,6 @@
146
],
"action": "Click",
"post_wait_freezes": 300
"post_delay": 1000
}
}
Loading