fz-mirrors/MaaAssistantArknights
0
0
Fork 0
mirror of https://github.com/MaaAssistantArknights/MaaAssistantArknights.git synced 2026-07-19 18:47:55 +08:00
Code Issues Packages Projects Releases Wiki Activity
6,525 Commits 60 Branches 1,840 Tags
6c09fba96bf60694d08724dd1dbbfc428d87aa4b
Commit Graph

347 Commits

Author SHA1 Message Date
MistEO
6c09fba96b fix: 修复视频识别不支持中文路径的问题 2023-04-05 23:36:36 +08:00
MistEO
ed116df079 chore: fix vs filters 2023-04-05 20:14:05 +08:00
MistEO
0a30126835 fix: 视频识别方向分类size error 2023-04-05 20:02:00 +08:00
MistEO
05438f2182 perf: 优化干员方向识别 2023-04-05 19:08:14 +08:00
MistEO
3337f0e141 feat: 修复技能识别；条件判断改为费用变化 2023-04-05 18:43:16 +08:00
MistEO
7d736e1a7b feat: 新增视频击杀、费用识别，修复方向结果错误 2023-04-05 18:43:16 +08:00
MistEO
55bacfb468 feat: 初步实现MacController (#4161) 
添加新的触控方式，针对 macOS 平台原生运行的 iOS 版明日方舟客户端。

## 背景

macOS 上有一个叫做 [PlayCover](https://playcover.io) 的 iOS
游戏启动器的项目。它的原理是通过注入库（[PlayTools](https://github.com/PlayCover/PlayTools)）让应用绕过系统的运行环境检查。

## 实现

我们可以 [fork 一份
PlayTools](https://github.com/hguandl/PlayTools/tree/MaaTools)，添加一个功能类似
adb 的本地 server，来实现截图和触控。我们可以称其为 MaaTools。

## 协议

当前的 MaaTools 基于 TCP 实现了以下协议：

- 握手：`MAA\x00` 作为最初的 4 个字节发送以尝试建立连接，如果成功会收到 `OKAY`，连接就此建立。
- 请求体：后续请求会先有2字节作为长度，然后发送请求内容。
- 截图请求：内容为 `SCRN`，返回 4 字节头作为长度，然后紧接着是 RGBA bitmap 内容。
- 分辨率请求：内容为 `SIZE`，返回各 2 字节长度的宽和高。
- 触控请求：内容为 `TUCH` + 1 字节触控类型 + 各 2 字节长度的 x 和 y，无返回。
- 关闭请求：内容为 `TERM`，关闭客户端，无返回。

## 合并

请 @aa889788 帮忙看看我对新 Controller 类的实现是否完全。iOS 不支持 ESC
按键，不知道除了不能暂停部署之外，会不会对 MAA 的其他功能造成影响。最后再让玛丽 @MistEO 把把关（）
 2023-04-05 16:47:54 +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
c309ddcda2 feat: 初步实现Mac平台的原生Controller 2023-04-04 21:45:17 +10:00
dantmnf
669b2cc5f8 chore: stop build if MaaDeps is missing 2023-04-03 23:23:53 +08:00
MistEO
296b320c21 fix: 修复肉鸽崩溃问题 
fix #4160 #4163
 2023-04-03 19:09:34 +08:00
shxyke
c0db35a8e8 fix: release controllers before connect 2023-04-02 11:27:20 +00:00
shxyke
b9c38651c6 fix: return null when connect failed 2023-04-02 11:20:11 +00:00
DuKong
bd6c4cf1d7 Merge branch 'dev' of https://github.com/LingXii/MaaAssistantArknights into dev 2023-04-02 11:38:19 +08:00
DuKong
754501db40 Merge branch 'dev' of https://github.com/LingXii/MaaAssistantArknights into dev 2023-04-02 11:18:16 +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
shxyke
ab463c6ebf fix: fallback to NativeIO when AdbLite not inited 2023-03-29 19:52:39 +08:00
MistEO
0e51252685 refactor: 从curl迁移到libcpr (#4088) 2023-03-28 19:20:16 +08:00
MistEO
0ccc9dc860 perf: 优化请求结构 2023-03-28 18:05:59 +08:00
shxyke
ec99ccad24 Revert removal of timeout in call_and_hup_minitouch 2023-03-28 06:50:07 +00:00
Horror Proton
78e8251517 fix: add missing item in AsstMsg 2023-03-28 11:19:24 +08:00
shxyke
ecd453d134 fix: add timeout for IOHandler read 2023-03-28 02:14:40 +00:00
MistEO
5d8999a30c fix: crash 2023-03-27 22:30:23 +08:00
shxyke
655c55e3d0 chore: use dynamic vc runtime on Windows 2023-03-27 14:22:32 +00:00
shxyke
24898ebdcf refactor: use libcpr instead of curl 2023-03-27 14:22:32 +00:00
MistEO
bfb50c972c Merge branch 'dev' into fix/fix-controller 2023-03-27 22:09:48 +08:00
shxyke
040eded105 fix: set the params after controller created 2023-03-27 10:24:07 +00:00
MistEO
d64e829ac3 styles: format all cpp 2023-03-27 18:19:48 +08:00
MistEO
c5658b84b2 chore: 作用域啥的 2023-03-27 18:00:08 +08:00
MistEO
8ed7b70040 refactor: 重构 Controller 架构 (#3907) 2023-03-27 16:46:39 +08:00
Horror Proton
ea89f14b8b fix: improve post processing in depot item quantity match 
fix #4057
 2023-03-24 19:51:40 +08:00
shxyke
d730634081 refactor: 重构 Controller 架构 2023-03-24 01:30:22 +00:00
MistEO
a810841e49 fix: build error 2023-03-23 21:24:06 +08:00
MistEO
f9ea34d1ab fix: 关闭基建宿舍复查功能 
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/4035
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/4053
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/4011
 2023-03-23 21:16:36 +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
daa3e5a6d8 chore: 移除对图片太小的检查 
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/3955
 2023-03-12 19:48:58 +08:00
MistEO
368bfd8fd3 feat: 新增支持 CF 关卡掉落识别 (#3961) 2023-03-12 01:41:58 +08:00
MistEO
ee2ac5d9d5 fix: 修复技能ready识别改变原图的问题 2023-03-11 22:56:02 +08:00
MistEO
5c03e10545 chore: 技能ready识别改下日志 2023-03-11 20:43:34 +08:00
MistEO
b3306d2a4d chore: format and add filters 2023-03-11 19:19:08 +08: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
Horror Proton
c44c896e45 chore: fix compile error 2023-03-10 01:21:29 +08:00
yuanyan3060
ae7875ba72 增加一个task，可以执行tasks.json内任意一个task (#3930) 2023-03-10 01:04:41 +08:00
yuanyan3060
03f65c154e 增加一个task，可以执行tasks.json内任意一个task 2023-03-10 00:45:07 +08:00
MistEO
16cf3e26db chore: 更新测试代码 2023-03-09 21:07:03 +08:00
MistEO
9e808c9ba1 fix: 修复技能识别预处理错误 2023-03-09 20:30:24 +08:00