autowsgr 2.2.0.post1__tar.gz → 2.2.2__tar.gz

{autowsgr-2.2.0.post1 → autowsgr-2.2.2}/.github/workflows/lint.yml

@@ -5,7 +5,6 @@ on:
   push:
     branches: [main]
   pull_request:
-    branches: [main]
 
 permissions:
   contents: read

autowsgr-2.2.2/.github/workflows/pytest.yml

@@ -0,0 +1,31 @@
+# Pytest — 运行全部单元测试并生成覆盖率报告
+name: Pytest
+
+on:
+  push:
+    branches: [main]
+  pull_request:
+
+permissions:
+  contents: read
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v6
+      - uses: astral-sh/setup-uv@v8.1.0
+        with:
+          enable-cache: true
+      - name: Run tests with coverage
+        run: uv run pytest -n auto --cov=autowsgr --cov-report=xml --cov-report=term-missing --junitxml=junit.xml
+      - name: Upload coverage to Codecov
+        uses: codecov/codecov-action@v6
+        with:
+          token: ${{ secrets.CODECOV_TOKEN }}
+          slug: OpenWSGR/AutoWSGR
+      - name: Upload test results to Codecov
+        if: ${{ !cancelled() }}
+        uses: codecov/test-results-action@v1
+        with:
+          token: ${{ secrets.CODECOV_TOKEN }}

