Commit Graph

2679 Commits

Author SHA1 Message Date
Horror Proton
a28220fe08 Remove redundant if, fix some compile errors on linux platform (uncompleted) 2022-06-19 22:52:46 +08:00
MistEO
10522582ab style: 所有代码格式化 2022-06-19 21:24:07 +08:00
MistEO
311f2b7d62 style: 傻逼VS怎么总是乱格式化 2022-06-19 21:08:21 +08:00
MistEO
1572c2c55b docs: update changelog v4.0.0 2022-06-19 20:44:23 +08:00
MistEO
6f6efc04d2 Merge pull request #921 from MaaAssistantArknights/feat/rg_copilot
perf: 优化肉鸽评分表算法及专家系统
2022-06-19 20:41:44 +08:00
MistEO
caa5b53aa5 Merge pull request #918 from zhangweijian97/dev
feat.适配美服访问好友
2022-06-19 20:41:33 +08:00
MistEO
e8e8e58781 Merge pull request #926 from cglcv/dev
修改自动关机UI,新增关闭程序及关闭模拟器
2022-06-19 20:41:22 +08:00
MistEO
998705bd88 perf: 优化肉鸽评分表的值,新增几个地图的家门替换,修复一些小问题 2022-06-19 19:19:01 +08:00
cglcv
5f95193551 Merge pull request #7 from cglcv/dev-taskqueueshow
完成关闭模拟器功能
2022-06-19 13:09:31 +08:00
cglcv
f3c68789c4 完成关闭模拟器功能 2022-06-19 13:04:01 +08:00
cglcv
7df60e562f Merge branch 'MaaAssistantArknights:dev' into dev 2022-06-19 10:13:17 +08:00
cglcv
896ea5c17b Merge pull request #6 from cglcv/dev-taskqueueshow
关闭程序先推过来
2022-06-19 10:13:01 +08:00
cglcv
0ccbdbff97 减少修改 2022-06-19 10:12:03 +08:00
cglcv
2f62a513a4 优化 2022-06-19 10:08:36 +08:00
cglcv
fb0959662e 关闭程序 2022-06-19 09:26:51 +08:00
MistEO
c6647b2748 fix: 修复版本号解析错误
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/901
2022-06-19 00:37:34 +08:00
MistEO
24f8a6000d docs: update changelog v3.10.0-alpha.1 2022-06-18 23:24:13 +08:00
MistEO
3a6176b452 Merge branch 'dev' into feat/rg_copilot 2022-06-18 23:21:07 +08:00
MistEO
21ecbc7f06 feat: 支持一些深入调查模式,支持一些图的 copilot 2022-06-18 23:18:09 +08:00
MistEO
d4e1a32199 feat: 完成肉鸽 copilot 2022-06-18 22:58:46 +08:00
MistEO
68c75b087a chore: remove useless files 2022-06-18 22:02:15 +08:00
MistEO
1c5d044672 docs: update translation 2022-06-18 21:35:23 +08:00
MistEO
75f1b8eef3 docs: update translation 2022-06-18 21:33:47 +08:00
MistEO
23181966ce perf: 优化肉鸽评分表算法 2022-06-18 19:04:46 +08:00
zhangweijian97
4a5836f3d3 fix.参数名更正 2022-06-18 18:30:58 +08:00
zhangweijian97
8a8074a24f Merge branch 'dev' of https://github.com/zhangweijian97/MaaAssistantArknights into dev 2022-06-18 18:26:31 +08:00
zhangweijian97
4553386ef7 Merge branch 'master' of https://github.com/zhangweijian97/MaaAssistantArknights into dev 2022-06-18 18:26:25 +08:00
Zhang Weijian
16d285b142 Merge branch 'MaaAssistantArknights:dev' into dev 2022-06-18 18:21:02 +08:00
zhangweijian97
4ccc83f84c feat.适配美服领取任务奖励(已测试)& fix.修复领取奖励任务死循环的问题 2022-06-18 18:20:35 +08:00
MistEO
f97bb1119f Merge branch 'docs/FAQ' 2022-06-18 17:47:58 +08:00
MistEO
b5dfdf3fbe docs: fix grammar 2022-06-18 17:46:41 +08:00
MistEO
9113774a9c Merge pull request #919 from MaaAssistantArknights/dev
Release v3.9.9
2022-06-18 17:18:19 +08:00
zhangweijian97
a5c10fd5cc Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2022-06-18 17:15:28 +08:00
MistEO
6d19f9319a Merge branch 'docs/FAQ' into dev v3.9.9 2022-06-18 17:14:51 +08:00
MistEO
da34fb145c docs: 更新CHANGELOG 2022-06-18 17:14:01 +08:00
zhangweijian97
61ee3c3391 Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2022-06-18 17:11:34 +08:00
zhangweijian97
46ac88f626 feat.适配美服访问好友 2022-06-18 17:11:28 +08:00
zhangweijian97
47476ad332 Revert "fix.刚才忘记add图片了"
This reverts commit 66bf7b47a3.
2022-06-18 17:10:19 +08:00
MistEO
a5cd9602f1 chore: 加一点抄作业的界面提示
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/874
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/904
2022-06-18 17:08:38 +08:00
zhangweijian97
66bf7b47a3 fix.刚才忘记add图片了 2022-06-18 17:07:12 +08:00
MistEO
6206c8a4bb fix: 再次增加肉鸽二倍速的前置延时,增加稳定性 2022-06-18 17:02:10 +08:00
MistEO
d11a1f2135 feat: 抄作业不支持的关卡,新增界面提示 2022-06-18 17:00:27 +08:00
MistEO
0ff6a8f950 docs: 修改一下描述 2022-06-18 16:40:44 +08:00
MistEO
91f0875e7e docs: update FAQ 2022-06-18 15:11:21 +08:00
MistEO
ecccf09d4b Merge pull request #916 from cglcv/dev
尝试解决手动点击更新闪退的问题
2022-06-18 13:49:10 +08:00
cglcv
40d02b79c9 解决点击手动更新直接闪退的问题 2022-06-18 13:05:22 +08:00
cglcv
0ce3b5d9ca Merge branch 'MaaAssistantArknights:dev' into dev 2022-06-18 12:52:52 +08:00
MistEO
4528cf3f59 fix: 再次修复肉鸽不点二倍速的问题 2022-06-18 05:15:58 +08:00
Liam Sho
79e6282415 fix.修复获取 TagName 的逻辑错误 2022-06-18 04:52:54 +08:00
Alisa
f115d1a878 Merge pull request #914 from MaaAssistantArknights/dev
fix. 修复 CI 的一堆问题
v3.9.9-beta.1
2022-06-18 04:34:13 +08:00