From 1ac78c74ca456c8002b93912a06438470326b90a Mon Sep 17 00:00:00 2001 From: Zhao Zuohong Date: Mon, 11 Sep 2023 22:25:01 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E9=99=A4asst.py=EF=BC=9B=E6=9B=B4?= =?UTF-8?q?=E6=96=B0Maa=EF=BC=9B=E6=9A=82=E6=97=B6=E5=85=B3=E9=97=AD?= =?UTF-8?q?=E5=9B=9E=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- arknights_mower/solvers/base_schedule.py | 83 ++++--- arknights_mower/utils/asst.py | 265 ----------------------- server.py | 2 +- 3 files changed, 50 insertions(+), 300 deletions(-) delete mode 100644 arknights_mower/utils/asst.py diff --git a/arknights_mower/solvers/base_schedule.py b/arknights_mower/solvers/base_schedule.py index 9d26d6dc4..917ced9b0 100644 --- a/arknights_mower/solvers/base_schedule.py +++ b/arknights_mower/solvers/base_schedule.py @@ -2,7 +2,9 @@ import copy import subprocess import time +import os import sys +import pathlib from enum import Enum from datetime import datetime, timedelta import numpy as np @@ -31,8 +33,6 @@ # 借用__main__.py里的时间计算器 from arknights_mower.__main__ import format_time -## Maa -from arknights_mower.utils.asst import Asst, Message import json from arknights_mower.utils.email import task_template, maa_template, recruit_template @@ -1871,42 +1871,57 @@ def reload(self): if not error: self.reload_time = datetime.now() - @Asst.CallBackType - def log_maa(msg, details, arg): - m = Message(msg) - d = json.loads(details.decode('utf-8')) - logger.debug(d) - logger.debug(m) - logger.debug(arg) - if "what" in d and d["what"] == "StageDrops": - global stage_drop - stage_drop["details"].append(d["details"]["drops"]) - stage_drop["summary"] = d["details"]["stats"] - - elif "what" in d and d["what"] == "RecruitTagsSelected": - global recruit_tags_selected - recruit_tags_selected["tags"].append(d["details"]["tags"]) - - elif "what" in d and d["what"] == "RecruitResult": - global recruit_results - temp_dict = { - "tags": d["details"]["tags"], - "level": d["details"]["level"], - "result": d["details"]["result"], - } - recruit_results["results"].append(temp_dict) - - elif "what" in d and d["what"] == "RecruitSpecialTag": - global recruit_special_tags - recruit_special_tags["tags"].append(d["details"]["tags"]) def initialize_maa(self): + asst_path = os.path.dirname(pathlib.Path(self.maa_config['maa_path']) / "Python" / "asst") + if asst_path not in sys.path: + sys.path.append(asst_path) + global Message + from asst.asst import Asst + from asst.utils import Message, Version, InstanceOptionType + from asst.updater import Updater + + + logger.info("开始更新Maa……") + Updater(self.maa_config['maa_path'], Version.Stable).update() + logger.info("Maa更新完成") # 若需要获取详细执行信息，请传入 callback 参数 # 例如 asst = Asst(callback=my_callback) Asst.load(path=self.maa_config['maa_path']) - self.MAA = Asst(callback=self.log_maa) + + @Asst.CallBackType + def log_maa(msg, details, arg): + m = Message(msg) + d = json.loads(details.decode('utf-8')) + logger.debug(d) + logger.debug(m) + logger.debug(arg) + if "what" in d and d["what"] == "StageDrops": + global stage_drop + stage_drop["details"].append(d["details"]["drops"]) + stage_drop["summary"] = d["details"]["stats"] + + elif "what" in d and d["what"] == "RecruitTagsSelected": + global recruit_tags_selected + recruit_tags_selected["tags"].append(d["details"]["tags"]) + + elif "what" in d and d["what"] == "RecruitResult": + global recruit_results + temp_dict = { + "tags": d["details"]["tags"], + "level": d["details"]["level"], + "result": d["details"]["result"], + } + recruit_results["results"].append(temp_dict) + + elif "what" in d and d["what"] == "RecruitSpecialTag": + global recruit_special_tags + recruit_special_tags["tags"].append(d["details"]["tags"]) + + # self.MAA = Asst(callback=log_maa) + self.MAA = Asst() self.stages = [] - self.MAA.set_instance_option(2, self.maa_config['touch_option']) + self.MAA.set_instance_option(InstanceOptionType.touch_type, self.maa_config['touch_option']) # 请自行配置 adb 环境变量，或修改为 adb 可执行程序的路径 # logger.info(self.device.client.device_id) if self.MAA.connect(self.maa_config['maa_adb_path'], self.device.client.device_id, @@ -1976,8 +1991,8 @@ def maa_plan_solver(self, tasks='All', one_time=False): logger.info("间隔未超过设定时间，不启动maa") else: """森空岛签到""" - skland = SKLand() - skland.attendance() + # skland = SKLand() + # skland.attendance() """测试公招用""" if 'Recruit' in tasks or tasks == 'All': diff --git a/arknights_mower/utils/asst.py b/arknights_mower/utils/asst.py deleted file mode 100644 index e12eb266d..000000000 --- a/arknights_mower/utils/asst.py +++ /dev/null @@ -1,265 +0,0 @@ -import ctypes -import os -import pathlib -import platform -import json - -from typing import Union, Dict, List, Any, Type, Optional -from enum import Enum, IntEnum, unique, auto - -JSON = Union[Dict[str, Any], List[Any], int, str, float, bool, Type[None]] - - -class InstanceOptionType(IntEnum): - touch_type = 2 - deployment_with_pause = 3 - - -class Asst: - CallBackType = ctypes.CFUNCTYPE( - None, ctypes.c_int, ctypes.c_char_p, ctypes.c_void_p) - """ - 回调函数，使用实例可参照 my_callback - :params: - ``param1 message``: 消息类型 - ``param2 details``: json string - ``param3 arg``: 自定义参数 - """ - - @staticmethod - def load(path: Union[pathlib.Path, str], incremental_path: Optional[Union[pathlib.Path, str]] = None, user_dir: Optional[Union[pathlib.Path, str]] = None) -> bool: - """ - 加载 dll 及资源 - :params: - ``path``: DLL及资源所在文件夹路径 - ``incremental_path``: 增量资源所在文件夹路径 - ``user_dir``: 用户数据（日志、调试图片等）写入文件夹路径 - """ - - platform_values = { - 'windows': { - 'libpath': 'MaaCore.dll', - 'environ_var': 'PATH' - }, - 'darwin': { - 'libpath': 'libMaaCore.dylib', - 'environ_var': 'DYLD_LIBRARY_PATH' - }, - 'linux': { - 'libpath': 'libMaaCore.so', - 'environ_var': 'LD_LIBRARY_PATH' - } - } - lib_import_func = None - - platform_type = platform.system().lower() - if platform_type == 'windows': - lib_import_func = ctypes.WinDLL - else: - lib_import_func = ctypes.CDLL - - Asst.__libpath = pathlib.Path(path) / platform_values[platform_type]['libpath'] - try: - os.environ[platform_values[platform_type]['environ_var']] += os.pathsep + str(path) - except KeyError: - os.environ[platform_values[platform_type]['environ_var']] = os.pathsep + str(path) - Asst.__lib = lib_import_func(str(Asst.__libpath)) - Asst.__set_lib_properties() - - ret: bool = True - if user_dir: - ret &= Asst.__lib.AsstSetUserDir(str(user_dir).encode('utf-8')) - - ret &= Asst.__lib.AsstLoadResource(str(path).encode('utf-8')) - if incremental_path: - ret &= Asst.__lib.AsstLoadResource( - str(incremental_path).encode('utf-8')) - - return ret - - def __init__(self, callback: CallBackType = None, arg=None): - """ - :params: - ``callback``: 回调函数 - ``arg``: 自定义参数 - """ - - if callback: - self.__ptr = Asst.__lib.AsstCreateEx(callback, arg) - else: - self.__ptr = Asst.__lib.AsstCreate() - - def __del__(self): - Asst.__lib.AsstDestroy(self.__ptr) - self.__ptr = None - - def set_instance_option(self, option_type: InstanceOptionType, option_value: str): - """ - 设置额外配置 - 参见${MaaAssistantArknights}/src/MaaCore/Assistant.cpp#set_instance_option - :params: - ``externa_config``: 额外配置类型 - ``config_value``: 额外配置的值 - :return: 是否设置成功 - """ - return Asst.__lib.AsstSetInstanceOption(self.__ptr, - int(option_type), option_value.encode('utf-8')) - - - def connect(self, adb_path: str, address: str, config: str = 'General'): - """ - 连接设备 - :params: - ``adb_path``: adb 程序的路径 - ``address``: adb 地址+端口 - ``config``: adb 配置，可参考 resource/config.json - :return: 是否连接成功 - """ - return Asst.__lib.AsstConnect(self.__ptr, - adb_path.encode('utf-8'), address.encode('utf-8'), config.encode('utf-8')) - - TaskId = int - - def append_task(self, type_name: str, params: JSON = {}) -> TaskId: - """ - 添加任务 - :params: - ``type_name``: 任务类型，请参考 docs/集成文档.md - ``params``: 任务参数，请参考 docs/集成文档.md - :return: 任务 ID, 可用于 set_task_params 接口 - """ - return Asst.__lib.AsstAppendTask(self.__ptr, type_name.encode('utf-8'), json.dumps(params, ensure_ascii=False).encode('utf-8')) - - def set_task_params(self, task_id: TaskId, params: JSON) -> bool: - """ - 动态设置任务参数 - :params: - ``task_id``: 任务 ID, 使用 append_task 接口的返回值 - ``params``: 任务参数，同 append_task 接口，请参考 docs/集成文档.md - :return: 是否成功 - """ - return Asst.__lib.AsstSetTaskParams(self.__ptr, task_id, json.dumps(params, ensure_ascii=False).encode('utf-8')) - - def start(self) -> bool: - """ - 开始任务 - :return: 是否成功 - """ - return Asst.__lib.AsstStart(self.__ptr) - - def stop(self) -> bool: - """ - 停止并清空所有任务 - :return: 是否成功 - """ - return Asst.__lib.AsstStop(self.__ptr) - - def running(self) -> bool: - """ - 是否正在运行 - :return: 是否正在运行 - """ - return Asst.__lib.AsstRunning(self.__ptr) - - @staticmethod - def log(level: str, message: str) -> None: - ''' - 打印日志 - :params: - ``level``: 日志等级标签 - ``message``: 日志内容 - ''' - - Asst.__lib.AsstLog(level.encode('utf-8'), message.encode('utf-8')) - - def get_version(self) -> str: - """ - 获取DLL版本号 - : return: 版本号 - """ - return Asst.__lib.AsstGetVersion().decode('utf-8') - - @staticmethod - def __set_lib_properties(): - Asst.__lib.AsstSetUserDir.restype = ctypes.c_bool - Asst.__lib.AsstSetUserDir.argtypes = ( - ctypes.c_char_p,) - - Asst.__lib.AsstLoadResource.restype = ctypes.c_bool - Asst.__lib.AsstLoadResource.argtypes = ( - ctypes.c_char_p,) - - Asst.__lib.AsstCreate.restype = ctypes.c_void_p - Asst.__lib.AsstCreate.argtypes = () - - Asst.__lib.AsstCreateEx.restype = ctypes.c_void_p - Asst.__lib.AsstCreateEx.argtypes = ( - ctypes.c_void_p, ctypes.c_void_p,) - - Asst.__lib.AsstDestroy.argtypes = (ctypes.c_void_p,) - - Asst.__lib.AsstSetInstanceOption.restype = ctypes.c_bool - Asst.__lib.AsstSetInstanceOption.argtypes = ( - ctypes.c_void_p, ctypes.c_int, ctypes.c_char_p,) - - Asst.__lib.AsstConnect.restype = ctypes.c_bool - Asst.__lib.AsstConnect.argtypes = ( - ctypes.c_void_p, ctypes.c_char_p, ctypes.c_char_p, ctypes.c_char_p,) - - Asst.__lib.AsstAppendTask.restype = ctypes.c_int - Asst.__lib.AsstAppendTask.argtypes = ( - ctypes.c_void_p, ctypes.c_char_p, ctypes.c_char_p) - - Asst.__lib.AsstSetTaskParams.restype = ctypes.c_bool - Asst.__lib.AsstSetTaskParams.argtypes = ( - ctypes.c_void_p, ctypes.c_int, ctypes.c_char_p) - - Asst.__lib.AsstStart.restype = ctypes.c_bool - Asst.__lib.AsstStart.argtypes = (ctypes.c_void_p,) - - Asst.__lib.AsstStop.restype = ctypes.c_bool - Asst.__lib.AsstStop.argtypes = (ctypes.c_void_p,) - - Asst.__lib.AsstRunning.restype = ctypes.c_bool - Asst.__lib.AsstRunning.argtypes = (ctypes.c_void_p,) - - Asst.__lib.AsstGetVersion.restype = ctypes.c_char_p - - Asst.__lib.AsstLog.restype = None - Asst.__lib.AsstLog.argtypes = ( - ctypes.c_char_p, ctypes.c_char_p) - - -@unique -class Message(Enum): - """ - 回调消息 - 请参考 docs/回调消息.md - """ - InternalError = 0 - - InitFailed = auto() - - ConnectionInfo = auto() - - AllTasksCompleted = auto() - - TaskChainError = 10000 - - TaskChainStart = auto() - - TaskChainCompleted = auto() - - TaskChainExtraInfo = auto() - - TaskChainStopped = auto() - - SubTaskError = 20000 - - SubTaskStart = auto() - - SubTaskCompleted = auto() - - SubTaskExtraInfo = auto() - - SubTaskStopped = auto() \ No newline at end of file diff --git a/server.py b/server.py index 73c446003..d72994cdb 100755 --- a/server.py +++ b/server.py @@ -202,7 +202,7 @@ def start(): operators, write, ), - daemon=True, + daemon=False, ) mower_process.start()