fz-mirrors/MaaAssistantArknights
0
0
Fork 0
mirror of https://github.com/MaaAssistantArknights/MaaAssistantArknights.git synced 2026-07-17 18:01:26 +08:00
Code Issues Packages Projects Releases Wiki Activity
6,594 Commits 61 Branches 1,838 Tags
07caee7d42f894d7e855c2c8a8d276f0be12e1ee
Commit Graph

1018 Commits

Author SHA1 Message Date
zzyyyl
764a7cd8fa feat: 添加主线第十二章导航 
close https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/4208
 2023-04-07 17:09:56 +08:00
MistEO
9cdcfcd344 fix: 修复掉落识别-关卡难度识别 2023-04-06 22:20:14 +08:00
MistEO
f58f31687d fix: 尝试修复干员撤退不掉的问题 2023-04-05 20:30:09 +08:00
uye
2bb1d51f68 fix: 修复采购中心识别问题 
fix #4177
 2023-04-05 17:31:08 +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
DuKong
0f221a82bb fix: 修复收藏品二选一卡死问题 2023-04-02 22:35:39 +08:00
LingXii
f8c4063310 Merge branch 'MaaAssistantArknights:dev' into dev 2023-04-02 11:04:04 +08:00
DuKong
4a3814cdd4 feat: 优化招募与战斗逻辑框架 2023-04-01 19:19:55 +08:00
uye
d8d9612272 fix: 危机合约版本更新无法刷钱本等物质搜寻关 #4051 
fix #4051
 2023-03-21 23:02:50 +08:00
uye
fc7fafcc33 fix: CE-6 代理识别错误 2023-03-21 20:49:35 +08:00
uye
77431aaee4 chore: 调整Level6资源关卡代理判断延迟，替换识别图片 2023-03-19 23:55:14 +08:00
uye
4f18a5509c fix: 尝试修复CE-5导航问题 2023-03-19 20:14:05 +08:00
MistEO
531bf29fb8 chore: 更新子模块 2023-03-19 01:19:16 +08:00
uye
9cb3727094 fix: 主线关卡导航问题 
#4029
 2023-03-19 01:03:29 +08:00
cenfusheng
817ac0b6d6 Create tasks.json 
修复可能识别不到第一个字的问题。保留原本X与S的识别修正。就成了：.*麟.*夜刀$  
修修补补又一年（
 2023-03-14 14:09:24 +08:00
MistEO
51986346de fix: 修复CF关卡“用餐加成“识别错误 
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/3981
 2023-03-13 14:04:37 +08:00
