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
10 changes: 8 additions & 2 deletions app/task/Okww/tools/account_switch.py
Original file line number Diff line number Diff line change
Expand Up @@ -508,12 +508,18 @@ def _switch_to_login(hwnd: int, on_log: Callable[[str], None]) -> None:
round(0.63 * _FRAME_HEIGHT),
after_sleep=3,
)
_wait_ocr_text(
if _wait_ocr_text(
hwnd,
_LOGIN_PAGE_TEXTS,
roi=_LOGIN_ROI,
timeout=60,
)
) is None:
# 不能在等待超时后假报「已返回登录界面」:盲点可能误触登录进入游戏,
# 此时画面无掩码账号,继续选号必然失败且更难排查,必须显式失败留证。
raise RuntimeError(
"返回登录流程结束但未识别到登录界面(60s 未出现「其他登录方式」),"
"可能误入了游戏内画面,请人工确认后重试"
)
on_log("已返回登录界面")


Expand Down
3 changes: 2 additions & 1 deletion res/version.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,8 @@
"OK-WW专项 修复任务报告推送因漏传通知用户配置参数而失败的问题 by [@AthenaHibou](https://github.com/AthenaHibou)",
"游戏签到 修复通知返回值改为 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)"
]
},
"v5.5.0-beta.2": {
Expand Down
Loading