解决合并冲突：又是Merge这一块

2025-08-22 13:47:36 +08:00
parent 3de02fd3a7 5c7bdfb069
commit 021a1a5906
6 changed files with 171 additions and 50 deletions
--- a/src/plugins/built_in/core_actions/no_reply.py
+++ b/src/plugins/built_in/core_actions/no_reply.py
@@ -16,7 +16,7 @@ class NoReplyAction(BaseAction):

    focus_activation_type = ActionActivationType.ALWAYS  # 修复：在focus模式下应该始终可用
    normal_activation_type = ActionActivationType.ALWAYS  # 修复：在normal模式下应该始终可用
-    mode_enable = ChatMode.FOCUS 
+    mode_enable = ChatMode.FOCUS  # 修复：只在专注模式下有用
    parallel_action = False

    # 动作基本信息
--- a/src/plugins/built_in/core_actions/reply.py
+++ b/src/plugins/built_in/core_actions/reply.py
@@ -16,7 +16,7 @@ class ReplyAction(BaseAction):

    focus_activation_type = ActionActivationType.ALWAYS
    normal_activation_type = ActionActivationType.ALWAYS
-    mode_enable = ChatMode.FOCUS | ChatMode.NORMAL
+    mode_enable = ChatMode.ALL
    parallel_action = False

    # 动作基本信息