MistEO
a12d55cb8c feat: 新增支持 CF 关卡掉落识别 (#3961) 2023-03-12 01:41:58 +08:00
MistEO
ef1c522584 fix: 修复自动作战，部分地图中干员技能无法开启的问题 
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/3931
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/3551
 2023-03-11 13:59:05 +08:00
MistEO
d322525b1a fix: 修复泰拉大陆调查团 
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/3927
 2023-03-10 11:10:24 +08:00
MistEO
286a7cedf3 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
uye
c0f25f28cc feat: 添加活动导航 2023-03-07 21:16:41 +08:00
MistEO
8c790e4925 chore: 更新资源 2023/3/7 2023-03-07 10:52:01 +08:00
LambdaLe
d4dcc466bc fix: 修复 肉鸽助战 招募后卡在干员立绘界面的问题 2023-03-06 18:15:32 +08:00
Yifan Liu
65c0aad77c Merge branch 'dev' into feat/activity_ota 2023-03-04 11:48:56 -06:00
zzyyyl
444998b64e feat: 修复战斗过程卡住的问题 
PrtsErrorConfirm 出不去的时候用 WaitAfterPRTS 兜住

fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/3841
 2023-03-04 21:35:56 +08:00
Yifan Liu
9e54a958f3 chore: remove DH resources (which will be ota) 2023-03-04 00:45:41 -06:00
MistEO
c2938bebdd Merge pull request #3862 from DaysGone233/patch-1 
feat: 自动公招时增加掉线识别
 2023-03-04 03:35:53 +08:00
LambdaLe
6f4fc8fa91 fix: 修复 肉鸽助战 刷新按钮ocr不能部分匹配及刷新时间识别错误问题 2023-03-03 13:39:10 +08:00
DaysGone233
f705069ddb Merge branch 'dev' into patch-1 2023-03-03 01:14:24 +08:00
Yifan Liu
22b4581287 fix: JP IS(rogue) friend support oper 
refresh support list is yet to be fixed
 2023-03-01 22:43:34 -06:00
Yifan Liu
6246287c0d feat: JP DH-9 Navigation多索雷斯导航 2023-03-01 21:23:20 -06:00
DaysGone233
dbe2f88c1a Add offline confirm in recruting 2023-03-02 10:16:03 +08:00
Yifan Liu
a673fd9cfb fix: infrast oper name ocr issue on JP 
enlarge the roi so it exactly covers the area of the name
 2023-03-01 19:33:26 -06:00
Yifan Liu
618bebe7f7 fix: JP IS specific stage stuck 
enlarge roi of dps enter

should fix #3842 #3714
 2023-02-28 23:43:45 -06:00
cenfusheng
807a5c9922 修复重岳的识别错误 
修复重岳识别为重岳-的错误，按照令的经验，应还有可能识别为重岳——，一并修复。
皮肤怎么那么多疑似白色横线的地方啊【指指点点】
 2023-02-28 14:29:59 +08:00
MistEO
f4118a62b6 Merge pull request #3812 from MaaAssistantArknights/feat/rogue_recruit 
feat: 加速肉鸽招募时滑动
 2023-02-25 15:53:25 +08:00
zzyyyl
0f52f73a11 Merge pull request #3773 from MaaAssistantArknights/clickcorner 
fix: 修复一些关卡结算界面的问题

fix #3758
fix #3803
 2023-02-24 20:21:47 +08:00
zzyyyl
3b2abc65b6 fix: 修复一些小问题 2023-02-23 23:04:58 +08:00
zzyyyl
8576b524a3 feat: 加速肉鸽招募时滑动 2023-02-23 22:42:23 +08:00
zzyyyl
3d15a5fddf fix: 修复肉鸽招募有时漏干员的问题 
可能引入一个新的问题：靠后的干员在之前能招募到，改完招募不到了。这个问题可以通过修改滑动上限解决，不过感觉影响不大，先不做改动

fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/3811
 2023-02-23 21:28:18 +08:00
uye
56d860182b refactor: 简化关卡导航写法 2023-02-23 21:02:05 +08:00
zzyyyl
04d9699fb4 fix: 修复一些修改任务名引起的问题 2023-02-23 19:10:00 +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
zzyyyl
4e925a7b25 perf: 简化 PRTS 相关任务 2023-02-23 09:17:36 +08:00
zzyyyl
6ba171f529 perf: 使用任务表达式的语法优化 ClickCorner 相关任务 2023-02-23 09:17:27 +08:00
zzyyyl
5b3b470954 fix: 调整 ClickCorner 相关任务，将重试次数从原来的 2 次提高到 5 次 2023-02-23 09:17:07 +08:00
zzyyyl
a1237c1b34 feat: 重命名 Loading、 Loading2 相关任务 
将 Loading 任务重命名为 LoadingText，Loading2 任务重命名为 LoadingIcon 方便区分
 2023-02-23 08:18:16 +08:00
zzyyyl
a754a7fe77 fix: 删除一段可能导致问题的代码 
ClickCorner 这个任务只会在 EndOfAction 等 掉落识别 的任务结束后调用。
这里若出现差错导致没有进入前面的任务而是再次进入 EndOfAction 任务（例如 ClickCorner 的点击失效导致停留在结算界面），可能会导致重复识别
 2023-02-23 08:18:07 +08:00
zzyyyl
4b465ebd35 feat: 删除一段冗余代码 2023-02-23 08:14:13 +08:00
MistEO
115f3b4c68 fix: 修复基建宿舍选择状态识别错误 2023-02-21 21:15:10 +08:00