fz-mirrors/MaaAssistantArknights
0
0
Fork 0
mirror of https://github.com/MaaAssistantArknights/MaaAssistantArknights.git synced 2026-07-16 09:50:40 +08:00
Code Issues Packages Projects Releases Wiki Activity
17,139 Commits 61 Branches 1,837 Tags
4e075cdb3cdebca3aec648818caf17aea80bdcd7
Commit Graph

17139 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
github-actions[bot]
4e075cdb3c feat: Update Submodules MaaMacGui, maa-cli 
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/19498803186
[skip changelog]
 2025-11-19 10:54:03 +00:00
萨拉托加
6a5c3410f9 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
a1ead2bef3 fix: 修复集成战略萨米主题下凹密闻板相关功能 (#14755) 2025-11-19 18:50:32 +08:00
travellerse
73eeaec928 fix: 保存招募券结束后等待确认招募按钮消失 (#14773) 
* fix: 保存招募券结束后加点延时

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

* fix: 添加确认按钮未消失时继续招募流程
 2025-11-19 18:50:03 +08:00
uye
b9eed42422 ci: 更新下 changelog 2025-11-19 18:49:23 +08:00
travellerse
e8635ac59d fix: 修正不期而遇事件名ocr以区分禳解的三个相近选项 (#14799) 2025-11-19 18:11:02 +08:00
status102
9a44f4f2ca ci: nightly版恢复pdb文件生成及上传 2025-11-19 17:47:38 +08:00
status102
1b7d642fd6 fix: 刷理智指定次数未完全消耗警告在剩余理智也会提示 2025-11-19 16:51:51 +08:00
status102
488834ccd3 fix: 干员识别复制结果到剪贴板时丢失未拥有干员 2025-11-19 15:53:27 +08:00
status102
de008a414a fix: 移除过旧的add_user_additional参数弃用提示 2025-11-19 15:53:05 +08:00
github-actions[bot]
c2df4a0aba 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
965a762e8a 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
5a0305ceb2 fix: 上调助战栏位匹配分数阈值 (#14796) 2025-11-18 21:54:06 +00:00
AnnAngela
d35b69cda4 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
c75b7b41bc ci(testing): game resource update error comment tweaks and changes 2025-11-18 16:11:14 +01:00
AnnAngela
d4a6fb3fa2 ci: Change curl command to fail on error 
cc @Constrat
 2025-11-18 22:31:57 +08:00
github-actions[bot]
0f1ff2a36f chore: Auto Templates Optimization 
Triggered by 087a530a37

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

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

* fix: 更新JieGarden的OCR替换规则
 2025-11-18 19:58:13 +08:00
Constrat
59cf0eaa62 fix: Sami IS EN 3rd floor regex 2025-11-18 11:39:52 +01:00
github-actions[bot]
daf532ab23 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
49d0e56730 chore: 路径迁移 2025-11-18 15:19:25 +08:00
Constrat
852e4f7281 fix: regex AD navigation EN 2025-11-17 20:06:48 +01:00
AnnAngela
aa374699a4 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]
c74b63db4d feat: Update Submodules MaaMacGui, maa-cli 
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/19412598245
[skip changelog]
 2025-11-16 21:52:53 +00:00
uye
43fcc736d5 feat: 清日志的时候把 ToolTip 手动清除一下 2025-11-16 03:32:39 +08:00
uye
f1888c989e Release v5.28.0-beta.1 (#14767) 2025-11-16 03:13:09 +08:00
github-actions[bot]
f058ee333d 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
5f08484d5c 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
f4aa30168f fix: 进一步调整 WpfGui 助战选项显示布局 2025-11-16 00:32:14 +11:00
uye
1efd1bf8e7 fix: 自动借助战错误显示 2025-11-15 20:17:20 +08:00
HX3N
1ac8aa37dc i18n: KR tweak SupportUnitUsage translation 2025-11-15 13:20:51 +09:00
Status102
3287fd8423 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>
 2025-11-14 22:22:48 +08:00
uye
cd9242792d fix: 干员识别包含 盟约·辅助干员 和 领主·Sharp 2025-11-14 18:49:32 +08:00
github-actions[bot]
c0b6781553 chore: Auto Templates Optimization 
Triggered by 2f96f03551

[skip changelog]
 2025-11-14 09:03:43 +00:00
github-actions[bot]
2f96f03551 chore: Auto Update Game Resources - 2025-11-14 
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/19359577330

[skip changelog]
 2025-11-14 09:03:16 +00:00
Manicsteiner
fe0d7a45f2 fix: JP paradox 2025-11-14 16:30:38 +08:00
github-actions[bot]
e1df3d82dd chore: Auto Update Game Resources - 2025-11-14 
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/19358208540

[skip changelog]
 2025-11-14 08:03:37 +00:00
Weiyou Wang
d6cc72bcb3 rft: 修复、改进自动借助战功能 (#11105) 2025-11-14 14:20:45 +11:00
Weiyou Wang
d975340d90 fix: 简化萨米肉鸽 "诡秘的预感" 相关任务链 (#14749) 2025-11-14 12:17:13 +11:00
Weiyou Wang
601aa95fd9 fix: 给 open_series_list 加上失败截图机制 (#14693) 2025-11-14 12:16:41 +11:00
Weiyou Wang
e30a88c49b refactor: 修复 "入暂亭" 事件 (#14684) 2025-11-14 12:16:03 +11:00
Weiyou Wang
0f2776ba31 fix: 防止生息演算重置地图视图时因截图延迟卡死 (#14721) 2025-11-14 12:15:17 +11:00
Status102
00cf6457bb chore: 向MaaCore工程增加tasks文件以便检索 (#14731) 
* chore: 向MaaCore增加tasks文件

* chore: 支持global
 2025-11-14 01:23:24 +08:00
Manicsteiner
30d0b93052 chore: JP ocr edits (#14748) 2025-11-13 17:02:25 +01:00
github-actions[bot]
e2e666e59d chore: Auto Update Game Resources - 2025-11-13 
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/19337134611

[skip changelog]
 2025-11-13 15:44:31 +00:00
github-actions[bot]
12e8697c23 chore: Auto Update Game Resources - 2025-11-13 
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/19326795251

[skip changelog]
 2025-11-13 09:28:33 +00:00
HX3N
47da437fde fix: KR AD navigation (#14742) 2025-11-13 09:19:11 +01:00
Weiyou Wang
5829ece632 fix: ocrReplace for EN (#14740) 
Co-authored-by: 萨拉托加 <151550168+saratoga-official@users.noreply.github.com>
 2025-11-13 09:18:35 +01:00
github-actions[bot]
0b936c7a98 chore: Auto Update Game Resources - 2025-11-13 
https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/19324207913

[skip changelog]
 2025-11-13 07:43:04 +00:00