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

Fix login task stuck when render error (#503)

Browse Source 
* modify similarity limit for login task

* Revert modification to similarity and add asset for render error

* Apply luma match for `LOGIN_CONFIRM`

* cancel color match for login confirm
This commit is contained in:
Schwarze-Katze 2024-06-12 12:29:51 +08:00 committed by GitHub
parent 365b1744e5
commit 1f734b494d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 20 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

@ -96,7 +96,8 @@ class UI(MainPage):
if self.handle_popup_confirm(): if self.handle_popup_confirm():
timeout.reset() timeout.reset()
continue continue
if self.appear_then_click(LOGIN_CONFIRM, interval=5): if self.is_in_login_confirm(interval=5):
self.device.click(LOGIN_CONFIRM)
timeout.reset() timeout.reset()
continue continue
if self.appear(MAP_LOADING, interval=5): if self.appear(MAP_LOADING, interval=5):
@ -169,7 +170,8 @@ class UI(MainPage):
continue continue
if self.handle_popup_confirm(): if self.handle_popup_confirm():
continue continue
if self.appear_then_click(LOGIN_CONFIRM, interval=5): if self.is_in_login_confirm(interval=5):
self.device.click(LOGIN_CONFIRM)
continue continue
# Reset connection # Reset connection
@ -327,6 +329,20 @@ class UI(MainPage):
return appear return appear
def is_in_login_confirm(self, interval=0):
self.device.stuck_record_add(LOGIN_CONFIRM)
if interval and not self.interval_is_reached(LOGIN_CONFIRM, interval=interval):
return False
appear = LOGIN_CONFIRM.match_template_luma(self.device.image)
if appear and interval:
self.interval_reset(LOGIN_CONFIRM, interval=interval)
return appear
def is_in_map_exit(self, interval=0): def is_in_map_exit(self, interval=0):
self.device.stuck_record_add(MAP_EXIT) self.device.stuck_record_add(MAP_EXIT)

3
tasks/login/login.py
View File

@ -56,7 +56,8 @@ class Login(UI, LoginAndroidCloud):
orientation_timer.reset() orientation_timer.reset()
# Login # Login
if self.appear_then_click(LOGIN_CONFIRM): if self.is_in_login_confirm(interval=5):
self.device.click(LOGIN_CONFIRM)
login_success = True login_success = True
continue continue
if self.appear_then_click(USER_AGREEMENT_ACCEPT): if self.appear_then_click(USER_AGREEMENT_ACCEPT):