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

Fix: Enter cloud at account login page

Browse Source
This commit is contained in:
LmeSzinc 2024-06-29 20:11:14 +08:00
parent 1697753f31
commit bc4081a697
1 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
tasks/login/cloud.py
View File

@ -16,8 +16,12 @@ class XPath:
""" """
登录界面元素 登录界面元素
""" """
# 帐号登录界面的进入游戏按钮，有这按钮说明帐号没登录 # 帐号登录界面的进入游戏按钮
ACCOUNT_LOGIN = '//*[@text="进入游戏"]' ACCOUNT_LOGIN = '//*[@text="进入游戏"]'
# 帐号登录界面，有这些按钮说明帐号没登录
ACCOUNT_PASSWORD_LOGIN = '//*[@text="账号密码"]'
ACCOUNT_REGISTER = '//*[@text="立即注册"]'
ACCOUNT_FORGET_PASSWORD = '//*[@text="忘记密码"]'
# 登录后的弹窗，获得免费时长 # 登录后的弹窗，获得免费时长
GET_REWARD = '//*[@text="点击空白区域关闭"]' GET_REWARD = '//*[@text="点击空白区域关闭"]'
# 用户协议和隐私政策更新提示 # 用户协议和隐私政策更新提示
@ -107,7 +111,11 @@ class LoginAndroidCloud(ModuleBase):
if self.appear(XPath.START_GAME): if self.appear(XPath.START_GAME):
logger.info('Login to cloud main page') logger.info('Login to cloud main page')
break break
if self.appear(XPath.ACCOUNT_LOGIN): if (
self.appear(XPath.ACCOUNT_REGISTER)
or self.appear(XPath.ACCOUNT_PASSWORD_LOGIN)
or self.appear(XPath.ACCOUNT_FORGET_PASSWORD)
):
logger.critical('Account not login, you must have login once before running') logger.critical('Account not login, you must have login once before running')
raise RequestHumanTakeover raise RequestHumanTakeover
if update_checker.started() and update_checker.reached(): if update_checker.started() and update_checker.reached():
@ -119,6 +127,8 @@ class LoginAndroidCloud(ModuleBase):
# Click # Click
if self.appear_then_click(XPath.GET_REWARD): if self.appear_then_click(XPath.GET_REWARD):
continue continue
if self.appear_then_click(XPath.ACCOUNT_LOGIN):
continue
if self.appear_then_click(XPath.POPUP_CONFIRM): if self.appear_then_click(XPath.POPUP_CONFIRM):
update_checker.start() update_checker.start()
continue continue
@ -395,12 +405,15 @@ class LoginAndroidCloud(ModuleBase):
if self.appear(XPath.START_GAME): if self.appear(XPath.START_GAME):
logger.info('Cloud game is in main page') logger.info('Cloud game is in main page')
return True return True
elif self.appear(XPath.FLOAT_DELAY): if self.appear(XPath.FLOAT_DELAY):
logger.info('Cloud game is in game with float window expanded') logger.info('Cloud game is in game with float window expanded')
return True return True
elif self.appear(XPath.POPUP_CONFIRM): if self.appear(XPath.POPUP_CONFIRM):
logger.info('Cloud game have a popup') logger.info('Cloud game have a popup')
return True return True
if self.appear(XPath.ACCOUNT_LOGIN):
logger.info('Cloud game is at account login')
return True
logger.info('Not in cloud page') logger.info('Not in cloud page')
return False return False