fix: 修复决战技能只识别一艘船的bug (#379)

* fix skills

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>

Author: kuainx

autowsgr/ops/decisive/handlers.py

@@ -214,6 +214,13 @@ def _handle_prepare_combat(self) -> None:
                 self._has_chosen_fleet,
             )
 
+        # 先使用技能，再注册舰船
+        if self._state.node == 'A' and not self._map.is_skill_used():
+            gained = self._map.use_skill()
+            if gained:
+                _log.info('[决战] 使用技能获得: {}', gained)
+                self._state.ships.update(gained)
+
         # ── 恢复模式: 扫描当前舰队与可用舰船 ─────────────────────────
         # 对齐 legacy: if fleet.empty() and not is_begin(): _check_fleet()
         if self._resume_mode:
@@ -228,12 +235,6 @@ def _handle_prepare_combat(self) -> None:
             self._sync_ship_states()
             self._resume_mode = False  # 扫描完成后退出恢复模式
 
-        if self._state.node == 'A' and not self._map.is_skill_used():
-            gained = self._map.use_skill()
-            if gained:
-                _log.info('[决战] 使用技能获得: {}', gained)
-                self._state.ships.update(gained)
-
         best_fleet = self._logic.get_best_fleet()
         if self._logic.should_retreat(best_fleet):
             _log.info('[决战] 舰船不足, 准备撤退')
@@ -251,8 +252,10 @@ def _handle_prepare_combat(self) -> None:
             self._state.fleet = best_fleet
 
         strategy = (
-            RepairStrategy.NEVER if not self._config.use_quick_repair
-            else RepairStrategy.MODERATE if self._config.repair_level <= 1
+            RepairStrategy.NEVER
+            if not self._config.use_quick_repair
+            else RepairStrategy.MODERATE
+            if self._config.repair_level <= 1
             else RepairStrategy.SEVERE
         )
         page.apply_repair(strategy)

autowsgr/server/routes/ops.py

@@ -220,9 +220,7 @@ async def repair_ship(request: RepairShipRequest):
     from autowsgr.ops.repair import repair_ship_by_name
 
     try:
-        repair_secs = await asyncio.to_thread(
-            repair_ship_by_name, ctx, request.ship_name
-        )
+        repair_secs = await asyncio.to_thread(repair_ship_by_name, ctx, request.ship_name)
         if repair_secs < 0:
             return ApiResponse(
                 success=False,

autowsgr/ui/decisive/fleet_ocr.py

@@ -139,10 +139,10 @@ def use_skill(
 
     screen = ctrl.screenshot()
     crop = ship_area.crop(screen)
-    result = ocr.recognize_ship_name(crop)
+    result = ocr.recognize_ship_names(crop)
     acquired: list[str] = []
     if result is not None:
-        acquired.append(result)
+        acquired.extend(result)
 
     ctrl.click(*skill_pos)  # 快进一下
     return acquired

autowsgr/vision/ocr.py

@@ -297,7 +297,7 @@ def recognize_ship_names(
                     if dist > max_threshold:
                         raise ShipNameMismatchError(text, best_candidate, dist, max_threshold)
                 _log_fn("[OCR] recognize_ship_names: '{}' 无匹配 (阈值={})，跳过", text, threshold)
-        _log_fn('[OCR] recognize_ship_names: 共识别 {} 艰: {}', len(matched), matched)
+        _log_fn('[OCR] recognize_ship_names: 共识别 {} 艘: {}', len(matched), matched)
         return matched
 
     # ── 工厂方法 ──