fz-mirrors/MaaAssistantArknights
0
0
Fork 0
mirror of https://github.com/MaaAssistantArknights/MaaAssistantArknights.git synced 2026-07-16 17:57:01 +08:00
Code Issues Packages Projects Releases Wiki Activity
9,191 Commits 61 Branches 1,837 Tags
206a7042e2688cebd08e0ccb4e40cc1ca30551ba
Commit Graph

77 Commits

Author SHA1 Message Date
Lancarus
206a7042e2 feat: 根据review将check_skip_plot_button移动到BattleProcess里面 2023-10-07 02:14:45 +08:00
Lancarus
eea8e223ee feat: 抄作业自动跳过战斗中剧情 2023-10-06 18:23:22 +08:00
MistEO
41d0c507da feat: 支持多模板匹配，任一达到阈值即视为命中 
MultiMatcher 暂不支持，仅使用第一个模板
 2023-10-01 13:54:56 +08:00
zzyyyl
69fad6f127 style: code format 2023-09-30 23:44:34 +08:00
MiaoYan JY
abe648344b fix: 修复肉鸽中干员 山 2 技能反复释放的问题 2023-08-21 23:40:40 +08:00
Annoying Flower
5a7659c1b3 feat: 添加对 "skill_times" 字段的支持，再也不会狂点重岳辣 (#6007) 2023-08-20 21:38:40 +08:00
MistEO
0d6b43adba fix: 修复SSS技能用法判断错误的问题 
fix #5991
 2023-08-20 21:32:23 +08:00
MistEO
b88be2252f fix: 修复不能部署干员的问题 2023-05-24 00:33:13 +08:00
MistEO
4253c87db7 fix: 全局减小adb滑动距离 
糊屎！
 2023-05-21 01:19:15 +08:00
MistEO
a8ec8709f4 refactor: 重构全部战斗相关视觉代码 2023-04-29 18:24:10 +08:00
MistEO
80828fb2fe refactor: Battlefield Matcher 重构 2023-04-29 16:50:39 +08:00
MistEO
88a021cb2c refactor: 视觉相关重命名 2023-04-29 16:20:12 +08:00
MistEO
578e5abc05 refactor: Vision 超级大重构 Phase 1 2023-04-27 22:42:56 +08:00
MistEO
f232be39e2 fix: 修复战斗中狂点cooling干员的问题 
识别不了就摆烂了.jpg
 2023-04-08 22:13:23 +08:00
MistEO
fcfb05feb0 refactor: 重构地图加载逻辑，改为惰性加载 2023-04-08 01:58:09 +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
shxyke
d730634081 refactor: 重构 Controller 架构 2023-03-24 01:30:22 +00:00
MistEO
e9f9f37a00 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
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
d7265bfb40 feat: change replace_full so it's set in tasks 
previously in set_replace
 2023-02-24 15:34:59 -06:00
Yifan Liu
069db100ef feat: 涉及干员名称的ocrReplace更改为替换整个str 
比如["name", "名字"]，"name~"原来会被替换成"名字~"，现在则是"名字"
 2023-02-20 23:09:09 -06:00
dantmnf
7f8e84d3de chore: move controller to subdirectory 2023-02-17 19:40:15 +08:00
MistEO
12d51d48a9 fix: 为战斗干员头像识别，召唤物使用单独的阈值 
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/3735
 2023-02-17 17:37:10 +08:00
Congcong Cai
3f58e1a5ba fix: check_and_use_skill logic bug 2023-02-08 08:05:27 +08:00
MistEO
61ff3f9c79 fix: 修复自动作战不开技能的问题 
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/3453
 2023-01-25 02:01:07 +08:00
MistEO
a0721b7b2c fix: 简单修复下战斗中技能识别错误一直点着尝试使用的问题 
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/3409
 2023-01-23 23:05:37 +08:00
MistEO
4101659eef fix: 修复抄作业退出战斗还在执行的问题；修复保全retry_times不生效的问题 2023-01-18 01:34:55 +08:00
MistEO
b758bf05c6 fix: 修复保全一系列的问题（我忘了具体有哪些了.jpg） 2023-01-17 02:49:54 +08:00
MistEO
cd9de33244 perf: 优化了点有的没的 2023-01-16 11:05:47 +08:00
MistEO
9da092b3b9 feat: 优化保全派驻工具人部署策略，新增黑名单字段，修复一些卡住的问题，新增部分界面提示 2023-01-16 01:20:20 +08:00
MistEO
c32c28f02a fix: 修复镜头切换带来的击杀数状态问题 2023-01-15 03:24:14 +08:00
MistEO
6d14722e1a fix: 修复保全MoveCamera动作错误 2023-01-15 02:23:33 +08:00
MistEO
a0671d3305 fix: 修复自动战斗开局暂停的问题；修复自动战斗距离太短干员放不下去的问题 2023-01-14 20:09:38 +08:00
MistEO
de6c35d2bf perf: 优化战斗中识别的鲁棒性 2023-01-14 14:41:40 +08:00
MistEO
72500b191a fix: 修复抄作业移动镜头不重置的问题 2023-01-14 03:28:23 +08:00
MistEO
4fd822cb6d perf: 优化干员头像识别，去掉一些日志 2023-01-14 02:02:30 +08:00
MistEO
2dab961dd8 fix: 修复抄作业干员识别错误 2023-01-14 02:02:30 +08:00
Horror Proton
86656a3e76 fix: fix wrong behavior of move_camera 2023-01-14 01:00:42 +08:00
MistEO
95f4b5f54c feat: 整理日志，缓存等目录结构 2023-01-13 14:39:03 +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
be1cb19036 perf: 优化下move_camera的行为 2023-01-12 02:14:46 +08:00
MistEO
51de1132fa feat: 优化移动镜头后的截图文件名 2023-01-11 22:33:24 +08:00
Horror Proton
187ee9e577 feat: update BattleHelper::move_camera 2023-01-11 14:22:44 +08:00
MistEO
456828425f fix: 修复偶现战斗中干员名识别识别崩溃的问题 2023-01-11 11:34:58 +08:00
MistEO
61ebeae497 fix: 修复战斗中干员名识别错误，增加容错机制 2023-01-11 11:28:41 +08:00
MistEO
51fcdecb80 fix: typos 2023-01-11 00:15:50 +08:00
MistEO
308f9c0da8 feat: 自动战斗新增引航者试炼支持，"MoveCamera" / "移动镜头" 新字段 2023-01-10 23:25:13 +08:00