Skip to content

fix: 决战bugs #382

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
huan-yp merged 2 commits into from
Mar 27, 2026
Merged

fix: 决战bugs #382

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
82f5ae5
fix bugs
kuainx Mar 27, 2026
3f60654
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Mar 27, 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: 2 additions & 0 deletions autowsgr/infra/config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,6 +228,8 @@ class DecisiveConfig(BaseModel):
"""旗舰优先级队列"""
repair_level: int = 1
"""维修策略 (1=中破修, 2=大破修)"""
use_quick_repair: bool = True
"""是否使用快修"""
full_destroy: bool = False
"""船舱满了是否解装舰船"""
useful_skill: bool = False
Expand Down
1 change: 1 addition & 0 deletions autowsgr/ops/decisive/handlers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,6 +246,7 @@ def _handle_prepare_combat(self) -> None:

current_fleet = self._state.fleet[:]
if current_fleet != best_fleet:
time.sleep(0.5) # 等待进入出征准备页面
page.change_fleet(None, best_fleet[1:])
self._state.fleet = best_fleet
else:
Expand Down
6 changes: 3 additions & 3 deletions autowsgr/ops/decisive/logic.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,11 +201,11 @@ def get_best_fleet(self) -> list[str]:
best: list[str] = ['']
_log.debug('[决战] 当前舰船: {}', ships)
for ship in self.config.level1:
if ship in ships and self._is_available(ship) and len(best) < 7:
if ship in ships and self._is_available(ship) and len(best) <= 7:
best.append(ship)

for ship in self.config.level2:
if ship in ships and ship not in best and self._is_available(ship) and len(best) < 7:
if ship in ships and ship not in best and self._is_available(ship) and len(best) <= 7:
best.append(ship)

for flag_ship in self.config.flagship_priority:
Expand All @@ -214,7 +214,7 @@ def get_best_fleet(self) -> list[str]:
best[idx], best[1] = best[1], best[idx]
break

while len(best) < 7:
while len(best) <= 7:
best.append('')

_log.debug('[决战] 最优编队: {}', best)
Expand Down
2 changes: 1 addition & 1 deletion autowsgr/ui/decisive/fleet_ocr.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ def use_skill(
ship_area = ROI(x1=0.26, y1=0.685, x2=0.74, y2=0.715)

ctrl.click(*skill_pos)
time.sleep(0.5)
time.sleep(1.0)

screen = ctrl.screenshot()
crop = ship_area.crop(screen)
Expand Down
3 changes: 3 additions & 0 deletions autowsgr/ui/map/panels/decisive.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,9 @@ def enter_decisive(self) -> None:

_log.info('[UI] 地图页面 → 决战页面')

# 0. 等待一下，确保地图页面加载完成
time.sleep(0.5)

# 1. 确保在决战面板
self.ensure_panel(MapPanel.DECISIVE)
time.sleep(0.5)
Expand Down