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

Opt: Rename arguments to avoid possible conflicts

Browse Source
This commit is contained in:
SarContDeli
2022-09-13 21:01:00 +08:00
parent 4372c81fcd
commit f513f0fa91
12 changed files with 573 additions and 536 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
submodule/AlasMaaBridge/maa.py
View File

@@ -47,7 +47,7 @@ class ArknightsAutoScript(AzurLaneAutoScript):
self.config.task_call('MaaStartup', True)
self.config.task_stop()
AssistantHandler.load(self.config.Emulator_MaaPath)
AssistantHandler.load(self.config.MaaEmulator_MaaPath)
@AssistantHandler.Asst.CallBackType
def callback(msg, details, arg):
@@ -58,18 +58,18 @@ class ArknightsAutoScript(AzurLaneAutoScript):
arg (c_void_p):
"""
m = AssistantHandler.Message(msg)
d = details.decode('utf-8', 'ignore')
d = json.loads(details.decode('utf-8', 'ignore'))
logger.info(f'{m} {d}')
handler = AssistantHandler.ASST_HANDLER
if handler:
handler.callback_timer.reset()
for func in handler.callback_list:
func(m, json.loads(d))
func(m, d)
ArknightsAutoScript.callback = callback
asst = AssistantHandler.Asst(callback)
if not asst.connect(os.path.abspath(DeployConfig().AdbExecutable), self.config.Emulator_Serial):
if not asst.connect(os.path.abspath(DeployConfig().AdbExecutable), self.config.MaaEmulator_Serial):
logger.critical('Adb connect failed')
raise RequestHumanTakeover