autowsgr 2.2.1__tar.gz → 2.2.2__tar.gz

{autowsgr-2.2.1 → autowsgr-2.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: autowsgr
-Version: 2.2.1
+Version: 2.2.2
 Summary: Auto Warship Girls Framework.
 Project-URL: Documentation, https://docs-autowsgr.notion.site
 Project-URL: Repository, https://github.com/OpenWSGR/AutoWSGR

{autowsgr-2.2.1 → autowsgr-2.2.2}/autowsgr/__init__.py

@@ -1,3 +1,3 @@
 """AutoWSGR - 战舰少女R 自动化框架(v2)"""
 
-__version__ = '2.2.1'
+__version__ = '2.2.2'

{autowsgr-2.2.1 → autowsgr-2.2.2}/autowsgr/types.py

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

{autowsgr-2.2.1 → autowsgr-2.2.2}/autowsgr/ui/__init__.py

@@ -125,6 +125,7 @@ register_page(PageName.BUILD, BuildPage.is_current_page)
 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-2.2.1 → autowsgr-2.2.2}/autowsgr/ui/map/base.py

@@ -20,10 +20,6 @@ from autowsgr.ui.map.data import (
     EXPEDITION_TOLERANCE,
     PANEL_LIST,
     PANEL_TO_INDEX,
-    SIDEBAR_BRIGHTNESS_THRESHOLD,
-    SIDEBAR_SCAN_STEP,
-    SIDEBAR_SCAN_X,
-    SIDEBAR_SCAN_Y_RANGE,
     TITLE_CROP_REGION,
     MapIdentity,
     MapPanel,
@@ -107,29 +103,9 @@ class BaseMapPage:
     # ═══════════════════════════════════════════════════════════════════════
 
     @staticmethod
-    def find_selected_chapter_y(screen: np.ndarray) -> float | None:
+    def find_selected_chapter_y() -> float | None:
         """扫描侧边栏，定位选中章节的 y 坐标。"""
-        y_min, y_max = SIDEBAR_SCAN_Y_RANGE
-        bright_ys: list[float] = []
-
-        y = y_min
-        while y <= y_max:
-            c = PixelChecker.get_pixel(screen, SIDEBAR_SCAN_X, y)
-            brightness = c.r + c.g + c.b
-            if brightness >= SIDEBAR_BRIGHTNESS_THRESHOLD:
-                bright_ys.append(y)
-            y += SIDEBAR_SCAN_STEP
-
-        if not bright_ys:
-            return None
-
-        center = sum(bright_ys) / len(bright_ys)
-        _log.debug(
-            '[UI] 侧边栏选中章节: y_center={:.3f} ({}个亮点)',
-            center,
-            len(bright_ys),
-        )
-        return center
+        return 0.556
 
     # ═══════════════════════════════════════════════════════════════════════
     # 状态查询 — 地图 OCR

{autowsgr-2.2.1 → autowsgr-2.2.2}/autowsgr/ui/map/panels/sortie.py

@@ -20,7 +20,6 @@ from autowsgr.ui.map.data import (
     LOOT_COUNT_CROP,
     SHIP_COUNT_CROP,
     SIDEBAR_CLICK_X,
-    SIDEBAR_SCAN_Y_RANGE,
     TOTAL_CHAPTERS,
     MapPanel,
 )
@@ -149,39 +148,26 @@ class SortiePanelMixin(BaseMapPage):
     # 章节 / 地图导航
     # ═══════════════════════════════════════════════════════════════════════
 
-    def click_prev_chapter(self, screen: np.ndarray | None = None) -> bool:
-        """点击侧边栏上方章节 (前一章)。"""
-        if screen is None:
-            screen = self._ctrl.screenshot()
-        sel_y = self.find_selected_chapter_y(screen)
-        if sel_y is None:
-            _log.warning('[UI] 侧边栏未找到选中章节，无法切换')
-            return False
-        target_y = sel_y - CHAPTER_SPACING
-        if target_y < SIDEBAR_SCAN_Y_RANGE[0]:
-            _log.warning('[UI] 已在最前章节，无法继续向前')
-            return False
-        _log.info('[UI] 地图页面 -> 上一章 (y={:.3f})', target_y)
-        self._ctrl.click(SIDEBAR_CLICK_X, target_y)
-        return True
+    def click_chapter(self, num: int):
+        """点击侧边栏章节
 
-    def click_next_chapter(self, screen: np.ndarray | None = None) -> bool:
-        """点击侧边栏下方章节 (后一章)。"""
-        if screen is None:
-            screen = self._ctrl.screenshot()
-        sel_y = self.find_selected_chapter_y(screen)
-        if sel_y is None:
-            _log.warning('[UI] 侧边栏未找到选中章节，无法切换')
-            return False
-        target_y = sel_y + CHAPTER_SPACING
-        if target_y > SIDEBAR_SCAN_Y_RANGE[1]:
-            _log.warning('[UI] 已在最后章节，无法继续向后')
-            return False
-        _log.info('[UI] 地图页面 -> 下一章 (y={:.3f})', target_y)
+        Parameters
+        ----------
+        num:
+            跳转数量, 正数为向下跳转, 负数为向上跳转
+            允许输入[-3, 3]
+        """
+        if not -3 <= num <= 3:
+            raise ValueError(f'跳转数量必须为 -3 到 3, 收到: {num}')
+        if num == 0:
+            return
+        sel_y = self.find_selected_chapter_y()
+        target_y = sel_y + num * CHAPTER_SPACING
+        _log.info('[UI] 地图页面 -> 跳转章节 {} (y={:.3f})', num, target_y)
         self._ctrl.click(SIDEBAR_CLICK_X, target_y)
-        return True
+        return
 
-    def navigate_to_chapter(self, target: int) -> int | None:  # noqa: C901, PLR0912, PLR0915
+    def navigate_to_chapter(self, target: int) -> int | None:
         """导航到指定章节 (通过 OCR 识别当前位置并批量点击)。
 
         远距离章节切换时采用批量点击 + 充分等待的策略，
@@ -261,30 +247,14 @@ class SortiePanelMixin(BaseMapPage):
                 continue
 
             delta = target - current
-            direction = -1 if delta < 0 else 1
-            steps = abs(delta)
-
-            # 远距离批量点击，近距离逐步点击
-            if steps > 2:
-                batch = min(steps, 4)
-                _log.info('[UI] 章节导航: 批量点击 {} 章', batch)
-                for _ in range(batch):
-                    ok = self.click_prev_chapter() if direction < 0 else self.click_next_chapter()
-                    if not ok:
-                        _log.warning('[UI] 章节导航: 点击失败，终止')
-                        return None
-                    time.sleep(0.3)
-                # 批量点击后充分等待动画完全结束，避免 OCR 抖动
-                time.sleep(1.0)
-            else:
-                if direction < 0:
-                    ok = self.click_prev_chapter(screen)
-                else:
-                    ok = self.click_next_chapter(screen)
-                if not ok:
-                    _log.warning('[UI] 章节导航: 点击失败，终止')
-                    return None
-                time.sleep(CHAPTER_NAV_DELAY)
+            direction = 1 if delta > 0 else -1
+            remaining = abs(delta)
+            while remaining > 0:
+                step = min(remaining, 3) * direction
+                self.click_chapter(step)
+                remaining -= abs(step)
+                _log.info(f'[UI] 章节导航: 跳转{step}章, 剩余{remaining}章')
+                time.sleep(CHAPTER_NAV_DELAY * abs(step))
 
         _log.warning(
             '[UI] 章节导航: 超过最大尝试次数 ({}), 目标第 {} 章',

{autowsgr-2.2.1 → autowsgr-2.2.2}/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 @@ NAV_GRAPH: list[NavEdge] = [
     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-2.2.1 → autowsgr-2.2.2}/autowsgr/ui/utils/ship_list.py

@@ -35,7 +35,7 @@ _LEVEL_PATTERN = re.compile(r'[Ll][Vv]\.?\s*([0-9ILilOo]{1,6})')
 _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):