Skip to content

Commit f816d27

Browse files
committed
Opt: allow manjuu loading until stuck long but not normal stuck
1 parent 9c87cec commit f816d27

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
@@ -535,11 +535,12 @@ def wait_until_manjuu_disappear(self):
535535
"""
536536
Wait until manjuu loading disappear.
537537
"""
538+
# Abuse of notation. Template do not have readable name, so add string here.
539+
self.device.stuck_record_add('TEMPLATE_MANJUU')
538540
timer = Timer(1.5, count=3).start()
539541
while 1:
540542
self.device.screenshot()
541543
if self.manjuu_count():
542-
self.device.stuck_record_clear()
543544
timer.reset()
544545
else:
545546
if timer.reached():

0 commit comments

Comments
 (0)