Del: Replace EXIT_DUNGEON with MAP_EXIT

This commit is contained in:
LmeSzinc 2023-09-22 21:43:06 +08:00
parent d3239ac3e5
commit 478f187295
3 changed files with 2 additions and 12 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.0 KiB

View File

@ -53,16 +53,6 @@ EXIT_CONFIRM = ButtonWrapper(
button=(776, 458, 800, 482), button=(776, 458, 800, 482),
), ),
) )
EXIT_DUNGEON = ButtonWrapper(
name='EXIT_DUNGEON',
share=Button(
file='./assets/share/forgotten_hall/EXIT_DUNGEON.png',
area=(15, 45, 45, 75),
search=(0, 25, 65, 95),
color=(113, 117, 124),
button=(15, 45, 45, 75),
),
)
FIRST_CHARACTER = ButtonWrapper( FIRST_CHARACTER = ButtonWrapper(
name='FIRST_CHARACTER', name='FIRST_CHARACTER',
share=Button( share=Button(

View File

@ -9,7 +9,7 @@ from module.logger.logger import logger
from module.ocr.keyword import Keyword from module.ocr.keyword import Keyword
from module.ocr.ocr import Ocr, OcrResultButton from module.ocr.ocr import Ocr, OcrResultButton
from module.ui.draggable_list import DraggableList from module.ui.draggable_list import DraggableList
from tasks.base.assets.assets_base_page import FORGOTTEN_HALL_CHECK from tasks.base.assets.assets_base_page import FORGOTTEN_HALL_CHECK, MAP_EXIT
from tasks.dungeon.keywords import DungeonList, KEYWORDS_DUNGEON_TAB from tasks.dungeon.keywords import DungeonList, KEYWORDS_DUNGEON_TAB
from tasks.dungeon.ui import DungeonUI from tasks.dungeon.ui import DungeonUI
from tasks.forgotten_hall.assets.assets_forgotten_hall import * from tasks.forgotten_hall.assets.assets_forgotten_hall import *
@ -135,7 +135,7 @@ class ForgottenHallUI(DungeonUI):
logger.info("Forgotten hall dungeon exited") logger.info("Forgotten hall dungeon exited")
break break
if self.appear_then_click(EXIT_DUNGEON): if self.appear_then_click(MAP_EXIT):
continue continue
if self.appear_then_click(EXIT_CONFIRM): if self.appear_then_click(EXIT_CONFIRM):
continue continue