fz-mirrors/MaaAssistantArknights
0
0
Fork 0
mirror of https://github.com/MaaAssistantArknights/MaaAssistantArknights.git synced 2026-07-15 17:30:27 +08:00
Code Issues Packages Projects Releases Wiki Activity
17,280 Commits 61 Branches 1,836 Tags
b697fdc2c746121e3bc0aeeb60a07d1f7d9bfe99
Commit Graph

17280 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Status102
b697fdc2c7 feat: MaaCore主任务错误时保存截图 (#14812) 
* feat: MaaCore主任务错误时保存截图

* chore: Auto update by pre-commit hooks [skip changelog]

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
 2025-11-22 02:33:31 +08:00
uye
5c37d751c7 perf: 优化自动战斗界面显示 (#14795) 
* perf: 优化自动战斗界面显示

* fix: 不勾选战斗列表时也会吃理智药

* i18n: KR

* i18n: 加個空白

* i18n: EN

* i18n: JP

* rft: 使用自动换行

* style: increase size a bit

* perf: 优化界面布局

* rft: UserAdditional 改为序列化存储，增加自选模组

* fix: 列表过长时超链接无法显示

* perf: 未激活追加自定干员也可以进行编辑

* perf: 战斗列表自适应宽度

* chore: 按钮放上面

* perf: 优化日志栏宽度，占用 1/2 或 2/5

* perf: 突袭改成用背景色提示

---------

Co-authored-by: HX3N <scarlet7518@gmail.com>
Co-authored-by: momomochi987 <as99us301@gmail.com>
Co-authored-by: Constrat <56174894+Constrat@users.noreply.github.com>
Co-authored-by: Manicsteiner <Manicsteiner@outlook.com>
Co-authored-by: status102 <102887808+status102@users.noreply.github.com>
 2025-11-22 02:30:44 +08:00
pre-commit-ci[bot]
07982cfebd chore: Auto update by pre-commit hooks [skip changelog] 2025-11-21 12:57:53 +00:00
SherkeyXD
ca21c9bcca chore: 更新多模板截图工具 2025-11-21 20:54:50 +08:00
github-actions[bot]
fbeed8083f chore: Auto Update Game Resources - 2025-11-20 
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/19541308413

[skip changelog]
 2025-11-20 15:03:33 +00:00
Rbqwow
9ae8ca3ba8 feat: 为GPU加速添加超过两年的驱动版本检测 (#14690) 
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
Co-authored-by: status102 <102887808+status102@users.noreply.github.com>
 2025-11-20 14:45:55 +00:00
SherkeyXD
b70d6b6b7f rft: 拆分多主题识别任务 (#14774) 
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: DavidWang19 <dwang0340@gmail.com>
 2025-11-20 13:34:02 +00:00
Hao Guan
d6dbbf194f i18n(mac): KR 2025-11-20 18:38:49 +08:00
Hao Guan
fe134e2587 chore(mac): 修复UI细节 2025-11-20 16:58:49 +08:00
github-actions[bot]
b3539e6f27 chore: Auto Update Game Resources - 2025-11-20 
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/19528514707

[skip changelog]
 2025-11-20 07:03:47 +00:00
Manicsteiner
3f06c13ff8 chore: SSS#8 for global (#14803) 2025-11-19 17:59:56 +01:00
Constrat
036f1c55ae fix: reduce template size for QuickFormation RL 2025-11-19 17:37:56 +01:00
Constrat
bba94660d7 perf: optimize templates 2025-11-19 17:36:37 +01:00
uye
0963e88112 fix: RA 导航错误 2025-11-19 23:15:16 +08:00
uye
bbb48127ff rft: 调整 ExportOperBox 内的变量命名与结构 2025-11-19 23:08:49 +08:00
travellerse
88acc9e83d fix: 修复通宝配置解析逻辑 (#14802) 2025-11-19 23:03:52 +08:00
SherkeyXD
38a7710387 style: changelog 生成器格式化 2025-11-19 20:30:53 +08:00
github-actions[bot]
9a7318942c feat: Update Submodules MaaMacGui, maa-cli 
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/19498803186
[skip changelog]
 2025-11-19 10:54:03 +00:00
萨拉托加
48bb385211 fix: 从主页进入终端点过头后返回 (#14698) 
* fix: 从主页进入终端点过头后返回

* chore: Auto update by pre-commit hooks [skip changelog]

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
 2025-11-19 18:52:16 +08:00
Weiyou Wang
cb897863f6 fix: 修复集成战略萨米主题下凹密闻板相关功能 (#14755) 2025-11-19 18:50:32 +08:00
travellerse
d25f8e934c fix: 保存招募券结束后等待确认招募按钮消失 (#14773) 
* fix: 保存招募券结束后加点延时

* fix: 增加确认招募按钮消失的等待逻辑

* fix: 添加确认按钮未消失时继续招募流程
 2025-11-19 18:50:03 +08:00
uye
5d75c247be ci: 更新下 changelog 2025-11-19 18:49:23 +08:00
travellerse
f08fdd0548 fix: 修正不期而遇事件名ocr以区分禳解的三个相近选项 (#14799) 2025-11-19 18:11:02 +08:00
status102
06f793cf59 ci: nightly版恢复pdb文件生成及上传 2025-11-19 17:47:38 +08:00
status102
8b61cac331 fix: 刷理智指定次数未完全消耗警告在剩余理智也会提示 2025-11-19 16:51:51 +08:00
status102
807a3d472d fix: 干员识别复制结果到剪贴板时丢失未拥有干员 2025-11-19 15:53:27 +08:00
status102
4a71452841 fix: 移除过旧的add_user_additional参数弃用提示 2025-11-19 15:53:05 +08:00
github-actions[bot]
d5b6d2fe60 chore: Auto Update Game Resources - 2025-11-19 
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/19493348827

[skip changelog]
 2025-11-19 07:28:02 +00:00
travellerse
ac7d449584 feat: 适配界园肉鸽通宝交换 (#13835) 
* feat: 初步实现界园肉鸽通宝交换

* feat: 实现通宝交换后弹窗点击

* fix: 使用ocr作为通宝交换完成的标志

* fix: 给通宝弹窗确认的 pre_task 加上 postDelay

* fix: 小错误修改

* fix: 添加ocrReplace

* feat: 给通宝赋予临时权重，之后再改

* refactor: 重构通宝任务插件，拆分复杂的_run

* fix: 修正通宝选择点击错误

* refactor: 把滑动函数改回直观

* feat: 新增已投出时的通宝丢弃权重

* fix: 更新通宝名称匹配规则

* chore: 增加注释和日志输出

* chore: 添加调试截图保存

* fix: 清理未使用的参数

* fix: 微调通宝权重

* fix: 修正保存截图过多

* fix: 修复Rect不匹配造成的错误

* fix: 调整debug截图

* fix: 修正选择通宝时位置错误

* fix: 修复刷不交换通宝时无法退出

* fix: 修改`已投出`识别得分的绘制位置

* fix: 启用不期而遇`饕餮廊`获取通宝

* fix: 调整通宝识别区域宽度

* fix: 添加`厉-安硕` -> `厉-安硕鼷`的替换

* fix: 为通宝名称未匹配产生的debug截图添加方框

* fix: 修正debug截图方框位置

* fix: 清理无用的ocrReplace

* fix: 删除通过任务给插件传递特殊参数

* fix: 增加"衡-霹雳"和"花-圣诏封神"的ocr替换

* docs: 添加界园肉鸽通宝交换文档

* fix: 默认刷开局模式交换通宝

* fix: 删除未使用的通宝列表行数变量

* fix: 通宝交换完成识别增加延迟

* fix: 增加"衡-军屯垦"的ocr替换

* chore: Auto update by pre-commit hooks [skip changelog]

* fix: 修正调试图像保存路径

* perf: 优化通宝创建逻辑

* refactor: 更新通宝任务模式名称

* refactor: 更新通宝稀有度键值

* chore: 更新通宝优先级

* fix: 通宝列表匹配时可能会将y轴间隔覆盖为0

* perf: 将交换通宝的信息发送到wpf

* perf: 将通宝调试截图改为jpeg

* fix:  添加"衡-旱热"的ocr替换

* refactor: 传递任务执行结果

* feat: 初步动态识别通宝列表

* perf: 将期望为空的识别逻辑改为期望匹配到

* chore: 为通宝类型模板添加mask

* refactor: 重构通宝识别逻辑

* refactor: 提取保存调试图像

* refactor: 使用std::format优化日志输出

* refactor: 收尾

* chore: 微调滑动距离

* fix: 忘了加maskRange了

* chore: 保留score小数点后六位

* fix: 修复神秘的点击停止后卡死问题

* docs: 更新文档

* docs: 添加通宝识别流程示意图

* fix: 更新通宝稀有度定义

* chore: 添加通宝交换模式的图片示意注释

* chore: 加点注释

* perf: 预分配通宝和检测结果的空间

* chore: 优化运行时状态变量注释

* fix: 仅在确实已被投出时绘制已投出的调试方框

* fix: 修正坐标变量名称以符合语义

* perf: 滑动误差较大时额外滑动一次进行回正

* fix: 仅在缓慢滑动时校准位置

* refactor: 优化通宝列表滑动

* fix: 尝试修复偶发通宝最后一列无法识别

* fix: 移除了 999

* fix: 进一步修复滑动

* chore: 更新未知通宝调试图像保存路径

* fix: 更改调试截图保存位置和matcher使用图片初始化

* fix: 添加"厉-一字落"的ocr替换

* fix: 适配MaaUtils的更改

* chore: 调整任务顺序

* chore: 添加通宝重投和开关钱盒任务配置

* chore: 文件头/注释调整

* rft: meojson反序列化

* chore: Auto update by pre-commit hooks [skip changelog]

* perf: 替换部分新log输出

* i18n: KR

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: status102 <102887808+status102@users.noreply.github.com>
Co-authored-by: HX3N <scarlet7518@gmail.com>
 2025-11-19 15:22:33 +08:00
Weiyou Wang
e9bc53cb6d fix: 上调助战栏位匹配分数阈值 (#14796) alpha/v5.28.0-beta.1.d014.ge9bc53cb6 2025-11-18 21:54:06 +00:00
AnnAngela
990907fdb1 chore: Revise security support to only include v5 [skip changelog] 
Updated security policy to indicate support only for v5.
 2025-11-18 23:45:13 +08:00
Constrat
a4ca4ffda9 ci(testing): game resource update error comment tweaks and changes 2025-11-18 16:11:14 +01:00
AnnAngela
8e9c648f0e ci: Change curl command to fail on error 
cc @Constrat
 2025-11-18 22:31:57 +08:00
github-actions[bot]
b2231e3392 chore: Auto Templates Optimization 
Triggered by 70075152df

[skip changelog]
 2025-11-18 12:11:17 +00:00
uye
70075152df fix: 通关角标 2025-11-18 20:10:38 +08:00
travellerse
d8000250dc fix: 添加不期而遇事件名ocr替换 (#14588) 
* fix: 添加不期而遇事件名ocr替换

* fix: 添加"找黍溯果"的ocr替换

* fix: 更新JieGarden的OCR替换规则
 2025-11-18 19:58:13 +08:00
Constrat
37299f8758 fix: Sami IS EN 3rd floor regex 2025-11-18 11:39:52 +01:00
github-actions[bot]
bdd747fe2a chore: Auto Update Game Resources - 2025-11-18 
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/19457757314

[skip changelog]
 2025-11-18 07:27:47 +00:00
status102
e71ade9573 chore: 路径迁移 2025-11-18 15:19:25 +08:00
Constrat
b77b8e55e5 fix: regex AD navigation EN alpha/v5.28.0-beta.1.d004.gb77b8e55e 2025-11-17 20:06:48 +01:00
AnnAngela
222af5e23c ci: Simplify resource update workflow (#14785) 
* ci: Simplify resource update workflow

Removed unnecessary delay and re-download steps for resources.

* ci: Apply suggestions from code review

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

* ci: Remove continue-on-error from download steps

Removed 'continue-on-error' option from multiple download steps.

---------

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
 2025-11-17 17:41:08 +01:00
github-actions[bot]
0014167468 feat: Update Submodules MaaMacGui, maa-cli 
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/19412598245
[skip changelog]
alpha/v5.28.0-beta.1.d002.g001416746 		2025-11-16 21:52:53 +00:00
uye
56a83bb8d7 feat: 清日志的时候把 ToolTip 手动清除一下 alpha/v5.28.0-beta.1.d001.g56a83bb8d 2025-11-16 03:32:39 +08:00
uye
fe71d9ea1c Release v5.28.0-beta.1 (#14767) v5.28.0-beta.1 2025-11-16 03:13:09 +08:00
github-actions[bot]
565b8fa7f9 docs: Auto Update Changelogs of v5.28.0-beta.1 (#14768) 
* docs: Auto Generate Changelog of Release v5.28.0-beta.1

* docs: Optimize changelog formatting for v5.28.0-beta.1 (#14769)

* Initial plan

* docs: Optimize changelog formatting per review guidelines

Co-authored-by: ABA2396 <99072975+ABA2396@users.noreply.github.com>

* docs: Update CHANGELOG for v5.28.0-beta.1

---------

Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: ABA2396 <99072975+ABA2396@users.noreply.github.com>

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Copilot <198982749+Copilot@users.noreply.github.com>
Co-authored-by: ABA2396 <99072975+ABA2396@users.noreply.github.com>
 2025-11-16 03:02:46 +08:00
uye
b71f0b0a9f feat: 卫戍协议：盟约 小游戏 (#14763) 
* feat: 卫戍协议：盟约 小游戏

* chore: Auto update by pre-commit hooks [skip changelog]

* feat: 调整描述

* chore: Auto update by pre-commit hooks [skip changelog]

* i18n: EN tweak

* i18n: KR tweak

* i18n: EN tweak

* feat: mac 卫戍协议：盟约

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Constrat <56174894+Constrat@users.noreply.github.com>
Co-authored-by: HX3N <scarlet7518@gmail.com>
 2025-11-16 02:42:44 +08:00
Weiyou Wang
abe9affa44 fix: 进一步调整 WpfGui 助战选项显示布局 2025-11-16 00:32:14 +11:00
uye
e20508d46e fix: 自动借助战错误显示 2025-11-15 20:17:20 +08:00
HX3N
6427fdd609 i18n: KR tweak SupportUnitUsage translation 2025-11-15 13:20:51 +09:00
Status102
5c86b4b875 docs: integration zh可读性增强 (#14756) 
docs: integration zh可读性增强 (#14754)

* docs: integration zh可读性增强

* docs: 再加一点

* docs: all in

* chore: Auto update by pre-commit hooks [skip changelog]

* docs: 去掉点多余的换行

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
alpha/v5.27.5-alpha.1.d034.g5c86b4b87 		2025-11-14 22:22:48 +08:00