用户代理信息:{{ user_info }}
-任务开始时间:{{ start_time }}
-任务结束时间:{{ end_time }}
+用户信息:{{ user_info }}
+开始时间:{{ start_time }}
+结束时间:{{ end_time }}
+理智剩余:{{ sanity }}
+回复时间:{{ sanity_full_at }}
MAA执行结果: {% if maa_result == '代理任务全部完成' %} {{ maa_result }}
From 4e446696959b52c49cf3ce0a2d7cca8add5721d3 Mon Sep 17 00:00:00 2001 From: Alirea <2981883527@qq.com> Date: Fri, 26 Sep 2025 23:18:32 +0800 Subject: [PATCH] =?UTF-8?q?feat(notif):=20=E9=80=9A=E7=9F=A5=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E7=90=86=E6=99=BA=E5=89=A9=E4=BD=99=E9=87=8F=E5=92=8C?= =?UTF-8?q?=E7=90=86=E6=99=BA=E6=81=A2=E5=A4=8D=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/core/config.py | 15 +++++++++++++++ app/task/MAA.py | 2 ++ res/html/MAA_statistics.html | 8 +++++--- 3 files changed, 22 insertions(+), 3 deletions(-) diff --git a/app/core/config.py b/app/core/config.py index 9a2b4f8..14bb172 100644 --- a/app/core/config.py +++ b/app/core/config.py @@ -2038,11 +2038,25 @@ class AppConfig(GlobalConfig): data = { "recruit_statistics": defaultdict(int), "drop_statistics": defaultdict(dict), + "sanity": 0, + "sanity_full_at": "", "maa_result": maa_result, } if_six_star = False + # 提取理智相关信息 + for log_line in logs: + # 提取当前理智值:理智: 5/180 + sanity_match = re.search(r"理智:\s*(\d+)/\d+", log_line) + if sanity_match: + data["sanity"] = int(sanity_match.group(1)) + + # 提取理智回满时间:理智将在 2025-09-26 18:57 回满 + sanity_full_match = re.search(r"理智将在\s*(\d{4}-\d{2}-\d{2}\s+\d{2}:\d{2})\s*回满", log_line) + if sanity_full_match: + data["sanity_full_at"] = sanity_full_match.group(1) + # 公招统计(仅统计招募到的) confirmed_recruit = False current_star_level = None @@ -2151,6 +2165,7 @@ class AppConfig(GlobalConfig): log_path.parent.mkdir(parents=True, exist_ok=True) with log_path.open("w", encoding="utf-8") as f: f.writelines(logs) + # 保存统计数据 with log_path.with_suffix(".json").open("w", encoding="utf-8") as f: json.dump(data, f, ensure_ascii=False, indent=4) diff --git a/app/task/MAA.py b/app/task/MAA.py index b6b57a9..70ea193 100644 --- a/app/task/MAA.py +++ b/app/task/MAA.py @@ -1933,6 +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"MAA执行结果: {message['maa_result']}\n\n" f"{recruit_text}\n" f"{drop_text}" diff --git a/res/html/MAA_statistics.html b/res/html/MAA_statistics.html index c5ec5cb..a2f4089 100644 --- a/res/html/MAA_statistics.html +++ b/res/html/MAA_statistics.html @@ -166,9 +166,11 @@
用户代理信息:{{ user_info }}
-任务开始时间:{{ start_time }}
-任务结束时间:{{ end_time }}
+用户信息:{{ user_info }}
+开始时间:{{ start_time }}
+结束时间:{{ end_time }}
+理智剩余:{{ sanity }}
+回复时间:{{ sanity_full_at }}
MAA执行结果: {% if maa_result == '代理任务全部完成' %} {{ maa_result }}