Skip to content

Commit 1fefc0f

Browse files
committed
Opt: allow manjuu loading until stuck long but not normal stuck
1 parent fc1c4e8 commit 1fefc0f

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

module/device/device.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ class Device(Screenshot, Control, AppControl):
6767
click_record = collections.deque(maxlen=15)
6868
stuck_timer = Timer(60, count=60).start()
6969
stuck_timer_long = Timer(180, count=180).start()
70-
stuck_long_wait_list = ['BATTLE_STATUS_S', 'PAUSE', 'LOGIN_CHECK']
70+
stuck_long_wait_list = ['BATTLE_STATUS_S', 'PAUSE', 'LOGIN_CHECK', 'TEMPLATE_MANJUU']
7171

7272
def __init__(self, *args, **kwargs):
7373
for trial in range(4):

module/handler/info_handler.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -531,11 +531,12 @@ def wait_until_manjuu_disappear(self):
531531
"""
532532
Wait until manjuu loading disappear.
533533
"""
534+
# Abuse of notation. Template do not have readable name, so add string here.
535+
self.device.stuck_record_add('TEMPLATE_MANJUU')
534536
timer = Timer(1.5, count=3).start()
535537
while 1:
536538
self.device.screenshot()
537539
if self.manjuu_count():
538-
self.device.stuck_record_clear()
539540
timer.reset()
540541
else:
541542
if timer.reached():

0 commit comments

Comments
 (0)