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,636 Commits 61 Branches 1,838 Tags
27edfbbdfdb6e0768eff37b6775009cde028794d
Commit Graph

3516 Commits

Author SHA1 Message Date
MistEO
27edfbbdfd refactor: 简单整理了下肉鸽招募 2023-04-09 20:50:38 +08:00
LingXii
57b0654872 Feat: 新增不期而遇插件，优化招募与战斗策略 (#4241) 
feat: 新增不期而遇插件，优化招募与作战策略
 2023-04-09 20:28:15 +08:00
MistEO
65ff63eb70 perf: 改用HandyControls (#4200) 
本pr的主要变化：

- 改用HandyControls
- 改用HandyControls的DarkMode
- 改用HandyControls的MessageBox

DarkMode的默认颜色和注释已经写入src/MaaWpfGui/Res/Themes/Dark.xaml，大家看着改.jpg

close #4069
close #4076

<!-- Add GUI -->
------------------------------------

虽然但是，HandyControl也有DarkMode，不知道你们发现没有（

看看符不符合预期，要不要合并到dev

- 暗色模式

![image](https://user-images.githubusercontent.com/35213527/230454770-61f0613a-8e27-4b20-911f-9db3ac7a9768.png)

![image](https://user-images.githubusercontent.com/35213527/230454808-5715cbd2-06d2-4a4f-9006-da3e6a88549b.png)


- 跟随系统主题

![image](https://user-images.githubusercontent.com/35213527/230454558-73154438-767c-4f34-a54c-e307f44b8d08.png)
 2023-04-09 19:06:22 +08:00
MistEO
e386261c79 perf: 简化肉鸽编队界面的选中识别 (#4246) 2023-04-09 19:04:59 +08:00
MistEO
4c80085d18 fix: 修复部署战斗中部署区识别错误 
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/4197
 2023-04-09 19:03:39 +08:00
Horror Proton
8c3d3c78fe perf: simplify RoguelikeFormation selected_analyze 2023-04-09 18:50:41 +08:00
MistEO
ca41f51adb fix: 修复视频识别职业识别错误，并添加一个兜底措施 
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/4222
 2023-04-09 17:25:57 +08:00
MistEO
80adbcce84 fix: 规避第十二章三倍掉落被上传的可能性 2023-04-09 16:16:36 +08:00
MistEO
2331360796 revert: 回滚战斗干员标记 模板阈值 2023-04-09 15:19:48 +08:00
MistEO
c1c26772c0 feat: 企鹅id无条件同步 2023-04-09 14:27:31 +08:00
Horror Proton
13c9563ccb fix: 修复一个罕见的肉鸽崩溃情况 2023-04-09 10:51:20 +08:00
枫雨
a924a6f198 style: 修改牛牛喝酒弹窗icon 2023-04-09 02:37:31 +08:00
枫雨
810e1b215f feat: 为MessageBox添加反色 2023-04-09 02:37:21 +08:00
枫雨
76c09a630a perf: 改用HandyControls 2023-04-09 02:37:20 +08:00
枫雨
e2fd405dcb feat: add ThemeHelper 2023-04-09 01:31:10 +08:00
枫雨
3dfe76e893 perf: 使用HandyControl的DarkMode 2023-04-09 01:31:10 +08:00
MistEO
aedadd40b2 fix: 修复战斗中狂点cooling干员的问题 
识别不了就摆烂了.jpg
 2023-04-08 22:13:23 +08:00
MistEO
494c3e9d4d perf: 尝试优化ocr模型加载过程 2023-04-08 04:07:42 +08:00
MistEO
ff4edac430 feat: 启动MAA后直接最小化 & fix: 修复MAA主窗口最小化后弹窗位置错误 (#4193) 
close #3561
close #4091


![image](https://user-images.githubusercontent.com/35213527/230378135-b2aa772e-bbe1-4c7e-ae76-42520aa35e60.png)
 2023-04-08 01:59:44 +08:00
MistEO
5dfe3556ec refactor: 重构地图加载逻辑，改为惰性加载 2023-04-08 01:58:09 +08:00
MistEO
43236f62ab fix: remove debug data 2023-04-08 01:37:02 +08:00
MistEO
bce5175641 fix: 修复更新镜像爆炸时不尝试其他镜像的问题，删掉几个爆炸的镜像 2023-04-07 23:35:14 +08:00
MistEO
2132d097d3 feat: 模板图片惰性读取，优化onnx读取 2023-04-07 23:14:17 +08:00
MistEO
da0b860f4a feat: 惰性加载onnx模型 2023-04-07 22:44:19 +08:00
枫雨
1b67719357 perf: VersionUpdateView窗口相对主界面居中 2023-04-07 20:01:39 +08:00
枫雨
0dbef50035 feat: 启动MAA后直接最小化 2023-04-07 20:01:39 +08:00
枫雨
29b71e7f44 chore: 调整条件执行语句的作用域 2023-04-07 20:01:38 +08:00
枫雨
13935a5588 fix: 修复MAA主窗口最小化后弹窗位置错误 
#4091
 2023-04-07 20:01:38 +08:00
uye
409e925ab0 chore: 固定 DarkMode 复选框宽度 2023-04-07 00:39:05 +08:00
uye
516dd70407 feat: 添加b站链接 2023-04-07 00:34:31 +08:00
MistEO
9d6fc4c3b9 feat: 新增开始和结束前后的自定义命令 
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/4157
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1536
 2023-04-06 23:43:54 +08:00
MistEO
0516877672 feat: 新增一个不释放adb的连接选项 
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/3264
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1413
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/4165
 2023-04-06 23:04:32 +08:00
MistEO
5c7372c6db feat: 新增一个选择第二分辨率的连接选项 
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/4173
 2023-04-06 22:50:04 +08:00
MistEO
9cdcfcd344 fix: 修复掉落识别-关卡难度识别 2023-04-06 22:20:14 +08:00
Horror Proton
7f7f64eee5 chore: remove some deprecated api of onnxruntime 
ref: 1e4f600e5e
 2023-04-06 20:07:44 +08:00
Hao Guan
1dcd2fb66e feat: MacGui 初步支持 iOS 控制 2023-04-06 02:59:24 +10:00
MistEO
8b30626dea fix: 修复视频识别不支持中文路径的问题 2023-04-05 23:36:36 +08:00
MistEO
4b1d6ebf35 chore: fix vs filters 2023-04-05 20:14:05 +08:00
MistEO
9a0fc82281 fix: 视频识别方向分类size error 2023-04-05 20:02:00 +08:00
MistEO
131e863d32 perf: 优化干员方向识别 2023-04-05 19:08:14 +08:00
MistEO
91ade36b8f feat: 修复技能识别；条件判断改为费用变化 2023-04-05 18:43:16 +08:00
MistEO
e8e98e6be5 feat: 新增视频击杀、费用识别，修复方向结果错误 2023-04-05 18:43:16 +08:00
uye
f2be82ac06 Use ComboBox instead in DarkMode Setting (#4178) 
related to #4174
 2023-04-05 17:34:06 +08:00
MistEO
ceba5c38aa 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
Cryolitia
e12b5a7c17 use ComboBox instead 
Signed-off-by: Cryolitia <Cryolitia@gmail.com>
 2023-04-05 16:38:33 +08:00
MistEO
025cf39fe5 Add auto dark mode (#4174) 
Only support Windows 10 1803+
 2023-04-05 16:35:44 +08:00
MistEO
91b425dbc4 fix: 修复识别错误时，界面不报错的问题 2023-04-05 16:23:58 +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
Cryolitia
958967876e Update src/MaaWpfGui/App.xaml.cs 
Co-authored-by: uye <99072975+ABA2396@users.noreply.github.com>
 2023-04-05 13:53:49 +08:00
Cryolitia
2cfea1ae11 Update src/MaaWpfGui/Views/UserControl/GUISettingsUserControl.xaml 
Co-authored-by: uye <99072975+ABA2396@users.noreply.github.com>
 2023-04-05 13:53:25 +08:00