Merge pull request #2658 from LmeSzinc/dev

Bug fix

Author: LmeSzinc

module/gacha/gacha_reward.py

@@ -234,6 +234,11 @@ def gacha_flush_queue(self, skip_first_screenshot=True):
                 if confirm_timer.reached():
                     break
 
+        # Wishing pool no longer shows coins, go back to normal pools
+        if self.appear(BUILD_SUBMIT_WW_ORDERS):
+            logger.info('In wishing pool, go back to normal pools')
+            self.gacha_side_navbar_ensure(upper=1)
+
     def gacha_submit(self, skip_first_screenshot=True):
         """
         Pages:

module/map/fleet.py

@@ -508,7 +508,7 @@ def find_path_initial(self):
         if self.fleet_2_location:
             self.map[self.fleet_2_location].is_fleet = True
         location_dict = {}
-        if self.config.FLEET_2:
+        if self.fleet_2_location:
             location_dict[2] = self.fleet_2_location
         location_dict[1] = self.fleet_1_location
         # Release fortress block

module/os/config.py

@@ -10,8 +10,9 @@ class OSConfig:
     IGNORE_LOW_EMOTION_WARN = False
 
     MAP_GRID_CENTER_TOLERANCE = 0.2
-    MAP_SWIPE_MULTIPLY = (1.320, 1.009)
-    MAP_SWIPE_MULTIPLY_MINITOUCH = (1.276, 0.974)
+    MAP_SWIPE_MULTIPLY = (1.174, 1.200)
+    MAP_SWIPE_MULTIPLY_MINITOUCH = (1.135, 1.160)
+    MAP_SWIPE_MULTIPLY_MAATOUCH = (1.102, 1.126)
 
     DETECTION_BACKEND = 'perspective'
     MID_DIFF_RANGE_H = (103 - 3, 103 + 3)

module/os/map.py

@@ -826,8 +826,8 @@ def map_rescan_once(self, rescan_mode='full', drop=None):
         self.handle_info_bar()
         self.update()
         if self.map_rescan_current(drop=drop):
-            logger.info(f'Map rescan once end, result={result}')
-            return result
+            logger.info(f'Map rescan once end, result={True}')
+            return True
 
         if rescan_mode == 'full':
             logger.hr('Map rescan full', level=2)

module/ui/page.py

@@ -129,8 +129,8 @@ def link(self, button, destination):
 
 # Raid
 page_raid = Page(RAID_CHECK)
-page_raid.link(button=GOTO_MAIN, destination=page_main)
-page_main.link(button=MAIN_GOTO_RAID, destination=page_raid)
+# page_raid.link(button=GOTO_MAIN, destination=page_main)
+# page_main.link(button=MAIN_GOTO_RAID, destination=page_raid)
 
 # Research
 # Please don't goto page_research from page_reward.