fz-mirrors/MaaAssistantArknights
0
0
Fork 0
mirror of https://github.com/MaaAssistantArknights/MaaAssistantArknights.git synced 2026-07-16 01:40:46 +08:00
Code Issues Packages Projects Releases Wiki Activity
18,394 Commits 61 Branches 1,836 Tags
f6c39c3a8f05ddcc3f537dbf3e8e6e481bb9a2c5
Commit Graph

85 Commits

Author SHA1 Message Date
Status102
f6c39c3a8f feat: 合并 处于战斗中 检测, 增加倍速记忆, 支持战斗中 不带跳过按钮的 带头像对话教程 (#15706) 
* rft: 合并 处于战斗中 检测, 增加倍速记忆

* feat: 支持战斗中 不带跳过按钮的 带头像对话教程

* perf: 增加重试次数上限

* perf: 2倍速检查一致化
 2026-03-07 00:30:36 +08:00
pre-commit-ci[bot]
9f0e6e104c chore: Auto update by pre-commit hooks [skip changelog] 2025-11-24 05:00:32 +00:00
uye
e0b67b1523 fix: 大括号位置错误 2025-11-24 12:57:35 +08:00
Status102
58d001744e feat(MaaCore): Copilot支持切换技能用法使用坐标 (#14818) 
* feat: 支持切换技能用法使用坐标

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

* fix: usage

* fix: const ref

* perf: capture

* fix: case define

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
 2025-11-23 15:55:13 +08:00
MistEO
b73377eb6a refactor: use MaaUtils instead of Utils (#14579) 
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
 2025-11-02 23:19:38 +08:00
Weiyou Wang
880bdea7d3 refactor: 将 Copilot ActionType::ResetTimer 更改为更适合的 ResetStopwatch (#14507) 
* refactor: 为 ActionType::ResetTimer 加入中文变种

* refactor: Timer -> Stopwatch
 2025-10-22 22:20:50 +11:00
Weiyou Wang
1edd006982 feat: 跳过使用未准备好的技能 && 全局计时器 (#13913) 
* feat: skip_if_not_ready

* feat: elapsed_time

* feat: WpfGui log 输出计时器信息

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

* feat: 不默认启用全局计时器

* refactor: 支持 ResetTimer 拼写变种

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
 2025-10-20 01:35:37 +11:00
MistEO
51ab24945b refactor: 依赖大更新 (#13908) 
Co-authored-by: status102 <102887808+status102@users.noreply.github.com>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
 2025-09-08 21:17:47 +08:00
status102
75f4c8d01e perf: 自动战斗编队固定优先编入所有干员, 且按照作业顺序 2025-06-06 13:24:55 +08:00
status102
5a235f92d0 revert 532acde4c3 2025-06-06 13:13:45 +08:00
status102
532acde4c3 fix: 漏了.jpg 
[skip changelog]
 2025-06-06 13:02:20 +08:00
status102
9c79a8d09c feat: 自动战斗费用击杀数缓存, 减少性能消耗 2025-06-04 09:56:49 +08:00
status102
3cfc853d10 fix: 非部署动作时, 动作前等待结束后不必要的部署区更新可能触发暂停识别, 导致动作滞后 2025-05-29 22:15:23 +08:00
status102
75012b2252 feat: 自动战斗费用识别缓存, 减少性能消耗 (#12765) 
* feat: 自动战斗费用识别缓存

* refactor: 返回值格式

* chore: 改个名字

* chore: rename

* fix: 改名改着改着改错了

* fix: var init

* perf: 简化返回值

* fix: template

* fix: platform
 2025-05-23 09:02:00 +08:00
uye
bd6176b25f fix: 开始战斗前闪退无限循环识别，关卡名检查放宽至一分钟 (#12580) 2025-05-10 19:58:07 +08:00
Constrat
66d49a7e81 ci: bump oxi, clang, prettier, markdownlint (#12388) 
* ci: bump oxi, clang, prettier, markdownlint

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

* chore: 移除不再使用clang-format的JSON文件

* chore: clang-format disable

* chore: clang版本更新

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

* chore: ver注释

* docs: Modify the clang-format version restriction in the documentation to match the current changes

@zzyyyl

---------

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>
 2025-04-20 09:42:41 +08:00
pre-commit-ci[bot]
d3796ea4b3 chore: Auto update by pre-commit hooks [skip changelog] 2024-10-22 08:40:28 +00:00
Horror Proton
b5eb2a004f chore: fix missing includes 2024-06-19 17:15:48 +08:00
uye
d1a60aa1bb fix: 无法跳过关卡开始的剧情 2024-06-14 00:55:46 +08:00
uye
11b64cae3a fix: constexpr 构造错误 2024-06-04 20:55:49 +08:00
uye
0f14c11e3d feat: 增加保全、肉鸽、抄作业可配置截图最小间隔 2024-06-04 20:39:05 +08:00
status102
3d3d8c1036 perf: 移除过多的剧情检查 2024-03-22 16:48:35 +08:00
status102
c00d1673f5 fix: 战斗中教程剧情导致错误的倍速切换 2024-03-22 16:20:29 +08:00
status102
7cc1e7b551 perf: 自动战斗-自动编队存储编队信息 (#8542) 2024-03-14 11:24:18 +08:00
status102
931b11339c fix: 修复使用干员组切换技能用法失效 2024-02-25 20:58:51 +08:00
uye
cf828efbee fix: set_stage_name 回调信息错误 2024-02-03 00:29:13 +08:00
status102
cc3ac7ef1b refactor: 重构BattleHelper的m_cur_deployment_opers为vector 2023-11-27 16:22:44 +08:00
MistEO
e16a980ae9 Apply suggestions from code review 2023-10-08 15:14:05 +08:00
Lancarus
dcbe55e44c feat: 按照review修改 2023-10-07 18:40:25 +08:00
status102
06eae3e06a perf: 优化剧情跳过检测频率，修改暂停时返回值为true 2023-10-07 14:01:38 +08:00
Lancarus
5eee5098c0 feat: 按照review修改 2023-10-07 11:24:57 +08:00
Lancarus
70b6317d70 feat: 根据review将check_skip_plot_button移动到BattleProcess里面 2023-10-07 02:14:45 +08:00
Lancarus
08eeae14b9 格式化代码 2023-10-06 18:24:37 +08:00
Lancarus
2fa541860d feat: 抄作业自动跳过战斗中剧情 2023-10-06 18:23:22 +08:00
zzyyyl
a5daac889a style: code format 2023-09-30 23:44:34 +08:00
status102
0dd1405061 fix: 自动战斗-战斗列表启用时，自动追加摆完挂机选项 
close #6507
 2023-09-25 22:14:46 +08:00
MiaoYan JY
a19df2e24e fix: 修复肉鸽中干员 山 2 技能反复释放的问题 2023-08-21 23:40:40 +08:00
Annoying Flower
a61d8fd631 feat: 添加对 "skill_times" 字段的支持，再也不会狂点重岳辣 (#6007) 2023-08-20 21:38:40 +08:00
MistEO
3dcd5eab11 fix: 修复保全派驻干员技能用法错误 2023-05-02 04:36:35 +08:00
MistEO
793d18af07 refactor: Battlefield Matcher 重构 2023-04-29 16:50:39 +08:00
MistEO
d258dd675a refactor: 视觉相关重命名 2023-04-29 16:20:12 +08:00
MistEO
44ec93ccfd perf: 优化下抄作业的小逻辑 2023-04-17 00:03:05 +08:00
MistEO
c446466003 feat: 更新抄作业子弹时间操作逻辑 2023-04-16 23:44:09 +08:00
MistEO
6cd9a8ab7c fix: 优化抄作业子弹时间的逻辑 2023-04-16 23:21:03 +08:00
MistEO
82091b578d feat: 攻略视频导出作业 JSON (#4030) 
* feat: 作业视频识别，基本功能完成

Squashed commit of the following:

commit 3488507ebfb291b21ce9dae2d77536c39fc74840
Author: MistEO <mistereo@hotmail.com>
Date:   Sat Apr 1 19:05:19 2023 +0800

    chore: rename

commit ad3446fd823db3ea5cd657cf216fcfdd7063ce0b
Author: MistEO <mistereo@hotmail.com>
Date:   Sat Apr 1 19:02:34 2023 +0800

    perf: 优化视频识别结构

commit 5e5553e3720aa7c8c81d1667af96ffdc192d4281
Author: MistEO <mistereo@hotmail.com>
Date:   Sat Apr 1 18:53:13 2023 +0800

    fix: build error

commit ffe850ea49008e2c7cef281159ef673ffae735f2
Author: MistEO <mistereo@hotmail.com>
Date:   Sat Apr 1 18:40:46 2023 +0800

    perf: 识别识别不需要连接模拟器

commit 56711ea3ded5b8832b9399591cb93064740ba23c
Author: MistEO <mistereo@hotmail.com>
Date:   Sat Apr 1 18:40:20 2023 +0800

    perf: 优化视频读取性能

commit 1ce5ea3a61a6f270d834d1f2346832debd83f70f
Author: MistEO <mistereo@hotmail.com>
Date:   Sat Apr 1 16:19:08 2023 +0800

    feat: WPF UI 初步集成视频识别

commit d741d0fbef48829e502d9b641d918969c94a7352
Author: MistEO <mistereo@hotmail.com>
Date:   Sat Apr 1 15:18:58 2023 +0800

    chore: 一些重命名

commit a14652773989c35788dff0262c70cbc4c8c0cd0d
Author: MistEO <mistereo@hotmail.com>
Date:   Sat Apr 1 14:35:48 2023 +0800

    chore: rename and fix build error

commit 5ea7d52fab67d7085aceb3147b6940781f5e4b93
Merge: 89db75e0 4c4f8f4d
Author: MistEO <mistereo@hotmail.com>
Date:   Sat Apr 1 14:25:15 2023 +0800

    Merge branch 'dev' into feat/video_to_json

commit 89db75e05cea969417462dfcffb8e0b68233a199
Author: MistEO <mistereo@hotmail.com>
Date:   Sat Apr 1 03:49:41 2023 +0800

    chore: 导出json文件名

commit 6e1804b1dd49781dfeffc4a846321f8ebfff8b8c
Author: MistEO <mistereo@hotmail.com>
Date:   Sat Apr 1 03:47:38 2023 +0800

    fix: 修复关卡识别错误

commit cc0dab1c1b0e2ff4ce2d62e3996516b13039be2b
Author: MistEO <mistereo@hotmail.com>
Date:   Sat Apr 1 03:31:39 2023 +0800

    feat: 完成关卡名识别、重命名一些变量

commit bf1ab83bcfdeb64dad06c2cc3ac649c77baf317e
Author: MistEO <mistereo@hotmail.com>
Date:   Sat Apr 1 02:23:24 2023 +0800

    feat: 第一份作业导出

commit 76ae6262b64f7e7365cd1e7783b2cd4db61600ca
Author: MistEO <mistereo@hotmail.com>
Date:   Fri Mar 31 21:43:00 2023 +0800

    chore: rename

commit 493cb9c3ab4718f15316c357080fec6930c89a97
Author: MistEO <mistereo@hotmail.com>
Date:   Fri Mar 31 20:13:45 2023 +0800

    perf: 更新战斗识别相关模型

commit 623c80c76792a24c37d7dad5addb8c00341a5688
Author: MistEO <mistereo@hotmail.com>
Date:   Thu Mar 30 00:02:47 2023 +0800

    refactor: 完成视频切片重构

commit 73bbf7c8727d911effa298ccff0a4ae29376baed
Author: MistEO <mistereo@hotmail.com>
Date:   Tue Mar 28 23:54:39 2023 +0800

    perf: 优化tensor转换

commit 13ba7a01e1c46ee1f0b6bea55ffaaf30fcf552c3
Merge: 48a4d765 61577dc9
Author: MistEO <mistereo@hotmail.com>
Date:   Tue Mar 28 22:28:33 2023 +0800

    Merge branch 'dev' into feat/video_to_json

commit 48a4d765e2a1f1240e8f31352c21f58b565752d2
Author: MistEO <mistereo@hotmail.com>
Date:   Sat Mar 25 23:22:35 2023 +0800

    fix: build error

commit 02c80f4442e520998aff3b14fa4decbbc421b6c0
Author: MistEO <mistereo@hotmail.com>
Date:   Sat Mar 25 04:03:54 2023 +0800

    perf: 优化技能ready识别模型

commit 7c15b54bd4a7c97772f27ac8bebaec97dd59f19c
Author: MistEO <mistereo@hotmail.com>
Date:   Sat Mar 25 03:15:46 2023 +0800

    perf: 重新训练干员方向检测模型

commit 450eea50a0601676e731411188a74cfc38f21a42
Author: MistEO <mistereo@hotmail.com>
Date:   Sat Mar 25 01:39:23 2023 +0800

    feat: 画了一堆图

commit bf2bc66c6d52ecdc9f7ce0e7fc3a4891bbe59f7c
Author: MistEO <mistereo@hotmail.com>
Date:   Wed Mar 22 23:33:33 2023 +0800

    feat: 完成干员部署方向识别

commit f3a0b4aee8e910d5ebc8e42486c5194bd6ffe51e
Author: MistEO <mistereo@hotmail.com>
Date:   Wed Mar 22 22:43:01 2023 +0800

    feat: 输出draw，增加一些回调，修复干员位置检测

commit 772fd2dbeaef59812b563aef36808e15f8d33e08
Author: MistEO <mistereo@hotmail.com>
Date:   Wed Mar 22 18:16:26 2023 +0800

    feat: 初步识别上场干员

commit 4fda687bdcbc598c80576f741b518fae8fc87566
Author: MistEO <mistereo@hotmail.com>
Date:   Wed Mar 22 17:29:57 2023 +0800

    perf: 优化一些细节

commit c72a1d7c8a13c1d22d5e2598ae0db87e74d32c26
Author: MistEO <mistereo@hotmail.com>
Date:   Wed Mar 22 01:10:29 2023 +0800

    fix: 修复偶现误识别问题

commit 3021a7372dbad1f920aad346b49f115d4d2e073c
Author: MistEO <mistereo@hotmail.com>
Date:   Wed Mar 22 01:01:21 2023 +0800

    feat: 完成干员检测

commit e74072fbbeffd4c0cd7a4d67208a67797341f1fa
Author: MistEO <mistereo@hotmail.com>
Date:   Tue Mar 21 01:34:20 2023 +0800

    feat: 完成yolo干员检测模型集成

commit 27a10f0bd0529c71d09aa2434a1ef1fd0cac2449
Author: MistEO <mistereo@hotmail.com>
Date:   Mon Mar 20 20:39:44 2023 +0800

    chore: rename

commit 277a620819c1f368392c10f8d74a7b3e9f633a58
Author: MistEO <mistereo@hotmail.com>
Date:   Sun Mar 19 23:59:12 2023 +0800

    feat: 完成编队->部署区识别

commit 9cfda5d295c34f37b592125898ec70105de77f7c
Author: MistEO <mistereo@hotmail.com>
Date:   Sun Mar 19 02:02:11 2023 +0800

    feat: 完成编队识别

    MaaDeps 需要给 opencv features 加上 ffmpeg

* fix: 调整部分参数适应硬解带来的颜色变化问题

* chore: 删除部分日志

* fix: build error

* fix: 修复编队识别错误

* fix: 修复部署区识别错误（阈值问题

* fix: 修复初始部署区识别错误

* fix: 修复切片错误，修复部署区识别

* fix: 修了一些bug又制造了一些bug

* fix: 修了一些bug又制造了一些bug

* fix: typo

* fix: 关键帧错误

* fix: 修复部署区偶现识别错误

* fix: 修复暂停按钮偶现识别错误

* feat: 新增技能识别，修复一些bug

* fix: 修复变化判断错误

* chore: draw窗口优化
 2023-04-05 15:17:09 +08:00
Hao Guan
f2f26b5d2d chore: 修复Clang/GCC编译警告 2023-03-20 20:42:21 +10:00
dantmnf
8a18ba93bf Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into arm64 2023-03-04 16:51:33 +08:00
zzyyyl
3f0636ac61 style: format 
请各位开发者统一代码风格！
```
python tools\ClangFormatter\clang-formatter.py --clang-format=YOUR\PATH\TO\clang-format.exe --input=src\MaaCore
python tools\ClangFormatter\clang-formatter.py --clang-format=YOUR\PATH\TO\clang-format.exe --input=src\resource
```
参考 https://maa.plus/docs/2.2-%E5%BC%80%E5%8F%91%E7%9B%B8%E5%85%B3.html#%E5%9C%A8-visual-studio-%E4%B8%AD%E5%90%AF%E7%94%A8-clang-format
 2023-02-23 10:00:51 +08:00
dantmnf
7c2c0729a5 chore: move controller to subdirectory 2023-02-17 19:40:15 +08:00
MistEO
b240ebe9f1 fix: 修复单控的一些bug 2023-01-28 06:49:24 +08:00