Merge branch 'dev' of https://github.com/MaiM-with-u/MaiBot into dev

2025-08-26 10:41:52 +08:00
parent 1dbbbab8fa 2cec83e0dc
commit 0a409619d1
110 changed files with 4965 additions and 7572 deletions
--- a/src/mais4u/mais4u_chat/body_emotion_action_manager.py
+++ b/src/mais4u/mais4u_chat/body_emotion_action_manager.py
@@ -166,7 +166,6 @@ class ChatAction:
        chat_talking_prompt = build_readable_messages(
            message_list_before_now,
            replace_bot_name=True,
-            merge_messages=False,
            timestamp_mode="normal_no_YMD",
            read_mark=0.0,
            truncate=True,
@@ -230,7 +229,6 @@ class ChatAction:
        chat_talking_prompt = build_readable_messages(
            message_list_before_now,
            replace_bot_name=True,
-            merge_messages=False,
            timestamp_mode="normal_no_YMD",
            read_mark=0.0,
            truncate=True,