Skip to content

Commit 64fe3a9

Browse files
committed
fix: 移除无用的模板匹配并改为ocr识别
1 parent 5941216 commit 64fe3a9

4 files changed

Lines changed: 40 additions & 38 deletions

File tree

-1.59 KB
Binary file not shown.
-5.23 KB
Binary file not shown.

assets/resource/base/pipeline/Tetris/Tetris.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464
"desc": "泯除方块 - 检测到游戏空闲(等待方块出现)",
6565
"recognition": "And",
6666
"all_of": [
67-
"TetrisSceneGameIdle"
67+
"TetrisGamingNext"
6868
],
6969
"pre_delay": 500,
7070
"next": [

assets/resource/base/pipeline/Tetris/TetrisScene.json

Lines changed: 39 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -101,26 +101,6 @@
101101
"post_delay": 0,
102102
"next": []
103103
},
104-
"TetrisScenePrepareOneMarker": {
105-
"desc": "泯除方块 - 检测准备界面一标记",
106-
"recognition": {
107-
"type": "TemplateMatch",
108-
"param": {
109-
"roi": [
110-
779,
111-
151,
112-
245,
113-
366
114-
],
115-
"template": [
116-
"Tetris/prepare_one_marker.png"
117-
]
118-
}
119-
},
120-
"pre_delay": 0,
121-
"post_delay": 0,
122-
"next": []
123-
},
124104
"TetrisScenePrepareOneSingle": {
125105
"desc": "泯除方块 - 检测单人模式入口",
126106
"recognition": {
@@ -175,7 +155,6 @@
175155
"type": "Or",
176156
"param": {
177157
"any_of": [
178-
"TetrisScenePrepareOneMarker",
179158
"TetrisScenePrepareOneSingle",
180159
"TetrisScenePrepareOneMulti"
181160
]
@@ -286,24 +265,45 @@
286265
"pre_delay": 0,
287266
"post_delay": 0
288267
},
289-
"TetrisSceneDrop": {
290-
"desc": "泯除方块 - 检测下落按钮(游戏中标志)",
268+
"TetrisGamingNext": {
269+
"desc": "泯除方块 - 识别游戏中Next队列文字",
291270
"recognition": {
292-
"type": "TemplateMatch",
271+
"type": "OCR",
293272
"param": {
294273
"roi": [
295-
270,
296-
425,
297-
92,
298-
97
274+
792,
275+
52,
276+
45,
277+
25
299278
],
300-
"template": [
301-
"Tetris/drop.png"
279+
"expected": [
280+
"Next",
281+
"次の",
282+
"다음"
302283
]
303284
}
304-
},
305-
"pre_delay": 0,
306-
"post_delay": 0
285+
}
286+
},
287+
"TetrisGamingExisting": {
288+
"desc": "泯除方块 - 识别游戏中当前存活文字",
289+
"recognition": {
290+
"type": "OCR",
291+
"param": {
292+
"roi": [
293+
783,
294+
489,
295+
65,
296+
23
297+
],
298+
"expected": [
299+
"当前存活",
300+
"當前存活",
301+
"(?i)Existing",
302+
"現在の生存",
303+
"현재 생존"
304+
]
305+
}
306+
}
307307
},
308308
"TetrisSceneMatchend": {
309309
"desc": "泯除方块 - 检测对局结束界面",
@@ -326,12 +326,14 @@
326326
"post_delay": 0
327327
},
328328
"TetrisSceneGameActive": {
329-
"desc": "泯除方块 - 检测游戏中(下落按钮可见",
329+
"desc": "泯除方块 - 检测游戏中(下落按钮或游戏标记可见",
330330
"recognition": {
331-
"type": "And",
331+
"type": "Or",
332332
"param": {
333-
"all_of": [
334-
"TetrisSceneDrop"
333+
"any_of": [
334+
"TetrisSceneGameIdle",
335+
"TetrisGamingNext",
336+
"TetrisGamingExisting"
335337
]
336338
}
337339
},

0 commit comments

Comments
 (0)