npm - koishi-plugin-game-mini - Versions diffs - 0.2.6 → 0.2.8 - Mend

koishi-plugin-game-mini 0.2.6 → 0.2.8

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (4) hide show

package/lib/index.js CHANGED Viewed

@@ -11,27 +11,28 @@ const path_1 = __importDefault(require("path"));
 const yaml_1 = __importDefault(require("yaml"));
 const axios_1 = __importDefault(require("axios"));
 exports.name = 'game-mini';
-exports.using = ['i18n'];
+exports.using = ['i18n', 'database'];
 exports.inject = ['console'];
 const defaultMessages = {
     guessNumber: {
-        usage: "用法错误！正确用法：猜数字 开始 | 猜数字 [数字] | 猜数字 结束",
+        usage: "用法错误！正确用法：猜数字 开始 | [数字] | 猜数字 结束",
         start: "猜数字比赛开始！本次共 {0} 回合～",
         stop: "猜数字比赛已停止",
         outOfRange: "数字超出当前范围 [{0}-{1}]，请重新输入！",
         tooSmall: "猜小啦！当前范围更新为 [{0}-{1}]",
         tooBig: "猜大啦！当前范围更新为 [{0}-{1}]",
-        correct: "恭喜你猜中数字！本轮你不得分，其他参与者各得1分～",
+        correct: "恭喜你猜中数字！",
         roundEnd: "第 {0} 回合结束！剩余回合：{1}",
         gameEnd: "🎉 猜数字比赛结束！🎉",
-        rankTitle: "🏆 排行榜 🏆",
+        rankTitle: "🏆 本局排行榜 🏆",
         rankEmpty: "暂无参与记录～",
         disabled: "猜数字功能已关闭，请联系管理员开启",
-        autoStop: "游戏因长时间无人操作，已自动结束"
+        autoStop: "太久没人玩啦，比赛自动结束～"
     },
     wzHero: {
+        usage: "用法错误！正确用法：猜王者英雄 开始 | [答案] | 提示 | 结束",
         start: "猜王者英雄开始！本次共 {0} 回合～当前难度：{1}",
-        startUsage: "用法错误！正确用法：猜王者英雄 开始 | 猜王者英雄 [答案] | 猜王者英雄 提示 | 猜王者英雄 结束",
+        startUsage: "用法错误！正确用法：猜王者英雄 开始 | [答案] | 提示 | 结束",
         stop: "猜王者英雄比赛已停止",
         notStarted: "猜王者英雄比赛尚未开始，请输入 猜王者英雄 开始 开始游戏",
         hint: "提示",
@@ -40,15 +41,16 @@ const defaultMessages = {
         wrong: "答错啦～正确答案是：{0}，你不得分",
         roundEnd: "第 {0} 回合结束！剩余回合：{1}",
         gameEnd: "🎉 猜王者英雄比赛结束！🎉",
-        rankTitle: "🏆 排行榜 🏆",
+        rankTitle: "🏆 本局排行榜 🏆",
         rankEmpty: "暂无参与记录～",
         disabled: "猜王者英雄功能已关闭，请联系管理员开启",
-        autoStop: "游戏因长时间无人操作，已自动结束"
+        autoStop: "太久没人玩啦，比赛自动结束～"
     },
     chengyuImage: {
+        usage: "用法错误！正确用法：看图猜成语 开始 | [答案] | 提示 | 结束",
         start: "看图猜成语比赛开始！本次共 {0} 回合～当前提示级别：{1}",
         stop: "看图猜成语比赛已停止",
-        submitUsage: "请直接输入 看图猜成语 [答案]，或输入 看图猜成语 提示 获取线索",
+        submitUsage: "用法错误！正确用法：看图猜成语 开始 | [答案] | 提示 | 结束",
         notStarted: "看图猜成语比赛尚未开始，请输入 看图猜成语 开始 开始游戏",
         next: "第 {0} 题来啦！",
         hintGet: "【提示】{0}",
@@ -58,216 +60,260 @@ const defaultMessages = {
         wrong: "答错啦～正确答案是：{0}，你不得分",
         roundEnd: "第 {0} 回合结束！剩余回合：{1}",
         gameEnd: "🎉 看图猜成语比赛结束！🎉",
-        rankTitle: "🏆 排行榜 🏆",
+        rankTitle: "🏆 本局排行榜 🏆",
         rankEmpty: "暂无参与记录～",
         disabled: "看图猜成语功能已关闭，请联系管理员开启",
-        autoStop: "游戏因长时间无人操作，已自动结束"
+        autoStop: "太久没人玩啦，比赛自动结束～"
     },
     chengyuJielong: {
+        usage: "用法错误！正确用法：成语接龙 开始 | [成语] | 结束",
         start: "成语接龙比赛开始！本次共 {0} 回合～我先来～",
         stop: "成语接龙比赛已停止",
         notStarted: "成语接龙比赛尚未开始，请输入 成语接龙 开始 开始游戏",
-        joinUsage: "请直接发送 成语接龙 [成语] 参与接龙",
+        joinUsage: "用法错误！正确用法：成语接龙 开始 | [成语] | 结束",
         apiError: "API请求失败，请稍后再试",
-        botTurn: "该我了！我接：{0}（{1}）\n释义：{2}",
+        botTurn: "该我了！我接：{0}",
         botWin: "哈哈我接不上了！本轮结束～",
-        autoPlayTooMany: "我已经主动参与 {0} 次啦，不再主动接啦～",
-        gameInactiveStop: "太久没人玩啦，比赛自动结束～",
-        notIdiom: "请发送四字成语参与游戏～",
-        correct: "接龙成功！你获得1分～",
-        wrong: "接龙失败！你不得分，其他参与者各得1分～",
+        autoPlayTooMany: "自动参与次数已达上限 {0}",
+        notIdiom: "请输入4字成语",
+        correct: "接龙成功！",
+        wrong: "接龙失败！",
         roundEnd: "第 {0} 回合结束！剩余回合：{1}",
         gameEnd: "🎉 成语接龙比赛结束！🎉",
-        rankTitle: "🏆 排行榜 🏆",
+        rankTitle: "🏆 本局排行榜 🏆",
         rankEmpty: "暂无参与记录～",
         disabled: "成语接龙功能已关闭，请联系管理员开启",
-        autoStop: "游戏因长时间无人操作，已自动结束"
+        autoStop: "太久没人玩啦，比赛自动结束～"
     },
     calc24: {
+        usage: "用法错误！正确用法：算24点 开始 | [算式] | 换题 | 结束",
         start: "算24点游戏开始！本次共 {0} 回合～当前难度：{1}",
         stop: "算24点游戏已停止",
         notStarted: "算24点游戏尚未开始，请输入 算24点 开始 开始游戏",
         generate: "📝 第 {0} 题（{1}）：用 {2} 通过加减乘除和括号算出24！",
         correct: "答对啦！你获得1分～",
         wrong: "答错啦～",
-        impossible: "这组数无法算出24！本题作废，换一组数字～",
         solved: "这组数已经被答对啦，换一组数字～",
         roundEnd: "第 {0} 回合结束！剩余回合：{1}",
         gameEnd: "🎉 算24点游戏结束！🎉",
-        rankTitle: "🏆 排行榜 🏆",
+        rankTitle: "🏆 本局排行榜 🏆",
         rankEmpty: "暂无参与记录～",
         disabled: "算24点功能已关闭，请联系管理员开启",
-        autoStop: "游戏因长时间无人操作，已自动结束"
+        autoStop: "太久没人玩啦，比赛自动结束～"
+    },
+    rank: {
+        title: "📊 群游戏总排行榜",
+        empty: "暂无玩家数据",
+        playerInfo: "{0}. {1} - 得分：{2}分 | 答对：{3}题 | 游玩：{4}次",
+        totalStats: "\n📈 总统计：共 {0} 位玩家 | 总得分：{1} | 总答对：{2} | 总游玩：{3}",
+        noPermission: "❌ 你没有权限执行此操作",
+        clearSuccess: "✅ 本群所有玩家数据已清零"
     },
     common: {
         gameRunning: "当前已有游戏在运行中，请先结束当前游戏后再开始新游戏！",
-        gameStoppedByInactive: "游戏因长时间无人操作，已自动结束",
-        paramError: "参数错误！请检查输入格式"
+        gameStoppedByInactive: "太久没人玩啦，比赛自动结束～",
+        paramError: "❌ 参数错误！请检查输入格式"
     }
 };
 exports.Config = koishi_1.Schema.intersect([
     koishi_1.Schema.object({
-        enableNumberGuess: koishi_1.Schema.boolean().default(true).description('启用猜数字游戏'),
-        enableWzHero: koishi_1.Schema.boolean().default(true).description('启用王者英雄猜谜游戏'),
-        enableChengyuImage: koishi_1.Schema.boolean().default(true).description('启用看图猜成语游戏'),
-        enableChengyuJielong: koishi_1.Schema.boolean().default(true).description('启用成语接龙游戏'),
-        enableCalc24: koishi_1.Schema.boolean().default(true).description('启用算24点游戏'),
-        enablePrivateGame: koishi_1.Schema.boolean().default(true).description('允许私聊玩游戏'),
-    }).description('基础功能开关'),
+        enableNumberGuess: koishi_1.Schema.boolean().default(true).description('🎲 启用猜数字游戏'),
+        enableWzHero: koishi_1.Schema.boolean().default(true).description('⚔️ 启用王者英雄猜谜'),
+        enableChengyuImage: koishi_1.Schema.boolean().default(true).description('🖼️ 启用看图猜成语'),
+        enableChengyuJielong: koishi_1.Schema.boolean().default(true).description('🐉 启用成语接龙'),
+        enableCalc24: koishi_1.Schema.boolean().default(true).description('🧮 启用算24点'),
+    }).description('⚙️ 游戏开关'),
+    koishi_1.Schema.object({
+        privateGame: koishi_1.Schema.object({
+            enableNumberGuess: koishi_1.Schema.boolean().default(true).description('🎲 允许私聊玩猜数字'),
+            enableWzHero: koishi_1.Schema.boolean().default(true).description('⚔️ 允许私聊玩王者英雄'),
+            enableChengyuImage: koishi_1.Schema.boolean().default(true).description('🖼️ 允许私聊玩看图猜成语'),
+            enableChengyuJielong: koishi_1.Schema.boolean().default(true).description('🐉 允许私聊玩成语接龙'),
+            enableCalc24: koishi_1.Schema.boolean().default(true).description('🧮 允许私聊玩算24点'),
+        }).description('💬 私聊游戏开关'),
+    }),
+    koishi_1.Schema.object({
+        rank: koishi_1.Schema.object({
+            enableCommand: koishi_1.Schema.boolean().default(true).description('📊 启用排行榜指令'),
+            maxDisplay: koishi_1.Schema.number().min(1).max(100).default(10).description('📋 排行榜最多显示人数'),
+            clearDataPermission: koishi_1.Schema.number().default(5).description('🔑 清零数据所需权限等级'),
+            messages: koishi_1.Schema.object({
+                title: koishi_1.Schema.string().default(defaultMessages.rank.title).description('排行榜标题'),
+                empty: koishi_1.Schema.string().default(defaultMessages.rank.empty).description('排行榜为空提示'),
+                playerInfo: koishi_1.Schema.string().default(defaultMessages.rank.playerInfo).description('玩家信息格式\n{0}-排名, {1}-玩家名, {2}-得分, {3}-答对题数, {4}-游玩次数'),
+                totalStats: koishi_1.Schema.string().default(defaultMessages.rank.totalStats).description('总统计信息\n{0}-总玩家数, {1}-总得分, {2}-总答对, {3}-总游玩'),
+                noPermission: koishi_1.Schema.string().default(defaultMessages.rank.noPermission).description('无权限提示'),
+                clearSuccess: koishi_1.Schema.string().default(defaultMessages.rank.clearSuccess).description('清零成功提示'),
+                showTotalStats: koishi_1.Schema.boolean().default(true).description('是否显示总统计数据'),
+            }).description('📊 排行榜消息配置'),
+        }).description('📊 排行榜配置'),
+    }),
     koishi_1.Schema.object({
         guessNumber: koishi_1.Schema.object({
-            min: koishi_1.Schema.number().min(0).default(0).description('猜数字最小值'),
-            max: koishi_1.Schema.number().min(1).default(100).description('猜数字最大值'),
-            botParticipateInGroup: koishi_1.Schema.boolean().default(true).description('群聊中机器人参与猜数字'),
-            totalRounds: koishi_1.Schema.number().min(1).default(10).description('猜数字总回合数'),
-            showRank: koishi_1.Schema.boolean().default(true).description('显示排行榜'),
+            min: koishi_1.Schema.number().min(0).default(0).description('最小值'),
+            max: koishi_1.Schema.number().min(1).default(100).description('最大值'),
+            botParticipateInGroup: koishi_1.Schema.boolean().default(true).description('群聊中机器人是否参与'),
+            totalRounds: koishi_1.Schema.number().min(1).default(10).description('总回合数'),
+            showRank: koishi_1.Schema.boolean().default(true).description('游戏结束后显示本局排行榜'),
             autoPlayDelay: koishi_1.Schema.number().min(0).default(10).description('机器人自动操作延迟（秒）'),
             autoPlayMaxCount: koishi_1.Schema.number().min(1).default(5).description('机器人最大自动操作次数'),
             autoStopInactiveTime: koishi_1.Schema.number().min(0).default(60).description('游戏无操作自动停止时间（秒）'),
+            enablePenalty: koishi_1.Schema.boolean().default(true).description('启用惩罚机制（猜中者扣分，其他人加分）'),
+            penaltyScore: koishi_1.Schema.number().max(0).default(-1).description('猜中者扣除分数（负数）'),
+            rewardScore: koishi_1.Schema.number().min(0).default(1).description('其他人奖励分数'),
             messages: koishi_1.Schema.object({
-                usage: koishi_1.Schema.string().default(defaultMessages.guessNumber.usage).description('用法错误提示'),
-                start: koishi_1.Schema.string().default(defaultMessages.guessNumber.start).description('游戏开始提示'),
+                usage: koishi_1.Schema.string().default(defaultMessages.guessNumber.usage).description('用法错误提示\n{0}-最小值, {1}-最大值'),
+                start: koishi_1.Schema.string().default(defaultMessages.guessNumber.start).description('游戏开始提示\n{0}-总回合数'),
                 stop: koishi_1.Schema.string().default(defaultMessages.guessNumber.stop).description('游戏停止提示'),
-                outOfRange: koishi_1.Schema.string().default(defaultMessages.guessNumber.outOfRange).description('数字超出范围提示'),
-                tooSmall: koishi_1.Schema.string().default(defaultMessages.guessNumber.tooSmall).description('猜小了提示'),
-                tooBig: koishi_1.Schema.string().default(defaultMessages.guessNumber.tooBig).description('猜大了提示'),
+                outOfRange: koishi_1.Schema.string().default(defaultMessages.guessNumber.outOfRange).description('数字超出范围提示\n{0}-最小值, {1}-最大值'),
+                tooSmall: koishi_1.Schema.string().default(defaultMessages.guessNumber.tooSmall).description('猜小了提示\n{0}-新最小值, {1}-新最大值'),
+                tooBig: koishi_1.Schema.string().default(defaultMessages.guessNumber.tooBig).description('猜大了提示\n{0}-新最小值, {1}-新最大值'),
                 correct: koishi_1.Schema.string().default(defaultMessages.guessNumber.correct).description('猜中提示'),
-                roundEnd: koishi_1.Schema.string().default(defaultMessages.guessNumber.roundEnd).description('回合结束提示'),
+                roundEnd: koishi_1.Schema.string().default(defaultMessages.guessNumber.roundEnd).description('回合结束提示\n{0}-当前回合, {1}-剩余回合'),
                 gameEnd: koishi_1.Schema.string().default(defaultMessages.guessNumber.gameEnd).description('游戏结束提示'),
-                rankTitle: koishi_1.Schema.string().default(defaultMessages.guessNumber.rankTitle).description('排行榜标题'),
-                rankEmpty: koishi_1.Schema.string().default(defaultMessages.guessNumber.rankEmpty).description('排行榜为空提示'),
+                rankTitle: koishi_1.Schema.string().default(defaultMessages.guessNumber.rankTitle).description('本局排行榜标题'),
+                rankEmpty: koishi_1.Schema.string().default(defaultMessages.guessNumber.rankEmpty).description('本局排行榜为空提示'),
                 disabled: koishi_1.Schema.string().default(defaultMessages.guessNumber.disabled).description('功能禁用提示'),
                 autoStop: koishi_1.Schema.string().default(defaultMessages.guessNumber.autoStop).description('自动停止提示'),
-            }).description('猜数字消息配置'),
-        }).description('猜数字游戏配置'),
+            }).description('💬 猜数字消息配置'),
+        }).description('🎲 猜数字游戏配置'),
     }),
     koishi_1.Schema.object({
         wzHero: koishi_1.Schema.object({
-            totalRounds: koishi_1.Schema.number().min(1).default(10).description('王者英雄猜谜总回合数'),
-            showRank: koishi_1.Schema.boolean().default(true).description('显示排行榜'),
+            totalRounds: koishi_1.Schema.number().min(1).default(10).description('总回合数'),
+            showRank: koishi_1.Schema.boolean().default(true).description('游戏结束后显示本局排行榜'),
             defaultDifficulty: koishi_1.Schema.union(['简单', '中等', '困难']).default('简单').description('默认难度'),
             autoStopInactiveTime: koishi_1.Schema.number().min(0).default(60).description('游戏无操作自动停止时间（秒）'),
+            rewardScore: koishi_1.Schema.number().min(0).default(1).description('答对奖励分数'),
             messages: koishi_1.Schema.object({
-                start: koishi_1.Schema.string().default(defaultMessages.wzHero.start).description('游戏开始提示'),
+                usage: koishi_1.Schema.string().default(defaultMessages.wzHero.usage).description('用法错误提示'),
+                start: koishi_1.Schema.string().default(defaultMessages.wzHero.start).description('游戏开始提示\n{0}-总回合数, {1}-难度'),
                 startUsage: koishi_1.Schema.string().default(defaultMessages.wzHero.startUsage).description('开始用法提示'),
                 stop: koishi_1.Schema.string().default(defaultMessages.wzHero.stop).description('游戏停止提示'),
                 notStarted: koishi_1.Schema.string().default(defaultMessages.wzHero.notStarted).description('游戏未开始提示'),
                 hint: koishi_1.Schema.string().default(defaultMessages.wzHero.hint).description('提示命令'),
                 apiError: koishi_1.Schema.string().default(defaultMessages.wzHero.apiError).description('API错误提示'),
-                correct: koishi_1.Schema.string().default(defaultMessages.wzHero.correct).description('答对提示'),
-                wrong: koishi_1.Schema.string().default(defaultMessages.wzHero.wrong).description('答错提示'),
-                roundEnd: koishi_1.Schema.string().default(defaultMessages.wzHero.roundEnd).description('回合结束提示'),
+                correct: koishi_1.Schema.string().default(defaultMessages.wzHero.correct).description('答对提示\n{0}-当前得分'),
+                wrong: koishi_1.Schema.string().default(defaultMessages.wzHero.wrong).description('答错提示\n{0}-正确答案'),
+                roundEnd: koishi_1.Schema.string().default(defaultMessages.wzHero.roundEnd).description('回合结束提示\n{0}-当前回合, {1}-剩余回合'),
                 gameEnd: koishi_1.Schema.string().default(defaultMessages.wzHero.gameEnd).description('游戏结束提示'),
-                rankTitle: koishi_1.Schema.string().default(defaultMessages.wzHero.rankTitle).description('排行榜标题'),
-                rankEmpty: koishi_1.Schema.string().default(defaultMessages.wzHero.rankEmpty).description('排行榜为空提示'),
+                rankTitle: koishi_1.Schema.string().default(defaultMessages.wzHero.rankTitle).description('本局排行榜标题'),
+                rankEmpty: koishi_1.Schema.string().default(defaultMessages.wzHero.rankEmpty).description('本局排行榜为空提示'),
                 disabled: koishi_1.Schema.string().default(defaultMessages.wzHero.disabled).description('功能禁用提示'),
                 autoStop: koishi_1.Schema.string().default(defaultMessages.wzHero.autoStop).description('自动停止提示'),
-            }).description('王者英雄猜谜消息配置'),
-        }).description('王者英雄猜谜游戏配置'),
+            }).description('💬 王者英雄猜谜消息配置'),
+        }).description('⚔️ 王者英雄猜谜配置'),
     }),
     koishi_1.Schema.object({
         chengyuImage: koishi_1.Schema.object({
-            totalRounds: koishi_1.Schema.number().min(1).default(10).description('看图猜成语总回合数'),
-            showRank: koishi_1.Schema.boolean().default(true).description('显示排行榜'),
-            defaultHintLevel: koishi_1.Schema.union([1, 2, 3, 4, 5]).default(1).description('默认提示级别(1-5)'),
+            totalRounds: koishi_1.Schema.number().min(1).default(10).description('总回合数'),
+            showRank: koishi_1.Schema.boolean().default(true).description('游戏结束后显示本局排行榜'),
+            defaultHintLevel: koishi_1.Schema.union([1, 2, 3, 4, 5]).default(1).description('默认提示级别'),
             autoStopInactiveTime: koishi_1.Schema.number().min(0).default(60).description('游戏无操作自动停止时间（秒）'),
+            rewardScore: koishi_1.Schema.number().min(0).default(1).description('答对奖励分数'),
             messages: koishi_1.Schema.object({
-                start: koishi_1.Schema.string().default(defaultMessages.chengyuImage.start).description('游戏开始提示'),
+                usage: koishi_1.Schema.string().default(defaultMessages.chengyuImage.usage).description('用法错误提示'),
+                start: koishi_1.Schema.string().default(defaultMessages.chengyuImage.start).description('游戏开始提示\n{0}-总回合数, {1}-提示级别'),
                 stop: koishi_1.Schema.string().default(defaultMessages.chengyuImage.stop).description('游戏停止提示'),
                 submitUsage: koishi_1.Schema.string().default(defaultMessages.chengyuImage.submitUsage).description('提交答案用法提示'),
                 notStarted: koishi_1.Schema.string().default(defaultMessages.chengyuImage.notStarted).description('游戏未开始提示'),
-                next: koishi_1.Schema.string().default(defaultMessages.chengyuImage.next).description('下一题提示'),
-                hintGet: koishi_1.Schema.string().default(defaultMessages.chengyuImage.hintGet).description('获取提示成功'),
+                next: koishi_1.Schema.string().default(defaultMessages.chengyuImage.next).description('下一题提示\n{0}-当前回合'),
+                hintGet: koishi_1.Schema.string().default(defaultMessages.chengyuImage.hintGet).description('获取提示成功\n{0}-提示内容'),
                 hintError: koishi_1.Schema.string().default(defaultMessages.chengyuImage.hintError).description('获取提示失败'),
                 apiError: koishi_1.Schema.string().default(defaultMessages.chengyuImage.apiError).description('API错误提示'),
-                correct: koishi_1.Schema.string().default(defaultMessages.chengyuImage.correct).description('答对提示'),
-                wrong: koishi_1.Schema.string().default(defaultMessages.chengyuImage.wrong).description('答错提示'),
-                roundEnd: koishi_1.Schema.string().default(defaultMessages.chengyuImage.roundEnd).description('回合结束提示'),
+                correct: koishi_1.Schema.string().default(defaultMessages.chengyuImage.correct).description('答对提示\n{0}-当前得分'),
+                wrong: koishi_1.Schema.string().default(defaultMessages.chengyuImage.wrong).description('答错提示\n{0}-正确答案, {1}-当前得分'),
+                roundEnd: koishi_1.Schema.string().default(defaultMessages.chengyuImage.roundEnd).description('回合结束提示\n{0}-当前回合, {1}-剩余回合'),
                 gameEnd: koishi_1.Schema.string().default(defaultMessages.chengyuImage.gameEnd).description('游戏结束提示'),
-                rankTitle: koishi_1.Schema.string().default(defaultMessages.chengyuImage.rankTitle).description('排行榜标题'),
-                rankEmpty: koishi_1.Schema.string().default(defaultMessages.chengyuImage.rankEmpty).description('排行榜为空提示'),
+                rankTitle: koishi_1.Schema.string().default(defaultMessages.chengyuImage.rankTitle).description('本局排行榜标题'),
+                rankEmpty: koishi_1.Schema.string().default(defaultMessages.chengyuImage.rankEmpty).description('本局排行榜为空提示'),
                 disabled: koishi_1.Schema.string().default(defaultMessages.chengyuImage.disabled).description('功能禁用提示'),
                 autoStop: koishi_1.Schema.string().default(defaultMessages.chengyuImage.autoStop).description('自动停止提示'),
-            }).description('看图猜成语消息配置'),
-        }).description('看图猜成语游戏配置'),
+            }).description('💬 看图猜成语消息配置'),
+        }).description('🖼️ 看图猜成语配置'),
     }),
     koishi_1.Schema.object({
         chengyuJielong: koishi_1.Schema.object({
-            botParticipateInGroup: koishi_1.Schema.boolean().default(true).description('群聊中机器人参与成语接龙'),
-            totalRounds: koishi_1.Schema.number().min(1).default(10).description('成语接龙总回合数'),
-            showRank: koishi_1.Schema.boolean().default(true).description('显示排行榜'),
+            totalRounds: koishi_1.Schema.number().min(1).default(10).description('总回合数'),
+            showRank: koishi_1.Schema.boolean().default(true).description('游戏结束后显示本局排行榜'),
             autoPlayDelay: koishi_1.Schema.number().min(0).default(10).description('机器人自动操作延迟（秒）'),
             autoPlayMaxCount: koishi_1.Schema.number().min(1).default(5).description('机器人最大自动操作次数'),
             autoStopInactiveTime: koishi_1.Schema.number().min(0).default(60).description('游戏无操作自动停止时间（秒）'),
+            maxRounds: koishi_1.Schema.number().min(0).default(10).description('最大接龙回合数（0为无限）'),
+            botParticipate: koishi_1.Schema.boolean().default(false).description('机器人是否参与接龙'),
+            rewardScore: koishi_1.Schema.number().min(0).default(1).description('接龙成功奖励分数'),
             messages: koishi_1.Schema.object({
-                start: koishi_1.Schema.string().default(defaultMessages.chengyuJielong.start).description('游戏开始提示'),
+                usage: koishi_1.Schema.string().default(defaultMessages.chengyuJielong.usage).description('用法错误提示'),
+                start: koishi_1.Schema.string().default(defaultMessages.chengyuJielong.start).description('游戏开始提示\n{0}-总回合数'),
                 stop: koishi_1.Schema.string().default(defaultMessages.chengyuJielong.stop).description('游戏停止提示'),
                 notStarted: koishi_1.Schema.string().default(defaultMessages.chengyuJielong.notStarted).description('游戏未开始提示'),
                 joinUsage: koishi_1.Schema.string().default(defaultMessages.chengyuJielong.joinUsage).description('参与用法提示'),
                 apiError: koishi_1.Schema.string().default(defaultMessages.chengyuJielong.apiError).description('API错误提示'),
-                botTurn: koishi_1.Schema.string().default(defaultMessages.chengyuJielong.botTurn).description('机器人回合提示'),
+                botTurn: koishi_1.Schema.string().default(defaultMessages.chengyuJielong.botTurn).description('机器人回合提示\n{0}-成语'),
                 botWin: koishi_1.Schema.string().default(defaultMessages.chengyuJielong.botWin).description('机器人赢提示'),
-                autoPlayTooMany: koishi_1.Schema.string().default(defaultMessages.chengyuJielong.autoPlayTooMany).description('自动参与次数过多提示'),
-                gameInactiveStop: koishi_1.Schema.string().default(defaultMessages.chengyuJielong.gameInactiveStop).description('游戏无操作停止提示'),
+                autoPlayTooMany: koishi_1.Schema.string().default(defaultMessages.chengyuJielong.autoPlayTooMany).description('自动参与次数过多提示\n{0}-最大次数'),
                 notIdiom: koishi_1.Schema.string().default(defaultMessages.chengyuJielong.notIdiom).description('非成语提示'),
                 correct: koishi_1.Schema.string().default(defaultMessages.chengyuJielong.correct).description('接龙成功提示'),
                 wrong: koishi_1.Schema.string().default(defaultMessages.chengyuJielong.wrong).description('接龙失败提示'),
-                roundEnd: koishi_1.Schema.string().default(defaultMessages.chengyuJielong.roundEnd).description('回合结束提示'),
+                roundEnd: koishi_1.Schema.string().default(defaultMessages.chengyuJielong.roundEnd).description('回合结束提示\n{0}-当前回合, {1}-剩余回合'),
                 gameEnd: koishi_1.Schema.string().default(defaultMessages.chengyuJielong.gameEnd).description('游戏结束提示'),
-                rankTitle: koishi_1.Schema.string().default(defaultMessages.chengyuJielong.rankTitle).description('排行榜标题'),
-                rankEmpty: koishi_1.Schema.string().default(defaultMessages.chengyuJielong.rankEmpty).description('排行榜为空提示'),
+                rankTitle: koishi_1.Schema.string().default(defaultMessages.chengyuJielong.rankTitle).description('本局排行榜标题'),
+                rankEmpty: koishi_1.Schema.string().default(defaultMessages.chengyuJielong.rankEmpty).description('本局排行榜为空提示'),
                 disabled: koishi_1.Schema.string().default(defaultMessages.chengyuJielong.disabled).description('功能禁用提示'),
                 autoStop: koishi_1.Schema.string().default(defaultMessages.chengyuJielong.autoStop).description('自动停止提示'),
-            }).description('成语接龙消息配置'),
-        }).description('成语接龙游戏配置'),
+            }).description('💬 成语接龙消息配置'),
+        }).description('🐉 成语接龙配置'),
     }),
     koishi_1.Schema.object({
         calc24: koishi_1.Schema.object({
-            totalRounds: koishi_1.Schema.number().min(1).default(5).description('算24点总回合数'),
-            showRank: koishi_1.Schema.boolean().default(true).description('显示排行榜'),
+            totalRounds: koishi_1.Schema.number().min(1).default(5).description('总回合数'),
+            showRank: koishi_1.Schema.boolean().default(true).description('游戏结束后显示本局排行榜'),
             defaultDifficulty: koishi_1.Schema.union(['简单', '中等', '困难']).default('中等').description('默认难度'),
             difficultyLevels: koishi_1.Schema.object({
                 easy: koishi_1.Schema.object({
                     min: koishi_1.Schema.number().default(1).description('最小值'),
                     max: koishi_1.Schema.number().default(8).description('最大值'),
-                }).description('简单难度'),
+                }).description('简单难度数字范围'),
                 medium: koishi_1.Schema.object({
                     min: koishi_1.Schema.number().default(1).description('最小值'),
                     max: koishi_1.Schema.number().default(10).description('最大值'),
-                }).description('中等难度'),
+                }).description('中等难度数字范围'),
                 hard: koishi_1.Schema.object({
                     min: koishi_1.Schema.number().default(1).description('最小值'),
                     max: koishi_1.Schema.number().default(13).description('最大值'),
-                }).description('困难难度'),
-            }).description('难度等级配置'),
+                }).description('困难难度数字范围'),
+            }).description('各难度数字范围配置'),
             autoStopInactiveTime: koishi_1.Schema.number().min(0).default(60).description('游戏无操作自动停止时间（秒）'),
