Merge pull request #3393 from LmeSzinc/dev

Bug fix

Author: LmeSzinc

module/campaign/gems_farming.py

@@ -92,10 +92,15 @@ def change_vanguard_equip(self):
 
     def _fleet_detail_enter(self):
         """
-        Enter GEMS_FLEET_1 page
+        Enter GEMS_FLEET page
         """
         self.ui_ensure(page_fleet)
-        self.ui_ensure_index(self.config.Fleet_Fleet1, letter=OCR_FLEET_INDEX,
+        _fleet_to_change = self.config.Fleet_Fleet1
+        if self.config.Fleet_FleetOrder == 'fleet1_all_fleet2_standby':
+            _fleet_to_change = self.config.Fleet_Fleet1
+        elif self.config.Fleet_FleetOrder == 'fleet1_standby_fleet2_all':
+            _fleet_to_change = self.config.Fleet_Fleet2
+        self.ui_ensure_index(_fleet_to_change, letter=OCR_FLEET_INDEX,
                              next_button=FLEET_NEXT, prev_button=FLEET_PREV, skip_first_screenshot=True)
 
     def _ship_detail_enter(self, button):

module/device/control.py

@@ -167,4 +167,4 @@ def drag(self, p1, p2, segments=1, shake=(0, 15), point_random=(-10, -10, 10, 10
             logger.warning(f'Control method {method} does not support drag well, '
                            f'falling back to ADB swipe may cause unexpected behaviour')
             self.swipe_adb(p1, p2, duration=ensure_time(swipe_duration * 2))
-            self.click(Button(area=(), color=(), button=area_offset(point_random, p2), name=name))
+            self.click(Button(area=(), color=(), button=area_offset(point_random, p2), name=name ),False)

submodule/AlasFpyBridge/module/config/config.py

@@ -25,10 +25,10 @@ def __init__(self, config_name, task=None):
             self.save()
 
     # @override
-    def bind(self, func, func_set=None):
-        if func_set is None:
-            func_set = {"Fpy"}
-        super().bind(func, func_set)
+    def bind(self, func, func_list=None):
+        if func_list is None:
+            func_list = ["Fpy"]
+        super().bind(func, func_list)
 
     # @override
     def save(self, mod_name="fpy"):

submodule/AlasMaaBridge/module/config/config.py

@@ -27,10 +27,10 @@ def __init__(self, config_name, task=None):
             self.task = task
             self.save()
 
-    def bind(self, func, func_set=None):
-        if func_set is None:
-            func_set = {'Maa'}
-        super().bind(func, func_set)
+    def bind(self, func, func_list=None):
+        if func_list is None:
+            func_list = ['Maa']
+        super().bind(func, func_list)
 
     def save(self, mod_name='maa'):
         super().save(mod_name)