Merge pull request #2318 from LmeSzinc/bug_fix

Bug fix

module/campaign/campaign_event.py

@@ -136,6 +136,8 @@ class CampaignEvent(CampaignStatus):
             return False
 
     def handle_task_balancer(self):
+        return
+
         if self.config.TaskBalancer_Enable and self.triggered_task_balancer():
             self.config.task_delay(minute=5)
             next_task = self.config.TaskBalancer_TaskCall

module/os_handler/storage.py

@@ -15,14 +15,28 @@ class StorageHandler(GlobeOperation, ZoneManager):
     def is_in_storage(self):
         return self.appear(STORAGE_CHECK, offset=(20, 20))
 
-    def storage_enter(self):
+    def storage_enter(self, skip_first_screenshot=True):
         """
         Pages:
             in: is_in_map, STORAGE_ENTER
             out: STORAGE_CHECK
         """
-        self.ui_click(STORAGE_ENTER, check_button=self.is_in_storage,
+        while 1:
-                      retry_wait=3, offset=(200, 5), skip_first_screenshot=True)
+            if skip_first_screenshot:
+                skip_first_screenshot = False
+            else:
+                self.device.screenshot()
+
+            # End
+            if self.is_in_storage():
+                break
+
+            if self.appear_then_click(STORAGE_ENTER, offset=(200, 5), interval=3):
+                continue
+            # A game bug that AUTO_SEARCH_REWARD from the last cleared zone popups
+            if self.appear_then_click(AUTO_SEARCH_REWARD, offset=(50, 50), interval=3):
+                continue
+
         self.handle_info_bar()
 
     def storage_quit(self):