{autowsgr-2.2.0.post1 → autowsgr-2.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: autowsgr
-Version: 2.2.0.post1
+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
@@ -20,6 +20,7 @@ Requires-Dist: keyboard
 Requires-Dist: loguru
 Requires-Dist: opencv-python-headless
 Requires-Dist: pydantic<3.0,>=2.0
+Requires-Dist: retry>=0.9.2
 Requires-Dist: rich
 Requires-Dist: uvicorn[standard]>=0.23.0
 Requires-Dist: websockets>=11.0
@@ -31,7 +32,7 @@ Description-Content-Type: text/markdown
 
 ## 项目简介
 
-![Repo Size](https://img.shields.io/github/repo-size/OpenWSGR/AutoWSGR) ![Pypi Version](https://img.shields.io/pypi/v/autowsgr) ![Pypi Downloads](https://img.shields.io/pypi/dm/autowsgr) ![Github Issues](https://img.shields.io/github/issues/OpenWSGR/AutoWSGR) ![Github Last Commit](https://img.shields.io/github/last-commit/OpenWSGR/AutoWSGR) [![License](https://img.shields.io/badge/license-OpenWSGR%20Strict%20NC-red.svg)](LICENSE)
+![Repo Size](https://img.shields.io/github/repo-size/OpenWSGR/AutoWSGR) ![Pypi Version](https://img.shields.io/pypi/v/autowsgr) ![Pypi Downloads](https://img.shields.io/pypi/dm/autowsgr) ![Github Issues](https://img.shields.io/github/issues/OpenWSGR/AutoWSGR) ![Github Last Commit](https://img.shields.io/github/last-commit/OpenWSGR/AutoWSGR) [![Codecov](https://codecov.io/gh/OpenWSGR/AutoWSGR/graph/badge.svg)](https://codecov.io/gh/OpenWSGR/AutoWSGR) [![License](https://img.shields.io/badge/license-OpenWSGR%20Strict%20NC-red.svg)](LICENSE)
 
 用 Python 与 C++ 实现的 战舰少女R 的自动化流水线 & 数据统计一体化脚本, 提供 `WSGR` 游戏级别接口以及部分图像和原子操作接口。
 

{autowsgr-2.2.0.post1 → autowsgr-2.2.2}/README.md

@@ -4,7 +4,7 @@
 
 ## 项目简介
 
-![Repo Size](https://img.shields.io/github/repo-size/OpenWSGR/AutoWSGR) ![Pypi Version](https://img.shields.io/pypi/v/autowsgr) ![Pypi Downloads](https://img.shields.io/pypi/dm/autowsgr) ![Github Issues](https://img.shields.io/github/issues/OpenWSGR/AutoWSGR) ![Github Last Commit](https://img.shields.io/github/last-commit/OpenWSGR/AutoWSGR) [![License](https://img.shields.io/badge/license-OpenWSGR%20Strict%20NC-red.svg)](LICENSE)
+![Repo Size](https://img.shields.io/github/repo-size/OpenWSGR/AutoWSGR) ![Pypi Version](https://img.shields.io/pypi/v/autowsgr) ![Pypi Downloads](https://img.shields.io/pypi/dm/autowsgr) ![Github Issues](https://img.shields.io/github/issues/OpenWSGR/AutoWSGR) ![Github Last Commit](https://img.shields.io/github/last-commit/OpenWSGR/AutoWSGR) [![Codecov](https://codecov.io/gh/OpenWSGR/AutoWSGR/graph/badge.svg)](https://codecov.io/gh/OpenWSGR/AutoWSGR) [![License](https://img.shields.io/badge/license-OpenWSGR%20Strict%20NC-red.svg)](LICENSE)
 
 用 Python 与 C++ 实现的 战舰少女R 的自动化流水线 & 数据统计一体化脚本, 提供 `WSGR` 游戏级别接口以及部分图像和原子操作接口。
 

{autowsgr-2.2.0.post1 → autowsgr-2.2.2}/autowsgr/__init__.py

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

{autowsgr-2.2.0.post1 → autowsgr-2.2.2}/autowsgr/types.py

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

{autowsgr-2.2.0.post1 → 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.0.post1 → 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
@@ -143,7 +119,7 @@ class BaseMapPage:
         """通过 OCR 识别当前地图。"""
         x1, y1, x2, y2 = TITLE_CROP_REGION
         cropped = PixelChecker.crop(screen, x1, y1, x2, y2)
-        result = ocr.recognize_single(cropped)
+        result = ocr.recognize_maxlen(cropped)
         if not result.text:
             _log.debug('[UI] 地图标题 OCR 无结果')
             return None

{autowsgr-2.2.0.post1 → autowsgr-2.2.2}/autowsgr/ui/map/data.py

@@ -99,7 +99,7 @@ MAP_DATABASE: dict[tuple[int, int], str] = {
     (9, 3): '南入海口海域',
     (9, 4): '河口外海',
     (9, 5): '南大洋群岛',
-    # 第十章：极地海峡
+    # 第十章：极地水域
     (10, 1): '极地海峡',
 }
 """已知地图 (章节, 关卡号) → 名称。"""
@@ -315,6 +315,9 @@ CAMPAIGN_POSITIONS: dict[int, tuple[float, float]] = {
 CLICK_DIFFICULTY: tuple[float, float] = (0.800, 0.130)
 """切换难度。"""
 
+CAMPAIGN_REMAIN_CROP: tuple[float, float, float, float] = (0.08, 0.82, 0.25, 0.92)
+"""战役剩余次数 OCR 裁剪区域 (第一列战役的底部文本区)。"""
+
 
 # ── 出征地图节点切换 ──
 

{autowsgr-2.2.0.post1 → autowsgr-2.2.2}/autowsgr/ui/map/panels/campaign.py

@@ -2,6 +2,7 @@
 
 from __future__ import annotations
 
+import re
 import time
 from dataclasses import dataclass
 from typing import TYPE_CHECKING
@@ -11,6 +12,7 @@ from autowsgr.types import PageName
 from autowsgr.ui.map.base import BaseMapPage
 from autowsgr.ui.map.data import (
     CAMPAIGN_POSITIONS,
+    CAMPAIGN_REMAIN_CROP,
     CLICK_DIFFICULTY,
     DIFFICULTY_EASY_COLOR,
     DIFFICULTY_HARD_COLOR,
@@ -38,6 +40,36 @@ class CampaignPanelMixin(BaseMapPage):
 
     # ── 查询 ─────────────────────────────────────────────────────────────
 
+    def get_campaign_remains(self) -> tuple[int, int] | None:
+        """获取战役剩余次数。
+
+        Returns
+        -------
+        tuple[int, int] | None
+            返回 (剩余次数, 总次数)，如 (0, 8)。如果识别失败返回 None。
+        """
+        self.ensure_panel(MapPanel.BATTLE)
+        time.sleep(0.5)
+        screen = self._ctrl.screenshot()
+        img = PixelChecker.crop(screen, *CAMPAIGN_REMAIN_CROP)
+
+        ocr = self._ocr
+        if ocr is None:
+            _log.warning('[UI] 无法获取战役次数: 未提供 OCR 引擎')
+            return None
+
+        results = ocr.recognize(img)
+        text = ''.join([r.text for r in results]).replace(' ', '')
+        m = re.search(r'(\d+)[/|](\d+)', text)
+        if m:
+            remains = int(m.group(1))
+            total = int(m.group(2))
+            _log.info(f'[UI] 战役次数识别成功: {remains}/{total}')
+            return remains, total
+
+        _log.warning(f'[UI] 战役次数识别失败: OCR 结果未匹配 ({text})')
+        return None
+
     def recognize_difficulty(self) -> str | None:
         """通过检测难度按钮颜色识别当前难度。
 

{autowsgr-2.2.0.post1 → 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.0.post1 → 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.0.post1 → 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):

{autowsgr-2.2.0.post1 → autowsgr-2.2.2}/autowsgr/vision/ocr.py

@@ -186,6 +186,24 @@ class OCREngine(ABC):
         _log_fn("[OCR] recognize_single: '{}' (conf={:.2f})", best.text, best.confidence)
         return best
 
+    def recognize_maxlen(
+        self,
+        image: np.ndarray,
+        allowlist: str = '',
+    ) -> OCRResult:
+        """识别单个文本区域，返回置信度最高的结果。
+
+        无结果时返回空文本、零置信度的 OCRResult。
+        """
+        results = self.recognize(image, allowlist)
+        _log_fn = _log.debug if self.verbose else _log.trace
+        if not results:
+            _log_fn('[OCR] recognize_maxlen: 无结果')
+            return OCRResult(text='', confidence=0.0)
+        best = max(results, key=lambda r: len(r.text))
+        _log_fn("[OCR] recognize_maxlen: '{}' (conf={:.2f})", best.text, best.confidence)
+        return best
+
     def recognize_number(
         self,
         image: np.ndarray,

{autowsgr-2.2.0.post1 → autowsgr-2.2.2}/pyproject.toml

@@ -27,6 +27,7 @@ dependencies = [
     "fastapi>=0.100.0",
     "uvicorn[standard]>=0.23.0",
     "websockets>=11.0",
+    "retry>=0.9.2",
 ]
 
 [dependency-groups]
@@ -36,6 +37,7 @@ dev = [
     "pytest-cov",
     "pytest-xdist",
     "requests>=2.32.5",
+    "beautifulsoup4",
 ]
 
 [build-system]

autowsgr-2.2.2/renovate.json

@@ -0,0 +1,46 @@
+{
+  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+  "extends": ["config:recommended"],
+  "rangeStrategy": "replace",
+  "lockFileMaintenance": {
+    "enabled": true,
+    "automerge": true
+  },
+  "automerge": false,
+  "automergeType": "pr",
+  "platformAutomerge": true,
+  "rebaseWhen": "behind-base-branch",
+  "internalChecksFilter": "strict",
+  "git-submodules": {
+    "enabled": true
+  },
+  "packageRules": [
+    {
+      "description": "Automerge dev dependency minor and patch updates",
+      "matchDepTypes": ["dev", "dependency-groups.dev"],
+      "matchUpdateTypes": ["minor", "patch"],
+      "automerge": true
+    },
+    {
+      "description": "Automerge lock file maintenance",
+      "matchUpdateTypes": ["lockFileMaintenance"],
+      "automerge": true
+    },
+    {
+      "description": "Group minor and patch production dependencies",
+      "matchUpdateTypes": ["minor", "patch"],
+      "groupName": "dependencies (minor and patch)",
+      "groupSlug": "dependencies-minor-patch"
+    },
+    {
+      "description": "Do not automerge 0.x versions (can have breaking changes)",
+      "matchCurrentVersion": "/^0\\./",
+      "automerge": false
+    },
+    {
+      "description": "Disable Python runtime version updates",
+      "matchPackageNames": ["python", "python3", "cpython", "requires-python"],
+      "enabled": false
+    }
+  ]
+}

{autowsgr-2.2.0.post1 → autowsgr-2.2.2}/tools/update_shipnames.py

@@ -28,6 +28,9 @@ import shutil
 import sys
 from pathlib import Path
 
+import requests
+from bs4 import BeautifulSoup
+
 
 # ── 项目根路径 ───────────────────────────────────────────────────────────────
 _ROOT = Path(__file__).resolve().parent.parent
@@ -74,11 +77,6 @@ Other: # 战例
 
 def _fetch_html(url: str, proxy: str | None, timeout: int) -> str:
     """下载页面 HTML。"""
-    try:
-        import requests
-    except ImportError as exc:
-        raise SystemExit('缺少依赖: requests\n请运行: pip install requests') from exc
-
     proxies = {'http': proxy, 'https': proxy} if proxy else None
     headers = {
         'User-Agent': (
@@ -124,15 +122,6 @@ def _parse_ships(html: str) -> list[tuple[str, str]]:
         return pairs
 
     # ── 方案 B：BeautifulSoup ────────────────────────────────────────────────
-    try:
-        from bs4 import BeautifulSoup
-    except ImportError:
-        raise SystemExit(
-            '正则未能匹配，且缺少 bs4。\n'
-            '请运行: pip install requests beautifulsoup4\n'
-            '或启用代理后重新尝试。'
-        ) from None
-
     soup = BeautifulSoup(html, 'html.parser')
     pairs: list[tuple[str, str]] = []