xtaodada/StarRailCopilot
1
0
Fork 0
mirror of https://github.com/LmeSzinc/StarRailCopilot.git synced 2024-11-29 11:03:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix: Handle login popups as unknown ui

Browse Source
This commit is contained in:
LmeSzinc 2023-10-30 02:30:47 +08:00
parent 25e7b1876c
commit 913de2771b
1 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
tasks/base/ui.py
View File

@ -8,6 +8,7 @@ from tasks.base.assets.assets_base_page import CLOSE, MAP_EXIT
from tasks.base.main_page import MainPage from tasks.base.main_page import MainPage
from tasks.base.page import Page, page_main from tasks.base.page import Page, page_main
from tasks.combat.assets.assets_combat_finish import COMBAT_EXIT from tasks.combat.assets.assets_combat_finish import COMBAT_EXIT
from tasks.combat.assets.assets_combat_interact import MAP_LOADING
from tasks.combat.assets.assets_combat_prepare import COMBAT_PREPARE from tasks.combat.assets.assets_combat_prepare import COMBAT_PREPARE
from tasks.daily.assets.assets_daily_trial import INFO_CLOSE from tasks.daily.assets.assets_daily_trial import INFO_CLOSE
from tasks.login.assets.assets_login import LOGIN_CONFIRM from tasks.login.assets.assets_login import LOGIN_CONFIRM
@ -79,6 +80,19 @@ class UI(MainPage):
if self.ui_additional(): if self.ui_additional():
timeout.reset() timeout.reset()
continue continue
if self.handle_popup_single():
timeout.reset()
continue
if self.handle_popup_confirm():
timeout.reset()
continue
if self.appear_then_click(LOGIN_CONFIRM, interval=5):
timeout.reset()
continue
if self.appear(MAP_LOADING, interval=5):
logger.info('Map loading')
timeout.reset()
continue
app_check() app_check()
minicap_check() minicap_check()
@ -138,13 +152,13 @@ class UI(MainPage):
continue continue
# Additional # Additional
if self.ui_additional():
continue
if self.handle_popup_single(): if self.handle_popup_single():
continue continue
if self.handle_popup_confirm(): if self.handle_popup_confirm():
continue continue
if self.ui_additional(): if self.appear_then_click(LOGIN_CONFIRM, interval=5):
continue
if self.appear_then_click(LOGIN_CONFIRM):
continue continue
# Reset connection # Reset connection