Fix/choose ship and ocr (#485)

* fix(ui): register CHOOSE_SHIP page to prevent navigation failure on fleet formation

* fix(ui): increase level OCR noise tolerance and fix CHOOSE_SHIP navigation edge

* ruff

---------

Co-authored-by: yltx <2326439151@qq.com>

Author: kuainx

autowsgr/types.py

@@ -424,6 +424,8 @@ class PageName(StrEnum):
     """好友页面"""
     DECISIVE_BATTLE = '决战页面'
     """决战页面"""
+    CHOOSE_SHIP = '选择舰船页面'
+    """选择舰船页面"""
 
     EVENT_MAP = '活动页面'
     """活动地图页面"""

autowsgr/ui/__init__.py

@@ -125,6 +125,7 @@
 register_page(PageName.INTENSIFY, IntensifyPage.is_current_page)
 register_page(PageName.FRIEND, FriendPage.is_current_page)
 register_page(PageName.DECISIVE_BATTLE, DecisiveBattlePage.is_current_page)
+register_page(PageName.CHOOSE_SHIP, ChooseShipPage.is_current_page)
 register_page(PageName.EVENT_MAP, BaseEventPage.is_current_page)
 
 __all__ = [

autowsgr/ui/navigation.py

@@ -120,6 +120,11 @@ def _battle_prep_to_map(ctx: GameContext) -> None:
     BattlePreparationPage(ctx).go_back()
 
 
+def _choose_ship_to_battle_prep(ctx: GameContext) -> None:
+    # 选船页面的返回按钮和出征准备页面位置一致
+    ctx.ctrl.click(0.022, 0.058)
+
+
 def _backyard_to_bath(ctx: GameContext) -> None:
     from autowsgr.ui.backyard_page import BackyardPage, BackyardTarget
 
@@ -214,8 +219,11 @@ def _event_to_main(ctx: GameContext) -> None:
     NavEdge(PageName.SIDEBAR, PageName.MAIN, _sidebar_to_main, '侧边栏 → 主页面'),
     # ── 地图 → 子页面 ──
     NavEdge(PageName.MAP, PageName.DECISIVE_BATTLE, _map_to_decisive, '地图 → 决战'),
-    # ── 出征准备 → 地图 ──
+    # ── 出征准备 ↔ 选船 ──
     NavEdge(PageName.BATTLE_PREP, PageName.MAP, _battle_prep_to_map, '出征准备 → 地图'),
+    NavEdge(
+        PageName.CHOOSE_SHIP, PageName.BATTLE_PREP, _choose_ship_to_battle_prep, '选船 → 出征准备'
+    ),
     # ── 后院 ↔ 子页面 ──
     NavEdge(PageName.BACKYARD, PageName.BATH, _backyard_to_bath, '后院 → 浴室'),
     NavEdge(PageName.BACKYARD, PageName.CANTEEN, _backyard_to_canteen, '后院 → 食堂'),

autowsgr/ui/utils/ship_list.py

@@ -35,7 +35,7 @@
 _LEVEL_NOISY_PATTERN = re.compile(r'(?:[LlIi1O0][VvYy])[\.:]?\s*([0-9ILilOo]{1,6})')
 _MAX_LEVEL_VALUE = 200
 _MAX_LEVEL_NOISE_CHARS = 1
-_MAX_NOISY_LEVEL_HITS_BEFORE_RETRY = 1
+_MAX_NOISY_LEVEL_HITS_BEFORE_RETRY = 5
 
 
 class LevelOCRRetryNeededError(RuntimeError):