fz-mirrors/MaaAssistantArknights
0
0
Fork 0
mirror of https://github.com/MaaAssistantArknights/MaaAssistantArknights.git synced 2026-07-16 09:50:40 +08:00
Code Issues Packages Projects Releases Wiki Activity
5,240 Commits 61 Branches 1,837 Tags
bad80da309d5754e888c0da72c5824cdc2e4ccbf
Commit Graph

5240 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
uye
bad80da309 feat: 添加YJ历时间转换 2022-12-19 02:09:43 +08:00
uye
1c69a97899 feat: 借助战一日只执行一次 2022-12-19 01:28:49 +08:00
MistEO
7e38033be4 Merge pull request #3099 from popjdh/dev 
fix pr#3086 && 添加Python环境变量设置流程
 2022-12-18 00:39:48 +08:00
trance233
97d6847753 Update asst.py 
修改环境变量设置流程, 避免空环境变量问题
 2022-12-17 21:25:05 +08:00
trance233
adb398afd3 Update asst.py 
修正枚举类使用错误, 删除部分冗余代码
 2022-12-17 16:53:44 +08:00
trance233
a7539c7af1 Update asst.py 
修正Python枚举类型使用错误
 2022-12-17 16:47:40 +08:00
uye
f9a2f7489f fix: 修复选择关卡日志输出错误 2022-12-17 16:03:33 +08:00
MistEO
c5eedf9039 Merge pull request #3086 from popjdh/dev 
修改截图命令 && 添加Python额外配置(触控, 暂停下干员等)接口
 2022-12-17 13:54:43 +08:00
popjdh
75670a9081 修改Python额外配置接口命名 2022-12-17 13:27:27 +08:00
MistEO
e25c5d488e Merge pull request #3090 from fearlessxjdx/dev 
fix: 宿舍内sort和autofill同为true时的选人bug #2693
 2022-12-17 13:13:00 +08:00
popjdh
a375af59e0 Python触控配置接口解耦, 增加使用例 2022-12-17 12:28:01 +08:00
popjdh
ccb0e5c31a 完善Python触控配置接口 2022-12-17 12:04:49 +08:00
popjdh
56841ccd94 添加Python触控配置接口 2022-12-17 11:50:05 +08:00
popjdh
2c48054af5 修正adb exec-out参数, 防止重定向符不生效 2022-12-17 11:41:18 +08:00
xjdx
12830ae25a fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2693 2022-12-16 23:52:16 +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