19448 Commits

Author SHA1 Message Date
uye
f3e4313e3a Release v6.12.0-beta.1 (#17029)
## Summary by Sourcery

更新 copilot、paradox 和任务处理逻辑,以跟踪每个 copilot 的独立 ID、改进阶段导航和 OCR
的稳健性,并通过强类型事件将子任务消息接入 WPF UI,同时为更多任务添加截图插件并改进工具和文档。

New Features:
- 在核心任务和 WPF 模型中支持按 copilot 区分的 ID,以更好地跟踪和操作特定的 copilot 条目。
- 在 WPF 层将子任务消息暴露为强类型事件,并在相关的设置视图模型中进行消费。
- 为 copilot 条目新增独立的视频 URL 字段和存在标记,而不是复用 copilot URL 字段。

Bug Fixes:
- 修复在缺少提交作者或使用 web-flow 时的变更日志生成问题,通过在 PR 或提交中解析作者登录名来解决。
- 通过使用双精度累积来提高掩码模板匹配的数值稳定性,以避免灾难性消除。
- 修正模拟器自动启动逻辑,并在测试模拟器路径时增加校验。

Enhancements:
- 重构 copilot 阶段导航,使用图像分析和 OCR 更可靠地定位和确认阶段,包括重试和对图表的处理。
- 在子任务的额外信息消息中包含 copilot ID,使 UI 能将结果与选中的条目进行关联。
- 为奖励、商店、仓库、战斗启动、基建开始和干员仓库进入等任务添加截图采集插件,以获得更好的诊断能力。
- 通过用事件机制替换静态分发器来简化任务子消息的传播。
- 对文档中的 copilot 协议命名进行轻微措辞调整,并更新若干资源和本地化内容。

Documentation:
- 在主 README 和中文 README 中将 copilot 协议描述由「自动抄作业协议」重命名为「自动战斗协议」。

<details>
<summary>Original summary in English</summary>

## Summary by Sourcery

Update copilot, paradox, and task handling to track per-copilot IDs,
improve stage navigation and OCR robustness, and wire subtask messages
into the WPF UI via strongly typed events, while adding screenshot
plugins to more tasks and refining tooling and docs.

New Features:
- Support per-copilot IDs through core tasks and WPF models to better
track and act on specific copilot entries.
- Expose subtask messages as strongly typed events in the WPF layer and
consume them from relevant settings view models.
- Add a dedicated video URL field and presence flag for copilot entries
instead of overloading the copilot URL.

Bug Fixes:
- Fix changelog generation when commit authors are missing or web-flow
by resolving author logins via PRs or commits.
- Improve masked template matching numerical stability by using double
precision accumulation to avoid catastrophic cancellation.
- Correct emulator auto-start logic and add validation around testing
the emulator path.

Enhancements:
- Rework copilot stage navigation to use image analysis and OCR to
locate and confirm stages more reliably, including retries and plot
handling.
- Include copilot IDs in subtask extra info messages so the UI can
correlate results with selected items.
- Add screenshot capture plugins to award, mall, depot, fight startup,
infrastructure begin, and operator box enter tasks for better
diagnostics.
- Simplify task submessage propagation by replacing the static
dispatcher with an event-based mechanism.
- Minor wording updates in documentation for the copilot protocol naming
and various resource and localization updates.

Documentation:
- Rename the copilot protocol description from "自动抄作业协议" to "自动战斗协议" in
the main and Chinese READMEs.

</details>
v6.12.0-beta.1
2026-06-09 02:53:37 +08:00
uye
12f481706e docs: changelog 2026-06-09 02:43:48 +08:00
uye
07c923c894 docs: changelog 2026-06-09 02:32:50 +08:00
uye
204c9498ac fix: 错误隐藏开局分队与开局干员选项 2026-06-09 02:32:50 +08:00
Status102
f3df45bac4 feat: 理智药使用增加使用中的药品信息 (#17034)
- close #17032
@MaaAssistantArknights/i18n-dev 

## Summary by Sourcery

为理智药剂使用添加详细的报告和 UI 处理,包括按药剂的使用信息,并重构处理该子任务消息的位置。

新特性:
- 在理智药剂使用的 `SubTaskExtraInfo` 消息中加入按药剂的使用详情,并在任务队列日志中展示这些信息。

增强:
- 将药剂使用子任务的处理从 `AsstProxy` 移动到
`FightSettingsUserControlModel`,并扩展以展示当前使用的药剂信息,同时保留成就追踪功能。

<details>
<summary>Original summary in English</summary>

## Summary by Sourcery

Add detailed reporting and UI handling for sanity medicine usage,
including per-medicine information, and refactor where this subtask
message is processed.

New Features:
- Include per-medicine usage details in SubTaskExtraInfo messages for
sanity medicine usage and surface them in the task queue logs.

Enhancements:
- Move medicine usage subtask handling from AsstProxy into
FightSettingsUserControlModel and extend it to show currently used
medicine information while preserving achievement tracking.

</details>
2026-06-09 02:05:32 +08:00
uye
80aa69e710 docs: changelog 2026-06-09 02:04:19 +08:00
status102
9b951cbabf perf: 优化部分情况下自动战斗导航OCR结果中会出现误识别的前缀 2026-06-09 01:54:04 +08:00
uye
edeaeeba49 feat: 支持 mumu 6.0 截图增强路径 (#16994)
* feat: 支持 mumu 6.0 截图增强路径

* chore: Update src/MaaCore/Controller/MumuExtras.cpp

Co-authored-by: sourcery-ai[bot] <58596630+sourcery-ai[bot]@users.noreply.github.com>

* fix: 示例路径

---------

Co-authored-by: sourcery-ai[bot] <58596630+sourcery-ai[bot]@users.noreply.github.com>
2026-06-09 01:52:02 +08:00
status102
5fd74495a2 chore: rename Wpf ProcSubTaskMsg param name 2026-06-09 01:29:52 +08:00
status102
48f98ad413 perf(wpf): DEBUG 环境下Init时TaskQueue状态限制缓解 2026-06-09 01:29:52 +08:00
github-actions[bot]
ee6d2c9867 feat: Update Submodules MAAUnified, MaaMacGui, maa-cli
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/27154116231
[skip changelog]
2026-06-08 17:08:54 +00:00
github-actions[bot]
348825ef33 chore: Auto Update Game Resources - 2026-06-08
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/27142132661

[skip changelog]
2026-06-08 13:49:39 +00:00
Constrat
0ade8f5c7c chore: revert all changes to remainingcandleflame IS6 EN 2026-06-08 13:44:13 +02:00
MistEO
b18068c846 ci: user MistEO/codex bot (#17040) 2026-06-08 18:16:04 +08:00
Constrat
5ae734461e fix: EN IS6 bosky updated template 2026-06-08 01:06:58 +02:00
status102
e4c6a740c4 perf 2026-06-07 19:55:09 +08:00
Constrat
b281f258cd fix: EN IS6 bosky text size changed alpha/v6.11.2-alpha.1.d036.gb281f258cd 2026-06-07 12:59:39 +02:00
status102
b488aca991 perf: 2026-06-07 18:12:49 +08:00
status102
85ed1fb38b perf: null check 2026-06-07 18:08:35 +08:00
status102
8e3bfe3783 i18n: ai trans 2026-06-07 18:07:41 +08:00
status102
6e1f9e0fce feat: 理智药使用增加使用中的药品信息 2026-06-07 18:03:17 +08:00
HX3N
b461960985 chore: YostarKR winden colorScale for compatibility 2026-06-07 13:38:37 +09:00
github-actions[bot]
2a8c952b24 feat: Update Submodules MAAUnified, MaaMacGui, maa-cli
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/27075305432
[skip changelog]
alpha/v6.11.2-alpha.1.d034.g2a8c952b24
2026-06-06 22:12:57 +00:00
Status102
353c0ec972 fix: 修正特克诺干员名 OCR 误识别 (#17030)
## 问题与修复
issue 日志中,排序重选阶段 OCR 将“特克诺”识别为“持克诺”,导致后续按精确干员名匹配时无法命中。
在全局干员名 OCR 替换表中加入规则,仅将完整识别结果“持克诺”替换为“特克诺”。

```
15912:[2026-06-06 11:07:15.290][TRC][Px20248][Tx37564] asst::WordOcr [{ text: 褐果, rect: [ 0 (80), 0 (1), 40, 19 ], score: 0.999965 }] by OCR Rec , cost 16 ms
15913:[2026-06-06 11:07:15.290][TRC][Px20248][Tx37564] Proceed [{ text: 褐果, rect: [ 80, 1, 40, 19 ], score: 0.999965 }]
15914:[2026-06-06 11:07:15.290][WRN][Px20248][Tx37564] asst::VisionHelper::correct_rect roi is empty, use whole image
15915:[2026-06-06 11:07:15.307][TRC][Px20248][Tx37564] asst::WordOcr [{ text: 持克诺, rect: [ 0 (60), 0 (1), 60, 19 ], score: 0.881702 }] by OCR Rec , cost 16 ms
15916:[2026-06-06 11:07:15.307][TRC][Px20248][Tx37564] Proceed [{ text: 持克诺, rect: [ 60, 1, 60, 19 ], score: 0.881702 }]
15917:[2026-06-06 11:07:15.307][WRN][Px20248][Tx37564] asst::VisionHelper::correct_rect roi is empty, use whole image
15918:[2026-06-06 11:07:15.354][TRC][Px20248][Tx37564] asst::WordOcr [{ text: 凯尔希思衡托, rect: [ 0 (6), 0 (2), 114, 16 ], score: 0.992512 }] by OCR Rec , cost 45 ms
15919:[2026-06-06 11:07:15.354][TRC][Px20248][Tx37564] Proceed [{ text: 凯尔希·思衡托, rect: [ 6, 2, 114, 16 ], score: 0.992512 }]
```

fixes #17018

## Summary by Sourcery

错误修复:
- 通过在全局替换表中将误识别的“持克诺”映射为“特克诺”,纠正对运营商名称的 OCR 识别。

<details>
<summary>Original summary in English</summary>

## Summary by Sourcery

Bug Fixes:
- Correct OCR recognition of the operator name by mapping the misread
form “持克诺” to “特克诺” in the global replacement table.

</details>
2026-06-07 03:26:53 +08:00
ZiyinLin
4e5a234ece fix: 修正特克诺干员名 OCR 误识别 2026-06-07 00:57:00 +08:00
github-actions[bot]
2abb30e373 chore: Auto Update Game Resources - 2026-06-06
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/27067590574

[skip changelog]
2026-06-06 16:28:19 +00:00
uye
0a551b95f9 feat: 切换主题时保存当前画面截图 (#16993)
* feat: 切换主题时保存当前画面截图

* chore: SwitchTheme tasks 定义移到子文件夹中
2026-06-07 00:17:54 +08:00
github-actions[bot]
0b6280483c chore: Auto Templates Optimization
Triggered by 1247e9a308

[skip changelog]
alpha/v6.11.2-alpha.1.d029.g0b6280483c
2026-06-05 17:36:16 +00:00
status102
1247e9a308 fix: 绿票商店状态回退错误 2026-06-06 01:35:14 +08:00
status102
0ae5fceb87 fix: 绿票商店2阶段check
Co-authored-by: ZiyinLin <xuanbing1464129430@gmail.com>
2026-06-06 01:35:13 +08:00
github-actions[bot]
8bf6cb5033 chore: Auto Update Game Resources - 2026-06-05
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/27023843129

[skip changelog]
2026-06-05 15:27:16 +00:00
github-actions[bot]
1fcf16c234 chore: Auto Update Game Resources - 2026-06-05
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/27012894478

[skip changelog]
2026-06-05 11:45:03 +00:00
github-actions[bot]
64eb36e9e8 chore: Auto Update Game Resources - 2026-06-05
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/27001805688

[skip changelog]
2026-06-05 07:32:10 +00:00
github-actions[bot]
24ab0f454a chore: Auto Update Game Resources - 2026-06-05
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/26997987540

[skip changelog]
2026-06-05 05:50:51 +00:00
github-actions[bot]
4e2ff1eaef feat: Update Submodules MAAUnified, MaaMacGui, maa-cli
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/26982898553
[skip changelog]
alpha/v6.11.2-alpha.1.d022.g4e2ff1eaef
2026-06-04 22:17:05 +00:00
github-actions[bot]
84dcbce43e chore: Auto Update Game Resources - 2026-06-04
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/26973477754

[skip changelog]
2026-06-04 19:09:08 +00:00
Rbqwow
61d46678c8 docs: README 自动抄作业 --> 自动战斗 2026-06-05 02:28:37 +08:00
uye
b396d0fb8c feat: 统一 SearchBar 样式 2026-06-05 00:30:10 +08:00
Status102
204542620c rft: 肉鸽弹窗类事件处理重构 CloseCollectionClose (#17005)
* rft: 界园 part

* rft: 水月part

修改后未使用: StageEncounterEnter, CloseEvent, DropsFlag; 仅使用了: ChooseOperFlag, Stages
原始
```
"next": [
    "Mizuki@Roguelike@StageEncounterEnter",
    "Mizuki@Roguelike@Stages#next",
    "Mizuki@Roguelike@DropsFlag",
    "Mizuki@Roguelike@CloseEvent",
    "Mizuki@Roguelike@ChooseOperFlag"
]
```

* rft: 萨米part

* rft: 萨卡兹part

* rft: ChooseOper处的CloseCollectionContinue统一调整至上一级的ChooseOperFlag
2026-06-04 18:21:31 +08:00
status102
fa60340ed0 rft: ChooseOper处的CloseCollectionContinue统一调整至上一级的ChooseOperFlag 2026-06-04 17:05:38 +08:00
status102
8971768c33 rft: 萨卡兹part 2026-06-04 16:58:28 +08:00
status102
8610f11890 rft: 萨米part 2026-06-04 16:12:48 +08:00
status102
e4af06ea9c rft: 水月part
修改后未使用: StageEncounterEnter, CloseEvent, DropsFlag; 仅使用了: ChooseOperFlag, Stages
原始
```
"next": [
    "Mizuki@Roguelike@StageEncounterEnter",
    "Mizuki@Roguelike@Stages#next",
    "Mizuki@Roguelike@DropsFlag",
    "Mizuki@Roguelike@CloseEvent",
    "Mizuki@Roguelike@ChooseOperFlag"
]
```
2026-06-04 15:37:10 +08:00
status102
a132f80158 rft: 界园 part 2026-06-04 15:22:49 +08:00
Status102
bba3f3281a rft: 基于灰度阈值预处理的自动战斗导航, 适配H关及怪猎2期 (#16990)
* rft: 基于灰度阈值的自动战斗导航, 适配H关及怪猎2期

* perf: 清理

* fix: replace

Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>

* fix: loule

---------

Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
alpha/v6.11.2-alpha.1.d012.gbba3f3281a
2026-06-04 09:54:16 +08:00
Status102
4843310bec feat: 悖论模拟支持跳过战斗失败的作业, 自动战斗作业增加对应结构 (#16985)
feat: 悖论模拟支持跳过战斗失败的作业
2026-06-04 09:53:56 +08:00
uye
f31ceb55c9 chore: 自动战斗-视频链接 始终显示
fix #5349
alpha/v6.11.2-alpha.1.d010.gf31ceb55c9
2026-06-04 02:15:32 +08:00
uye
fc89014ab5 feat: 启动设置添加模拟器启动测试按钮,便于测试是否配置成功
fix #10627
2026-06-04 02:02:48 +08:00
Aliothmoon
77612daaeb fix: MaskedCcoeffMatcher 稀疏路径累加器改用 CV_64F 防止大数相减精度损失 (#16983) 2026-06-04 00:54:19 +08:00
Luhan Xiao
e25ee6920e fix: 修复 MaaMacGui changelog 贡献者 mention (#16978)
## 变更内容

修复 MaaMacGui 子仓库 changelog 中贡献者 mention 可能错误的问题。

- associated PR 存在时,优先使用 PR 作者的 `user.login`,并保持 PR title / PR link
逻辑不变。
- 无 associated PR 时,使用 GitHub commit API 的 `author.login` 作为贡献者。
- 无法确认 GitHub login 时,不追加作者 mention。
- 不再使用 git author name / display name / commit author name 生成
`@mention`。
- 不写入主仓库 `contributors` 映射,避免污染主仓库贡献者缓存。
- 过滤空 contributors,避免生成无效 mention。

## 验证

- `python3 -m py_compile
tools/ChangelogGenerator/changelog_generator.py`
- `git diff --cached --check`
- 使用 MaaMacGui 真实历史区间验证:
  - `Add localized strings for relaunch case` 输出 `@ABA2396`
  - `RelaunchAnchor` 输出 `@hguandl`
  - 不再输出 `@uye` / `@hao Guan`
  - PR 记录仍正常输出 `@FireflySentinel` / `@ColdSpellhere`

## Summary by Sourcery

基于 GitHub 元数据而非本地 git 作者信息,改进 MaaMacGui 更新日志中的贡献者提及方式。

Bug 修复:
- 防止空的贡献者账号在生成的更新日志中产生无效的 @提及。
- 确保 MaaMacGui 更新日志使用关联的 PR 作者登录名或提交作者登录名作为贡献者提及,避免错误或缺失的映射。

<details>
<summary>Original summary in English</summary>

## Summary by Sourcery

Improve MaaMacGui changelog contributor mentions based on GitHub
metadata instead of local git author information.

Bug Fixes:
- Prevent empty contributor handles from producing invalid @mentions in
generated changelogs.
- Ensure MaaMacGui changelog uses the associated PR author login or
commit author login as the contributor mention, avoiding incorrect or
missing mappings.

</details>
2026-06-04 00:17:15 +08:00