Skip to content

Commit 325ee05

Browse files
committed
fix: 修复了一些切换舰船的 bug
1 parent 03b8596 commit 325ee05

3 files changed

Lines changed: 26 additions & 1 deletion

File tree

autowsgr/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
"""AutoWSGR — 战舰少女R 自动化框架 (v2)"""
22

3-
__version__ = "2.0.2"
3+
__version__ = "2.0.2r1"

autowsgr/ui/battle/fleet_change.py

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
"""出征准备 — 舰队编成更换。
22
33
提供按舰船名称更换编队的组合动作。
4+
5+
TODO: 优化为使用快速编队逻辑
6+
TODO: 对 choose_ship_page 建模
47
"""
58

69
from __future__ import annotations
@@ -49,6 +52,10 @@ def change_fleet(
4952
"""
5053
if fleet_id == 1:
5154
raise ValueError("不支持更换 1 队舰船编成")
55+
56+
if fleet_id and self.get_selected_fleet(self._ctrl.screenshot()) != fleet_id:
57+
self.select_fleet(fleet_id)
58+
time.sleep(0.5)
5259

5360
_log.info("[UI] 更换 {} 队编成: {}", fleet_id, ship_names)
5461

examples/change_fleet.py

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
"""最小示例 — 常规作战 (7-4 千伪)。
2+
3+
使用内置策略 ``7-4千伪`` 执行 3 次常规作战。
4+
策略文件自动从 ``autowsgr/data/plan/normal_fight/`` 解析,无需指定完整路径。
5+
"""
6+
7+
from autowsgr.scheduler import launch
8+
from autowsgr.ops import goto_page
9+
from autowsgr.ui import BattlePreparationPage, PageName
10+
11+
# 1. 启动 (加载配置 → 连接模拟器 → 启动游戏)
12+
ctx = launch('usersettings.yaml')
13+
14+
goto_page(ctx, PageName.BATTLE_PREP)
15+
16+
page = BattlePreparationPage(ctx)
17+
18+
page.change_fleet(2, ["U-47", "U-96"])

0 commit comments

Comments
 (0)