Merge pull request #2843 from LmeSzinc/dev

Bug fix

module/gacha/gacha_reward.py

@@ -197,15 +197,18 @@ class RewardGacha(GachaUI, GeneralShop, Retirement):
         confirm_mode = True  # Drill, Lock Ship
         # Clear button offset, or will click at the PLUS button of gems or HOME button
         STORY_SKIP.clear_offset()
+        queue_clean = True
         while 1:
             if skip_first_screenshot:
                 skip_first_screenshot = False
             else:
                 self.device.screenshot()
 
-            if self.appear(BUILD_QUEUE_EMPTY, offset=(20, 20)):
+            if self.appear(BUILD_QUEUE_EMPTY, offset=(20, 20)) and queue_clean:
                 self.gacha_side_navbar_ensure(upper=1)
                 break
+            else:
+                queue_clean = False
             
             if self.appear_then_click(BUILD_FINISH_ORDERS, interval=3):
                 confirm_timer.reset()

module/retire/retirement.py

@@ -307,6 +307,9 @@ class Retirement(Enhancement, QuickRetireSettingHandler):
                 self.device.screenshot()
 
             ships = scanner.scan(self.device.image)
+            if not ships:
+                # exit if nothing can be retired
+                break
             if keep_one:
                 if len(ships) < 2:
                     break