From 1992b680be932936ab10dee54611c812d9efba71 Mon Sep 17 00:00:00 2001
From: SengokuCola <1026294844@qq.com>
Date: Sun, 29 Jun 2025 22:20:59 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E5=A4=8D=E8=A1=A8?=
 =?UTF-8?q?=E6=83=85=E5=8C=85=E6=A6=82=E7=8E=87=E8=AE=BE=E7=BD=AE=E5=A4=B1?=
 =?UTF-8?q?=E6=95=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/plugins/built_in/core_actions/plugin.py | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/src/plugins/built_in/core_actions/plugin.py b/src/plugins/built_in/core_actions/plugin.py
index dcd4ce5c..98c668d5 100644
--- a/src/plugins/built_in/core_actions/plugin.py
+++ b/src/plugins/built_in/core_actions/plugin.py
@@ -12,6 +12,7 @@ from typing import List, Tuple, Type
 # 导入新插件系统
 from src.plugin_system import BasePlugin, register_plugin, BaseAction, ComponentInfo, ActionActivationType, ChatMode
 from src.plugin_system.base.config_types import ConfigField
+from src.config.config import global_config
 
 # 导入依赖的系统组件
 from src.common.logger import get_logger
@@ -197,7 +198,6 @@ class CoreActionsPlugin(BasePlugin):
         "plugin": "插件启用配置",
         "components": "核心组件启用配置",
         "no_reply": "不回复动作配置（智能等待机制）",
-        "emoji": "表情动作配置",
     }
 
     # 配置Schema定义
@@ -231,18 +231,13 @@ class CoreActionsPlugin(BasePlugin):
                 type=int, default=600, description="回复频率检查窗口时间（秒）", example=600
             ),
         },
-        "emoji": {
-            "random_probability": ConfigField(
-                type=float, default=0.1, description="Normal模式下，随机发送表情的概率（0.0到1.0）", example=0.15
-            )
-        },
     }
 
     def get_plugin_components(self) -> List[Tuple[ComponentInfo, Type]]:
         """返回插件包含的组件列表"""
 
         # --- 从配置动态设置Action/Command ---
-        emoji_chance = self.get_config("emoji.random_probability", 0.1)
+        emoji_chance = global_config.normal_chat.emoji_chance
         EmojiAction.random_activation_probability = emoji_chance
 
         no_reply_probability = self.get_config("no_reply.random_probability", 0.8)