diff --git a/assets/share/forgotten_hall/ENTRANCE_CHECKED.png b/assets/share/forgotten_hall/ENTRANCE_CHECKED.png index b0dd8ac2d..80a67e697 100644 Binary files a/assets/share/forgotten_hall/ENTRANCE_CHECKED.png and b/assets/share/forgotten_hall/ENTRANCE_CHECKED.png differ diff --git a/tasks/forgotten_hall/assets/assets_forgotten_hall.py b/tasks/forgotten_hall/assets/assets_forgotten_hall.py index 9a375e392..4cec7cb3d 100644 --- a/tasks/forgotten_hall/assets/assets_forgotten_hall.py +++ b/tasks/forgotten_hall/assets/assets_forgotten_hall.py @@ -37,10 +37,10 @@ ENTRANCE_CHECKED = ButtonWrapper( name='ENTRANCE_CHECKED', share=Button( file='./assets/share/forgotten_hall/ENTRANCE_CHECKED.png', - area=(62, 662, 80, 680), - search=(42, 642, 100, 700), - color=(160, 162, 162), - button=(62, 662, 80, 680), + area=(55, 632, 71, 650), + search=(35, 612, 91, 670), + color=(156, 156, 157), + button=(55, 632, 71, 650), ), ) EXIT_CONFIRM = ButtonWrapper( diff --git a/tasks/forgotten_hall/ui.py b/tasks/forgotten_hall/ui.py index d298b69cb..363a1767d 100644 --- a/tasks/forgotten_hall/ui.py +++ b/tasks/forgotten_hall/ui.py @@ -91,6 +91,12 @@ class DraggableStageList(DraggableList): def is_row_selected(self, button: OcrResultButton, main: ModuleBase) -> bool: return main.appear(ENTRANCE_CHECKED) + def load_rows(self, main: ModuleBase): + if not main.appear(FORGOTTEN_HALL_CHECK): + logger.info('Not in forgotten hall, skip load_rows()') + return + return super().load_rows(main=main) + STAGE_LIST = DraggableStageList("ForgottenHallStageList", keyword_class=ForgottenHallStage, ocr_class=ForgottenHallStageOcr, search_button=OCR_STAGE,