Skip to content

Fix: wait_until_manjuu_disappear should wait at least 1.5s #5093

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
guoh064 wants to merge 2 commits into
base: dev
Choose a base branch
from
Open

Fix: wait_until_manjuu_disappear should wait at least 1.5s #5093

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9c87cec
Fix: wait_until_manjuu_disappear should wait at least 1.5s
guoh064 Aug 31, 2025
f816d27
Opt: allow manjuu loading until stuck long but not normal stuck
guoh064 Sep 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion module/device/device.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ class Device(Screenshot, Control, AppControl):
click_record = collections.deque(maxlen=15)
stuck_timer = Timer(60, count=60).start()
stuck_timer_long = Timer(180, count=180).start()
stuck_long_wait_list = ['BATTLE_STATUS_S', 'PAUSE', 'LOGIN_CHECK']
stuck_long_wait_list = ['BATTLE_STATUS_S', 'PAUSE', 'LOGIN_CHECK', 'TEMPLATE_MANJUU']

def __init__(self, *args, **kwargs):
for trial in range(4):
Expand Down
13 changes: 10 additions & 3 deletions module/handler/info_handler.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -535,11 +535,18 @@ def wait_until_manjuu_disappear(self):
"""
Wait until manjuu loading disappear.
"""
# Abuse of notation. Template do not have readable name, so add string here.
self.device.stuck_record_add('TEMPLATE_MANJUU')
timer = Timer(1.5, count=3).start()
while 1:
self.device.screenshot()
if not self.manjuu_count():
break

if self.manjuu_count():
timer.reset()
else:
if timer.reached():
logger.info(f'Manjuu disappeared')
break

def handle_manjuu(self):
"""
Handle manjuu loading.
Expand Down