fz-mirrors/MaaAssistantArknights
0
0
Fork 0
mirror of https://github.com/MaaAssistantArknights/MaaAssistantArknights.git synced 2026-07-20 02:55:38 +08:00
Code Issues Packages Projects Releases Wiki Activity
6,193 Commits 60 Branches 1,840 Tags
b9eaec333f97a404e40afc8d42bc6631e62ee88e
Commit Graph

6193 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kevin Hu
b9eaec333f Merge branch 'dev' into dev_auto_restart_on_drop_option 2023-03-06 17:16:50 +08:00
MistEO
5a83504ff5 docs: update doc of develops 2023-03-06 17:16:23 +08:00
Kevin Hu
a7b6965eef Merge branch 'dev' into dev_auto_restart_on_drop_option 2023-03-06 17:15:42 +08:00
Yifan Liu
7afb0a2b4e feat: minor updates to the coord tool 2023-03-05 18:11:45 -06:00
Yifan Liu
1a715a79c3 feat: add new functions to the coordinate tool 2023-03-05 18:00:06 -06:00
MistEO
fd985c8579 feat: 优化 changelog 弹窗 (#3882) 2023-03-05 23:51:24 +08:00
MistEO
807ff9c9c0 chore: 更新剿灭资源；更新ResourceUpdater依赖 2023-03-05 20:13:46 +08:00
Horror Proton
05ae3620b4 feat: add fallback for python library search, etc. 2023-03-05 20:05:32 +08:00
MistEO
4f452770bb Merge branch 'master' into dev 2023-03-05 20:03:31 +08:00
MistEO
a7217b81f1 chore: 修改一个不知道什么时候遗留下来的App信息 2023-03-05 19:59:45 +08:00
zzyyyl
97358acea6 feat: 修改 IsFirstBootAfterUpdate 的处理方式 
更新完设成 True，弹完窗设成 False
 2023-03-05 17:53:10 +08:00
zzyyyl
f43c07ba80 feat: 优化 changelog 弹窗 2023-03-05 17:53:02 +08:00
Horror Proton
b8e3c501d5 fix: update nightly build script 2023-03-05 17:50:59 +08:00
Hao Guan
aec7cf35c2 fix: 修复MacGui基建设施选择 2023-03-05 19:45:02 +10:00
MistEO
d69b10408f chore: 默认关闭 adb-lite 
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/3861
 2023-03-05 17:02:10 +08:00
MistEO
baf5e19b68 feat: 添加给作业点赞的接口 (#3719) 2023-03-05 16:53:26 +08:00
MistEO
c4f24becb3 feat: Windows ARM64 支持及第三方依赖重构 (#3346) 2023-03-05 16:52:51 +08:00
MistEO
ba42298d84 docs: 后端不招人了，前端招！ 2023-03-05 16:46:22 +08:00
MistEO
ea1326c604 fix: 修复作业可以点赞两次的问题 2023-03-05 15:56:32 +08:00
MistEO
a17e36fd72 fix: merge error 2023-03-05 15:44:04 +08:00
MistEO
c85a884b49 Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into feat/like 2023-03-05 15:36:05 +08:00
MistEO
bf761a8367 feat: 完成作业点赞功能 2023-03-05 15:34:58 +08:00
Yifan Liu
521dbb8078 fix: JP 48h medicine recognition issue 2023-03-04 16:51:44 -06:00
MistEO
7526f085b2 Merge pull request #3875 from MaaAssistantArknights/feat/changelog 
feat: 增加 “更新日志” 按钮
 2023-03-04 23:07:10 +08:00
MistEO
f69218c6eb Merge pull request #3834 from MaaAssistantArknights/dev 
Release v4.12.0-beta.1
 2023-03-04 22:34:38 +08:00
MistEO
db3b26d11f docs: changelog 2023-03-04 22:34:21 +08:00
MistEO
66612a2aa8 docs: changelogs typo 2023-03-04 22:30:27 +08:00
MistEO
3c1c169605 docs: changelogs 2023-03-04 22:27:58 +08:00
uye
a6a868fe58 Merge pull request #3874 from 050644zf/master 
fix: Fix CustomInfrastGenerator URL
 2023-03-04 22:22:38 +08:00
zzyyyl
5752ea5e66 feat: 修复战斗过程卡住的问题 
PrtsErrorConfirm 出不去的时候用 WaitAfterPRTS 兜住

fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/3841
 2023-03-04 21:35:56 +08:00
zzyyyl
d93fda436b feat: 增加 “更新日志” 按钮 2023-03-04 20:24:26 +08:00
Nightsky
538a4bbe85 Update CustomInfrastGenerator URL 2023-03-04 20:19:45 +08:00
uye
f4f01c8b62 docs: changelogs 2023-03-04 19:42:18 +08:00
uye
708239f688 Merge pull request #3873 from MaaAssistantArknights/feat/helpus 
feat: 添加帮助链接
 2023-03-04 19:02:11 +08:00
dantmnf
5d07c50d1b chore: retry on rate limit 2023-03-04 18:33:52 +08:00
Kevin Hu
15c1146c18 Merge branch 'dev' into dev_auto_restart_on_drop_option 2023-03-04 18:19:10 +08:00
dantmnf
8499bd9198 chore: set LIBRARY DESTINATION 2023-03-04 18:06:01 +08:00
uye
6d53d29802 chore: 修改调试版本解析问题 2023-03-04 17:52:12 +08:00
dantmnf
7ae9cce3a7 chore: update MaaDeps ref 2023-03-04 16:51:49 +08:00
dantmnf
447b9d86e7 Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into arm64 2023-03-04 16:51:33 +08:00
Horror Proton
021416a172 fix: avoid overlapping sprintf output 2023-03-04 14:01:35 +08:00
Yifan Liu
e3339b3d52 chore: update coordinate tool windows bat file 2023-03-03 19:40:08 -06:00
MistEO
d01fe0b033 Merge pull request #3862 from DaysGone233/patch-1 
feat: 自动公招时增加掉线识别
 2023-03-04 03:35:53 +08:00
LambdaLe
a13a1c8bb0 fix: 修复 肉鸽助战 刷新按钮ocr不能部分匹配及刷新时间识别错误问题 2023-03-03 13:39:10 +08:00
DaysGone233
1084287fb5 Merge branch 'dev' into patch-1 2023-03-03 01:14:24 +08:00
uye
433128710a refactor: 整理超链接 2023-03-02 23:00:08 +08:00
uye
36311074f6 fix: 修复链接问题 2023-03-02 22:05:48 +08:00
Yifan Liu
ba23a21cad feat: add hyperlink of helpus (does not compile) 2023-03-02 07:31:50 -06:00
uye
e0c9f04a89 feat: 添加帮帮 2023-03-02 16:28:17 +08:00
Yifan Liu
2ea28f37e6 fix: JP IS(rogue) friend support oper 
refresh support list is yet to be fixed
 2023-03-01 22:43:34 -06:00