+            rewardScore: koishi_1.Schema.number().min(0).default(1).description('答对奖励分数'),
             messages: koishi_1.Schema.object({
-                start: koishi_1.Schema.string().default(defaultMessages.calc24.start).description('游戏开始提示'),
+                usage: koishi_1.Schema.string().default(defaultMessages.calc24.usage).description('用法错误提示'),
+                start: koishi_1.Schema.string().default(defaultMessages.calc24.start).description('游戏开始提示\n{0}-总回合数, {1}-难度'),
                 stop: koishi_1.Schema.string().default(defaultMessages.calc24.stop).description('游戏停止提示'),
                 notStarted: koishi_1.Schema.string().default(defaultMessages.calc24.notStarted).description('游戏未开始提示'),
-                generate: koishi_1.Schema.string().default(defaultMessages.calc24.generate).description('生成题目提示'),
+                generate: koishi_1.Schema.string().default(defaultMessages.calc24.generate).description('生成题目提示\n{0}-当前回合, {1}-难度, {2}-数字列表'),
                 correct: koishi_1.Schema.string().default(defaultMessages.calc24.correct).description('答对提示'),
                 wrong: koishi_1.Schema.string().default(defaultMessages.calc24.wrong).description('答错提示'),
-                impossible: koishi_1.Schema.string().default(defaultMessages.calc24.impossible).description('无解提示'),
                 solved: koishi_1.Schema.string().default(defaultMessages.calc24.solved).description('已解决提示'),
-                roundEnd: koishi_1.Schema.string().default(defaultMessages.calc24.roundEnd).description('回合结束提示'),
+                roundEnd: koishi_1.Schema.string().default(defaultMessages.calc24.roundEnd).description('回合结束提示\n{0}-当前回合, {1}-剩余回合'),
                 gameEnd: koishi_1.Schema.string().default(defaultMessages.calc24.gameEnd).description('游戏结束提示'),
-                rankTitle: koishi_1.Schema.string().default(defaultMessages.calc24.rankTitle).description('排行榜标题'),
-                rankEmpty: koishi_1.Schema.string().default(defaultMessages.calc24.rankEmpty).description('排行榜为空提示'),
+                rankTitle: koishi_1.Schema.string().default(defaultMessages.calc24.rankTitle).description('本局排行榜标题'),
+                rankEmpty: koishi_1.Schema.string().default(defaultMessages.calc24.rankEmpty).description('本局排行榜为空提示'),
                 disabled: koishi_1.Schema.string().default(defaultMessages.calc24.disabled).description('功能禁用提示'),
                 autoStop: koishi_1.Schema.string().default(defaultMessages.calc24.autoStop).description('自动停止提示'),
-            }).description('算24点消息配置'),
-        }).description('算24点游戏配置'),
+            }).description('💬 算24点消息配置'),
+        }).description('🧮 算24点配置'),
     }),
     koishi_1.Schema.object({
         apiConfig: koishi_1.Schema.object({
             timeout: koishi_1.Schema.number().default(5000).description('API请求超时时间（毫秒）'),
-        }).description('API接口配置'),
+        }).description('🌐 API接口配置'),
+    }),
+    koishi_1.Schema.object({
         commonMessages: koishi_1.Schema.object({
             gameRunning: koishi_1.Schema.string().default(defaultMessages.common.gameRunning).description('游戏运行中提示'),
             gameStoppedByInactive: koishi_1.Schema.string().default(defaultMessages.common.gameStoppedByInactive).description('无操作停止提示'),
             paramError: koishi_1.Schema.string().default(defaultMessages.common.paramError).description('参数错误提示'),
-        }).description('通用消息配置'),
+        }).description('💬 通用消息配置'),
     }),
 ]);
 const logger = new koishi_1.Logger('game-mini');
