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

Merge branch 'master' of https://github.com/LmeSzinc/AzurLaneAutoScript

Browse Source
This commit is contained in:
GH Action - Upstream Sync
2026-03-28 14:39:56 +00:00
parent 52adbc54f2 dce5261670
commit 4f917c8169
17 changed files with 109 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
module/config/argument/args.json
View File

@@ -375,6 +375,7 @@
"LDPlayer3",
"LDPlayer4",
"LDPlayer9",
"LDPlayer14",
"MuMuPlayer",
"MuMuPlayerX",
"MuMuPlayer12",
@@ -7363,6 +7364,10 @@
"Favorite": {
"type": "checkbox",
"value": true
},
"MinLevel": {
"type": "input",
"value": 50
}
},
"Storage": {

2
module/config/argument/argument.yaml
View File

@@ -69,6 +69,7 @@ EmulatorInfo:
LDPlayer3,
LDPlayer4,
LDPlayer9,
LDPlayer14,
MuMuPlayer,
MuMuPlayerX,
MuMuPlayer12,
@@ -401,6 +402,7 @@ ControlExpOverflow:
AddNewStudent:
Enable: false
Favorite: true
MinLevel: 50
Research:
UseCube:
value: only_05_hour

3
module/config/config_generated.py
View File

@@ -27,7 +27,7 @@ class GeneratedConfig:
Emulator_AdbRestart = False
# Group `EmulatorInfo`
EmulatorInfo_Emulator = 'auto' # auto, NoxPlayer, NoxPlayer64, BlueStacks4, BlueStacks5, BlueStacks4HyperV, BlueStacks5HyperV, LDPlayer3, LDPlayer4, LDPlayer9, MuMuPlayer, MuMuPlayerX, MuMuPlayer12, MEmuPlayer
EmulatorInfo_Emulator = 'auto' # auto, NoxPlayer, NoxPlayer64, BlueStacks4, BlueStacks5, BlueStacks4HyperV, BlueStacks5HyperV, LDPlayer3, LDPlayer4, LDPlayer9, LDPlayer14, MuMuPlayer, MuMuPlayerX, MuMuPlayer12, MEmuPlayer
EmulatorInfo_name = None
EmulatorInfo_path = None
@@ -223,6 +223,7 @@ class GeneratedConfig:
# Group `AddNewStudent`
AddNewStudent_Enable = False
AddNewStudent_Favorite = True
AddNewStudent_MinLevel = 50
# Group `Research`
Research_UseCube = 'only_05_hour' # always_use, only_05_hour, only_no_project, do_not_use

5
module/config/i18n/en-US.json
View File

@@ -482,6 +482,7 @@
"LDPlayer3": "LD Player 3",
"LDPlayer4": "LD Player 4",
"LDPlayer9": "LD Player 9",
"LDPlayer14": "LDPlayer 14",
"MuMuPlayer": "MuMu Player",
"MuMuPlayerX": "MuMu Player X",
"MuMuPlayer12": "MuMu Player 12",
@@ -1531,6 +1532,10 @@
"Favorite": {
"name": "Use Favorite Filter",
"help": "During student selection apply the favorite filter\nThereby, giving priority to certain ship girls\nApply the favorite status to a ship girl in-game"
},
"MinLevel": {
"name": "Add Students with Level >= X Only",
"help": ""
}
},
"Research": {

5
module/config/i18n/ja-JP.json
View File

@@ -482,6 +482,7 @@
"LDPlayer3": "LDPlayer3",
"LDPlayer4": "LDPlayer4",
"LDPlayer9": "LDPlayer9",
"LDPlayer14": "LDPlayer14",
"MuMuPlayer": "MuMuPlayer",
"MuMuPlayerX": "MuMuPlayerX",
"MuMuPlayer12": "MuMuPlayer12",
@@ -1531,6 +1532,10 @@
"Favorite": {
"name": "好ましい選択",
"help": ""
},
"MinLevel": {
"name": "レベルがX以上のキャラクターのみを追加してください。",
"help": ""
}
},
"Research": {

5
module/config/i18n/zh-CN.json
View File

@@ -482,6 +482,7 @@
"LDPlayer3": "雷电模拟器3",
"LDPlayer4": "雷电模拟器4",
"LDPlayer9": "雷电模拟器9",
"LDPlayer14": "雷电模拟器14",
"MuMuPlayer": "MuMu模拟器",
"MuMuPlayerX": "MuMu模拟器X",
"MuMuPlayer12": "MuMu模拟器12",
@@ -1531,6 +1532,10 @@
"Favorite": {
"name": "优先选择常用",
"help": ""
},
"MinLevel": {
"name": "仅添加等级 >= X 的角色",
"help": ""
}
},
"Research": {

5
module/config/i18n/zh-TW.json
View File

@@ -482,6 +482,7 @@
"LDPlayer3": "雷電模擬器3",
"LDPlayer4": "雷電模擬器4",
"LDPlayer9": "雷電模擬器9",
"LDPlayer14": "雷電模擬器14",
"MuMuPlayer": "MuMu模擬器",
"MuMuPlayerX": "MuMu模擬器X",
"MuMuPlayer12": "MuMu模擬器12",
@@ -1531,6 +1532,10 @@
"Favorite": {
"name": "優先選擇常用",
"help": ""
},
"MinLevel": {
"name": "僅新增等級 >= X 的角色",
"help": ""
}
},
"Research": {

8
module/daemon/benchmark.py
View File

@@ -39,7 +39,7 @@ class Benchmark(DaemonBase, CampaignUI):
record = []
for n in range(1, self.TEST_TOTAL + 1):
start = time.time()
start = time.perf_counter()
try:
func(*args, **kwargs)
@@ -52,7 +52,7 @@ class Benchmark(DaemonBase, CampaignUI):
logger.warning(f'Benchmark tests failed on func: {func.__name__}')
return 'Failed'
cost = time.time() - start
cost = time.perf_counter() - start
logger.attr(
f'{str(n).rjust(2, "0")}/{self.TEST_TOTAL}',
f'{float2str(cost)}'
@@ -194,6 +194,10 @@ class Benchmark(DaemonBase, CampaignUI):
if device == 'android_phone_vmos':
screenshot = ['ADB', 'aScreenCap', 'DroidCast', 'DroidCast_raw']
click = ['ADB', 'Hermit', 'MaaTouch']
# Droidcast on SDK 23 (Android 6.0) to SDK 32 (Android 12)
if not (23 <= sdk <= 32):
screenshot = remove('DroidCast', 'DroidCast_raw')
if self.device.nemu_ipc_available():
screenshot.append('nemu_ipc')
if self.device.ldopengl_available():

2
module/device/method/ldopengl.py
View File

@@ -332,7 +332,7 @@ class LDOpenGL(Platform):
if not self.is_ldplayer_bluestacks_family:
return False
logger.attr('EmulatorInfo_Emulator', self.config.EmulatorInfo_Emulator)
if self.config.EmulatorInfo_Emulator not in ['LDPlayer9']:
if self.config.EmulatorInfo_Emulator not in ['LDPlayer9', 'LDPlayer14']:
return False
try:

3
module/device/platform/emulator_base.py
View File

@@ -155,7 +155,8 @@ class EmulatorBase:
LDPlayer3 = 'LDPlayer3'
LDPlayer4 = 'LDPlayer4'
LDPlayer9 = 'LDPlayer9'
LDPlayerFamily = [LDPlayer3, LDPlayer4, LDPlayer9]
LDPlayer14 = 'LDPlayer14'
LDPlayerFamily = [LDPlayer3, LDPlayer4, LDPlayer9, LDPlayer14]
MuMuPlayer = 'MuMuPlayer'
MuMuPlayerX = 'MuMuPlayerX'
MuMuPlayer12 = 'MuMuPlayer12'

9
module/device/platform/emulator_windows.py
View File

@@ -110,6 +110,8 @@ class Emulator(EmulatorBase):
return cls.LDPlayer4
elif dir1 == 'ldplayer9':
return cls.LDPlayer9
elif dir1 == 'ldplayer14':
return cls.LDPlayer14
else:
return cls.LDPlayer3
if exe == 'nemuplayer.exe':
@@ -538,8 +540,11 @@ class EmulatorManager(EmulatorManagerBase):
exe.add(file)
# LDPlayer install path
for path in [r'SOFTWARE\leidian\ldplayer',
r'SOFTWARE\leidian\ldplayer9']:
for path in [
r'SOFTWARE\leidian\ldplayer',
r'SOFTWARE\leidian\ldplayer9',
r'SOFTWARE\leidian\ldplayer14',
]:
ld = self.get_install_dir_from_reg(path, 'InstallDir')
if ld:
ld = abspath(os.path.join(ld, './dnplayer.exe'))

27
module/device/platform/platform_base.py
View File

@@ -181,6 +181,20 @@ class PlatformBase(Connection, EmulatorManagerBase):
logger.info(f'Found emulator instance: {instance}')
return instance
# search by emulator type first, which is the easiest setting for user to setup, so more trustworthy
# Multiple instances in given serial, name and path, search by emulator
if emulator:
search_args['type'] = emulator
select = instances.select(**search_args)
if select.count == 0:
logger.warning(f'No emulator instances with {search_args}, type invalid')
search_args.pop('type')
elif select.count == 1:
instance = select[0]
logger.hr('Emulator instance', level=2)
logger.info(f'Found emulator instance: {instance}')
return instance
# Multiple instances in given serial, search by name
if name:
search_args['name'] = name
@@ -207,19 +221,6 @@ class PlatformBase(Connection, EmulatorManagerBase):
logger.info(f'Found emulator instance: {instance}')
return instance
# Multiple instances in given serial, name and path, search by emulator
if emulator:
search_args['type'] = emulator
select = instances.select(**search_args)
if select.count == 0:
logger.warning(f'No emulator instances with {search_args}, type invalid')
search_args.pop('type')
elif select.count == 1:
instance = select[0]
logger.hr('Emulator instance', level=2)
logger.info(f'Found emulator instance: {instance}')
return instance
# Still too many instances, search from running emulators
running = remove_duplicated_path(list(self.iter_running_emulator()))
logger.info('Running emulators')

2
module/reward/reward.py
View File

@@ -89,6 +89,8 @@ class Reward(UI):
click_interval.reset()
clicked = True
continue
if self.appear(MISSION_UNFINISH, offset=(20, 20)):
return clicked
def _reward_mission_claim_receive(self):
"""

23
module/tactical/tactical_class.py
View File

@@ -643,27 +643,34 @@ class RewardTacticalClass(Dock):
# Wait until they turn into
# [120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120]
level_ocr = LevelOcr(CARD_LEVEL_GRIDS.buttons, name='DOCK_LEVEL_OCR', threshold=64)
timeout = Timer(1, count=1).start()
while 1:
list_level = []
for _ in self.loop(timeout=1):
list_level = level_ocr.ocr(self.device.image)
first_ship = next((i for i, x in enumerate(list_level) if x > 0), len(list_level))
first_empty = next((i for i, x in enumerate(list_level) if x == 0), len(list_level))
if timeout.reached():
logger.warning('Wait ship cards timeout')
break
if first_empty >= first_ship:
break
self.device.screenshot()
else:
logger.warning('Wait ship cards timeout')
try:
min_level = int(self.config.AddNewStudent_MinLevel)
if min_level < 1:
min_level = 1
except (ValueError, TypeError) as e:
logger.warning(f'Invalid AddNewStudent_MinLevel: {self.config.AddNewStudent_MinLevel}, {e}')
min_level = 1
logger.attr('AddNewStudent_MinLevel', min_level)
should_select_button = None
for button, level in list(zip(CARD_GRIDS.buttons, list_level))[self.dock_select_index:]:
# Select ship LV > 1 only
if level > 1:
if level >= min_level:
should_select_button = button
break
if should_select_button is None:
logger.info('No ships with level > 1 in dock')
logger.info(f'No ships with level >= {min_level} in dock')
return False
# select a ship