Commit Graph

17740 Commits

Author SHA1 Message Date
uye
a5c25fddda feat: 可以点 20 次按钮关闭弹窗 alpha/v6.1.2-alpha.1.d022.ga5c25fddd 2026-01-03 22:53:25 +08:00
uye
5467030be4 perf: 优化换行 2026-01-03 22:31:04 +08:00
Constrat
5fae60911d fix: update DormMini.png for EN (again) 2026-01-03 15:25:59 +01:00
Constrat
534ad0a7a0 fix: SA1633 warning missing copyright notice 2026-01-03 15:25:11 +01:00
SherkeyXD
8ed11ba8ec chore: 微调公告确认按钮位置 2026-01-03 20:29:22 +08:00
Manicsteiner
b404672b0b chore: YostarJP roguelike JieGarden ocr edit 2026-01-03 12:56:42 +08:00
github-actions[bot]
6ee4544d92 chore: Auto update by pre-commit hooks
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/20666643117
[skip changelog]
alpha/v6.1.2-alpha.1.d016.g6ee4544d9
2026-01-02 21:04:50 +00:00
uye
cc58382158 style: typo 2026-01-03 02:51:02 +08:00
uye
637ebc87ad feat: 还点? 2026-01-03 02:49:48 +08:00
uye
2f3dbf55d2 docs: 中文集成文档统一格式 2026-01-03 01:40:33 +08:00
uye
215d76e38d feat: 允许设置是否启用线索交流与赠送线索 (#15278)
* feat: 允许设置是否启用线索交流与赠送线索

* feat: ui 支持设置赠送线索,将借助战打 OF-1 的一日一次功能拆出来

* perf: 调整界面布局

* i18n: 漏了一个翻译

* chore: 简化代码

* docs: 补充文档
2026-01-03 00:04:10 +08:00
AnselYuki
0fd4b8185e feat: 给 bark 通知添加默认的分类组 (#15244) 2026-01-02 23:58:20 +08:00
MistEO
c4d361a363 feat: 重构主页日志侧边栏整体布局和样式 (#15211)
* feat: 重构主页日志侧边栏整体布局和样式

* feat: 优化一下Live

* refactor: 调整卡片布局

* revert: 回滚不知道干嘛的改动

* feat: 调整右上角悬浮窗布局

* chore: AI一直在改个啥

* Revert "chore: AI一直在改个啥"

This reverts commit b5ae565c34a2a187ae953cc385b0b85de83fc140.

* perf: 调整卡片分割逻辑,优化界面布局

* perf: 优化显示效果

* rft: 简化绑定

* chore: 调整界面布局

* feat: 任务报错更新缩略图

* feat: 肉鸽开始探索前分割卡片

* feat: 肉鸽结算更新缩略图

* feat: 肉鸽战斗成功/失败时更新缩略图

* feat: 事件选择更新图片

* fix: 在缩放时对 BGR 缓冲区长度或尺寸不匹配的情况进行防护

* chore: 添加日志,删除无用的 using

* style: 格式化代码

* fix: 避免在使用 PropertyDependsOn 的同时重复发送依赖属性通知。

* fix: 下载日志错位

* fix: 图片数量限制错误

* feat: 自定义最大缩略图数量

* fix: en 语言下背景图片选择按钮文字无法显示完全

* chore: 新用户标题栏默认不显示配置名称

* chore: 标题栏端口地址默认省略 127.0.0.1: 与 localhost:

* feat: 卡片背景色

* chore: 删除没用的 ColumnDefinitions

* feat: 就要四个字

---------

Co-authored-by: uye <99072975+ABA2396@users.noreply.github.com>
2026-01-02 23:40:26 +08:00
Loong
286908d41e ci: use git2/vendored-openssl feature flag for cli (#15279) 2026-01-02 23:40:11 +08:00
yali-hzy
bd4039d442 perf: 在禁用时 TooltipBlock 显示特效 (#15260)
* perf: 在禁用时 TooltipBlock 显示特效

* perf: 改用 ToolTip 触发改善性能

---------

Co-authored-by: uye <99072975+ABA2396@users.noreply.github.com>
2026-01-02 23:01:59 +08:00
SherkeyXD
e87608411f fix(docs): 修复文档站搜索问题 2026-01-02 21:51:08 +08:00
SherkeyXD
a0e5f9b3a6 rft: devcontainer 从 conda 迁移至 mise/uv (#15251)
Co-authored-by: Lucien Shaw <myxlc55@outlook.com>
2026-01-02 21:45:14 +08:00
白隐Hakuin
1456fbb91c fix: 远程控制截图无法获取最新图像 (#15276) 2026-01-02 19:20:55 +08:00
Hao Guan
6eaf74a289 fix: Debug图片保存目录 (#15250) 2026-01-02 17:26:22 +08:00
uye
edc8768b2e fix: 鬼影迷踪 -> 诡影迷踪
fix #15274
2026-01-02 15:28:24 +08:00
github-actions[bot]
1ce8ff4262 chore: Auto update by pre-commit hooks
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/20645504464
[skip changelog]
alpha/v6.1.2-alpha.1.d002.g1ce8ff426
2026-01-01 21:04:54 +00:00
晓丶梦丶仁
d0b594cdc0 docs: 战斗协议 移动镜头 (#15261)
* docs: 战斗协议 移动镜头

* docs: details

* docs: 地图站链接
2026-01-02 03:24:29 +08:00
uye
807adf92fa 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>
v6.1.1
2026-01-02 03:20:37 +08:00
MistEO
7397e1ac00 ci: fix concurrency group (#15269) 2026-01-02 02:28:55 +08:00
MistEO
c7c8466b10 ci: fix linux build (#15268) 2026-01-02 02:16:31 +08:00
Constrat
e0c226f7bb chore: optimize template
[skip changelog]
2026-01-01 18:30:58 +01:00
Constrat
de4b86fda8 fix: update Roguelike@TraderRandomShoppingConfirm for EN
fix #15264
2026-01-01 18:30:45 +01:00
MistEO
21181c2872 ci: try to fix linux arm64 build 2026-01-02 01:24:39 +08:00
MistEO
01b59f54fe ci: limit CI in PRs within the same branch 2026-01-02 01:18:30 +08:00
MistEO
03634ae516 ci: try to fix linux build 2026-01-02 01:03:13 +08:00
github-actions[bot]
2621b0a77b 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
cf42b1a9fd 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
f28c10a0b1 docs: update changelog 2026-01-02 00:26:37 +08:00
github-actions[bot]
6ae3cb685c 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
16e23a32b7 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
5fd5c8a90f 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]
9673b62ec7 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
fab4a272fd fix: 自动战斗击杀数识别错误 (#15266) 2026-01-01 23:22:54 +08:00
Constrat
2dddb7b231 ci: perhaps found a typo 2026-01-01 16:18:55 +01:00
status102
292624166f fix: 自动战斗 击杀数、费用识别 useRaw = false 2026-01-01 23:17:47 +08:00
status102
d85291a97a refactor: useRaw 参数设置重构 2026-01-01 23:17:17 +08:00
Constrat
cd0273d321 ci: try to fix cache miss on smoke-testing 2026-01-01 16:06:51 +01:00
github-actions[bot]
c7d9fc37f6 feat: Update Submodules MaaMacGui, maa-cli
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/20637168125
[skip changelog]
2026-01-01 10:40:12 +00:00
岩浆浮沉的木梳
5bc1d2835d 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
2ecb2b7206 fix: 自动战斗击杀数识别错误 2026-01-01 14:21:11 +08:00
HX3N
0943c48f4e i18n: KR tweak NightlyWarning and CheckBeforeReportingIssue 2026-01-01 09:01:06 +09:00
github-actions[bot]
a2c99dc72d chore: Auto Templates Optimization
Triggered by d036a2594c

[skip changelog]
alpha/v6.1.1-alpha.1.d025.ga2c99dc72
2025-12-31 18:56:22 +00:00
uye
d036a2594c chore: 更新截图 2026-01-01 02:55:57 +08:00
Constrat
0a89c82ba1 ci: fixes to cache removal scripts 2025-12-31 19:13:12 +01:00
Constrat
0224f51076 feat: YostarEN base templates overhaul alpha/v6.1.1-alpha.1.d022.g0224f5107 2025-12-31 18:05:48 +01:00