@@ -278,232 +324,29 @@ const getIntUserId = (session) => {
     const hash = userIdStr.split('').reduce((acc, char) => acc + char.charCodeAt(0), 0);
     return hash || 1000000;
 };
-const getPlayerData = (session) => {
-    const safeUserId = session.userId || 'unknown_user';
-    return {
-        platform: session.platform,
-        userId: safeUserId,
-        name: session.username || safeUserId || '未知用户',
-        score: 0,
-        correctCount: 0
-    };
-};
-const checkGameRunning = (s, t) => {
-    if (t !== 'guessNumber' && s.guessNumber.started)
-        return true;
-    if (t !== 'wzHero' && s.wzHero.started)
-        return true;
-    if (t !== 'chengyuImage' && s.chengyuImage.started)
-        return true;
-    if (t !== 'chengyuJielong' && s.chengyuJielong.started)
-        return true;
-    if (t !== 'calc24' && s.calc24.started)
-        return true;
-    return false;
-};
-const clearGameTimer = (state) => {
-    if (state.stopTimer)
-        clearTimeout(state.stopTimer);
-    if (state.autoPlayTimer)
-        clearTimeout(state.autoPlayTimer);
-};
-const clearAllTimers = (st) => {
-    clearGameTimer(st.guessNumber);
-    clearGameTimer(st.wzHero);
-    clearGameTimer(st.chengyuImage);
-    clearGameTimer(st.chengyuJielong);
-    clearGameTimer(st.calc24);
-};
-const initState = (key, c) => {
-    const s = {
-        guessNumber: {
-            started: false,
-            totalRounds: c.guessNumber.totalRounds,
-            currentRound: 0,
-            players: {},
-            participants: [],
-            target: 0,
-            currentMin: c.guessNumber.min,
-            currentMax: c.guessNumber.max,
-            botGuess: []
-        },
-        wzHero: {
-            started: false,
-            totalRounds: c.wzHero.totalRounds,
-            currentRound: 0,
-            players: {},
-            participants: [],
-            difficulty: c.wzHero.defaultDifficulty,
-            botAnswered: false,
-            lastHint: '',
-            currentHeroId: '',
-            currentAnswer: ''
-        },
-        chengyuImage: {
-            started: false,
-            totalRounds: c.chengyuImage.totalRounds,
-            currentRound: 0,
-            players: {},
-            participants: [],
-            currentId: '',
-            currentPage: 1,
-            options: [],
-            answer: ''
-        },
-        chengyuJielong: {
-            started: false,
-            totalRounds: c.chengyuJielong.totalRounds,
-            currentRound: 0,
-            players: {},
-            participants: [],
-            lastChar: '',
-            botTurn: true,
-            autoPlayCount: 0,
-            hasTriggeredAutoPlay: false,
-            lastActiveTime: Date.now()
-        },
-        calc24: {
-            started: false,
-            totalRounds: c.calc24.totalRounds,
-            currentRound: 0,
-            players: {},
-            participants: [],
-            difficulty: c.calc24.defaultDifficulty,
-            numbers: [],
-            playerAnswer: '',
-            solved: false,
-            availableNumbers: []
-        }
-    };
-    gameStates.set(key, s);
-    return s;
-};
-const isFourCharIdiom = (text) => {
-    const t = text.trim();
-    return /^[\u4e00-\u9fa5]{4}$/.test(t);
-};
-const generateRankText = (players, rankTitle, rankEmpty) => {
-    const playerList = Object.values(players);
-    if (playerList.length === 0) {
-        return `${rankTitle}\n${rankEmpty}`;
-    }
-    const sortedPlayers = playerList.sort((a, b) => b.score - a.score);
-    let rankText = `${rankTitle}\n`;
-    sortedPlayers.forEach((player, index) => {
-        rankText += `${index + 1}. ${player.name} - 得分：${player.score}分（答对${player.correctCount}题）\n`;
-    });
-    return rankText.trim();
-};
-const clearGameData = (gameState, showRank = false, session, rankTitle, rankEmpty) => {
-    if (showRank && session && session.channelId && rankTitle && rankEmpty) {
-        session.send(generateRankText(gameState.players, rankTitle, rankEmpty));
-    }
-    gameState.players = {};
-    gameState.participants = [];
-    gameState.currentRound = 0;
-    gameState.started = false;
-    clearGameTimer(gameState);
-};
-const addScoreToOthers = (players, excludePlayerKey) => {
-    Object.keys(players).forEach(playerKey => {
-        if (playerKey !== excludePlayerKey) {
-            players[playerKey].score += 1;
-        }
+async function apply(ctx, cfg) {
+    ctx.model.extend('game_mini_player', {
+        id: 'unsigned',
+        guildId: 'string',
+        platform: 'string',
+        userId: 'string',
+        name: 'string',
+        score: 'integer',
+        correctCount: 'integer',
+        playCount: 'integer',
+        lastGameTime: 'unsigned'
+    }, {
+        primary: 'id',
+        autoInc: true,
+        unique: [['guildId', 'platform', 'userId']]
     });
-};
-const setupAutoStop = (session, state, cfg, gameType, endMsg, showRank, rankTitle, rankEmpty) => {
-    clearGameTimer(state);
-    let inactiveTime = 60;
-    if (gameType === 'guessNumber')
-        inactiveTime = cfg.guessNumber.autoStopInactiveTime;
-    else if (gameType === 'wzHero')
-        inactiveTime = cfg.wzHero.autoStopInactiveTime;
-    else if (gameType === 'chengyuImage')
-        inactiveTime = cfg.chengyuImage.autoStopInactiveTime;
-    else if (gameType === 'chengyuJielong')
-        inactiveTime = cfg.chengyuJielong.autoStopInactiveTime;
-    else if (gameType === 'calc24')
-        inactiveTime = cfg.calc24.autoStopInactiveTime;
-    if (inactiveTime <= 0)
-        return;
-    state.stopTimer = setTimeout(() => {
-        clearGameData(state, showRank, session, rankTitle, rankEmpty);
-        session.send(endMsg);
-    }, inactiveTime * 1000);
-};
-const calculate24 = (numbers) => {
-    if (numbers.length === 1)
-        return Math.abs(numbers[0] - 24) < 0.001;
-    for (let i = 0; i < numbers.length; i++) {
-        for (let j = 0; j < numbers.length; j++) {
-            if (i === j)
-                continue;
-            const rest = [];
-            for (let k = 0; k < numbers.length; k++) {
-                if (k !== i && k !== j)
-                    rest.push(numbers[k]);
-            }
-            const a = numbers[i];
-            const b = numbers[j];
-            if (calculate24([...rest, a + b]))
-                return true;
-            if (calculate24([...rest, a - b]))
-                return true;
-            if (calculate24([...rest, b - a]))
-                return true;
-            if (calculate24([...rest, a * b]))
-                return true;
-            if (b !== 0 && calculate24([...rest, a / b]))
-                return true;
-            if (a !== 0 && calculate24([...rest, b / a]))
-                return true;
-        }
-    }
-    return false;
-};
-const generateSolvable24Numbers = (min, max) => {
-    const maxAttempts = 1000;
-    for (let attempt = 0; attempt < maxAttempts; attempt++) {
-        const numbers = [
-            koishi_1.Random.int(min, max + 1),
-            koishi_1.Random.int(min, max + 1),
-            koishi_1.Random.int(min, max + 1),
-            koishi_1.Random.int(min, max + 1)
-        ];
-        if (calculate24([...numbers])) {
-            return numbers;
-        }
-    }
-    return [6, 4, 3, 1];
-};
-const evaluateExpression = (expr) => {
-    try {
-        let cleanExpr = expr.replace(/\s+/g, '');
-        cleanExpr = cleanExpr.replace(/[×xX]/g, '*');
-        cleanExpr = cleanExpr.replace(/[÷/]/g, '/');
-        cleanExpr = cleanExpr.replace(/\/\//g, '/');
-        if (!/^[\d\+\-\*\/\(\)\[\]\{\}]+$/.test(cleanExpr)) {
-            return null;
-        }
-        const normalizedExpr = cleanExpr.replace(/[\[\{]/g, '(').replace(/[\]\}]/g, ')');
-        const func = new Function('return ' + normalizedExpr);
-        const result = func();
-        if (typeof result === 'number' && isFinite(result)) {
-            return result;
-        }
-        return null;
-    }
-    catch {
-        return null;
-    }
-};
-function apply(ctx, cfg) {
     const d = {
         guessNumber: cfg.guessNumber.messages,
         wzHero: cfg.wzHero.messages,
         chengyuImage: cfg.chengyuImage.messages,
         chengyuJielong: cfg.chengyuJielong.messages,
         calc24: cfg.calc24.messages,
+        rank: cfg.rank.messages,
         common: cfg.commonMessages
     };
     try {
@@ -517,6 +360,318 @@ function apply(ctx, cfg) {
         ctx.i18n.define('zh-CN', d);
     }
     const isPrivate = (s) => !s.channelId;
+    const canPlayPrivate = (game) => {
+        if (game === 'guessNumber')
+            return cfg.privateGame.enableNumberGuess;
+        if (game === 'wzHero')
+            return cfg.privateGame.enableWzHero;
+        if (game === 'chengyuImage')
+            return cfg.privateGame.enableChengyuImage;
+        if (game === 'chengyuJielong')
+            return cfg.privateGame.enableChengyuJielong;
+        if (game === 'calc24')
+            return cfg.privateGame.enableCalc24;
+        return false;
+    };
+    const getPlayerData = async (session) => {
+        if (!session.channelId) {
+            return {
+                platform: session.platform,
+                userId: session.userId || 'unknown_user',
+                name: session.username || session.userId || '未知用户',
+                score: 0,
+                correctCount: 0,
+                playCount: 0,
+                lastGameTime: 0
+            };
+        }
+        const guildId = session.channelId;
+        const platform = session.platform;
+        const userId = session.userId || 'unknown_user';
+        const name = session.username || userId;
+        let player = await ctx.database.get('game_mini_player', {
+            guildId,
+            platform,
+            userId
+        });
+        if (!player.length) {
+            const newPlayer = {
+                guildId,
+                platform,
+                userId,
+                name,
+                score: 0,
+                correctCount: 0,
+                playCount: 0,
+                lastGameTime: 0
+            };
+            await ctx.database.create('game_mini_player', newPlayer);
+            return {
+                guildId,
+                platform,
+                userId,
+                name,
+                score: 0,
+                correctCount: 0,
+                playCount: 0,
+                lastGameTime: 0
+            };
+        }
+        return player[0];
+    };
+    const savePlayerData = async (session, playerData) => {
+        if (!session.channelId)
+            return;
+        await ctx.database.set('game_mini_player', { guildId: session.channelId, platform: session.platform, userId: session.userId }, {
+            name: playerData.name,
+            score: playerData.score,
+            correctCount: playerData.correctCount,
+            playCount: playerData.playCount,
+            lastGameTime: playerData.lastGameTime
+        });
+    };
+    const updatePlayerPlayCount = async (session) => {
+        if (!session.channelId)
+            return;
+        const player = await getPlayerData(session);
+        player.playCount += 1;
+        player.lastGameTime = Date.now();
+        await savePlayerData(session, player);
+    };
+    const generateTotalRankText = async (session) => {
+        if (!session.channelId)
+            return cfg.rank.messages.empty;
+        const players = await ctx.database.get('game_mini_player', { guildId: session.channelId });
+        if (players.length === 0) {
+            return cfg.rank.messages.empty;
+        }
+        const sortedPlayers = players.sort((a, b) => b.score - a.score);
+        let rankText = cfg.rank.messages.title + '\n';
+        const displayCount = Math.min(cfg.rank.maxDisplay, sortedPlayers.length);
+        for (let i = 0; i < displayCount; i++) {
+            const player = sortedPlayers[i];
+            rankText += cfg.rank.messages.playerInfo
+                .replace('{0}', String(i + 1))
+                .replace('{1}', player.name)
+                .replace('{2}', String(player.score))
+                .replace('{3}', String(player.correctCount))
+                .replace('{4}', String(player.playCount)) + '\n';
+        }
+        if (cfg.rank.messages.showTotalStats) {
+            const totalScore = players.reduce((sum, p) => sum + p.score, 0);
+            const totalCorrect = players.reduce((sum, p) => sum + p.correctCount, 0);
+            const totalPlay = players.reduce((sum, p) => sum + p.playCount, 0);
+            rankText += cfg.rank.messages.totalStats
+                .replace('{0}', String(players.length))
+                .replace('{1}', String(totalScore))
+                .replace('{2}', String(totalCorrect))
+                .replace('{3}', String(totalPlay));
+        }
+        return rankText;
+    };
+    const checkGameRunning = (s, t) => {
+        if (t !== 'guessNumber' && s.guessNumber.started)
+            return true;
+        if (t !== 'wzHero' && s.wzHero.started)
+            return true;
+        if (t !== 'chengyuImage' && s.chengyuImage.started)
+            return true;
+        if (t !== 'chengyuJielong' && s.chengyuJielong.started)
+            return true;
+        if (t !== 'calc24' && s.calc24.started)
+            return true;
+        return false;
+    };
+    const clearGameTimer = (state) => {
+        if (state.stopTimer)
+            clearTimeout(state.stopTimer);
+        if (state.autoPlayTimer)
+            clearTimeout(state.autoPlayTimer);
+    };
+    const clearAllTimers = (st) => {
+        clearGameTimer(st.guessNumber);
+        clearGameTimer(st.wzHero);
+        clearGameTimer(st.chengyuImage);
+        clearGameTimer(st.chengyuJielong);
+        clearGameTimer(st.calc24);
+    };
+    const initState = (key) => {
+        const s = {
+            guessNumber: {
+                started: false,
+                totalRounds: cfg.guessNumber.totalRounds,
+                currentRound: 0,
+                players: {},
+                participants: [],
+                target: 0,
+                currentMin: cfg.guessNumber.min,
+                currentMax: cfg.guessNumber.max,
+                botGuess: []
+            },
+            wzHero: {
+                started: false,
+                totalRounds: cfg.wzHero.totalRounds,
+                currentRound: 0,
+                players: {},
+                participants: [],
+                difficulty: cfg.wzHero.defaultDifficulty,
+                botAnswered: false,
+                lastHint: '',
+                currentHeroId: '',
+                currentAnswer: ''
+            },
+            chengyuImage: {
+                started: false,
+                totalRounds: cfg.chengyuImage.totalRounds,
+                currentRound: 0,
+                players: {},
+                participants: [],
+                currentId: '',
+                currentPage: 1,
+                options: [],
+                answer: ''
+            },
+            chengyuJielong: {
+                started: false,
+                totalRounds: cfg.chengyuJielong.totalRounds,
+                currentRound: 0,
+                players: {},
+                participants: [],
+                lastChar: '',
+                botTurn: true,
+                autoPlayCount: 0,
+                hasTriggeredAutoPlay: false,
+                lastActiveTime: Date.now(),
+                jielongCount: 0
+            },
+            calc24: {
+                started: false,
+                totalRounds: cfg.calc24.totalRounds,
+                currentRound: 0,
+                players: {},
+                participants: [],
+                difficulty: cfg.calc24.defaultDifficulty,
+                numbers: [],
+                playerAnswer: '',
+                solved: false,
+                availableNumbers: []
+            }
+        };
+        gameStates.set(key, s);
+        return s;
+    };
+    const isFourCharIdiom = (text) => {
+        const t = text.trim();
+        return /^[\u4e00-\u9fa5]{4}$/.test(t);
+    };
+    const generateGameRankText = (players, rankTitle, rankEmpty) => {
+        const playerList = Object.values(players);
+        if (playerList.length === 0) {
+            return `${rankTitle}\n${rankEmpty}`;
+        }
+        const sortedPlayers = playerList.sort((a, b) => b.score - a.score);
+        let rankText = `${rankTitle}\n`;
+        sortedPlayers.forEach((player, index) => {
+            rankText += `${index + 1}. ${player.name} - 得分：${player.score}分\n`;
+        });
+        return rankText.trim();
+    };
+    const clearGameData = (gameState, showRank = false, session, rankTitle, rankEmpty) => {
+        if (showRank && session && session.channelId && rankTitle && rankEmpty) {
+            session.send(generateGameRankText(gameState.players, rankTitle, rankEmpty));
+        }
+        gameState.players = {};
+        gameState.participants = [];
+        gameState.currentRound = 0;
+        gameState.started = false;
+        clearGameTimer(gameState);
+    };
+    const setupAutoStop = (session, state, gameType, endMsg, showRank, rankTitle, rankEmpty) => {
+        clearGameTimer(state);
+        let inactiveTime = 60;
+        if (gameType === 'guessNumber')
+            inactiveTime = cfg.guessNumber.autoStopInactiveTime;
+        else if (gameType === 'wzHero')
+            inactiveTime = cfg.wzHero.autoStopInactiveTime;
+        else if (gameType === 'chengyuImage')
+            inactiveTime = cfg.chengyuImage.autoStopInactiveTime;
+        else if (gameType === 'chengyuJielong')
+            inactiveTime = cfg.chengyuJielong.autoStopInactiveTime;
+        else if (gameType === 'calc24')
+            inactiveTime = cfg.calc24.autoStopInactiveTime;
+        if (inactiveTime <= 0)
+            return;
+        state.stopTimer = setTimeout(() => {
+            clearGameData(state, showRank, session, rankTitle, rankEmpty);
+            session.send(endMsg);
+        }, inactiveTime * 1000);
+    };
+    const calculate24 = (numbers) => {
+        if (numbers.length === 1)
+            return Math.abs(numbers[0] - 24) < 0.001;
+        for (let i = 0; i < numbers.length; i++) {
+            for (let j = 0; j < numbers.length; j++) {
+                if (i === j)
+                    continue;
+                const rest = [];
+                for (let k = 0; k < numbers.length; k++) {
+                    if (k !== i && k !== j)
+                        rest.push(numbers[k]);
+                }
+                const a = numbers[i];
+                const b = numbers[j];
+                if (calculate24([...rest, a + b]))
+                    return true;
+                if (calculate24([...rest, a - b]))
+                    return true;
+                if (calculate24([...rest, b - a]))
+                    return true;
+                if (calculate24([...rest, a * b]))
+                    return true;
+                if (b !== 0 && calculate24([...rest, a / b]))
+                    return true;
+                if (a !== 0 && calculate24([...rest, b / a]))
+                    return true;
+            }
+        }
+        return false;
+    };
+    const generateSolvable24Numbers = (min, max) => {
+        const maxAttempts = 1000;
+        for (let attempt = 0; attempt < maxAttempts; attempt++) {
+            const numbers = [
+                koishi_1.Random.int(min, max + 1),
+                koishi_1.Random.int(min, max + 1),
+                koishi_1.Random.int(min, max + 1),
+                koishi_1.Random.int(min, max + 1)
+            ];
+            if (calculate24([...numbers])) {
+                return numbers;
+            }
+        }
+        return [6, 4, 3, 1];
+    };
+    const evaluateExpression = (expr) => {
+        try {
+            let cleanExpr = expr.replace(/\s+/g, '');
+            cleanExpr = cleanExpr.replace(/[×xX]/g, '*');
+            cleanExpr = cleanExpr.replace(/[÷/]/g, '/');
+            cleanExpr = cleanExpr.replace(/\/\//g, '/');
+            if (!/^[\d\+\-\*\/\(\)\[\]\{\}]+$/.test(cleanExpr)) {
+                return null;
+            }
+            const normalizedExpr = cleanExpr.replace(/[\[\{]/g, '(').replace(/[\]\}]/g, ')');
+            const func = new Function('return ' + normalizedExpr);
+            const result = func();
+            if (typeof result === 'number' && isFinite(result)) {
+                return result;
+            }
+            return null;
+        }
+        catch {
+            return null;
+        }
+    };
     const refreshActive = (st) => {
         st.chengyuJielong.lastActiveTime = Date.now();
     };
@@ -526,7 +681,7 @@ function apply(ctx, cfg) {
             doAutoPlay(session, key, st);
             return;
         }
-        if (!cfg.chengyuJielong.botParticipateInGroup)
+        if (!cfg.chengyuJielong.botParticipate)
             return;
         if (st.chengyuJielong.hasTriggeredAutoPlay)
             return;
@@ -541,10 +696,9 @@ function apply(ctx, cfg) {
         if (st.chengyuJielong.hasTriggeredAutoPlay)
             return;
         if (st.chengyuJielong.autoPlayCount >= cfg.chengyuJielong.autoPlayMaxCount) {
-            session.send(d.chengyuJielong.autoPlayTooMany.replace('{0}', String(cfg.chengyuJielong.autoPlayMaxCount)));
             st.chengyuJielong.hasTriggeredAutoPlay = true;
             gameStates.set(key, st);
-            setupAutoStop(session, st.chengyuJielong, cfg, 'chengyuJielong', d.chengyuJielong.autoStop, cfg.chengyuJielong.showRank, d.chengyuJielong.rankTitle, d.chengyuJielong.rankEmpty);
+            setupAutoStop(session, st.chengyuJielong, 'chengyuJielong', d.chengyuJielong.autoStop, cfg.chengyuJielong.showRank, d.chengyuJielong.rankTitle, d.chengyuJielong.rankEmpty);
             return;
         }
         st.chengyuJielong.hasTriggeredAutoPlay = true;
@@ -566,8 +720,9 @@ function apply(ctx, cfg) {
             let m = '';
             if (dt.code === 200 && dt.data?.system) {
                 const sys = dt.data.system;
-                m = d.chengyuJielong.botTurn.replace('{0}', sys.idiom).replace('{1}', sys.pinyin).replace('{2}', sys.meaning);
+                m = d.chengyuJielong.botTurn.replace('{0}', sys.idiom);
                 st.chengyuJielong.lastChar = dt.data.current_char || '';
+                st.chengyuJielong.jielongCount += 1;
             }
             else {
                 m = dt.msg || d.chengyuJielong.botWin;
@@ -578,7 +733,7 @@ function apply(ctx, cfg) {
                     await session.send(m);
                     await session.send(d.chengyuJielong.gameEnd);
                     if (cfg.chengyuJielong.showRank && !isPrivate(session)) {
-                        const rankText = generateRankText(st.chengyuJielong.players, d.chengyuJielong.rankTitle, d.chengyuJielong.rankEmpty);
+                        const rankText = generateGameRankText(st.chengyuJielong.players, d.chengyuJielong.rankTitle, d.chengyuJielong.rankEmpty);
                         await session.send(rankText);
                     }
                     clearGameData(st.chengyuJielong);
@@ -589,34 +744,63 @@ function apply(ctx, cfg) {
                     m += '\n' + d.chengyuJielong.roundEnd.replace('{0}', st.chengyuJielong.currentRound.toString()).replace('{1}', (st.chengyuJielong.totalRounds - st.chengyuJielong.currentRound).toString());
                 }
             }
+            if (cfg.chengyuJielong.maxRounds > 0 && st.chengyuJielong.jielongCount >= cfg.chengyuJielong.maxRounds) {
+                st.chengyuJielong.started = false;
+                clearAllTimers(st);
+                await session.send(m);
+                await session.send(d.chengyuJielong.gameEnd);
+                if (cfg.chengyuJielong.showRank && !isPrivate(session)) {
+                    const rankText = generateGameRankText(st.chengyuJielong.players, d.chengyuJielong.rankTitle, d.chengyuJielong.rankEmpty);
+                    await session.send(rankText);
+                }
+                clearGameData(st.chengyuJielong);
+                gameStates.set(key, st);
+                return;
+            }
             await session.send(m);
         }
         catch (error) {
             await session.send(d.chengyuJielong.apiError);
         }
         gameStates.set(key, st);
-        setupAutoStop(session, st.chengyuJielong, cfg, 'chengyuJielong', d.chengyuJielong.autoStop, cfg.chengyuJielong.showRank, d.chengyuJielong.rankTitle, d.chengyuJielong.rankEmpty);
+        setupAutoStop(session, st.chengyuJielong, 'chengyuJielong', d.chengyuJielong.autoStop, cfg.chengyuJielong.showRank, d.chengyuJielong.rankTitle, d.chengyuJielong.rankEmpty);
     };
     ctx.middleware(async (session, next) => {
         if (!session.content)
             return next();
         const key = getSessionKey(session);
-        const st = gameStates.get(key) || initState(key, cfg);
-        if (isPrivate(session) && !cfg.enablePrivateGame)
-            return next();
+        const st = gameStates.get(key) || initState(key);
+        if (isPrivate(session)) {
+            const gameActive = st.guessNumber.started || st.wzHero.started || st.chengyuImage.started || st.chengyuJielong.started || st.calc24.started;
+            if (gameActive) {
+                if (st.guessNumber.started && !canPlayPrivate('guessNumber'))
+                    return next();
+                if (st.wzHero.started && !canPlayPrivate('wzHero'))
+                    return next();
+                if (st.chengyuImage.started && !canPlayPrivate('chengyuImage'))
+                    return next();
+                if (st.chengyuJielong.started && !canPlayPrivate('chengyuJielong'))
+                    return next();
+                if (st.calc24.started && !canPlayPrivate('calc24'))
+                    return next();
+            }
+        }
         const content = session.content.trim();
         const playerKey = `${session.platform}_${session.userId || 'unknown'}`;
         if (cfg.enableChengyuJielong && st.chengyuJielong.started) {
             refreshActive(st);
             clearGameTimer(st.chengyuJielong);
             if (!st.chengyuJielong.players[playerKey]) {
-                st.chengyuJielong.players[playerKey] = getPlayerData(session);
+                const playerData = await getPlayerData(session);
+                st.chengyuJielong.players[playerKey] = playerData;
                 st.chengyuJielong.participants.push(playerKey);
+                await updatePlayerPlayCount(session);
             }
             if (!isFourCharIdiom(content)) {
-                setupAutoStop(session, st.chengyuJielong, cfg, 'chengyuJielong', d.chengyuJielong.autoStop, cfg.chengyuJielong.showRank, d.chengyuJielong.rankTitle, d.chengyuJielong.rankEmpty);
+                await session.send(d.chengyuJielong.notIdiom);
+                setupAutoStop(session, st.chengyuJielong, 'chengyuJielong', d.chengyuJielong.autoStop, cfg.chengyuJielong.showRank, d.chengyuJielong.rankTitle, d.chengyuJielong.rankEmpty);
                 scheduleAutoPlay(session, key, st);
-                return next();
+                return;
             }
             try {
                 const intUserId = getIntUserId(session);
@@ -635,27 +819,41 @@ function apply(ctx, cfg) {
                 if (dt.code === 200) {
                     m = dt.msg + '\n';
                     if (dt.data?.user) {
-                        st.chengyuJielong.players[playerKey].score += 1;
+                        m += d.chengyuJielong.correct + '\n';
+                        m += `你的成语：${dt.data.user.idiom}\n`;
+                        st.chengyuJielong.players[playerKey].score += cfg.chengyuJielong.rewardScore;
                         st.chengyuJielong.players[playerKey].correctCount += 1;
-                        m += d.chengyuJielong.correct.replace('{0}', st.chengyuJielong.players[playerKey].score.toString()) + '\n';
-                        m += `你的成语：${dt.data.user.idiom}（${dt.data.user.pinyin}）\n释义：${dt.data.user.meaning}\n`;
+                        await savePlayerData(session, st.chengyuJielong.players[playerKey]);
                     }
                     else {
-                        addScoreToOthers(st.chengyuJielong.players, playerKey);
-                        m += d.chengyuJielong.wrong.replace('{1}', st.chengyuJielong.players[playerKey].score.toString()) + '\n';
+                        m += d.chengyuJielong.wrong + '\n';
                     }
                     if (dt.data?.system) {
-                        m += `我的接龙：${dt.data.system.idiom}（${dt.data.system.pinyin}）\n释义：${dt.data.system.meaning}`;
+                        m += `我的接龙：${dt.data.system.idiom}`;
                         st.chengyuJielong.lastChar = dt.data.current_char || '';
+                        st.chengyuJielong.jielongCount += 1;
                     }
                     st.chengyuJielong.currentRound += 1;
+                    if (cfg.chengyuJielong.maxRounds > 0 && st.chengyuJielong.jielongCount >= cfg.chengyuJielong.maxRounds) {
+                        st.chengyuJielong.started = false;
+                        clearAllTimers(st);
+                        await session.send(m);
+                        await session.send(d.chengyuJielong.gameEnd);
+                        if (cfg.chengyuJielong.showRank && !isPrivate(session)) {
+                            const rankText = generateGameRankText(st.chengyuJielong.players, d.chengyuJielong.rankTitle, d.chengyuJielong.rankEmpty);
+                            await session.send(rankText);
+                        }
+                        clearGameData(st.chengyuJielong);
+                        gameStates.set(key, st);
+                        return;
+                    }
                     if (st.chengyuJielong.currentRound > st.chengyuJielong.totalRounds) {
                         st.chengyuJielong.started = false;
                         clearAllTimers(st);
                         await session.send(m);
                         await session.send(d.chengyuJielong.gameEnd);
                         if (cfg.chengyuJielong.showRank && !isPrivate(session)) {
-                            const rankText = generateRankText(st.chengyuJielong.players, d.chengyuJielong.rankTitle, d.chengyuJielong.rankEmpty);
+                            const rankText = generateGameRankText(st.chengyuJielong.players, d.chengyuJielong.rankTitle, d.chengyuJielong.rankEmpty);
                             await session.send(rankText);
                         }
                         clearGameData(st.chengyuJielong);
@@ -664,20 +862,19 @@ function apply(ctx, cfg) {
                         m += '\n' + d.chengyuJielong.roundEnd.replace('{0}', st.chengyuJielong.currentRound.toString()).replace('{1}', (st.chengyuJielong.totalRounds - st.chengyuJielong.currentRound).toString());
                         await session.send(m);
                         st.chengyuJielong.hasTriggeredAutoPlay = false;
-                        setupAutoStop(session, st.chengyuJielong, cfg, 'chengyuJielong', d.chengyuJielong.autoStop, cfg.chengyuJielong.showRank, d.chengyuJielong.rankTitle, d.chengyuJielong.rankEmpty);
+                        setupAutoStop(session, st.chengyuJielong, 'chengyuJielong', d.chengyuJielong.autoStop, cfg.chengyuJielong.showRank, d.chengyuJielong.rankTitle, d.chengyuJielong.rankEmpty);
                         scheduleAutoPlay(session, key, st);
                     }
                 }
                 else {
                     m = dt.msg || '接龙失败';
-                    addScoreToOthers(st.chengyuJielong.players, playerKey);
-                    m += '\n' + d.chengyuJielong.wrong.replace('{1}', st.chengyuJielong.players[playerKey].score.toString());
+                    m += '\n' + d.chengyuJielong.wrong;
                     await session.send(m);
                 }
             }
             catch (error) {
                 await session.send(d.chengyuJielong.apiError);
-                setupAutoStop(session, st.chengyuJielong, cfg, 'chengyuJielong', d.chengyuJielong.autoStop, cfg.chengyuJielong.showRank, d.chengyuJielong.rankTitle, d.chengyuJielong.rankEmpty);
+                setupAutoStop(session, st.chengyuJielong, 'chengyuJielong', d.chengyuJielong.autoStop, cfg.chengyuJielong.showRank, d.chengyuJielong.rankTitle, d.chengyuJielong.rankEmpty);
                 scheduleAutoPlay(session, key, st);
             }
             gameStates.set(key, st);
@@ -686,8 +883,10 @@ function apply(ctx, cfg) {
         if (cfg.enableChengyuImage && st.chengyuImage.started) {
             clearGameTimer(st.chengyuImage);
             if (!st.chengyuImage.players[playerKey]) {
-                st.chengyuImage.players[playerKey] = getPlayerData(session);
+                const playerData = await getPlayerData(session);
+                st.chengyuImage.players[playerKey] = playerData;
                 st.chengyuImage.participants.push(playerKey);
+                await updatePlayerPlayCount(session);
             }
             if (content === '提示') {
                 try {
@@ -710,12 +909,13 @@ function apply(ctx, cfg) {
                 catch (error) {
                     await session.send(d.chengyuImage.hintError);
                 }
-                setupAutoStop(session, st.chengyuImage, cfg, 'chengyuImage', d.chengyuImage.autoStop, cfg.chengyuImage.showRank, d.chengyuImage.rankTitle, d.chengyuImage.rankEmpty);
+                setupAutoStop(session, st.chengyuImage, 'chengyuImage', d.chengyuImage.autoStop, cfg.chengyuImage.showRank, d.chengyuImage.rankTitle, d.chengyuImage.rankEmpty);
                 return;
             }
             if (!isFourCharIdiom(content)) {
-                setupAutoStop(session, st.chengyuImage, cfg, 'chengyuImage', d.chengyuImage.autoStop, cfg.chengyuImage.showRank, d.chengyuImage.rankTitle, d.chengyuImage.rankEmpty);
-                return next();
+                await session.send('请输入4字成语');
+                setupAutoStop(session, st.chengyuImage, 'chengyuImage', d.chengyuImage.autoStop, cfg.chengyuImage.showRank, d.chengyuImage.rankTitle, d.chengyuImage.rankEmpty);
+                return;
             }
             try {
                 const r = await axios_1.default.get('https://jcy.lvlong.xyz/api/api/chengyu.php', {
@@ -730,8 +930,9 @@ function apply(ctx, cfg) {
                 if (dt.success) {
                     let reply = '';
                     if (dt.message.includes('正确') || dt.message.includes('答对')) {
-                        st.chengyuImage.players[playerKey].score += 1;
+                        st.chengyuImage.players[playerKey].score += cfg.chengyuImage.rewardScore;
                         st.chengyuImage.players[playerKey].correctCount += 1;
+                        await savePlayerData(session, st.chengyuImage.players[playerKey]);
                         reply = d.chengyuImage.correct.replace('{0}', st.chengyuImage.players[playerKey].score.toString());
                         st.chengyuImage.currentRound += 1;
                         if (st.chengyuImage.currentRound > st.chengyuImage.totalRounds) {
@@ -740,7 +941,7 @@ function apply(ctx, cfg) {
                             await session.send(reply);
                             await session.send(d.chengyuImage.gameEnd);
                             if (cfg.chengyuImage.showRank && !isPrivate(session)) {
-                                const rankText = generateRankText(st.chengyuImage.players, d.chengyuImage.rankTitle, d.chengyuImage.rankEmpty);
+                                const rankText = generateGameRankText(st.chengyuImage.players, d.chengyuImage.rankTitle, d.chengyuImage.rankEmpty);
                                 await session.send(rankText);
                             }
                             clearGameData(st.chengyuImage);
@@ -770,7 +971,7 @@ function apply(ctx, cfg) {
                                 st.chengyuImage.started = false;
                                 clearGameTimer(st.chengyuImage);
                                 if (cfg.chengyuImage.showRank && !isPrivate(session)) {
-                                    const rankText = generateRankText(st.chengyuImage.players, d.chengyuImage.rankTitle, d.chengyuImage.rankEmpty);
+                                    const rankText = generateGameRankText(st.chengyuImage.players, d.chengyuImage.rankTitle, d.chengyuImage.rankEmpty);
                                     await session.send(rankText);
                                 }
                                 clearGameData(st.chengyuImage);
@@ -790,15 +991,17 @@ function apply(ctx, cfg) {
             catch (error) {
                 await session.send(d.chengyuImage.apiError);
             }
-            setupAutoStop(session, st.chengyuImage, cfg, 'chengyuImage', d.chengyuImage.autoStop, cfg.chengyuImage.showRank, d.chengyuImage.rankTitle, d.chengyuImage.rankEmpty);
+            setupAutoStop(session, st.chengyuImage, 'chengyuImage', d.chengyuImage.autoStop, cfg.chengyuImage.showRank, d.chengyuImage.rankTitle, d.chengyuImage.rankEmpty);
             gameStates.set(key, st);
             return;
         }
         if (cfg.enableWzHero && st.wzHero.started) {
             clearGameTimer(st.wzHero);
             if (!st.wzHero.players[playerKey]) {
-                st.wzHero.players[playerKey] = getPlayerData(session);
+                const playerData = await getPlayerData(session);
+                st.wzHero.players[playerKey] = playerData;
                 st.wzHero.participants.push(playerKey);
+                await updatePlayerPlayCount(session);
             }
             if (content === '结束') {
                 clearGameData(st.wzHero, cfg.wzHero.showRank && !isPrivate(session), session, d.wzHero.rankTitle, d.wzHero.rankEmpty);
@@ -815,8 +1018,9 @@ function apply(ctx, cfg) {
                     let text = `${dt.message || ''}\n${dt.hint || ''}\n剩余提示次数：${dt.remaining_hints}\n${dt.guide || ''}`;
                     text = text.replace(/\\n/g, '\n');
                     if (content !== '提示' && dt.message.includes('正确')) {
-                        st.wzHero.players[playerKey].score += 1;
+                        st.wzHero.players[playerKey].score += cfg.wzHero.rewardScore;
                         st.wzHero.players[playerKey].correctCount += 1;
+                        await savePlayerData(session, st.wzHero.players[playerKey]);
                         text += '\n' + d.wzHero.correct.replace('{0}', st.wzHero.players[playerKey].score.toString());
                         st.wzHero.currentRound += 1;
                         if (st.wzHero.currentRound > st.wzHero.totalRounds) {
@@ -825,7 +1029,7 @@ function apply(ctx, cfg) {
                             await session.send(text);
                             await session.send(d.wzHero.gameEnd);
                             if (cfg.wzHero.showRank && !isPrivate(session)) {
-                                const rankText = generateRankText(st.wzHero.players, d.wzHero.rankTitle, d.wzHero.rankEmpty);
+                                const rankText = generateGameRankText(st.wzHero.players, d.wzHero.rankTitle, d.wzHero.rankEmpty);
                                 await session.send(rankText);
                             }
                             clearGameData(st.wzHero);
@@ -858,15 +1062,17 @@ function apply(ctx, cfg) {
             catch (error) {
                 await session.send(d.wzHero.apiError);
             }
-            setupAutoStop(session, st.wzHero, cfg, 'wzHero', d.wzHero.autoStop, cfg.wzHero.showRank, d.wzHero.rankTitle, d.wzHero.rankEmpty);
+            setupAutoStop(session, st.wzHero, 'wzHero', d.wzHero.autoStop, cfg.wzHero.showRank, d.wzHero.rankTitle, d.wzHero.rankEmpty);
             gameStates.set(key, st);
             return;
         }
         if (cfg.enableNumberGuess && st.guessNumber.started) {
             clearGameTimer(st.guessNumber);
             if (!st.guessNumber.players[playerKey]) {
-                st.guessNumber.players[playerKey] = getPlayerData(session);
+                const playerData = await getPlayerData(session);
+                st.guessNumber.players[playerKey] = playerData;
                 st.guessNumber.participants.push(playerKey);
+                await updatePlayerPlayCount(session);
             }
             if (content === '结束') {
                 clearGameData(st.guessNumber, cfg.guessNumber.showRank && !isPrivate(session), session, d.guessNumber.rankTitle, d.guessNumber.rankEmpty);
@@ -876,19 +1082,35 @@ function apply(ctx, cfg) {
             }
             const num = parseInt(content);
             if (isNaN(num)) {
-                setupAutoStop(session, st.guessNumber, cfg, 'guessNumber', d.guessNumber.autoStop, cfg.guessNumber.showRank, d.guessNumber.rankTitle, d.guessNumber.rankEmpty);
+                setupAutoStop(session, st.guessNumber, 'guessNumber', d.guessNumber.autoStop, cfg.guessNumber.showRank, d.guessNumber.rankTitle, d.guessNumber.rankEmpty);
                 return next();
             }
+            if (num < st.guessNumber.currentMin || num > st.guessNumber.currentMax) {
+                await session.send(d.guessNumber.outOfRange.replace('{0}', st.guessNumber.currentMin.toString()).replace('{1}', st.guessNumber.currentMax.toString()));
+                setupAutoStop(session, st.guessNumber, 'guessNumber', d.guessNumber.autoStop, cfg.guessNumber.showRank, d.guessNumber.rankTitle, d.guessNumber.rankEmpty);
+                return;
+            }
             if (num === st.guessNumber.target) {
-                await session.send(d.guessNumber.correct);
-                addScoreToOthers(st.guessNumber.players, playerKey);
+                st.guessNumber.players[playerKey].score += cfg.guessNumber.penaltyScore;
+                await savePlayerData(session, st.guessNumber.players[playerKey]);
+                let message = d.guessNumber.correct;
+                if (cfg.guessNumber.enablePenalty) {
+                    Object.keys(st.guessNumber.players).forEach(key => {
+                        if (key !== playerKey) {
+                            st.guessNumber.players[key].score += cfg.guessNumber.rewardScore;
+                            savePlayerData(session, st.guessNumber.players[key]);
+                        }
+                    });
+                    message += `\n猜中者被扣 ${-cfg.guessNumber.penaltyScore} 分，其他玩家各加 ${cfg.guessNumber.rewardScore} 分`;
+                }
+                await session.send(message);
                 st.guessNumber.currentRound += 1;
                 if (st.guessNumber.currentRound > st.guessNumber.totalRounds) {
                     st.guessNumber.started = false;
                     clearGameTimer(st.guessNumber);
                     await session.send(d.guessNumber.gameEnd);
                     if (cfg.guessNumber.showRank && !isPrivate(session)) {
-                        const rankText = generateRankText(st.guessNumber.players, d.guessNumber.rankTitle, d.guessNumber.rankEmpty);
+                        const rankText = generateGameRankText(st.guessNumber.players, d.guessNumber.rankTitle, d.guessNumber.rankEmpty);
                         await session.send(rankText);
                     }
                     clearGameData(st.guessNumber);
@@ -907,15 +1129,17 @@ function apply(ctx, cfg) {
                 st.guessNumber.currentMax = num - 1;
                 await session.send(d.guessNumber.tooBig.replace('{0}', st.guessNumber.currentMin.toString()).replace('{1}', st.guessNumber.currentMax.toString()));
             }
-            setupAutoStop(session, st.guessNumber, cfg, 'guessNumber', d.guessNumber.autoStop, cfg.guessNumber.showRank, d.guessNumber.rankTitle, d.guessNumber.rankEmpty);
+            setupAutoStop(session, st.guessNumber, 'guessNumber', d.guessNumber.autoStop, cfg.guessNumber.showRank, d.guessNumber.rankTitle, d.guessNumber.rankEmpty);
             gameStates.set(key, st);
             return;
         }
         if (cfg.enableCalc24 && st.calc24.started) {
             clearGameTimer(st.calc24);
             if (!st.calc24.players[playerKey]) {
-                st.calc24.players[playerKey] = getPlayerData(session);
+                const playerData = await getPlayerData(session);
+                st.calc24.players[playerKey] = playerData;
                 st.calc24.participants.push(playerKey);
+                await updatePlayerPlayCount(session);
             }
             if (content === '结束') {
                 clearGameData(st.calc24, cfg.calc24.showRank && !isPrivate(session), session, d.calc24.rankTitle, d.calc24.rankEmpty);
@@ -933,19 +1157,20 @@ function apply(ctx, cfg) {
                         .replace('{1}', st.calc24.difficulty)
                         .replace('{2}', st.calc24.numbers.join('、')));
                 }
-                setupAutoStop(session, st.calc24, cfg, 'calc24', d.calc24.autoStop, cfg.calc24.showRank, d.calc24.rankTitle, d.calc24.rankEmpty);
+                setupAutoStop(session, st.calc24, 'calc24', d.calc24.autoStop, cfg.calc24.showRank, d.calc24.rankTitle, d.calc24.rankEmpty);
                 return;
             }
             if (st.calc24.solved) {
                 await session.send(d.calc24.solved);
-                setupAutoStop(session, st.calc24, cfg, 'calc24', d.calc24.autoStop, cfg.calc24.showRank, d.calc24.rankTitle, d.calc24.rankEmpty);
+                setupAutoStop(session, st.calc24, 'calc24', d.calc24.autoStop, cfg.calc24.showRank, d.calc24.rankTitle, d.calc24.rankEmpty);
                 return;
             }
             const result = evaluateExpression(content);
             if (result !== null && Math.abs(result - 24) < 0.001) {
                 await session.send(d.calc24.correct);
-                st.calc24.players[playerKey].score += 1;
+                st.calc24.players[playerKey].score += cfg.calc24.rewardScore;
                 st.calc24.players[playerKey].correctCount += 1;
+                await savePlayerData(session, st.calc24.players[playerKey]);
                 st.calc24.solved = true;
                 st.calc24.currentRound += 1;
                 if (st.calc24.currentRound > st.calc24.totalRounds) {
@@ -953,7 +1178,7 @@ function apply(ctx, cfg) {
                     clearGameTimer(st.calc24);
                     await session.send(d.calc24.gameEnd);
                     if (cfg.calc24.showRank && !isPrivate(session)) {
-                        const rankText = generateRankText(st.calc24.players, d.calc24.rankTitle, d.calc24.rankEmpty);
+                        const rankText = generateGameRankText(st.calc24.players, d.calc24.rankTitle, d.calc24.rankEmpty);
                         await session.send(rankText);
                     }
                     clearGameData(st.calc24);
@@ -972,7 +1197,7 @@ function apply(ctx, cfg) {
             else {
                 await session.send(d.calc24.wrong);
             }
-            setupAutoStop(session, st.calc24, cfg, 'calc24', d.calc24.autoStop, cfg.calc24.showRank, d.calc24.rankTitle, d.calc24.rankEmpty);
+            setupAutoStop(session, st.calc24, 'calc24', d.calc24.autoStop, cfg.calc24.showRank, d.calc24.rankTitle, d.calc24.rankEmpty);
             gameStates.set(key, st);
             return;
         }
@@ -983,8 +1208,12 @@ function apply(ctx, cfg) {
         const session = argv.session;
         if (!session)
             return;
+        if (isPrivate(session) && !canPlayPrivate('guessNumber')) {
+            await session.send('私聊已禁用猜数字游戏');
+            return;
+        }
         const key = getSessionKey(session);
-        const st = gameStates.get(key) || initState(key, cfg);
+        const st = gameStates.get(key) || initState(key);
         if (checkGameRunning(st, 'guessNumber')) {
             await session.send(d.common.gameRunning);
             return;
@@ -998,7 +1227,7 @@ function apply(ctx, cfg) {
             await session.send(d.guessNumber.start.replace('{0}', st.guessNumber.totalRounds.toString()));
             await session.send(`猜数字范围：${st.guessNumber.currentMin} - ${st.guessNumber.currentMax}`);
             gameStates.set(key, st);
-            setupAutoStop(session, st.guessNumber, cfg, 'guessNumber', d.guessNumber.autoStop, cfg.guessNumber.showRank, d.guessNumber.rankTitle, d.guessNumber.rankEmpty);
+            setupAutoStop(session, st.guessNumber, 'guessNumber', d.guessNumber.autoStop, cfg.guessNumber.showRank, d.guessNumber.rankTitle, d.guessNumber.rankEmpty);
         }
         else if (action === '结束') {
             clearGameData(st.guessNumber, cfg.guessNumber.showRank && !isPrivate(session), session, d.guessNumber.rankTitle, d.guessNumber.rankEmpty);
@@ -1014,8 +1243,12 @@ function apply(ctx, cfg) {
         const session = argv.session;
         if (!session)
             return;
+        if (isPrivate(session) && !canPlayPrivate('wzHero')) {
+            await session.send('私聊已禁用王者英雄猜谜');
+            return;
+        }
         const key = getSessionKey(session);
-        const st = gameStates.get(key) || initState(key, cfg);
+        const st = gameStates.get(key) || initState(key);
         if (checkGameRunning(st, 'wzHero')) {
             await session.send(d.common.gameRunning);
             return;
@@ -1040,7 +1273,7 @@ function apply(ctx, cfg) {
                 await session.send(d.wzHero.apiError);
             }
             gameStates.set(key, st);
-            setupAutoStop(session, st.wzHero, cfg, 'wzHero', d.wzHero.autoStop, cfg.wzHero.showRank, d.wzHero.rankTitle, d.wzHero.rankEmpty);
+            setupAutoStop(session, st.wzHero, 'wzHero', d.wzHero.autoStop, cfg.wzHero.showRank, d.wzHero.rankTitle, d.wzHero.rankEmpty);
         }
         else if (action === '结束') {
             clearGameData(st.wzHero, cfg.wzHero.showRank && !isPrivate(session), session, d.wzHero.rankTitle, d.wzHero.rankEmpty);
@@ -1048,7 +1281,7 @@ function apply(ctx, cfg) {
             gameStates.set(key, st);
         }
         else {
-            await session.send(d.wzHero.startUsage);
+            await session.send(d.wzHero.usage);
         }
     });
     ctx.command('看图猜成语 <action>', '看图猜成语')
@@ -1056,8 +1289,12 @@ function apply(ctx, cfg) {
         const session = argv.session;
         if (!session)
             return;
+        if (isPrivate(session) && !canPlayPrivate('chengyuImage')) {
+            await session.send('私聊已禁用看图猜成语');
+            return;
+        }
         const key = getSessionKey(session);
-        const st = gameStates.get(key) || initState(key, cfg);
+        const st = gameStates.get(key) || initState(key);
         if (checkGameRunning(st, 'chengyuImage')) {
             await session.send(d.common.gameRunning);
             return;
@@ -1088,7 +1325,7 @@ function apply(ctx, cfg) {
                 await session.send(d.chengyuImage.apiError);
             }
             gameStates.set(key, st);
-            setupAutoStop(session, st.chengyuImage, cfg, 'chengyuImage', d.chengyuImage.autoStop, cfg.chengyuImage.showRank, d.chengyuImage.rankTitle, d.chengyuImage.rankEmpty);
+            setupAutoStop(session, st.chengyuImage, 'chengyuImage', d.chengyuImage.autoStop, cfg.chengyuImage.showRank, d.chengyuImage.rankTitle, d.chengyuImage.rankEmpty);
         }
         else if (action === '结束') {
             clearGameData(st.chengyuImage, cfg.chengyuImage.showRank && !isPrivate(session), session, d.chengyuImage.rankTitle, d.chengyuImage.rankEmpty);
@@ -1096,7 +1333,7 @@ function apply(ctx, cfg) {
             gameStates.set(key, st);
         }
         else {
-            await session.send(d.chengyuImage.submitUsage);
+            await session.send(d.chengyuImage.usage);
         }
     });
     ctx.command('成语接龙 <action>', '成语接龙')
@@ -1104,8 +1341,12 @@ function apply(ctx, cfg) {
         const session = argv.session;
         if (!session)
             return;
+        if (isPrivate(session) && !canPlayPrivate('chengyuJielong')) {
+            await session.send('私聊已禁用成语接龙');
+            return;
+        }
         const key = getSessionKey(session);
-        const st = gameStates.get(key) || initState(key, cfg);
+        const st = gameStates.get(key) || initState(key);
         if (checkGameRunning(st, 'chengyuJielong')) {
             await session.send(d.common.gameRunning);
             return;
@@ -1115,10 +1356,13 @@ function apply(ctx, cfg) {
             st.chengyuJielong.currentRound = 1;
             st.chengyuJielong.hasTriggeredAutoPlay = false;
             st.chengyuJielong.autoPlayCount = 0;
+            st.chengyuJielong.jielongCount = 0;
             await session.send(d.chengyuJielong.start.replace('{0}', st.chengyuJielong.totalRounds.toString()));
+            setTimeout(() => {
+                scheduleAutoPlay(session, key, st);
+            }, 100);
             gameStates.set(key, st);
-            scheduleAutoPlay(session, key, st);
-            setupAutoStop(session, st.chengyuJielong, cfg, 'chengyuJielong', d.chengyuJielong.autoStop, cfg.chengyuJielong.showRank, d.chengyuJielong.rankTitle, d.chengyuJielong.rankEmpty);
+            setupAutoStop(session, st.chengyuJielong, 'chengyuJielong', d.chengyuJielong.autoStop, cfg.chengyuJielong.showRank, d.chengyuJielong.rankTitle, d.chengyuJielong.rankEmpty);
         }
         else if (action === '结束') {
             clearGameData(st.chengyuJielong, cfg.chengyuJielong.showRank && !isPrivate(session), session, d.chengyuJielong.rankTitle, d.chengyuJielong.rankEmpty);
@@ -1126,7 +1370,7 @@ function apply(ctx, cfg) {
             gameStates.set(key, st);
         }
         else {
-            await session.send(d.chengyuJielong.joinUsage);
+            await session.send(d.chengyuJielong.usage);
         }
     });
     ctx.command('算24点 <action>', '算24点游戏')
@@ -1134,8 +1378,12 @@ function apply(ctx, cfg) {
         const session = argv.session;
         if (!session)
             return;
+        if (isPrivate(session) && !canPlayPrivate('calc24')) {
+            await session.send('私聊已禁用算24点');
+            return;
+        }
         const key = getSessionKey(session);
-        const st = gameStates.get(key) || initState(key, cfg);
+        const st = gameStates.get(key) || initState(key);
         if (checkGameRunning(st, 'calc24')) {
             await session.send(d.common.gameRunning);
             return;
@@ -1153,7 +1401,7 @@ function apply(ctx, cfg) {
                 .replace('{1}', st.calc24.difficulty)
                 .replace('{2}', st.calc24.numbers.join('、')));
             gameStates.set(key, st);
-            setupAutoStop(session, st.calc24, cfg, 'calc24', d.calc24.autoStop, cfg.calc24.showRank, d.calc24.rankTitle, d.calc24.rankEmpty);
+            setupAutoStop(session, st.calc24, 'calc24', d.calc24.autoStop, cfg.calc24.showRank, d.calc24.rankTitle, d.calc24.rankEmpty);
         }
         else if (action === '结束') {
             clearGameData(st.calc24, cfg.calc24.showRank && !isPrivate(session), session, d.calc24.rankTitle, d.calc24.rankEmpty);
@@ -1161,7 +1409,27 @@ function apply(ctx, cfg) {
             gameStates.set(key, st);
         }
         else {
-            await session.send('请输入：算24点 开始 或 算24点 结束');
+            await session.send(d.calc24.usage);
         }
     });
+    if (cfg.rank.enableCommand) {
+        ctx.command('排行榜', '查看本群游戏排行榜')
+            .action(async ({ session }) => {
+            if (!session || !session.channelId)
+                return;
+            const rankText = await generateTotalRankText(session);
+            await session.send(rankText);
+        });
+        ctx.command('清零', '清零本群所有玩家数据')
+            .action(async ({ session }) => {
+            if (!session || !session.channelId)
+                return;
+            if (session.user?.authority < cfg.rank.clearDataPermission) {
+                await session.send(d.rank.noPermission);
+                return;
+            }
+            await ctx.database.remove('game_mini_player', { guildId: session.channelId });
+            await session.send(d.rank.clearSuccess);
+        });
+    }
 }