Skip to content

fix: decisive shipname patch #448

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kuainx merged 2 commits into from
Apr 17, 2026
Merged

fix: decisive shipname patch #448

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
401d546
fix: apply_ship_patches
kuainx Apr 17, 2026
3bce188
fix ship choose logic
kuainx Apr 17, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion autowsgr/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
"""AutoWSGR - 战舰少女R 自动化框架(v2)"""

__version__ = '2.1.9.post8'
__version__ = '2.1.9.post9'
1 change: 1 addition & 0 deletions autowsgr/ops/decisive/logic.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
8 changes: 5 additions & 3 deletions autowsgr/ui/utils/ship_list.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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


Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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))

Expand Down
Loading