Fix: Detect auto search menu in every steps of auto search

- Fix: Increase timer in mission submit

module/combat/auto_search_combat.py

@@ -78,9 +78,7 @@ class AutoSearchCombat(Combat):
             # End
             if self.is_combat_loading():
                 break
-            if self.is_in_auto_search_menu():
-                raise CampaignEnd
-            if self._handle_auto_search_menu_missing():
+            if self.is_in_auto_search_menu() or self._handle_auto_search_menu_missing():
                 raise CampaignEnd
 
     def auto_search_combat_execute(self, emotion_reduce, fleet_index):
@@ -101,6 +99,9 @@ class AutoSearchCombat(Combat):
             if self.handle_combat_automation_confirm():
                 continue
 
+            # End
+            if self.is_in_auto_search_menu() or self._handle_auto_search_menu_missing():
+                raise CampaignEnd
             if self.is_combat_executing():
                 break
 
@@ -116,6 +117,9 @@ class AutoSearchCombat(Combat):
                 continue
 
             # End
+            if self.is_in_auto_search_menu() or self._handle_auto_search_menu_missing():
+                self.device.screenshot_interval_set(0)
+                raise CampaignEnd
             if self.is_combat_executing():
                 continue
             if self.appear(BATTLE_STATUS_S) or self.appear(BATTLE_STATUS_A) or self.appear(BATTLE_STATUS_B) \
@@ -143,9 +147,7 @@ class AutoSearchCombat(Combat):
             # End
             if self.is_auto_search_running():
                 break
-            if self.is_in_auto_search_menu():
-                raise CampaignEnd
-            if self._handle_auto_search_menu_missing():
+            if self.is_in_auto_search_menu() or self._handle_auto_search_menu_missing():
                 raise CampaignEnd
 
     def auto_search_combat(self, emotion_reduce=None, fleet_index=1):

module/os_handler/mission.py

@@ -52,7 +52,7 @@ class MissionHandler(UI, MapEventHandler, ZoneManager):
             in: MISSION_CHECK
             out: MISSION_CHECK
         """
-        confirm_timer = Timer(1, count=2).start()
+        confirm_timer = Timer(2, count=6).start()
         while 1:
             if skip_first_screenshot:
                 skip_first_screenshot = False