Fix: ui misclick in coalition_20251120

Author: guoh064

module/coalition/coalition.py

@@ -166,10 +166,10 @@ def run(self, event='', mode='', fleet='', total=0):
                 logger.info(f'Count: {self.run_count}')
 
             # UI switches
-            if self.config.SERVER in ['tw']:
-	            self.ui_goto(page_campaign_menu)
-	            if self.triggered_stop_condition(oil_check=True):
-		            break
+            # if self.config.SERVER in ['tw']:
+	        #     self.ui_goto(page_campaign_menu)
+	        #     if self.triggered_stop_condition(oil_check=True):
+		    #         break
             self.device.stuck_record_clear()
             self.device.click_record_clear()
             self.ui_goto_coalition()

module/coalition/ui.py

@@ -293,6 +293,9 @@ def coalition_map_exit(self, event):
                 logger.info(f'{fleet_preparation} -> {NEONCITY_PREPARATION_EXIT}')
                 self.device.click(NEONCITY_PREPARATION_EXIT)
                 continue
+            if self.appear_then_click(DAL_DIFFICULTY_EXIT, offset=(20, 20), interval=3):
+                logger.info(f'{DAL_DIFFICULTY_EXIT} -> {DAL_DIFFICULTY_EXIT}')
+                continue
 
     def enter_map(self, event, stage, mode, skip_first_screenshot=True):
         """
@@ -313,6 +316,7 @@ def enter_map(self, event, stage, mode, skip_first_screenshot=True):
             button_difficulty = None
         fleet_preparation = self.coalition_get_fleet_preparation(event)
         campaign_timer = Timer(5)
+        campaign_difficulty_timer = Timer(5)
         fleet_timer = Timer(5)
         campaign_click = 0
         campaign_difficulty_click = 0
@@ -365,10 +369,10 @@ def enter_map(self, event, stage, mode, skip_first_screenshot=True):
                 campaign_timer.reset()
                 continue
             if event in ['coalition_20251120']:
-                if campaign_timer.reached() and self.in_coalition_20251120_difficulty_selection() and button_difficulty:
+                if campaign_difficulty_timer.reached() and self.in_coalition_20251120_difficulty_selection() and button_difficulty:
                     self.device.click(button_difficulty)
                     campaign_difficulty_click += 1
-                    campaign_timer.reset()
+                    campaign_difficulty_timer.reset()
                     continue
 
             # Fleet preparation

module/ui/ui.py

@@ -1,7 +1,7 @@
 from module.base.button import Button
 from module.base.decorator import run_once
 from module.base.timer import Timer
-from module.coalition.assets import NEONCITY_FLEET_PREPARATION, NEONCITY_PREPARATION_EXIT
+from module.coalition.assets import NEONCITY_FLEET_PREPARATION, NEONCITY_PREPARATION_EXIT, DAL_DIFFICULTY_EXIT
 from module.combat.assets import GET_ITEMS_1, GET_ITEMS_2, GET_SHIP
 from module.event_hospital.assets import HOSIPITAL_CLUE_CHECK, HOSPITAL_BATTLE_EXIT
 from module.exception import (GameNotRunningError, GamePageUnknownError,
@@ -559,9 +559,12 @@ def ui_additional(self, get_ship=True):
         # if self.appear_then_click(HOSPITAL_BATTLE_EXIT, offset=(20, 20), interval=2):
         #     return True
         # Neon city (coalition_20250626)
-        if self.appear(NEONCITY_FLEET_PREPARATION, offset=(20, 20), interval=3):
-            logger.info(f'{NEONCITY_FLEET_PREPARATION} -> {NEONCITY_PREPARATION_EXIT}')
-            self.device.click(NEONCITY_PREPARATION_EXIT)
+        # if self.appear(NEONCITY_FLEET_PREPARATION, offset=(20, 20), interval=3):
+        #     logger.info(f'{NEONCITY_FLEET_PREPARATION} -> {NEONCITY_PREPARATION_EXIT}')
+        #     self.device.click(NEONCITY_PREPARATION_EXIT)
+        #     return True
+        # DATE A LANE (coalition_20251120)
+        if self.appear_then_click(DAL_DIFFICULTY_EXIT, offset=(20, 20), interval=3):
             return True
 
         # Idle page