sui_feng/AzurLaneAutoScript
1
0
Fork 0
mirror of https://gitee.com/sui-feng-cb/AzurLaneAutoScript1 synced 2026-03-19 23:33:33 +08:00
Code Activity

Merge pull request #3393 from LmeSzinc/dev

Browse Source 
Bug fix
This commit is contained in:
LmeSzinc
2023-12-29 10:00:54 +08:00
committed by GitHub
parent a49e149daa 9d7d0474ce
commit 31c31fe70d
4 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
module/campaign/gems_farming.py
View File

@@ -92,10 +92,15 @@ class GemsFarming(CampaignRun, Dock, EquipmentChange):
def _fleet_detail_enter(self): def _fleet_detail_enter(self):
""" """
Enter GEMS_FLEET_1 page Enter GEMS_FLEET page
""" """
self.ui_ensure(page_fleet) 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) next_button=FLEET_NEXT, prev_button=FLEET_PREV, skip_first_screenshot=True)
def _ship_detail_enter(self, button): def _ship_detail_enter(self, button):

2
module/device/control.py
View File

@@ -167,4 +167,4 @@ class Control(Hermit, Minitouch, Scrcpy, MaaTouch):
logger.warning(f'Control method {method} does not support drag well, ' logger.warning(f'Control method {method} does not support drag well, '
f'falling back to ADB swipe may cause unexpected behaviour') f'falling back to ADB swipe may cause unexpected behaviour')
self.swipe_adb(p1, p2, duration=ensure_time(swipe_duration * 2)) 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)

8
submodule/AlasFpyBridge/module/config/config.py
View File

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

8
submodule/AlasMaaBridge/module/config/config.py
View File

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