fz-mirrors/MaaAssistantArknights
0
0
Fork 0
mirror of https://github.com/MaaAssistantArknights/MaaAssistantArknights.git synced 2026-07-15 17:30:27 +08:00
Code Issues Packages Projects Releases Wiki Activity
5,914 Commits 61 Branches 1,836 Tags
68a08dc893c3697ee18c8a448ca84dfa323d11c6
Commit Graph

5914 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Yifan Liu
5ade646f5c Update src/MaaWpfGui/Helper/StageManager.cs 
Co-authored-by: uye <99072975+ABA2396@users.noreply.github.com>
 2023-02-05 23:35:49 -06:00
Yifan Liu
ccd93b9595 feat: 活动/关卡小提示支持外服 
StageManager支持ClientType，只要maa api上加入外服信息即可

断网+改cache测过了
 2023-02-05 23:35:48 -06:00
Yifan Liu
a4bc12270e fix: overseas servers infrast dorm/power issue 
修改了roi避免识别到上面的同样的“入驻”
 2023-02-05 14:42:36 -06:00
uye
d4374e0a13 feat: 切换客户端类型时实时更新应用标题 2023-02-06 01:34:01 +08:00
uye
021f383e34 style: 删除多余空行 2023-02-06 00:32:43 +08:00
uye
04c27d4db3 chore: 调整 始终检测 选框位置 2023-02-06 00:32:43 +08:00
uye
2a3077092c chore: 重命名战斗设置相关文件名 2023-02-06 00:32:43 +08:00
uye
cd55db0cf5 feat: 调整部分选项所在位置 2023-02-06 00:32:43 +08:00
MistEO
b34bb248f6 Merge pull request #3611 from vonnoq/dev 
基建圖檔/愚人號圖檔
 2023-02-05 22:20:11 +08:00
MistEO
85d6750db2 Merge pull request #3585 from bigqiao/dev 
仓库识别任务前先返回到首页再开始，增强任务启动时的可靠性
 2023-02-05 22:19:52 +08:00
Qiao
f57273ecdb 调整为只在匹配不到时才退到首页尝试进入仓库 
Co-authored-by: uye <99072975+ABA2396@users.noreply.github.com>
 2023-02-05 21:31:03 +08:00
vonnoq
9a5a3526e4 基建圖檔/愚人號圖檔 2023-02-05 18:43:40 +08:00
MistEO
e6cd06bf3f Merge pull request #3608 from Chr0nixz/dev 
fix:包路径问题修复
 2023-02-05 17:20:43 +08:00
陈泽煊
a8eae1a163 fix:包路径问题修复 2023-02-05 17:18:08 +08:00
MistEO
09b882dae9 Merge pull request #3606 from 178619/dev 
KR localization update
 2023-02-05 17:15:06 +08:00
Clock
2207f29cd7 KR localization update 2023-02-05 16:38:58 +09:00
uye
b146034389 docs: upate changelog 2023-02-05 13:35:04 +08:00
MistEO
ce39b5186d Merge pull request #3593 from MaaAssistantArknights/dev 
Release v4.10.6-beta.5
v4.10.6-beta.5 		2023-02-05 02:11:01 +08:00
MistEO
e6c6653f02 docs: upate changelog 2023-02-05 02:10:15 +08:00
MistEO
212aab9902 Merge pull request #3595 from vonnoq/dev 
繁中服 識別任務失敗
 2023-02-04 20:43:32 +08:00