Commit Graph

5227 Commits

Author SHA1 Message Date
popjdh
56841ccd94 添加Python触控配置接口 2022-12-17 11:50:05 +08:00
popjdh
2c48054af5 修正adb exec-out参数, 防止重定向符不生效 2022-12-17 11:41:18 +08:00
popjdh
2ff74a7076 删除截图命令冗余操作 2022-12-16 20:52:37 +08:00
popjdh
f72781d624 Revert "删除截图命令冗余操作"
This reverts commit 28f8ecd5c0.
2022-12-16 20:52:10 +08:00
popjdh
28f8ecd5c0 删除截图命令冗余操作 2022-12-16 20:18:01 +08:00
popjdh
5fac599141 添加屏蔽错误输出的连接配置类型 2022-12-16 19:36:46 +08:00
popjdh
4f252fa6fc Revert "修改截图命令"
This reverts commit c4de1010dd.
2022-12-16 19:17:39 +08:00
trance233
c4de1010dd 修改截图命令
丢弃截图命令的stderr. 如Amd显卡+Waydroid时, screencap会先输出一行报错, 再输出图片信息, 通过丢弃stderr让adb exec-out能得到仅图片信息, 防止MAA解码失败.
2022-12-16 16:53:46 +08:00
MistEO
738bb22283 Merge pull request #3079 from hguandl/osx/multiple-builds
macOS: 分别编译 x86_64 和 arm64 应用
2022-12-16 11:51:07 +08:00
Hao Guan
85950f7037 ci: macOS builds 2022-12-16 04:36:18 +10:00
Hao Guan
c2439fb591 cmake: update MaaCore rules for macOS 2022-12-16 03:27:52 +10:00
Hao Guan
65fef514c3 Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2022-12-16 03:14:26 +10:00
Hao Guan
9a84d16827 cmake: macOS architectures 2022-12-16 03:12:22 +10:00
Horror Proton
8a1bc20433 chore: update cmake checksum 2022-12-15 23:13:33 +08:00
MistEO
d90fd42905 Merge branch 'master' into dev 2022-12-15 21:48:27 +08:00
MistEO
f7ce385f6f Merge pull request #3076 from MaaAssistantArknights/dev
Release v4.8.1
2022-12-15 21:47:53 +08:00
MistEO
20c0be270d docs: update changelog 2022-12-15 21:47:45 +08:00
MistEO
f43a1dbff3 feat: 启动时删除.old文件夹 2022-12-15 21:26:08 +08:00
uye
c894b98e5d fix: 修复关卡导航错误 2022-12-15 19:36:39 +08:00
uye
bc27c157ce fix: 修复活动关卡名错误 2022-12-15 17:57:36 +08:00
uye
0a78393d24 feat: 支持活动导航 2022-12-15 17:34:11 +08:00
MistEO
eb0b902d8f Merge pull request #3071 from MaaAssistantArknights/dev
Release v4.8.0
2022-12-15 16:14:22 +08:00
MistEO
ab9d57debd docs: update changelog 2022-12-15 16:13:04 +08:00
MistEO
6bd85f2f81 docs: update changelog 2022-12-15 15:31:21 +08:00
MistEO
442746e296 perf: 优化战斗中技能识别的性能 2022-12-15 14:12:48 +08:00
MistEO
6c0dc37787 chore: 更新2022/12/15游戏数据(不包括关卡掉落信息) 2022-12-15 14:07:52 +08:00
Horror Proton
ef4ccde7c9 chore: parallel build for linux workflow 2022-12-15 09:16:44 +08:00
Horror Proton
8d13553e28 fix: install 3rdparty/resource in CMakeList 2022-12-15 00:34:13 +08:00
MistEO
e31781c681 docs: update issue teamplate 2022-12-15 00:06:29 +08:00
MistEO
3e4a897f3a docs: fix typos 2022-12-14 23:58:15 +08:00
MistEO
c2095476d1 Merge pull request #3068 from MaaAssistantArknights/dev
Release v4.8.0-rc.1
2022-12-14 23:51:40 +08:00
MistEO
bfec2fe69d docs: update changelog 2022-12-14 23:48:18 +08:00
MistEO
3aa58f5e72 chore: update issue template 2022-12-14 23:43:36 +08:00
MistEO
28798ca319 fix: 修复肉鸽打到一半,识别错误导致突然摆烂的问题
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/3032
2022-12-14 23:20:59 +08:00
MistEO
62006140d7 fix: 修复肉鸽关卡名识别错误
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/3061
2022-12-14 23:20:59 +08:00
MistEO
bf6edda5bf fix: 修复肉鸽卡在放弃招募界面的问题
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/3063
2022-12-14 23:20:59 +08:00
uye
36f0058db2 style: 信用商店显示内容自动换行
fix #3065
2022-12-14 22:49:00 +08:00
MistEO
9c2a7100b8 feat: 关机和休眠也保存设置 2022-12-14 21:41:27 +08:00
uye
096894e670 fix: 修复WEChapterToWE算法选择错误 2022-12-14 15:04:04 +08:00
uye
5e72353323 feat: 添加活动导航 2022-12-14 14:59:14 +08:00
MistEO
8ead25f9d2 chore: 调整 OCR keys 文件路径 2022-12-14 01:00:39 +08:00
MistEO
0c25893a55 perf: 进一步提高http解析的鲁棒性 2022-12-14 00:11:44 +08:00
MistEO
cc0b74ee56 fix: 修复http解析错误 2022-12-13 23:35:38 +08:00
MistEO
05f21f20bb Merge pull request #2869 from MaaAssistantArknights/feat/skill_ready_match
feat: 修改战斗技能图标识别方法
2022-12-13 20:54:13 +08:00
MistEO
02a85171b4 perf: 缩小技能图标识别范围 2022-12-13 20:49:36 +08:00
uye
cca2729e00 refactor: 重构切换语言提示 2022-12-13 20:31:34 +08:00
Horror Proton
3652ec52ed perf: update BattleSkillReadyImageAnalyzer 2022-12-13 19:07:48 +08:00
MistEO
4fc5878ddf refactor: 重新封装了一下战斗技能识别。 BattleSkillReadyImageAnalyzer::analyze 还没写完 2022-12-13 18:50:18 +08:00
uye
81f0848a50 feat: 切换语言添加双语提示 2022-12-13 18:10:02 +08:00
MistEO
20ba8dab1a merge: dev 2022-12-13 17:44:06 +08:00