Del: Replace EXIT_CONFIRM with enlarged POPUP_*.SEARCH

tasks/base/assets/assets_base_popup.py

@@ -48,7 +48,7 @@ POPUP_CANCEL = ButtonWrapper(
     share=Button(
         file='./assets/share/base/popup/POPUP_CANCEL.png',
         area=(428, 537, 452, 561),
-        search=(334, 453, 594, 653),
+        search=(339, 446, 482, 653),
         color=(98, 92, 80),
         button=(419, 531, 512, 567),
     ),
@@ -58,7 +58,7 @@ POPUP_CONFIRM = ButtonWrapper(
     share=Button(
         file='./assets/share/base/popup/POPUP_CONFIRM.png',
         area=(776, 537, 800, 561),
-        search=(683, 464, 943, 644),
+        search=(686, 446, 829, 644),
         color=(95, 90, 78),
         button=(767, 531, 862, 567),
     ),
@@ -68,7 +68,7 @@ POPUP_SINGLE = ButtonWrapper(
     share=Button(
         file='./assets/share/base/popup/POPUP_SINGLE.png',
         area=(602, 458, 626, 482),
-        search=(511, 365, 771, 575),
+        search=(512, 446, 655, 644),
         color=(95, 90, 77),
         button=(578, 451, 705, 489),
     ),

tasks/forgotten_hall/assets/assets_forgotten_hall.py

@@ -43,16 +43,6 @@ ENTRANCE_CHECKED = ButtonWrapper(
         button=(55, 632, 71, 650),
     ),
 )
-EXIT_CONFIRM = ButtonWrapper(
-    name='EXIT_CONFIRM',
-    share=Button(
-        file='./assets/share/forgotten_hall/EXIT_CONFIRM.png',
-        area=(776, 458, 800, 482),
-        search=(756, 438, 820, 502),
-        color=(94, 88, 76),
-        button=(776, 458, 800, 482),
-    ),
-)
 FIRST_CHARACTER = ButtonWrapper(
     name='FIRST_CHARACTER',
     share=Button(

tasks/forgotten_hall/ui.py

@@ -13,7 +13,7 @@ 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.ui import DungeonUI
 from tasks.forgotten_hall.assets.assets_forgotten_hall import *
-from tasks.forgotten_hall.keywords import *
+from tasks.forgotten_hall.keywords import ForgottenHallStage
 from tasks.map.control.joystick import MapControlJoystick
 
 
@@ -125,6 +125,7 @@ class ForgottenHallUI(DungeonUI):
         STAGE_LIST.select_row(stage_keyword, main=self)
 
     def exit_dungeon(self, skip_first_screenshot=True):
+        logger.info('Exit dungeon')
         while 1:
             if skip_first_screenshot:
                 skip_first_screenshot = False
@@ -137,7 +138,7 @@ class ForgottenHallUI(DungeonUI):
 
             if self.appear_then_click(MAP_EXIT):
                 continue
-            if self.appear_then_click(EXIT_CONFIRM):
+            if self.handle_popup_confirm():
                 continue
 
     def _choose_first_character(self, skip_first_screenshot=True):