Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions app/task/MAA/AutoProxy.py
Original file line number Diff line number Diff line change
Expand Up @@ -791,6 +791,11 @@ async def set_maa(self, emulator_info: DeviceInfo):
)
elif self.cur_user_config.get("Info", "Server") == "Bilibili":
task_set["StartUp"]["AccountName"] = self.cur_user_config.get("Info", "Id")
# MAA v6.14.0-b2 起账号切换由独立开关控制,配置里已存为 false 时只写账号名不会切号
if self.cur_user_config.get("Info", "Server") in ("Official", "Bilibili"):
task_set["StartUp"]["AccountSwitchEnabled"] = bool(
task_set["StartUp"]["AccountName"].strip()
)

# 加载关卡号配置
if self.cur_user_config.get("Info", "StageMode") == "Fixed":
Expand Down
7 changes: 4 additions & 3 deletions res/docs/MAA配置文件信息.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,10 @@

> StartUp

| 字段 | 类型/常用值 | 释义 |
| ----------- | ----------------- | -------- |
| AccountName | 手机号、B站用户名 | 账号切换 |
| 字段 | 类型/常用值 | 释义 |
| -------------------- | ----------------- | ----------------------------------------------------------- |
| AccountName | 手机号、B站用户名 | 账号切换 |
| AccountSwitchEnabled | bool | 启用账号切换(MAA v6.14.0-b2 起,为 false 时忽略 AccountName) |

### 理智作战

Expand Down
3 changes: 2 additions & 1 deletion res/version.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,8 @@
"游戏签到 修复通知返回值改为 DispatchResult 后未同步两处消费方、开启签到通知时执行签到必报 TypeError 的问题(手动签到接口返回 500,慢渠道后台通知路径丢失日志) by [@1w1w11w1](https://github.com/1w1w11w1)",
"修复明日方舟PC工具连接失败后每秒重试并反复弹出错误提示的问题 by [@qiyinxi](https://github.com/qiyinxi)",
"OK-WW专项 修复账号切换在游戏启动阶段定位不到窗口、或界面尚未进入可执行登录态就误操作而失败的问题,改为分段进展续延等待:先轮询窗口就绪,再等待界面进入「登录页/已登录主菜单」(游戏内长时间更新/加载时持续顺延,长时间无进展才判失败),兼容低性能设备启动延迟 by [@AthenaHibou](https://github.com/AthenaHibou)",
"OK-WW专项 账号切换未能回到登录界面时立即报错并说明原因,不再误报已就绪后在错误画面上继续选号失败 by [@AthenaHibou](https://github.com/AthenaHibou)"
"OK-WW专项 账号切换未能回到登录界面时立即报错并说明原因,不再误报已就绪后在错误画面上继续选号失败 by [@AthenaHibou](https://github.com/AthenaHibou)",
"MAA专项 修复 MAA 更新至 v6.14 后代理时不再按用户填写的账号执行账号切换的问题"
]
},
"v5.5.0-beta.2": {
Expand Down
Loading