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

Merge pull request #4619 from LmeSzinc/dev

Browse Source 
Bug fix
This commit is contained in:
LmeSzinc
2025-02-28 02:13:47 +08:00
committed by GitHub
parent c548e4b960 9e74c43c93
commit 5f5fb22268
3 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
module/config/config_manual.py
View File

@@ -118,6 +118,8 @@ class ManualConfig:
# Since event_20241219_cn chapter B unlocks event startup # Since event_20241219_cn chapter B unlocks event startup
# which means chapter AB are continuous # which means chapter AB are continuous
STAGE_INCREASE_AB = False STAGE_INCREASE_AB = False
# Insert anything to STAGE_INCREASE
STAGE_INCREASE_CUSTOM = ''
MAP_HAS_CLEAR_PERCENTAGE = True MAP_HAS_CLEAR_PERCENTAGE = True
MAP_HAS_WALK_SPEEDUP = False MAP_HAS_WALK_SPEEDUP = False
MAP_HAS_AMBUSH = True MAP_HAS_AMBUSH = True

5
module/device/connection.py
View File

@@ -1025,10 +1025,7 @@ class Connection(ConnectionAttr):
self.serial = emu_serial self.serial = emu_serial
# Redirect MuMu12 from 127.0.0.1:7555 to 127.0.0.1:16xxx # Redirect MuMu12 from 127.0.0.1:7555 to 127.0.0.1:16xxx
if ( if self.serial == '127.0.0.1:7555':
(IS_WINDOWS and self.serial == '127.0.0.1:7555')
or (IS_MACINTOSH and self.serial == '127.0.0.1:5555')
):
for _ in range(2): for _ in range(2):
mumu12 = available.select(may_mumu12_family=True) mumu12 = available.select(may_mumu12_family=True)
if mumu12.count == 1: if mumu12.count == 1:

13
module/handler/fast_forward.py
View File

@@ -334,8 +334,19 @@ class FastForwardHandler(AutoSearchHandler):
""" """
# Copy STAGE_INCREASE to avoid potential duplicate inserting # Copy STAGE_INCREASE to avoid potential duplicate inserting
stage_increase = [r for r in self.STAGE_INCREASE] stage_increase = [r for r in self.STAGE_INCREASE]
# Insert custom increase logic
if self.config.STAGE_INCREASE_AB: if self.config.STAGE_INCREASE_AB:
stage_increase.insert(0, 'A1 > A2 > A3 > B1 > B2 > B3') stage_increase = [
'A1 > A2 > A3 > B1 > B2 > B3',
'C1 > C2 > C3 > D1 > D2 > D3',
] + stage_increase
custom = self.config.STAGE_INCREASE_CUSTOM
if custom:
if isinstance(custom, str):
custom = [custom]
stage_increase = custom + stage_increase
# Increase stage
name = to_map_input_name(name) name = to_map_input_name(name)
for increase in stage_increase: for increase in stage_increase:
increase = [i.strip(' \t\r\n') for i in increase.split('>')] increase = [i.strip(' \t\r\n') for i in increase.split('>')]