fz-mirrors/MaaAssistantArknights
0
0
Fork 0
mirror of https://github.com/MaaAssistantArknights/MaaAssistantArknights.git synced 2026-07-19 18:47:55 +08:00
Code Issues Packages Projects Releases Wiki Activity
5,859 Commits 60 Branches 1,840 Tags
ff2385ee418ef3a64ddcf66be918f48ae5910dd1
Commit Graph

5859 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Yifan Liu
ff2385ee41 Merge pull request #3588 from liuyifan-eric/stage_manager_overseas 
feat: 活动/关卡小提示支持外服
 2023-02-07 01:57:57 -06:00
Yifan Liu
c28ecc2b56 fix: StageManager.cs 服务器为不选择的时候也视为官服 2023-02-07 01:57:15 -06:00
uye
fdbc6a7ea6 feat: 切换服务器类型时更新关卡列表和关卡提示 2023-02-07 01:51:54 -06:00
Yifan Liu
4555f00ac3 Revert "feat: 切换服务器类型时更新关卡列表和关卡提示" 
This reverts commit b8c7136492.
 2023-02-07 01:50:08 -06:00
Yifan Liu
7a582bb57c Revert "feat: 界面更新时间根据所选客户端类型决定（外服时区还要改）" 
This reverts commit 68012f0a12.
a914abcb 也在这个commit里面revert了

cherrypick放到stage_manager_overseas branch里等之后一起merge
 2023-02-07 01:50:09 -06:00
uye
b8c7136492 feat: 切换服务器类型时更新关卡列表和关卡提示 2023-02-07 15:21:50 +08:00
uye
376de2c22b chore: 重命名客户端对应时间变量名 2023-02-07 00:18:09 -06:00
uye
0d2e374799 feat: 界面更新时间根据所选客户端类型决定（外服时区还要改） 2023-02-07 00:17:16 -06:00
MistEO
5c50ba338b Merge pull request #3625 from Rbqwow/dev 
doc: 修正文档错误引用
 2023-02-07 01:31:06 +08:00
Rbqwow
9743ac3789 Update 2.3-IssueBot使用方法.md 2023-02-06 22:19:34 +08:00
uye
a914abcb67 chore: 重命名客户端对应时间变量名 2023-02-06 15:03:51 +08:00
uye
68012f0a12 feat: 界面更新时间根据所选客户端类型决定（外服时区还要改） 2023-02-06 14:47:23 +08:00
MistEO
a65f1e2429 Merge pull request #3616 from MaaAssistantArknights/dev 
Release v4.10.6-rc.1
 2023-02-06 14:29:01 +08:00
MistEO
1e7a8e2ff2 docs: update changelog 2023-02-06 14:28:53 +08:00
FSPaul
cd9a473994 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
02f02caee9 docs: update changelog 2023-02-06 14:26:33 +08:00
Yifan Liu
56b4d36f2b fix: update activity check 2023-02-05 23:35:50 -06:00
Yifan Liu
69c68f6290 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
3c9fa62054 feat: 活动/关卡小提示支持外服 
StageManager支持ClientType，只要maa api上加入外服信息即可

断网+改cache测过了
 2023-02-05 23:35:48 -06:00
Yifan Liu
a89841c4a3 fix: overseas servers infrast dorm/power issue 
修改了roi避免识别到上面的同样的“入驻”
 2023-02-05 14:42:36 -06:00
uye
74da877ba8 feat: 切换客户端类型时实时更新应用标题 2023-02-06 01:34:01 +08:00
uye
be1abe41b6 style: 删除多余空行 2023-02-06 00:32:43 +08:00
uye
6c72cfa530 chore: 调整 始终检测 选框位置 2023-02-06 00:32:43 +08:00
uye
30127cd3cd chore: 重命名战斗设置相关文件名 2023-02-06 00:32:43 +08:00
uye
f0bfa34494 feat: 调整部分选项所在位置 2023-02-06 00:32:43 +08:00
MistEO
ae4c1a60ba Merge pull request #3611 from vonnoq/dev 
基建圖檔/愚人號圖檔
 2023-02-05 22:20:11 +08:00
MistEO
cd08da9caf Merge pull request #3585 from bigqiao/dev 
仓库识别任务前先返回到首页再开始，增强任务启动时的可靠性
 2023-02-05 22:19:52 +08:00
Qiao
2d964e9e11 调整为只在匹配不到时才退到首页尝试进入仓库 
Co-authored-by: uye <99072975+ABA2396@users.noreply.github.com>
 2023-02-05 21:31:03 +08:00
vonnoq
ecf8809d46 基建圖檔/愚人號圖檔 2023-02-05 18:43:40 +08:00
MistEO
fd48f3774f Merge pull request #3608 from Chr0nixz/dev 
fix:包路径问题修复
 2023-02-05 17:20:43 +08:00
陈泽煊
1c2484cb52 fix:包路径问题修复 2023-02-05 17:18:08 +08:00
MistEO
ee3b7238b2 Merge pull request #3606 from 178619/dev 
KR localization update
 2023-02-05 17:15:06 +08:00
Clock
5ccaf25bf7 KR localization update 2023-02-05 16:38:58 +09:00
uye
1acad64da0 docs: upate changelog 2023-02-05 13:35:04 +08:00
MistEO
c3acff8868 Merge pull request #3593 from MaaAssistantArknights/dev 
Release v4.10.6-beta.5
 2023-02-05 02:11:01 +08:00
MistEO
826be1108a docs: upate changelog 2023-02-05 02:10:15 +08:00
MistEO
44e69fc0a3 Merge pull request #3595 from vonnoq/dev 
繁中服 識別任務失敗
 2023-02-04 20:43:32 +08:00
MistEO
5b9ca87602 Merge pull request #3591 from liuyifan-eric/JP_json_template 
chore: 日服json及template更新
 2023-02-04 20:43:16 +08:00
MistEO
618b648e86 Merge pull request #3584 from Chr0nixz/dev 
重构了Python接口结构
 2023-02-04 20:42:46 +08:00
MistEO
3ba43a715d Merge pull request #3583 from RiichiTsumo/master 
国际服添加一堆截图
 2023-02-04 20:40:39 +08:00
RiichiTsumo
e0f66e2d43 添加一堆截图 2023-02-04 19:19:48 +08:00
vonnoq
fbe4a7249b 繁中服 識別任務失敗 2023-02-04 19:17:38 +08:00
RiichiTsumo
3f97b6f5da Add files via upload 2023-02-04 19:15:49 +08:00
RiichiTsumo
d9c273e266 Add files via upload 2023-02-04 18:37:25 +08:00
uye
cf9d084afb chore: 取消无人机功能与自定义排班的绑定关系 2023-02-04 16:21:45 +08:00
uye
7a25a687fe style: 格式化 task.json 2023-02-04 15:34:37 +08:00
uye
cf01adf8bb Merge pull request #3587 from WLLEGit/ReclamationAlgorithm 
feat: 生息演算 添加回调Log
 2023-02-04 15:33:19 +08:00
uye
44ccebe021 Merge pull request #3579 from liuyifan-eric/dev 
feat: 统一资源本和芯片本进入方式为ocr以支持外服
 2023-02-04 15:20:28 +08:00
uye
122ba97477 Merge pull request #3592 from 178619/dev 
KR resources
 2023-02-04 15:19:40 +08:00
Clock
cbf00624f2 KR resources update 2023-02-04 15:55:38 +09:00