Skip to content

Commit f6feedf

Browse files
committed
fix(ui): increase level OCR noise tolerance and fix CHOOSE_SHIP navigation edge
1 parent 6e930b4 commit f6feedf

2 files changed

Lines changed: 8 additions & 2 deletions

File tree

autowsgr/ui/navigation.py

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,11 @@ def _battle_prep_to_map(ctx: GameContext) -> None:
120120
BattlePreparationPage(ctx).go_back()
121121

122122

123+
def _choose_ship_to_battle_prep(ctx: GameContext) -> None:
124+
# 选船页面的返回按钮和出征准备页面位置一致
125+
ctx.ctrl.click(0.022, 0.058)
126+
127+
123128
def _backyard_to_bath(ctx: GameContext) -> None:
124129
from autowsgr.ui.backyard_page import BackyardPage, BackyardTarget
125130

@@ -214,8 +219,9 @@ def _event_to_main(ctx: GameContext) -> None:
214219
NavEdge(PageName.SIDEBAR, PageName.MAIN, _sidebar_to_main, '侧边栏 → 主页面'),
215220
# ── 地图 → 子页面 ──
216221
NavEdge(PageName.MAP, PageName.DECISIVE_BATTLE, _map_to_decisive, '地图 → 决战'),
217-
# ── 出征准备 → 地图 ──
222+
# ── 出征准备 ↔ 选船 ──
218223
NavEdge(PageName.BATTLE_PREP, PageName.MAP, _battle_prep_to_map, '出征准备 → 地图'),
224+
NavEdge(PageName.CHOOSE_SHIP, PageName.BATTLE_PREP, _choose_ship_to_battle_prep, '选船 → 出征准备'),
219225
# ── 后院 ↔ 子页面 ──
220226
NavEdge(PageName.BACKYARD, PageName.BATH, _backyard_to_bath, '后院 → 浴室'),
221227
NavEdge(PageName.BACKYARD, PageName.CANTEEN, _backyard_to_canteen, '后院 → 食堂'),

autowsgr/ui/utils/ship_list.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
_LEVEL_NOISY_PATTERN = re.compile(r'(?:[LlIi1O0][VvYy])[\.:]?\s*([0-9ILilOo]{1,6})')
3636
_MAX_LEVEL_VALUE = 200
3737
_MAX_LEVEL_NOISE_CHARS = 1
38-
_MAX_NOISY_LEVEL_HITS_BEFORE_RETRY = 1
38+
_MAX_NOISY_LEVEL_HITS_BEFORE_RETRY = 5
3939

4040

4141
class LevelOCRRetryNeededError(RuntimeError):

0 commit comments

Comments
 (0)