Commit Graph

17595 Commits

Author SHA1 Message Date
晓丶梦丶仁
fa3fce6d7a docs: 战斗协议 移动镜头 (#15261)
* docs: 战斗协议 移动镜头

* docs: details

* docs: 地图站链接
2026-01-02 03:24:29 +08:00
uye
2de537bb92 Release v6.1.1 (#15270)
## Summary by Sourcery

CI:
- 调整 CI 和冒烟测试工作流的并发组配置,在键中加入仓库和分支信息,以更好地隔离各次运行。

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

## Summary by Sourcery

CI:
- Adjust CI and smoke test workflow concurrency groups to include
repository and branch in the key to better isolate runs.

</details>
2026-01-02 03:20:37 +08:00
MistEO
0d46f8f3e2 ci: fix concurrency group (#15269) 2026-01-02 02:28:55 +08:00
MistEO
2f71207fb8 ci: fix linux build (#15268) 2026-01-02 02:16:31 +08:00
Constrat
848ada178a chore: optimize template
[skip changelog]
2026-01-01 18:30:58 +01:00
Constrat
77d65394d8 fix: update Roguelike@TraderRandomShoppingConfirm for EN
fix #15264
2026-01-01 18:30:45 +01:00
MistEO
599148cfe3 ci: try to fix linux arm64 build 2026-01-02 01:24:39 +08:00
MistEO
31e3e0c36a ci: limit CI in PRs within the same branch 2026-01-02 01:18:30 +08:00
MistEO
712541e0e6 ci: try to fix linux build 2026-01-02 01:03:13 +08:00
github-actions[bot]
955c116884 chore: Auto Update Game Resources - 2026-01-01
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/20641861359

[skip changelog]
2026-01-01 16:30:53 +00:00
uye
34c11cdfd0 Release v6.1.1 (#15262)
## Summary by Sourcery

使版本报告与 MAA 核心配置保持一致,加固任务解析与符号处理,改进战斗/地图交互与图像工具,并为新版本优化 CI 缓存清理和资源数据。

New Features:
- 在生成和裁剪基于 ROI 的任务时,新增对分组 UI 主题变体和嵌套图像布局的支持。
- 引入新的 TXWY 关卡任务定义,并更新多种肉鸽和 UI 主题任务资源。

Bug Fixes:
- 通过引入来自地块位置信息的地图视图偏移,修复地块位置以及技能/撤退按钮的计算。
- 在撤退后通过取消选中作为保护措施,防止干员被误操作。
- 在执行清理前检查地图目录,避免删除不存在的地图图像。
- 通过处理缺失的 PR 和与陈旧分支相关的缓存,提高缓存清理脚本的健壮性。
- 通过统一使用拥有所有权的 `std::string` 作为键和容器,替代基于 `std::string_view`
的映射,提高任务与符号解析的稳定性。

Enhancements:
- 将版本日志、API 上报和上传数据统一切换为使用统一的 `MAA_VERSION` 配置和一致的 `DEBUG_VERSION` 标记。
- 通过委托给更高层级的流程任务,简化基建设施线索的快速插入处理逻辑。
- 整理版本更新 UI 逻辑与注释,以反映新的调试版本命名约定。
- 调整图像裁剪器的输出,以提供更清晰的 ROI 诊断信息和控制台消息。
- 优化 JSON 工具中关于默认值检查的注释,而不改变运行时行为。

CI:
- 扩展 GitHub 缓存清理脚本,覆盖与 Linux X64 prek 构建相关的更多缓存键模式,并更智能地清理 PR 和分支缓存。

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

## Summary by Sourcery

Align version reporting with MAA core config, harden task parsing and
symbol handling, improve battle/map interactions and image tooling, and
refine CI cache cleanup and resource data for the new release.

New Features:
- Add support for grouped UI theme variants and nested image layouts
when generating and cutting ROI-based tasks.
- Introduce a new TXWY stage task definition and update various
Roguelike and UI theme task resources.

Bug Fixes:
- Fix tile position and skill/retreat button calculations by
incorporating map view offsets from tile position data.
- Prevent unintended operator interactions after retreat by cancelling
selection as a safeguard.
- Avoid deleting non-existent map images by checking the map directory
before cleanup.
- Increase robustness of cache cleanup scripts by handling missing PRs
and stale branch-related caches.
- Improve stability of task and symbol parsing by standardizing on
owning std::string keys and containers instead of
std::string_view-backed maps.

Enhancements:
- Switch version logging, API reporting, and upload payloads to use the
unified MAA_VERSION config and consistent DEBUG_VERSION marker.
- Simplify infrastructure clue quick-insert handling by delegating to a
higher-level process task.
- Tidy version update UI logic and comments to reflect the new debug
version naming convention.
- Adjust image cropper output for clearer ROI diagnostics and console
messaging.
- Refine JSON utility comments around default-value checks without
changing runtime behavior.

CI:
- Extend GitHub cache cleanup scripts to cover additional cache key
patterns related to Linux X64 prek builds and to clean both PR and
branch caches more intelligently.

</details>
2026-01-02 00:28:01 +08:00
uye
7747da45fb docs: update changelog 2026-01-02 00:26:37 +08:00
github-actions[bot]
efa7241cb4 feat: Update Submodules MaaMacGui, maa-cli
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/20641688332
[skip changelog]
2026-01-01 16:16:56 +00:00
uye
52363f2e9e feat: 隐秘战线支持系列任务 (#15249)
* feat: 隐秘战线支持系列事件

* fix: 漏了个事件

* fix: 避免修改任务导致后续无法进入系列任务

* fix: 怎么小游戏没禁用运行时修改

* rft: 提取通用逻辑

* i18n: KR

* i18n: EN

* i18n: KR fix typo

* i18n: JP

* i18n: txwy

* perf: 优化解析逻辑

* fix: 隐秘战线结局与事件无法保存

* chore: text → ocrReplace

* chore: 再改一點 gui 上的東西

---------

Co-authored-by: HX3N <scarlet7518@gmail.com>
Co-authored-by: Constrat <56174894+Constrat@users.noreply.github.com>
Co-authored-by: Manicsteiner <Manicsteiner@outlook.com>
Co-authored-by: momomochi987 <as99us301@gmail.com>
2026-01-02 00:15:30 +08:00
uye
9395bc3094 feat: 新增模板路径同步工具 (#15254)
* feat: 新增模板路径同步工具

* feat: 移动路径

* chore: remove stale templates + move HS to stagenavigation

* chore: update optimize_templates with new paths

* chore: KR remove unused templates

* chore: remove unused templates for txwy

* feat: 自动删除空文件夹

* chore: update optimize_templates.json

* fix: typo

---------

Co-authored-by: Constrat <56174894+Constrat@users.noreply.github.com>
Co-authored-by: HX3N <scarlet7518@gmail.com>
Co-authored-by: momomochi987 <as99us301@gmail.com>
2026-01-01 23:37:11 +08:00
github-actions[bot]
194f3d8417 chore: Auto Update Game Resources - 2026-01-01
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/20641085022

[skip changelog]
2026-01-01 15:29:06 +00:00
Status102
5941314d37 fix: 自动战斗击杀数识别错误 (#15266) 2026-01-01 23:22:54 +08:00
Constrat
947249c481 ci: perhaps found a typo 2026-01-01 16:18:55 +01:00
status102
2b77d7759a fix: 自动战斗 击杀数、费用识别 useRaw = false 2026-01-01 23:17:47 +08:00
status102
6d63736b9e refactor: useRaw 参数设置重构 2026-01-01 23:17:17 +08:00
Constrat
be9cb387fe ci: try to fix cache miss on smoke-testing 2026-01-01 16:06:51 +01:00
github-actions[bot]
39bf5c46cd feat: Update Submodules MaaMacGui, maa-cli
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/20637168125
[skip changelog]
2026-01-01 10:40:12 +00:00
岩浆浮沉的木梳
383fba095b chore: YostarJP copper regex (#15257)
* chore: YostarJP copper regex

* chore: YostarJP copper regex

act for event recognition failed:
まんまるな財神

* chore: YostarJP copper regex

fix: 通宝認識失敗: 「衡-軍屯翠す」

* chore: YostarJP copper regex

fix: 通宝認識失敗: 「厲-頃異を安める」
2026-01-01 16:33:53 +08:00
status102
b42a2a27e5 fix: 自动战斗击杀数识别错误 2026-01-01 14:21:11 +08:00
HX3N
fe55d7ff51 i18n: KR tweak NightlyWarning and CheckBeforeReportingIssue 2026-01-01 09:01:06 +09:00
github-actions[bot]
4c10daea2b chore: Auto Templates Optimization
Triggered by 3c56440d83

[skip changelog]
2025-12-31 18:56:22 +00:00
uye
3c56440d83 chore: 更新截图 2026-01-01 02:55:57 +08:00
Constrat
c6dbdc008c ci: fixes to cache removal scripts 2025-12-31 19:13:12 +01:00
Constrat
8d8d530402 feat: YostarEN base templates overhaul 2025-12-31 18:05:48 +01:00
github-actions[bot]
c51b89cf7c chore: Auto Update Game Resources - 2025-12-31
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/20622568070

[skip changelog]
2025-12-31 16:07:06 +00:00
Constrat
70eb2cddbe perf: optimize LoneTrail templates 2025-12-31 16:51:47 +01:00
Constrat
8c2b48738a fix: EN Sami floor detection regex 2025-12-31 15:51:49 +01:00
MistEO
9cd98b4142 fix: bad reference 2025-12-31 22:43:12 +08:00
MistEO
d6ef7a6bf5 refactor: 减少string_view滥用 2025-12-31 22:13:53 +08:00
MistEO
7817f35259 Revert "fix: 任务名字符串池的线程安全问题"
This reverts commit 58a735e8b4.
2025-12-31 21:46:59 +08:00
MistEO
9a20411553 refactor: 统一 DEBUG_VERSION 2025-12-31 21:38:44 +08:00
status102
d3d1d766f3 fix: 盲点撤退兜底 2025-12-31 20:59:23 +08:00
status102
9edaa8443c fix: 自动战斗在未存在 debug/map 路径时无法生成地图截图 2025-12-31 20:59:23 +08:00
uye
58a735e8b4 fix: 任务名字符串池的线程安全问题 2025-12-31 20:03:58 +08:00
Status102
a7bb06a225 fix: 大地图技能, 撤离按钮及相机偏移修复, 连带引航者S6地图TN-2 ~ TN-4 view[1] (#15252)
* chore: TN-2

* fix: 技能&撤退 大地图视角偏移

Co-authored-by: status102 <102887808+status102@users.noreply.github.com>

* chore: TN-3&TN-4

* perf: const

---------

Co-authored-by: Weiyou Wang <44151844+Alan-Charred@users.noreply.github.com>
2025-12-31 20:03:37 +08:00
Manicsteiner
a96d297693 chore: YostarJP copper regex 2025-12-31 16:38:22 +08:00
Constrat
4fbe8bcc8b fix: Copper regex for Sui Garden EN 2025-12-30 13:09:51 +01:00
Manicsteiner
7e959785a1 chore: YostarJP roguelike JieGarden ocr edit 2025-12-30 18:38:47 +08:00
uye
fb31e41693 fix: 满线索再放入 2025-12-30 15:04:31 +08:00
github-actions[bot]
9ef2efe550 chore: Auto update by pre-commit hooks
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/20582634976
[skip changelog]
2025-12-29 21:04:35 +00:00
HY
30b8853af7 chore: 繁中服「紅絲絨」活動導航 (#15234) 2025-12-29 18:17:04 +01:00
SherkeyXD
ecafbee4a2 feat: 添加孤星主题配置 2025-12-29 21:41:20 +08:00
SherkeyXD
9d141f184a feat: 添加孤星主题模板图 2025-12-29 21:41:20 +08:00
SherkeyXD
8975236c80 feat: 优化 ImageCropper 输出 2025-12-29 21:41:20 +08:00
SherkeyXD
e773bb861e chore: update template tool 2025-12-29 21:41:20 +08:00