diff --git a/autowsgr/__init__.py b/autowsgr/__init__.py index f0dcef7e..a338bc96 100644 --- a/autowsgr/__init__.py +++ b/autowsgr/__init__.py @@ -1,3 +1,3 @@ """AutoWSGR - 战舰少女R 自动化框架(v2)""" -__version__ = '2.1.9.post8' +__version__ = '2.1.9.post9' diff --git a/autowsgr/ops/decisive/logic.py b/autowsgr/ops/decisive/logic.py index a88db0fb..3f2b26d5 100644 --- a/autowsgr/ops/decisive/logic.py +++ b/autowsgr/ops/decisive/logic.py @@ -114,6 +114,7 @@ def choose_ships( candidates = self.config.level1 + [e for e in self._level2_full if not _is_ship(e)] lim = 6 if fleet_count < 6 else score + lim = score if fleet_count == 0 else lim result: list[str] = [] for target in candidates: if target in selections: diff --git a/autowsgr/ui/utils/ship_list.py b/autowsgr/ui/utils/ship_list.py index c29363d9..31c3368d 100644 --- a/autowsgr/ui/utils/ship_list.py +++ b/autowsgr/ui/utils/ship_list.py @@ -13,7 +13,7 @@ from autowsgr.constants import SHIPNAMES from autowsgr.infra.logger import get_logger -from autowsgr.vision import get_api_dll +from autowsgr.vision import apply_ship_patches, get_api_dll from autowsgr.vision.ocr import _fuzzy_match @@ -135,7 +135,8 @@ def locate_ship_rows( text = r.text.strip() if not text: continue - name = _fuzzy_match(text, SHIPNAMES) + correct_name = apply_ship_patches(text) + name = _fuzzy_match(correct_name, SHIPNAMES) if name is None: continue if deduplicate_by_name and name in seen: @@ -393,7 +394,8 @@ def read_ship_levels( if level is not None: local_level_hits.append((level, x_center)) - name = _fuzzy_match(text, SHIPNAMES) + correct_name = apply_ship_patches(text) + name = _fuzzy_match(correct_name, SHIPNAMES) if name is not None: name_hits.append((name, x_center))