fz-mirrors/MaaAssistantArknights
0
0
Fork 0
mirror of https://github.com/MaaAssistantArknights/MaaAssistantArknights.git synced 2026-07-16 01:40:46 +08:00
Code Issues Packages Projects Releases Wiki Activity
5,934 Commits 61 Branches 1,836 Tags
dc40f9ea0a2bb2a5f4d78a3f100baf8b15024a3e
Commit Graph

5934 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
uye
dc40f9ea0a chore: 优化sleep检查退出的间隔时间 2023-02-14 14:26:53 +08:00
uye
af91d73036 fix: 修复剩余理智显示错误 2023-02-14 14:26:39 +08:00
打麻将有点累
d936fd9bbb 修复因赠送线索弹窗遮挡new图标导致的因线索已满赠送后没有领取自己线索的问题 2023-02-14 14:26:06 +08:00
Congcong Cai
b9ca5ca68c fix: Analyzer should constructor with image and then set task info 2023-02-14 14:25:42 +08:00
MistEO
d352733916 fix: 修复检查更新不应用代理设置的问题 2023-02-14 14:25:27 +08:00
MistEO
702f525365 fix: 修复保全第三层中途掉落卡住的问题 2023-02-14 14:25:07 +08:00
MistEO
31dce5d791 feat: 保全core上满了就不再上工具人了 2023-02-14 14:24:57 +08:00
MistEO
8ab3a26cb6 Merge pull request #3640 from MaaAssistantArknights/dev 
Release v4.10.7
v4.10.7 		2023-02-08 16:12:43 +08:00
MistEO
5af75c0456 docs: changelogs 2023-02-08 16:12:08 +08:00
GalvinGao
290e9311a4 build: fix release-mirrors 2023-02-08 02:35:54 -05:00
MistEO
b91fe519f7 Merge pull request #3638 from HerrCai0907/fix/has_error 
fix: `check_and_use_skill` logic bug
 2023-02-08 15:23:21 +08:00
GalvinGao
b81b5587b3 build: fix release-mirrors 2023-02-08 02:21:38 -05:00
GalvinGao
c9b109e39c build: fix release-mirrors 2023-02-08 02:19:04 -05:00
GalvinGao
97fa75f7f7 build: fix release-mirrors 2023-02-08 02:15:07 -05:00
GalvinGao
f512cd1f41 build: fix release-mirrors 2023-02-08 02:12:56 -05:00
Congcong Cai
18d1e728e6 fix: check_and_use_skill logic bug 2023-02-08 08:05:27 +08:00
uye
52bcc58da5 fix: 修复s系列关卡导航问题 
fix #3628
 2023-02-08 00:28:03 +08:00
MistEO
0fffe0dcc7 docs: fix changlog's format 2023-02-07 23:35:59 +08:00
MistEO
44da4c29a5 Merge pull request #3636 from MaaAssistantArknights/dev 
Release v4.10.7-beta.1
v4.10.7-beta.1 		2023-02-07 23:20:17 +08:00
MistEO
8181d0b8c3 docs: changelogs 2023-02-07 23:20:00 +08:00
MistEO
68a08dc893 Merge branch 'master' into dev 2023-02-07 23:17:33 +08:00
MistEO
b681343904 docs: changelogs v4.10.6 2023-02-07 23:16:41 +08:00
vonnoq
a89fe8baa5 繁中服 愚人號入口改為識別文字 2023-02-07 23:16:22 +08:00
MistEO
9950b28e08 docs: changelogs 2023-02-07 23:14:41 +08:00
MistEO
f4b8f449b0 Merge pull request #3623 from HerrCai0907/fix/command_shell_use_lot_of_resource 
fix: `call_command_posix` in socket mode should return after child process finished
 2023-02-07 23:02:02 +08:00
MistEO
3e19cc9104 Merge pull request #3635 from vonnoq/dev 
繁中服 愚人號入口改為識別文字
 2023-02-07 23:00:06 +08:00
