fz-mirrors/MaaAssistantArknights
0
0
Fork 0
mirror of https://github.com/MaaAssistantArknights/MaaAssistantArknights.git synced 2026-07-15 17:30:27 +08:00
Code Issues Packages Projects Releases Wiki Activity
5,268 Commits 61 Branches 1,836 Tags
c012e6201ea53d3c3ca6ce119fbb3c56d7f5a71e
Commit Graph

5268 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
trance233
c012e6201e Update asst.py 
修正Python枚举类型使用错误
 2022-12-17 16:47:40 +08:00
popjdh
006beb88f0 修改Python额外配置接口命名 2022-12-17 13:27:27 +08:00
popjdh
4539342098 Python触控配置接口解耦, 增加使用例 2022-12-17 12:28:01 +08:00
popjdh
c1c0c14fde 完善Python触控配置接口 2022-12-17 12:04:49 +08:00
popjdh
2685c40d17 添加Python触控配置接口 2022-12-17 11:50:05 +08:00
popjdh
2634acd8d2 修正adb exec-out参数, 防止重定向符不生效 2022-12-17 11:41:18 +08:00
popjdh
e001326987 删除截图命令冗余操作 2022-12-16 20:52:37 +08:00
popjdh
24ab5410b3 Revert "删除截图命令冗余操作" 
This reverts commit 9341f6b3d3.
 2022-12-16 20:52:10 +08:00
popjdh
9341f6b3d3 删除截图命令冗余操作 2022-12-16 20:18:01 +08:00
popjdh
2e8218d5c1 添加屏蔽错误输出的连接配置类型 2022-12-16 19:36:46 +08:00
popjdh
00c5e4eb1a Revert "修改截图命令" 
This reverts commit 8dfaa3a35a.
 2022-12-16 19:17:39 +08:00
trance233
8dfaa3a35a 修改截图命令 
丢弃截图命令的stderr. 如Amd显卡+Waydroid时, screencap会先输出一行报错, 再输出图片信息, 通过丢弃stderr让adb exec-out能得到仅图片信息, 防止MAA解码失败.
 2022-12-16 16:53:46 +08:00
MistEO
c408fe622b Merge pull request #3079 from hguandl/osx/multiple-builds 
macOS: 分别编译 x86_64 和 arm64 应用
 2022-12-16 11:51:07 +08:00
Hao Guan
80748a7c91 ci: macOS builds 2022-12-16 04:36:18 +10:00
Hao Guan
d0d864df3c cmake: update MaaCore rules for macOS 2022-12-16 03:27:52 +10:00
Hao Guan
0e240ff050 Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2022-12-16 03:14:26 +10:00
Hao Guan
e8aaca422a cmake: macOS architectures 2022-12-16 03:12:22 +10:00
Horror Proton
1c8844e740 chore: update cmake checksum 2022-12-15 23:13:33 +08:00
MistEO
2971cc9d9a Merge branch 'master' into dev v4.8.1 2022-12-15 21:48:27 +08:00
MistEO
965668db75 Merge pull request #3076 from MaaAssistantArknights/dev 
Release v4.8.1
 2022-12-15 21:47:53 +08:00
MistEO
6bb955cba7 docs: update changelog 2022-12-15 21:47:45 +08:00
MistEO
716ab41ade feat: 启动时删除.old文件夹 2022-12-15 21:26:08 +08:00
uye
ef02c2e5b1 fix: 修复关卡导航错误 2022-12-15 19:36:39 +08:00
uye
e17952fe6e fix: 修复活动关卡名错误 2022-12-15 17:57:36 +08:00
uye
582b37124d feat: 支持活动导航 2022-12-15 17:34:11 +08:00
MistEO
8afc9f3ffc Merge pull request #3071 from MaaAssistantArknights/dev 
Release v4.8.0
v4.8.0 		2022-12-15 16:14:22 +08:00
MistEO
62bd51f77d docs: update changelog 2022-12-15 16:13:04 +08:00
MistEO
67a3b8368a chore: 更新2022/12/15关卡掉落数据 2022-12-15 16:11:32 +08:00
MistEO
a8211317c1 docs: update changelog 2022-12-15 15:31:21 +08:00
MistEO
461fd9419d perf: 优化战斗中技能识别的性能 2022-12-15 14:12:48 +08:00
MistEO
d7af9ecd95 chore: 更新2022/12/15游戏数据（不包括关卡掉落信息） 2022-12-15 14:07:52 +08:00
Horror Proton
6a44663779 chore: parallel build for linux workflow 2022-12-15 09:16:44 +08:00
Horror Proton
4d731d2c3b fix: install 3rdparty/resource in CMakeList 2022-12-15 00:34:13 +08:00
MistEO
12a50d1c92 docs: update issue teamplate 2022-12-15 00:06:29 +08:00
MistEO
b74d7cda18 docs: fix typos 2022-12-14 23:58:15 +08:00
MistEO
2a1dcf5745 Merge pull request #3068 from MaaAssistantArknights/dev 
Release v4.8.0-rc.1
v4.8.0-rc.1 		2022-12-14 23:51:40 +08:00
MistEO
a9697e5629 docs: update changelog 2022-12-14 23:48:18 +08:00
MistEO
b3b2331cd1 chore: update issue template 2022-12-14 23:43:36 +08:00
MistEO
27994385f2 fix: 修复肉鸽打到一半，识别错误导致突然摆烂的问题 
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/3032
 2022-12-14 23:20:59 +08:00
MistEO
0996106764 fix: 修复肉鸽关卡名识别错误 
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/3061
 2022-12-14 23:20:59 +08:00
MistEO
f39c93e0f2 fix: 修复肉鸽卡在放弃招募界面的问题 
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/3063
 2022-12-14 23:20:59 +08:00
uye
a8b00ba87b style: 信用商店显示内容自动换行 
fix #3065
 2022-12-14 22:49:00 +08:00
MistEO
18d367ee9e feat: 关机和休眠也保存设置 2022-12-14 21:41:27 +08:00
uye
1fc4f37ef0 fix: 修复WEChapterToWE算法选择错误 2022-12-14 15:04:04 +08:00
uye
f6a82decd2 feat: 添加活动导航 2022-12-14 14:59:14 +08:00
MistEO
6f70db89c4 chore: 调整 OCR keys 文件路径 2022-12-14 01:00:39 +08:00
MistEO
de5e9424e5 perf: 进一步提高http解析的鲁棒性 2022-12-14 00:11:44 +08:00
MistEO
c4689fd0d0 fix: 修复http解析错误 2022-12-13 23:35:38 +08:00
MistEO
10b9b9c1cf Merge pull request #2869 from MaaAssistantArknights/feat/skill_ready_match 
feat: 修改战斗技能图标识别方法
 2022-12-13 20:54:13 +08:00
MistEO
e4f13409c5 perf: 缩小技能图标识别范围 2022-12-13 20:49:36 +08:00