Skip to content

Commit 7cddbaf

Browse files
committed
Fix: Prefer TACTICAL_CLASS_START than TACTICAL_CLASS_CANCEL
because TACTICAL_CLASS_CANCEL might be "Cancel" or "Return" in EN
1 parent 561aa27 commit 7cddbaf

1 file changed

Lines changed: 4 additions & 5 deletions

File tree

module/tactical/tactical_class.py

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -373,7 +373,7 @@ def handle_rapid_training(self):
373373
if self.appear(RAPID_TRAINING, offset=offset, interval=1):
374374
self.device.click(RAPID_TRAINING)
375375
# Clear interval to enter _tactical_books_choose fast
376-
self.interval_clear(TACTICAL_CLASS_CANCEL, interval=2)
376+
self.interval_clear(TACTICAL_CLASS_START, interval=2)
377377
return True
378378

379379
return False
@@ -444,7 +444,7 @@ def tactical_class_receive(self, skip_first_screenshot=True):
444444
# Get finish time
445445
# sometimes you have TACTICAL_CHECK without black-blurred background
446446
# TACTICAL_CLASS_CANCEL and TACTICAL_CHECK appears
447-
if not self.appear(TACTICAL_CLASS_CANCEL, offset=(20, 20)) \
447+
if not self.appear(TACTICAL_CLASS_START, offset=(20, 20)) \
448448
and self.appear(TACTICAL_CHECK, offset=(20, 20), interval=2):
449449
self.interval_clear([POPUP_CONFIRM, POPUP_CANCEL, GET_MISSION])
450450
if book_empty:
@@ -495,11 +495,10 @@ def tactical_class_receive(self, skip_first_screenshot=True):
495495
if self.appear(MISSION_POPUP_GO, offset=self._popup_offset, interval=2):
496496
self.device.click(MISSION_POPUP_ACK)
497497
continue
498-
if self.appear(TACTICAL_CLASS_CANCEL, offset=(30, 30), interval=2) \
499-
and self.appear(TACTICAL_CLASS_START, offset=(30, 30)):
498+
if self.appear(TACTICAL_CLASS_START, offset=(30, 30), interval=2):
500499
if self._tactical_books_choose():
501500
self.dock_select_index = 0
502-
self.interval_reset([TACTICAL_CLASS_CANCEL, BOOK_EMPTY_POPUP])
501+
self.interval_reset([TACTICAL_CLASS_START, BOOK_EMPTY_POPUP])
503502
self.interval_clear([POPUP_CONFIRM, POPUP_CANCEL, GET_MISSION])
504503
else:
505504
study_finished = True

0 commit comments

Comments
 (0)