fz-mirrors/MaaAssistantArknights
0
0
Fork 0
mirror of https://github.com/MaaAssistantArknights/MaaAssistantArknights.git synced 2026-07-18 02:10:21 +08:00
Code Issues Packages Projects Releases Wiki Activity
6,971 Commits 61 Branches 1,838 Tags
88a021cb2c9c2741a2082a63f1fb464e43cf6ad7
Commit Graph

45 Commits

Author SHA1 Message Date
MistEO
88a021cb2c refactor: 视觉相关重命名 2023-04-29 16:20:12 +08:00
MistEO
8ae7ba62b6 perf: 优化下抄作业的小逻辑 2023-04-17 00:03:05 +08:00
MistEO
cf3adef12a feat: 更新抄作业子弹时间操作逻辑 2023-04-16 23:44:09 +08:00
MistEO
07c804acc8 fix: 优化抄作业子弹时间的逻辑 2023-04-16 23:21:03 +08:00
MistEO
39d323562a 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 b8bb725e
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 a0964485
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
ffdb9b1123 chore: 修复Clang/GCC编译警告 2023-03-20 20:42:21 +10:00
dantmnf
447b9d86e7 Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into arm64 2023-03-04 16:51:33 +08:00
zzyyyl
4d61950d7e 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
7f8e84d3de chore: move controller to subdirectory 2023-02-17 19:40:15 +08:00
MistEO
cbceae037e fix: 修复单控的一些bug 2023-01-28 06:49:24 +08:00
MistEO
a0807bd3d9 fix: 修复单步任务不执行的问题，添加一些日志 2023-01-28 02:38:59 +08:00
MistEO
ab308a51c7 feat: 新增自动战斗单步执行接口 2023-01-25 20:00:47 +08:00
MistEO
b758bf05c6 fix: 修复保全一系列的问题（我忘了具体有哪些了.jpg） 2023-01-17 02:49:54 +08:00
MistEO
aa003cafd9 fix: 修复保全派驻GetDrops崩溃的问题 2023-01-16 11:05:20 +08:00
MistEO
3325f2ae7c feat: 更新保全协议，整合drops字段，并支持战斗中获取战利品action 2023-01-14 23:48:11 +08:00
MistEO
3d7e6f0eeb fix: 修复自动战斗提前结束的问题，优化下保全测试作业 2023-01-13 01:33:40 +08:00
MistEO
6340e98f04 refactor: 重构干员头像缓存机制 2023-01-12 23:08:06 +08:00
MistEO
36526e427f perf: 优化保全转场的行为 2023-01-12 21:38:21 +08:00
MistEO
308f9c0da8 feat: 自动战斗新增引航者试炼支持，"MoveCamera" / "移动镜头" 新字段 2023-01-10 23:25:13 +08:00
MistEO
de20e7abbd feat: 完成保全的掉落干员选择等一些逻辑 2023-01-09 00:20:27 +08:00
MistEO
4f8bb72ea6 feat: 初步完成保全部署策略 2023-01-08 21:17:12 +08:00
MistEO
fcfe37c928 feat: 初步完成保全干员部署逻辑 2023-01-08 21:17:12 +08:00
Horror Proton
be55fac195 chore: fix typos 2023-01-07 20:30:27 +08:00
MistEO
818a47a980 fix: 修复自动战斗不部署召唤物的问题 2023-01-01 18:53:33 +08:00
MistEO
9fe608ddb3 fix: 修复抄作业不开技能的问题 2023-01-01 17:29:12 +08:00
MistEO
79d861c61e fix: build error on macOS 2022-12-26 19:36:15 +08:00
MistEO
e360063531 perf: 去除自动战斗/肉鸽多余的截图操作，提高速度 2022-12-26 18:40:26 +08:00
MistEO
5dcdb1134b perf: 优化自动战斗的cooling等待条件 2022-12-26 15:09:44 +08:00
MistEO
c64c271f03 fix: 修复自动战斗关卡名被清空的问题 2022-12-26 15:04:40 +08:00
MistEO
64b65e1df5 fix: build error on macOS 2022-12-26 02:26:12 +08:00
MistEO
f535400efe fix: 修复肉鸽及自动战斗数据不清空导致的一些乱七八糟的问题 2022-12-26 02:26:12 +08:00
MistEO
a46cc505ab fix: 修复自动战斗不会开技能的问题 2022-12-26 02:26:12 +08:00
MistEO
96e7ab0eb7 fix: 修复抄作业功能界面打印失效的问题 2022-12-26 02:26:12 +08:00
MistEO
35bfc113cc feat: 基本复刻原先肉鸽的所有功能 2022-12-26 02:26:12 +08:00
MistEO
5e08e1e138 feat: 自动战斗引入干员头像缓存机制 2022-12-26 02:26:12 +08:00
MistEO
35b93b765e feat: 初步跑通抄作业功能，并应用分组算法 2022-12-26 02:26:12 +08:00
MistEO
988de4bd97 refator: 完成肉鸽战斗任务整体重构（还没测） 2022-12-26 02:26:11 +08:00
MistEO
1839a2c416 fix: build error 2022-12-26 02:26:11 +08:00
MistEO
2171c9dde8 refactor: 重构战斗，抽出BattleHelper基类（还没写完，睡觉要紧） 
1>D:\Code\MeoAssistantArknights\src\MaaCore\Task\AbstractTask.cpp(25,1): error C2220: 以下警告被视为错误
1>D:\Code\MeoAssistantArknights\src\MaaCore\Task\AbstractTask.cpp(24,17): warning C4589: 抽象类“asst::AbstractTask”的构造函数忽略虚拟基类“asst::InstHelper”的初始化设定值
1>D:\Code\MeoAssistantArknights\src\MaaCore\Task\AbstractTask.cpp(24,17): message : 虚拟基类仅由最底层派生类型进行初始化
 2022-12-26 02:26:11 +08:00
MistEO
4fc5878ddf refactor: 重新封装了一下战斗技能识别。 BattleSkillReadyImageAnalyzer::analyze 还没写完 2022-12-13 18:50:18 +08:00
MistEO
20ba8dab1a merge: dev 2022-12-13 17:44:06 +08:00
MistEO
8f9e317a42 perf: 自动战斗一些没啥用的优化 2022-12-03 20:24:47 +08:00
MistEO
98644d357f fix: 修复自动战斗子弹时间部署不生效的问题 2022-12-03 20:16:09 +08:00
MistEO
dc48ff8028 feat: 支持暂停部署干员 2022-12-02 22:50:37 +08:00
MistEO
d9dcbb6289 chore: breaking rename 2022-12-02 00:22:47 +08:00