From 3848150f2fa51d90b6f11734415d9853c83f8220 Mon Sep 17 00:00:00 2001 From: Zwei Date: Fri, 2 Oct 2026 14:45:36 +0800 Subject: [PATCH 1/2] feat(event): adapt 20260930 event strategies --- autowsgr/data/plan/event/20260930-E1.yaml | 8 -------- .../plan/event/E1\347\202\270\351\261\274.yaml" | 9 ++++----- .../event/E2AC\345\244\234\346\210\230.yaml" | 13 +++++++++++++ .../event/E5ACD\345\244\234\346\210\230.yaml" | 9 +++++++++ .../event/E5ADE\345\244\234\346\210\230.yaml" | 14 -------------- .../event/E5A\345\244\234\346\210\230.yaml" | 8 ++++++++ .../plan/event/E5\345\244\234\346\210\230.yaml" | 17 ----------------- .../plan/event/H1\347\202\270\351\261\274.yaml" | 9 ++++----- .../event/H2AC\345\244\234\346\210\230.yaml" | 13 +++++++++++++ .../event/H5ACD\345\244\234\346\210\230.yaml" | 9 +++++++++ .../event/H5ADE\345\244\234\346\210\230.yaml" | 14 -------------- .../event/H5A\345\244\234\346\210\230.yaml" | 8 ++++++++ .../plan/event/H5\345\244\234\346\210\230.yaml" | 17 ----------------- examples/event_fight.py | 2 +- 14 files changed, 69 insertions(+), 81 deletions(-) delete mode 100644 autowsgr/data/plan/event/20260930-E1.yaml create mode 100644 "autowsgr/data/plan/event/E2AC\345\244\234\346\210\230.yaml" create mode 100644 "autowsgr/data/plan/event/E5ACD\345\244\234\346\210\230.yaml" delete mode 100644 "autowsgr/data/plan/event/E5ADE\345\244\234\346\210\230.yaml" create mode 100644 "autowsgr/data/plan/event/E5A\345\244\234\346\210\230.yaml" delete mode 100644 "autowsgr/data/plan/event/E5\345\244\234\346\210\230.yaml" create mode 100644 "autowsgr/data/plan/event/H2AC\345\244\234\346\210\230.yaml" create mode 100644 "autowsgr/data/plan/event/H5ACD\345\244\234\346\210\230.yaml" delete mode 100644 "autowsgr/data/plan/event/H5ADE\345\244\234\346\210\230.yaml" create mode 100644 "autowsgr/data/plan/event/H5A\345\244\234\346\210\230.yaml" delete mode 100644 "autowsgr/data/plan/event/H5\345\244\234\346\210\230.yaml" diff --git a/autowsgr/data/plan/event/20260930-E1.yaml b/autowsgr/data/plan/event/20260930-E1.yaml deleted file mode 100644 index f9c448bd..00000000 --- a/autowsgr/data/plan/event/20260930-E1.yaml +++ /dev/null @@ -1,8 +0,0 @@ -# 最强之舟 E1 示例；沿用参考仓库单战后回港策略，实机使用前检查舰队。 -event: "20260930" -chapter: E -map: 1 -selected_nodes: [A, B] -node_defaults: - proceed: false - formation: 5 diff --git "a/autowsgr/data/plan/event/E1\347\202\270\351\261\274.yaml" "b/autowsgr/data/plan/event/E1\347\202\270\351\261\274.yaml" index 5d3bcf01..f133c143 100644 --- "a/autowsgr/data/plan/event/E1\347\202\270\351\261\274.yaml" +++ "b/autowsgr/data/plan/event/E1\347\202\270\351\261\274.yaml" @@ -1,9 +1,8 @@ -# 20260730 激斗漩涡 E-1 α 入口 示例 -# map 写法: 数字+a/b, a=α入口 b=β入口; chapter: E(简单)/H(困难) -event: "20260730" +# 20260930 最强之舟 E1 示例；沿用参考仓库单战后回港策略，实机使用前检查舰队。 +event: "20260930" chapter: E -map: 1a # Ex-1 的 α 入口; 打 β 入口写 1b -selected_nodes: [B] +map: 1 +selected_nodes: [A, B] node_defaults: proceed: False formation: 5 diff --git "a/autowsgr/data/plan/event/E2AC\345\244\234\346\210\230.yaml" "b/autowsgr/data/plan/event/E2AC\345\244\234\346\210\230.yaml" new file mode 100644 index 00000000..43df7363 --- /dev/null +++ "b/autowsgr/data/plan/event/E2AC\345\244\234\346\210\230.yaml" @@ -0,0 +1,13 @@ +# 20260930 最强之舟 E2 示例；沿用参考仓库单战后回港策略，实机使用前检查舰队。 +# 带路：旗舰为航母 驱逐 ≤ 2 +event: "20260930" +chapter: E +map: 2 +selected_nodes: [A, C] +node_defaults: + proceed: True + formation: 4 + +node_args: + C: + proceed: False diff --git "a/autowsgr/data/plan/event/E5ACD\345\244\234\346\210\230.yaml" "b/autowsgr/data/plan/event/E5ACD\345\244\234\346\210\230.yaml" new file mode 100644 index 00000000..ed675a6a --- /dev/null +++ "b/autowsgr/data/plan/event/E5ACD\345\244\234\346\210\230.yaml" @@ -0,0 +1,9 @@ +# 20260930 最强之舟 E5 示例；沿用参考仓库单战后回港策略，实机使用前检查舰队。 +# 带路：驻防 I 点 +event: "20260930" +chapter: E +map: 5 +selected_nodes: [A, C, D] +node_defaults: + proceed: True + formation: 4 diff --git "a/autowsgr/data/plan/event/E5ADE\345\244\234\346\210\230.yaml" "b/autowsgr/data/plan/event/E5ADE\345\244\234\346\210\230.yaml" deleted file mode 100644 index 6920cc4a..00000000 --- "a/autowsgr/data/plan/event/E5ADE\345\244\234\346\210\230.yaml" +++ /dev/null @@ -1,14 +0,0 @@ -#H5 夜战 -#带路：1战列 -event: "20260212" -chapter: E -map: 5 -selected_nodes: [A, D, E] -node_defaults: - night: True - proceed: True - formation: 4 - -node_args: - E: - proceed: False diff --git "a/autowsgr/data/plan/event/E5A\345\244\234\346\210\230.yaml" "b/autowsgr/data/plan/event/E5A\345\244\234\346\210\230.yaml" new file mode 100644 index 00000000..121d81a8 --- /dev/null +++ "b/autowsgr/data/plan/event/E5A\345\244\234\346\210\230.yaml" @@ -0,0 +1,8 @@ +# 20260930 最强之舟 E5 示例；沿用参考仓库单战后回港策略，实机使用前检查舰队。 +event: "20260930" +chapter: E +map: 5 +selected_nodes: [A] +node_defaults: + proceed: False + formation: 4 diff --git "a/autowsgr/data/plan/event/E5\345\244\234\346\210\230.yaml" "b/autowsgr/data/plan/event/E5\345\244\234\346\210\230.yaml" deleted file mode 100644 index 85991f3a..00000000 --- "a/autowsgr/data/plan/event/E5\345\244\234\346\210\230.yaml" +++ /dev/null @@ -1,17 +0,0 @@ -# 20260730 激斗漩涡 E-5 α 入口 示例 -# map 写法: 数字+a/b, a=α入口 b=β入口; chapter: E(简单)/H(困难) -event: "20260730" -chapter: E -map: 5a # Ex-5 的 α 入口; 打 β 入口写 1b -selected_nodes: [A, B, C, D, F] -node_defaults: - night: True - proceed: True - formation: 4 -node_args: - C: - proceed: False - D: - proceed: False - F: - proceed: False diff --git "a/autowsgr/data/plan/event/H1\347\202\270\351\261\274.yaml" "b/autowsgr/data/plan/event/H1\347\202\270\351\261\274.yaml" index f9f5b6b5..6e3e7100 100644 --- "a/autowsgr/data/plan/event/H1\347\202\270\351\261\274.yaml" +++ "b/autowsgr/data/plan/event/H1\347\202\270\351\261\274.yaml" @@ -1,9 +1,8 @@ -# 20260730 激斗漩涡 H-1 α 入口 示例 -# map 写法: 数字+a/b, a=α入口 b=β入口; chapter: E(简单)/H(困难) -event: "20260730" +# 20260930 最强之舟 H1 示例；沿用参考仓库单战后回港策略，实机使用前检查舰队。 +event: "20260930" chapter: H -map: 1a # Ex-1 的 α 入口; 打 β 入口写 1b -selected_nodes: [B] +map: 1 +selected_nodes: [A, B] node_defaults: proceed: False formation: 5 diff --git "a/autowsgr/data/plan/event/H2AC\345\244\234\346\210\230.yaml" "b/autowsgr/data/plan/event/H2AC\345\244\234\346\210\230.yaml" new file mode 100644 index 00000000..c8311444 --- /dev/null +++ "b/autowsgr/data/plan/event/H2AC\345\244\234\346\210\230.yaml" @@ -0,0 +1,13 @@ +# 20260930 最强之舟 H2 示例；沿用参考仓库单战后回港策略，实机使用前检查舰队。 +# 带路：旗舰为航母 驱逐 ≤ 2 +event: "20260930" +chapter: H +map: 2 +selected_nodes: [A, C] +node_defaults: + proceed: True + formation: 5 + +node_args: + C: + proceed: False diff --git "a/autowsgr/data/plan/event/H5ACD\345\244\234\346\210\230.yaml" "b/autowsgr/data/plan/event/H5ACD\345\244\234\346\210\230.yaml" new file mode 100644 index 00000000..ef10ebef --- /dev/null +++ "b/autowsgr/data/plan/event/H5ACD\345\244\234\346\210\230.yaml" @@ -0,0 +1,9 @@ +# 20260930 最强之舟 H5 示例；沿用参考仓库单战后回港策略，实机使用前检查舰队。 +# 带路：驻防 I 点 +event: "20260930" +chapter: H +map: 5 +selected_nodes: [A] +node_defaults: + proceed: True + formation: 4 diff --git "a/autowsgr/data/plan/event/H5ADE\345\244\234\346\210\230.yaml" "b/autowsgr/data/plan/event/H5ADE\345\244\234\346\210\230.yaml" deleted file mode 100644 index c0d6dcc5..00000000 --- "a/autowsgr/data/plan/event/H5ADE\345\244\234\346\210\230.yaml" +++ /dev/null @@ -1,14 +0,0 @@ -#H5 夜战 -#带路：1战列 -event: "20260212" -chapter: H -map: 5 -selected_nodes: [A, D, E] -node_defaults: - night: True - proceed: True - formation: 4 - -node_args: - E: - proceed: False diff --git "a/autowsgr/data/plan/event/H5A\345\244\234\346\210\230.yaml" "b/autowsgr/data/plan/event/H5A\345\244\234\346\210\230.yaml" new file mode 100644 index 00000000..107e28ed --- /dev/null +++ "b/autowsgr/data/plan/event/H5A\345\244\234\346\210\230.yaml" @@ -0,0 +1,8 @@ +# 20260930 最强之舟 H5 示例；沿用参考仓库单战后回港策略，实机使用前检查舰队。 +event: "20260930" +chapter: H +map: 5 +selected_nodes: [A] +node_defaults: + proceed: False + formation: 4 diff --git "a/autowsgr/data/plan/event/H5\345\244\234\346\210\230.yaml" "b/autowsgr/data/plan/event/H5\345\244\234\346\210\230.yaml" deleted file mode 100644 index 94a852b8..00000000 --- "a/autowsgr/data/plan/event/H5\345\244\234\346\210\230.yaml" +++ /dev/null @@ -1,17 +0,0 @@ -# 20260730 激斗漩涡 H-5 α 入口 示例 -# map 写法: 数字+a/b, a=α入口 b=β入口; chapter: E(简单)/H(困难) -event: "20260730" -chapter: H -map: 5a # Ex-5 的 α 入口; 打 β 入口写 1b -selected_nodes: [A, B, C, D, F] -node_defaults: - night: True - proceed: True - formation: 4 -node_args: - C: - proceed: False - D: - proceed: False - F: - proceed: False diff --git a/examples/event_fight.py b/examples/event_fight.py index c850e0b7..a6c53015 100644 --- a/examples/event_fight.py +++ b/examples/event_fight.py @@ -17,6 +17,6 @@ ctx = launch('usersettings.yaml') # 2. 执行活动战 — 只需传策略名称, 支持外部指定舰队 -results = run_event_fight_from_yaml(ctx, 'H5ADE夜战', times=5, fleet_id=2) +results = run_event_fight_from_yaml(ctx, 'H5A夜战', times=5, fleet_id=2) print(f'完成 {len(results)} 次活动战') From 51e9ab4429c785daaf36bb701a13a4ca11a5e502 Mon Sep 17 00:00:00 2001 From: KUAI Date: Mon, 5 Oct 2026 15:50:23 +0800 Subject: [PATCH 2/2] rm useless test --- .codegraph/.gitignore | 5 +++++ testing/ui/event_page/test_20260930.py | 7 ------- 2 files changed, 5 insertions(+), 7 deletions(-) create mode 100644 .codegraph/.gitignore diff --git a/.codegraph/.gitignore b/.codegraph/.gitignore new file mode 100644 index 00000000..d20c0fe4 --- /dev/null +++ b/.codegraph/.gitignore @@ -0,0 +1,5 @@ +# CodeGraph data files — local to each machine, not for committing. +# Ignore everything in .codegraph/ except this file itself, so transient +# files (the database, daemon.pid, sockets, logs) never show up in git. +* +!.gitignore diff --git a/testing/ui/event_page/test_20260930.py b/testing/ui/event_page/test_20260930.py index 51156411..4bf062a5 100644 --- a/testing/ui/event_page/test_20260930.py +++ b/testing/ui/event_page/test_20260930.py @@ -139,10 +139,3 @@ def test_0930_rejects_previous_event_entrance() -> None: with pytest.raises(ValueError, match='纯数字'): BaseEventPage(ctx, event_name='20260930').start_fight('E1', 'alpha') ctx.ctrl.click.assert_not_called() - - -def test_0930_example_plan_loads() -> None: - from autowsgr.ops.normal_fight import get_normal_fight_plan - - plan = get_normal_fight_plan('20260930-E1') - assert (plan.event_name, plan.chapter, plan.map_id, plan.entrance) == ('20260930', 'E', 1, None)