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,551 Commits 61 Branches 1,838 Tags
fcfb05feb05bfe96993b48ce4b3f859e6fb6bd27
Commit Graph

88 Commits

Author SHA1 Message Date
MistEO
fcfb05feb0 refactor: 重构地图加载逻辑，改为惰性加载 2023-04-08 01:58:09 +08:00
MistEO
ef509bcf9a feat: 模板图片惰性读取，优化onnx读取 2023-04-07 23:14:17 +08:00
MistEO
ce14e23d9a feat: 惰性加载onnx模型 2023-04-07 22:44:19 +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
MistEO
296b320c21 fix: 修复肉鸽崩溃问题 
fix #4160 #4163
 2023-04-03 19:09:34 +08:00
LingXii
a192bea9ba Merge branch 'MaaAssistantArknights:dev' into dev 2023-04-02 11:04:04 +08:00
DuKong
6f76bff572 feat: 优化招募与战斗逻辑框架 2023-04-01 19:19:55 +08:00
MistEO
0ccc9dc860 perf: 优化请求结构 2023-03-28 18:05:59 +08:00
shxyke
24898ebdcf refactor: use libcpr instead of curl 2023-03-27 14:22:32 +00:00
MistEO
d64e829ac3 styles: format all cpp 2023-03-27 18:19:48 +08:00
Hao Guan
ffdb9b1123 chore: 修复Clang/GCC编译警告 2023-03-20 20:42:21 +10:00
zzyyyl
d8b0a52676 perf: fix typo 2023-03-18 21:25:05 +08:00
zzyyyl
a460224283 perf: 加速 tasks.json 的读取 
之前每个 tasks.json 文件读取的时候都会 expend 一遍（很耗时间）
现在在 parse 的时候不 expend, 而是等到一个任务被第一次 get 的时候才 expend.
（不知道会不会出问题，大家测测）
 2023-03-18 21:25:05 +08:00
Horror Proton
a02b7c183a perf: prevent unnecessary copy in TilePack 2023-03-15 11:04:40 +08:00
MistEO
54732036d8 perf: 优化战斗中技能识别，改用深度学习模型 (#3918) 
* feat: 战斗中技能使用ort识别

* fix: 修正技能识别的错误

* feat: 当技能识别置信度过低时，保存debug图片

* fix: build error for onnx runtime

* fix: build error on linux

* perf: onnx path

* fix: build error

* fix: onnx build error
 2023-03-08 21:55:57 +08:00
zzyyyl
f3d026072d fix(TaskData): 兜住某些情况下 tasks.json 解析炸了的异常 
例如加上 `"ResourceVersion": "v4.12.0-beta.2",`
 2023-03-07 23:28:41 +08:00
Horror Proton
b5c58609cb fix: fix wrong behaviours when reading levels.json 
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/3894
 2023-03-06 21:59:13 +08:00
dantmnf
447b9d86e7 Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into arm64 2023-03-04 16:51:33 +08:00
Yifan Liu
34742a9e3d fix: fix replace_full not acting correctly on chars_name 2023-02-28 12:05:44 -06:00
Yifan Liu
c5e28aee76 Merge branch 'dev' into feat/ocr_replace_all 2023-02-25 21:46:54 -06:00
MistEO
a63f3e891d Merge pull request #3795 from MaaAssistantArknights/feat/ocr_eq_class 
feat: OCR字符等价类支持
 2023-02-25 15:53:07 +08:00
Yifan Liu
fbff53d219 refactor: directly call get_instance instead of using static OcrData 2023-02-24 16:33:37 -06:00
Yifan Liu
1dc1530152 feat: add task replace_full 2023-02-24 15:34:38 -06:00
uye
6896a03c0d refactor: 优化代码 2023-02-23 17:04:48 +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
MistEO
7f14ca02c0 Merge pull request #3762 from horror-proton/perf/tile_pack_parse 
perf: read tile data concurrently
 2023-02-23 00:39:49 +08:00
Horror Proton
06d04f57f1 perf: read tile data concurrently 2023-02-22 10:54:04 +00:00
Yifan Liu
b71edb9477 feat: OCR equivalence class 2023-02-22 00:48:11 -06:00
zzyyyl
44053ee182 feat: 增加一些空白符 2023-02-22 13:10:18 +08:00
zzyyyl
3101bc39ad feat: 对 # 运算的逻辑稍作调整 
允许 A#(next+sub), 表示 (A#next + A#sub)
 2023-02-22 12:01:14 +08:00
zzyyyl
6f9a0ec5a4 feat: 对 @ 运算的逻辑稍作调整 
调整前: (...)@#none=#none, #none@(...)=#none
调整后: (...)@#none=(...), #none@(...)=(...)
 2023-02-22 11:57:04 +08:00
zzyyyl
700f77212c perf: 结构优化 2023-02-22 11:01:53 +08:00
zzyyyl
5c3efb719e feat: 增加一个虚任务 #none 
例：
```
"A": { "next": [ "#none+B" ] }
```
这个任务在增加前缀（如 `"D@A"`）时 next 不变。
 2023-02-22 11:01:53 +08:00
zzyyyl
fd36da1611 feat: 简易的任务表达式运算 2023-02-22 11:01:53 +08:00
dantmnf
f2f96541ac feat: load onnx from memory 2023-02-17 19:38:43 +08:00
MistEO
4101659eef fix: 修复抄作业退出战斗还在执行的问题；修复保全retry_times不生效的问题 2023-01-18 01:34:55 +08:00
MistEO
6418d34295 fix: 修复maa目录和用户临时目录同为中文时，飞浆加载的报错问题 2023-01-17 15:52:25 +08:00
MistEO
b758bf05c6 fix: 修复保全一系列的问题（我忘了具体有哪些了.jpg） 2023-01-17 02:49:54 +08:00
MistEO
a6ac4458e8 feat: 不读取旧版本的头像缓存数据 2023-01-17 00:23:32 +08:00
MistEO
9da092b3b9 feat: 优化保全派驻工具人部署策略，新增黑名单字段，修复一些卡住的问题，新增部分界面提示 2023-01-16 01:20:20 +08:00
MistEO
3325f2ae7c feat: 更新保全协议，整合drops字段，并支持战斗中获取战利品action 2023-01-14 23:48:11 +08:00
MistEO
d74c6a8306 fix: 修复头像缓存路径错误 2023-01-13 16:21:36 +08:00
MistEO
54f5fd5c7a fix: 修复fastdeploy加载中文路径下的onnx模型报错的问题 
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/3348
 2023-01-13 15:38:22 +08:00
MistEO
c2f6909926 chore: 增加一些加载时的日志打印 2023-01-13 15:16:18 +08:00
MistEO
95f4b5f54c feat: 整理日志，缓存等目录结构 2023-01-13 14:39:03 +08:00
MistEO
94a0fff6ad feat: 初步完成保全第一层循环刷 2023-01-12 23:54:13 +08:00
MistEO
6340e98f04 refactor: 重构干员头像缓存机制 2023-01-12 23:08:06 +08:00
MistEO
c8a724500e fix: 将OCR模型改为同步加载 
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/3342
 2023-01-12 15:16:54 +08:00
MistEO
fd87ed21b7 feat: 将所有OCR模型转换为ONNX格式 2023-01-12 15:16:35 +08:00
MistEO
69d35f8d31 Merge pull request #3332 from MaaAssistantArknights/perf/move_camera 
feat: 更新摄像机移动方法
 2023-01-11 22:15:19 +08:00