vonnoq
0059f7e252 繁中服 愚人號入口改為識別文字 2023-02-07 22:35:44 +08:00
uye
c23435445b feat: 开启备选关卡的情况下剿灭结束后尝试剩余开放的备选关卡 
fix #3626
 2023-02-07 17:34:30 +08:00
Yifan Liu
a6349ee33d feat: 更新了各个时区的YJ时间以及调整了YJ时间的计算方法 2023-02-07 02:32:49 -06:00
Yifan Liu
50602042db Merge pull request #3588 from liuyifan-eric/stage_manager_overseas 
feat: 活动/关卡小提示支持外服
 2023-02-07 01:57:57 -06:00
Yifan Liu
892d24b331 fix: StageManager.cs 服务器为不选择的时候也视为官服 2023-02-07 01:57:15 -06:00
uye
6c85ddbae1 feat: 切换服务器类型时更新关卡列表和关卡提示 2023-02-07 01:51:54 -06:00
Yifan Liu
1e549b9246 Revert "feat: 切换服务器类型时更新关卡列表和关卡提示" 
This reverts commit 9e1a0d9095.
 2023-02-07 01:50:08 -06:00
Yifan Liu
70fa2db091 Revert "feat: 界面更新时间根据所选客户端类型决定（外服时区还要改）" 
This reverts commit 11f4212cb8.
3ddeee1d 也在这个commit里面revert了

cherrypick放到stage_manager_overseas branch里等之后一起merge
 2023-02-07 01:50:09 -06:00
uye
9e1a0d9095 feat: 切换服务器类型时更新关卡列表和关卡提示 2023-02-07 15:21:50 +08:00
uye
fb04ca9898 chore: 重命名客户端对应时间变量名 2023-02-07 00:18:09 -06:00
uye
dca7f5e6c8 feat: 界面更新时间根据所选客户端类型决定（外服时区还要改） 2023-02-07 00:17:16 -06:00
Congcong Cai
7d6c116159 move sys socket in unix only macro 2023-02-07 07:53:25 +08:00
MistEO
d5e714aa01 Merge pull request #3625 from Rbqwow/dev 
doc: 修正文档错误引用
 2023-02-07 01:31:06 +08:00
Congcong Cai
49dbf3f18d shutdown socket before close 2023-02-07 00:32:14 +08:00
Congcong Cai
ba9518dc81 refactor logic 2023-02-07 00:24:51 +08:00
Rbqwow
ccfecd2b7c Update 2.3-IssueBot使用方法.md 2023-02-06 22:19:34 +08:00
Congcong Cai
4935711ef7 fix: call_command_posix in socket mode will return after child process finished" 2023-02-06 21:19:10 +08:00
uye
3ddeee1d0f chore: 重命名客户端对应时间变量名 2023-02-06 15:03:51 +08:00
uye
11f4212cb8 feat: 界面更新时间根据所选客户端类型决定（外服时区还要改） 2023-02-06 14:47:23 +08:00
MistEO
b716c1c877 Merge pull request #3616 from MaaAssistantArknights/dev 
Release v4.10.6-rc.1
v4.10.6-rc.1 		2023-02-06 14:29:01 +08:00
MistEO
a1f8d7dbfd docs: update changelog 2023-02-06 14:28:53 +08:00
FSPaul
b0ec427dd8 docs: 更新模拟器支持中蓝叠Hyper-V教程的部分描述 (#3605) 
* Update 1.3-模拟器支持.md

跟进修正新版本MAA的gui.json储存位置描述（已从MAA根目录迁移至config目录），并补充蓝叠Hyper-V版本可能遇到的权限问题解决方案。

* Update 1.3-模拟器支持.md

---------

Co-authored-by: MistEO <mistereo@hotmail.com>
 2023-02-06 14:27:49 +08:00
MistEO
58af20f477 docs: update changelog 2023-02-06 14:26:33 +08:00
Yifan Liu
07cb1c3145 fix: update activity check 2023-02-05 23:35:50 -06:00