From 17e41a8bff09d435375ffcd9bc3a2dcbe81d5769 Mon Sep 17 00:00:00 2001 From: SC23 <70562937+Jerrynh770@users.noreply.github.com> Date: Fri, 29 Dec 2023 09:47:30 +0800 Subject: [PATCH 1/3] Fix: GUILD DISPATCH (#3392) * Fix_Gulid_DISPATCH * Revert "Fix_Gulid_DISPATCH" This reverts commit ba1f1f2ef5c3d56297f945e92ae2f73aaff8eb53. * Fixed_Gulid_DISPATCH * Fixed_GulidDISPATCH --- module/device/control.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/device/control.py b/module/device/control.py index 6347234e58..5834d36253 100644 --- a/module/device/control.py +++ b/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) From 108e0d7da97b866587b7c5c71059bf2c12c78b9d Mon Sep 17 00:00:00 2001 From: LmeSzinc <37934724+LmeSzinc@users.noreply.github.com> Date: Fri, 29 Dec 2023 09:50:27 +0800 Subject: [PATCH 2/3] Fix: Plugins should bind a func list (#3390) --- submodule/AlasFpyBridge/module/config/config.py | 8 ++++---- submodule/AlasMaaBridge/module/config/config.py | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/submodule/AlasFpyBridge/module/config/config.py b/submodule/AlasFpyBridge/module/config/config.py index 64ecdda2eb..e6da096e28 100644 --- a/submodule/AlasFpyBridge/module/config/config.py +++ b/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"): diff --git a/submodule/AlasMaaBridge/module/config/config.py b/submodule/AlasMaaBridge/module/config/config.py index aca1c11687..2f8d206d54 100644 --- a/submodule/AlasMaaBridge/module/config/config.py +++ b/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) From 9d7d0474ce2464954248d38f47cd58ca2a08669c Mon Sep 17 00:00:00 2001 From: Zuosizhu <60862861+Zuosizhu@users.noreply.github.com> Date: Fri, 29 Dec 2023 09:59:09 +0800 Subject: [PATCH 3/3] Fix: Change Fleet_2's ships instead of fixed Fleet_1 when using 'fleet1_standby_fleet2_all' in GemsFarming (#3387) Co-authored-by: LmeSzinc --- module/campaign/gems_farming.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/module/campaign/gems_farming.py b/module/campaign/gems_farming.py index 682b21199d..eb537eed1f 100644 --- a/module/campaign/gems_farming.py +++ b/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):