Skip to content

Commit e777c4c

Browse files
committed
Merge remote-tracking branch 'upstream/master'
2 parents 9deacfa + 594a652 commit e777c4c

2 files changed

Lines changed: 7 additions & 3 deletions

File tree

module/tactical/tactical_class.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -526,6 +526,8 @@ def tactical_class_receive(self, skip_first_screenshot=True):
526526
logger.info('Not going to learn skill but in dock, close it')
527527
study_finished = True
528528
self.device.click(BACK_ARROW)
529+
# reset DOCK_CHECK to Timer(3)
530+
self.interval_timer.pop(DOCK_CHECK.name, None)
529531
self.interval_reset([BOOK_EMPTY_POPUP, DOCK_CHECK], interval=3)
530532
continue
531533
if self.appear(SKILL_CONFIRM, offset=(20, 20), interval=3):

module/webui/app.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,11 @@ def __init__(self) -> None:
124124
@use_scope("aside", clear=True)
125125
def set_aside(self) -> None:
126126
# TODO: update put_icon_buttons()
127+
128+
current_date = datetime.now().date()
129+
if current_date.month == 4 and current_date.day == 1:
130+
self.af_flag = True
131+
127132
put_icon_buttons(
128133
Icon.DEVELOP,
129134
buttons=[{"label": t("Gui.Aside.Home"), "value": "Home", "color": "aside"}],
@@ -146,9 +151,6 @@ def set_aside(self) -> None:
146151
onclick=[lambda: go_app("manage", new_window=False)],
147152
)
148153

149-
current_date = datetime.now().date()
150-
if current_date.month == 4 and current_date.day == 1:
151-
self.af_flag = True
152154

153155
@use_scope("aside_instance")
154156
def set_aside_status(self) -> None:

0 commit comments

Comments
 (0)