From 51ced0faddfece5258cec01ea329df77880b92ea Mon Sep 17 00:00:00 2001
From: qsc <qsc20001102@163.com>
Date: Wed, 28 Jan 2026 22:15:35 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=AE=8F=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/jx3_commands.py | 4 ++--
 core/jx3_data.py     | 2 +-
 templates/helps.html | 1 +
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/core/jx3_commands.py b/core/jx3_commands.py
index d7262fa..d7f2910 100644
--- a/core/jx3_commands.py
+++ b/core/jx3_commands.py
@@ -292,7 +292,7 @@ class JX3Commands(Star):
         # 获取用户ID
         user_id = event.get_sender_id()
         # 等等用户回复
-        @session_waiter(timeout=15)
+        @session_waiter(timeout=30)
         async def macro_select_waiter(controller: SessionController,new_event: AstrMessageEvent):
             if new_event.get_sender_id() != user_id:
                 return
@@ -343,7 +343,7 @@ class JX3Commands(Star):
         try:
             await macro_select_waiter(event)  
         except TimeoutError:
-            yield event.plain_result("选择宏超时，已取消")
+            yield event.plain_result("选择宏超时，已结束会话")
         except Exception:
             logger.error("宏选择发生异常", exc_info=True)
 
diff --git a/core/jx3_data.py b/core/jx3_data.py
index efe1d99..7068c75 100644
--- a/core/jx3_data.py
+++ b/core/jx3_data.py
@@ -1256,7 +1256,7 @@ class JX3Service:
         
         # 提取ID
         pid_list = [0]
-        msg = ""
+        msg = "按照热度排列\n"
         n = 1
         try:
             for m in data:
diff --git a/templates/helps.html b/templates/helps.html
index 7495127..ed9de3a 100644
--- a/templates/helps.html
+++ b/templates/helps.html
@@ -146,6 +146,7 @@
         <div class="command"><div class="cmd-name">阵营沙盘</div><div class="cmd-usage">沙盘 [服务器]</div></div>
         <div class="command"><div class="cmd-name">奇遇统计</div><div class="cmd-usage">奇遇统计 奇遇名称 [服务器]</div></div>
         <div class="command"><div class="cmd-name">奇遇攻略</div><div class="cmd-usage">奇遇攻略 奇遇名称</div></div>
+        <div class="command"><div class="cmd-name">魔盒宏</div><div class="cmd-usage">宏 心法</div></div>
         <div class="command"><div class="cmd-name">科举答题</div><div class="cmd-usage">科举 内容</div></div>
         <div class="command"><div class="cmd-name">家园鲜花</div><div class="cmd-usage">花价 名称 [服务器] [家园地图]</div></div>
         <div class="command"><div class="cmd-name">家园装饰</div><div class="cmd-usage">装饰 名称</div></div>