diff --git a/app/core/config.py b/app/core/config.py index 14bb172..9f36c79 100644 --- a/app/core/config.py +++ b/app/core/config.py @@ -2242,6 +2242,10 @@ class AppConfig(GlobalConfig): data[key][stage][item] = 0 data[key][stage][item] += count + # 处理理智相关字段 - 使用最后一个文件的值 + elif key in ["sanity", "sanity_full_at"]: + data[key] = single_data[key] + # 录入运行结果 elif key in ["maa_result", "general_result"]: diff --git a/app/task/MAA.py b/app/task/MAA.py index 70ea193..f844645 100644 --- a/app/task/MAA.py +++ b/app/task/MAA.py @@ -1052,7 +1052,7 @@ class MaaManager: ) if len(result["failed_user"]) > 0: result_text += ( - f"{self.mode}未成功的用户: \n{"\n".join(result["failed_user"])}\n" + f"{self.mode未成功的用户: \n{"\n".join(result["failed_user"])}\n" ) if len(result["waiting_user"]) > 0: result_text += f"\n未开始{self.mode}的用户: \n{"\n".join(result["waiting_user"])}\n" @@ -1122,7 +1122,7 @@ class MaaManager: await asyncio.sleep(self.wait_time) if "-" in self.ADB_address: - ADB_ip = f"{self.ADB_address.split("-")[0]}-" + ADB_ip = f"{self.ADB_address.split('-')[0]}-" ADB_port = int(self.ADB_address.split("-")[1]) elif ":" in self.ADB_address: @@ -1933,8 +1933,8 @@ class MaaManager: message_text = ( f"开始时间: {message['start_time']}\n" f"结束时间: {message['end_time']}\n" - f"理智剩余: {message['sanity']}\n" - f"回复时间: {message['sanity_full_at']}\n" + f"理智剩余: {message.get('sanity', '未知')}\n" + f"回复时间: {message.get('sanity_full_at', '未知')}\n" f"MAA执行结果: {message['maa_result']}\n\n" f"{recruit_text}\n" f"{drop_text}"