fz-mirrors/MaaAssistantArknights
0
0
Fork 0
mirror of https://github.com/MaaAssistantArknights/MaaAssistantArknights.git synced 2026-07-17 01:59:33 +08:00
Code Issues Packages Projects Releases Wiki Activity
7,018 Commits 61 Branches 1,838 Tags
e7e35f80d27caf3c0e31ba4508d55b261de668c3
Commit Graph

42 Commits

Author SHA1 Message Date
MistEO
e7e35f80d2 chore: 改一些日志 2023-04-30 19:46:50 +08:00
MistEO
69fdd29f35 chore: 改一些日志 2023-04-28 15:14:34 +08:00
MistEO
5c2e41d3dc revert: #4360 2023-04-28 02:52:47 +08:00
MistEO
8186589685 style: Core 全局格式化 2023-04-27 23:15:03 +08:00
罗家欣
4b2557782e 更名operBox 2023-04-20 10:56:29 +08:00
罗家欣
464629e1f2 优化逻辑,debug存图 2023-04-19 13:19:29 +08:00
GD-GK
400ecd5c8a Merge branch 'dev' into dev 2023-04-18 15:46:41 +08:00
罗家欣
0d50f9ab8c 干员识别,fix 2023-04-18 15:32:19 +08:00
Horror Proton
5f7a79acb0 feat: revert using std::function in append_async_c 2023-04-18 00:43:24 +08:00
Horror Proton
86654334c8 feat: make sure async func args listed explicitly 2023-04-18 00:43:24 +08:00
Horror Proton
7778c43195 perf: reduce amout of mutex in Assistant 2023-04-18 00:43:24 +08:00
罗家欣
6293ac572c 干员识别 2023-04-17 15:54:10 +08:00
MistEO
68d55c3ee1 perf: 再次优化外部调用等待函数 2023-04-13 01:11:47 +08:00
MistEO
ce079eb6a5 perf: 工作线程少嵌套一层 2023-04-13 00:55:34 +08:00
MistEO
a1ef4ab46a perf: 简单优化下等待外部调用id 2023-04-13 00:48:49 +08:00
MistEO
e713fd1746 fix: build error 2023-04-13 00:28:36 +08:00
MistEO
bc64425177 fix: build error on mac 
极为先进的 apple-clang!
 2023-04-13 00:20:48 +08:00
MistEO
69265603e4 feat: 兼容老的connect接口，更新集成示例 2023-04-12 23:56:05 +08:00
MistEO
19aa4278fc feat: 重构异步调用接口的逻辑，加入调用执行线程 2023-04-12 23:44:36 +08:00
MistEO
1cbfb53684 feat: 将退出时不释放adb作为独立选项 2023-04-12 00:38:41 +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
Horror Proton
78e8251517 fix: add missing item in AsstMsg 2023-03-28 11:19:24 +08:00
shxyke
d730634081 refactor: 重构 Controller 架构 2023-03-24 01:30:22 +00:00
Hao Guan
ffdb9b1123 chore: 修复Clang/GCC编译警告 2023-03-20 20:42:21 +10:00
yuanyan3060
03f65c154e 增加一个task，可以执行tasks.json内任意一个task 2023-03-10 00:45:07 +08: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
wangli
353360b895 feat: 五天流生息演算 2023-01-30 15:07:45 +08:00
MistEO
ab308a51c7 feat: 新增自动战斗单步执行接口 2023-01-25 20:00:47 +08:00
MistEO
87a995ca69 feat: 新增adblite控制开关，wpf上默认关闭 2023-01-25 19:06:30 +08:00
MistEO
1a38c9d6fa fix: 修复一个极端情况下的死锁问题 2023-01-12 15:33:53 +08:00
MistEO
e3f3c63997 feat: 初步完成保全json解析及进入作战前部分操作 2023-01-08 21:17:07 +08:00
MistEO
9aaad10787 feat: 移除对切换OCR后端功能的支持 2022-12-08 00:18:46 +08:00
MistEO
2335e279b4 perf: 明确api参数及返回值类型，并兼容原先接口 2022-12-06 18:10:52 +08:00
MistEO
21e6b33f24 feat: 新增“暂停下干员”选项，默认关闭。调整部署部署干员的参数 2022-12-03 21:02:58 +08:00
Horror Proton
f1a482d8f8 perf: update Assistant::async_call 2022-12-03 17:41:07 +08:00
MistEO
cf298c6964 feat: 分离触控模式设置 2022-12-03 00:11:36 +08:00
Horror Proton
ed07d46003 feat: pop ready futures in Assistant.cpp 2022-12-02 22:19:08 +08:00
MistEO
d9dcbb6289 chore: breaking rename 2022-12-02 00:22:47 +08:00