sui_feng/AzurLaneAutoScript
1
0
Fork 0
mirror of https://gitee.com/sui-feng-cb/AzurLaneAutoScript1 synced 2026-03-25 20:35:03 +08:00
Code Activity

Fix: Check LOGIN_CONFIRM before GET_SHIP (fixed #1152)

Browse Source
This commit is contained in:
LmeSzinc
2022-07-09 13:03:35 +08:00
parent e4904c977f
commit ad3be48b5a
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
module/handler/login.py
View File

@@ -40,6 +40,18 @@ class LoginHandler(Combat):
self.device.get_orientation() self.device.get_orientation()
orientation_timer.reset() orientation_timer.reset()
if self.appear_then_click(LOGIN_CHECK, interval=5):
if not login_success:
logger.info('Login success')
login_success = True
if self.appear(MAIN_CHECK):
if confirm_timer.reached():
logger.info('Login to main confirm')
break
else:
confirm_timer.reset()
if self.handle_get_items(): if self.handle_get_items():
continue continue
if self.handle_get_ship(): if self.handle_get_ship():
@@ -69,18 +81,6 @@ class LoginHandler(Combat):
if self.appear_then_click(GOTO_MAIN, offset=(30, 30), interval=5): if self.appear_then_click(GOTO_MAIN, offset=(30, 30), interval=5):
continue continue
if self.appear_then_click(LOGIN_CHECK, interval=5):
if not login_success:
logger.info('Login success')
login_success = True
if self.appear(MAIN_CHECK):
if confirm_timer.reached():
logger.info('Login to main confirm')
break
else:
confirm_timer.reset()
self.config.start_time = datetime.now() self.config.start_time = datetime.now()
return True return True