Commit Graph

17628 Commits

Author SHA1 Message Date
HY
2af35681eb feat: 增強自动战斗文件选择功能,支持多级路径和相对目录 (#15174)
* chore: 先依照保全派駐週期粗略分類

* chore: 換個位置

* chore: 換成用地圖名稱分類

* chore: 再改 再改

* chore: 別空白了 伺服器會被殺死的

* chore: 補上下拉選單顯示的 json 檔案名稱,避免解析錯誤

* chore: 幫展開後的下拉選單加上寬度限制

* Revert "chore: 幫展開後的下拉選單加上寬度限制"

This reverts commit d5f80c9d6e.

* feat: 新增文件树视图项样式

* perf: 优化自动战斗下拉列表

* feat: 统一样式

* chore: 删除多余调用

---------

Co-authored-by: uye <99072975+ABA2396@users.noreply.github.com>
2026-01-05 20:29:13 +08:00
718cf790da feat: 通知渠道添加 Gotify (#15284)
* feat: 通知渠道添加 Gotify

* fix: 移除 Gotify 通知内容中的颜色标记

* fix: 优化 Gotify 通知格式处理
2026-01-05 17:56:37 +08:00
Weiyou Wang
364314e00e fix: 给缺失干员检查补上 Unavailable (#15296)
fix: 缺失干员检查补上 Unavailable
2026-01-05 11:14:51 +08:00
github-actions[bot]
9349f3a43e feat: Update Submodules MaaMacGui, maa-cli
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/20699650804
[skip changelog]
2026-01-04 21:52:42 +00:00
Constrat
1637711ec3 chore: add IsDebugVersion to _forcedReloadResource (#15293)
fix: add IsDebugVersion to _forcedReloadResource
2026-01-04 20:58:49 +01:00
uye
18450fa84e fix: 尝试修复基建效率计算中的 out_of_range 异常
fix #15287
2026-01-04 20:35:01 +08:00
HX3N
ed01a804b8 chore: YostarKR tweak AS-OpenOcr
to prevent misrecognition
2026-01-04 19:03:24 +09:00
uye
5e624c9584 chore: 调整注释 2026-01-04 15:46:37 +08:00
Loong
63ca032ad0 docs: 使用脚本一键安装 maa-cli (#15283) 2026-01-04 15:09:03 +08:00
HX3N
4ea066e21c docs: update KR documents (#15282) 2026-01-04 10:36:17 +09:00
Rbqwow
f6dc2f051b docs: 源码链接同步最新行数
想了想还是觉得指向HEAD而非某个commit更好一点,但是要跟着行数变化
2026-01-04 06:29:00 +08:00
github-actions[bot]
3133568526 feat: Update Submodules MaaMacGui, maa-cli
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/20683420431
[skip changelog]
2026-01-03 21:52:48 +00:00
uye
0a1400b2b0 feat: 可以点 20 次按钮关闭弹窗 2026-01-03 22:53:25 +08:00
uye
bdd0690e3c perf: 优化换行 2026-01-03 22:31:04 +08:00
Constrat
b6d7268f28 fix: update DormMini.png for EN (again) 2026-01-03 15:25:59 +01:00
Constrat
14b2051b60 fix: SA1633 warning missing copyright notice 2026-01-03 15:25:11 +01:00
SherkeyXD
d611499208 chore: 微调公告确认按钮位置 2026-01-03 20:29:22 +08:00
Manicsteiner
9cba68e698 chore: YostarJP roguelike JieGarden ocr edit 2026-01-03 12:56:42 +08:00
github-actions[bot]
7413d8c0ee chore: Auto update by pre-commit hooks
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/20666643117
[skip changelog]
2026-01-02 21:04:50 +00:00
uye
0ac5e33395 style: typo 2026-01-03 02:51:02 +08:00
uye
e1c0dd77c6 feat: 还点? 2026-01-03 02:49:48 +08:00
uye
4e89c2c531 docs: 中文集成文档统一格式 2026-01-03 01:40:33 +08:00
uye
99cb7ec5dd feat: 允许设置是否启用线索交流与赠送线索 (#15278)
* feat: 允许设置是否启用线索交流与赠送线索

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

* perf: 调整界面布局

* i18n: 漏了一个翻译

* chore: 简化代码

* docs: 补充文档
2026-01-03 00:04:10 +08:00
AnselYuki
65a260c8f3 feat: 给 bark 通知添加默认的分类组 (#15244) 2026-01-02 23:58:20 +08:00
MistEO
9aab7f4846 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
79417a45a3 ci: use git2/vendored-openssl feature flag for cli (#15279) 2026-01-02 23:40:11 +08:00
yali-hzy
e86958359f 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
efc8e1d3db fix(docs): 修复文档站搜索问题 2026-01-02 21:51:08 +08:00
SherkeyXD
c396c95b31 rft: devcontainer 从 conda 迁移至 mise/uv (#15251)
Co-authored-by: Lucien Shaw <myxlc55@outlook.com>
2026-01-02 21:45:14 +08:00
白隐Hakuin
8fc0e56556 fix: 远程控制截图无法获取最新图像 (#15276) 2026-01-02 19:20:55 +08:00
Hao Guan
742e71a893 fix: Debug图片保存目录 (#15250) 2026-01-02 17:26:22 +08:00
uye
fee016634e fix: 鬼影迷踪 -> 诡影迷踪
fix #15274
2026-01-02 15:28:24 +08:00
github-actions[bot]
ad7e532ebf chore: Auto update by pre-commit hooks
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/20645504464
[skip changelog]
2026-01-01 21:04:54 +00:00
晓丶梦丶仁
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