koishi-plugin-game-mini 0.2.1 → 0.2.2

package/lib/index.d.ts

@@ -19,12 +19,10 @@ export interface Config {
         showRank: boolean;
     };
     wzHero: {
-        botParticipateInGroup: boolean;
         totalRounds: number;
         showRank: boolean;
     };
     chengyuImage: {
-        botParticipateInGroup: boolean;
         totalRounds: number;
         showRank: boolean;
     };

package/lib/index.js

@@ -57,9 +57,6 @@ exports.Config = koishi_1.Schema.object({
     }).description('猜数字游戏配置')
         .i18n({ 'zh-CN': '猜数字游戏配置' }),
     wzHero: koishi_1.Schema.object({
-        botParticipateInGroup: koishi_1.Schema.boolean().default(false)
-            .description('群聊中机器人是否参与王者英雄猜谜')
-            .i18n({ 'zh-CN': '机器人参与群聊游戏' }),
         totalRounds: koishi_1.Schema.number().min(1).default(10)
             .description('王者英雄猜谜总回合数')
             .i18n({ 'zh-CN': '总回合数' }),
@@ -69,9 +66,6 @@ exports.Config = koishi_1.Schema.object({
     }).description('王者英雄猜谜游戏配置')
         .i18n({ 'zh-CN': '王者英雄猜谜配置' }),
     chengyuImage: koishi_1.Schema.object({
-        botParticipateInGroup: koishi_1.Schema.boolean().default(false)
-            .description('群聊中机器人是否参与看图猜成语')
-            .i18n({ 'zh-CN': '机器人参与群聊游戏' }),
         totalRounds: koishi_1.Schema.number().min(1).default(10)
             .description('看图猜成语总回合数')
             .i18n({ 'zh-CN': '总回合数' }),
@@ -115,11 +109,9 @@ exports.Config = koishi_1.Schema.object({
         'guessNumber.totalRounds': '总回合数',
         'guessNumber.showRank': '显示排行榜',
         'wzHero': '王者英雄猜谜配置',
-        'wzHero.botParticipateInGroup': '机器人参与群聊游戏',
         'wzHero.totalRounds': '总回合数',
         'wzHero.showRank': '显示排行榜',
         'chengyuImage': '看图猜成语配置',
-        'chengyuImage.botParticipateInGroup': '机器人参与群聊游戏',
         'chengyuImage.totalRounds': '总回合数',
         'chengyuImage.showRank': '显示排行榜',
         'chengyuJielong': '成语接龙配置',
@@ -159,11 +151,17 @@ const checkGameRunning = (s, t) => {
         return true;
     return false;
 };
+const clearGameTimer = (state) => {
+    if (state.stopTimer)
+        clearTimeout(state.stopTimer);
+};
 const clearAllTimers = (st) => {
+    clearGameTimer(st.guessNumber);
+    clearGameTimer(st.wzHero);
+    clearGameTimer(st.chengyuImage);
+    clearGameTimer(st.chengyuJielong);
     if (st.chengyuJielong.autoPlayTimer)
         clearTimeout(st.chengyuJielong.autoPlayTimer);
-    if (st.chengyuJielong.stopTimer)
-        clearTimeout(st.chengyuJielong.stopTimer);
 };
 const initState = (key, c) => {
     const s = {
@@ -229,7 +227,7 @@ const generateRankText = (players) => {
     const sortedPlayers = playerList.sort((a, b) => b.score - a.score);
     let rankText = '🏆 排行榜 🏆\n';
     sortedPlayers.forEach((player, index) => {
-        rankText += `${index + 1}. ${player.name}（${player.platform}-${player.userId}） - 得分：${player.score}分（答对${player.correctCount}题）\n`;
+        rankText += `${index + 1}. ${player.name} - 得分：${player.score}分（答对${player.correctCount}题）\n`;
     });
     return rankText.trim();
 };
@@ -238,6 +236,7 @@ const clearGameData = (gameState) => {
     gameState.participants = [];
     gameState.currentRound = 0;
     gameState.started = false;
+    clearGameTimer(gameState);
 };
 const addScoreToOthers = (players, excludePlayerKey) => {
     Object.keys(players).forEach(playerKey => {
@@ -246,6 +245,18 @@ const addScoreToOthers = (players, excludePlayerKey) => {
         }
     });
 };
+const setupAutoStop = (session, state, cfg, endMsg, showRank) => {
+    clearGameTimer(state);
+    if (cfg.autoStopInactiveTime <= 0)
+        return;
+    state.stopTimer = setTimeout(() => {
+        clearGameData(state);
+        session.send(endMsg);
+        if (showRank && session.channelId) {
+            session.send(generateRankText(state.players));
+        }
+    }, cfg.autoStopInactiveTime * 1000);
+};
 function apply(ctx, cfg) {
     const d = {
         guessNumber: {
@@ -261,6 +272,7 @@ function apply(ctx, cfg) {
             rankTitle: "🏆 排行榜 🏆",
             rankEmpty: "暂无参与记录～",
             disabled: "猜数字功能已关闭，请联系管理员开启",
+            autoStop: "游戏因长时间无人操作，已自动结束"
         },
         wzHero: {
             start: "王者英雄猜谜开始！本次共 {0} 回合～",
@@ -276,6 +288,7 @@ function apply(ctx, cfg) {
             rankTitle: "🏆 排行榜 🏆",
             rankEmpty: "暂无参与记录～",
             disabled: "王者英雄猜谜功能已关闭，请联系管理员开启",
+            autoStop: "游戏因长时间无人操作，已自动结束"
         },
         chengyuImage: {
             start: "看图猜成语比赛开始！本次共 {0} 回合～",
@@ -293,6 +306,7 @@ function apply(ctx, cfg) {
             rankTitle: "🏆 排行榜 🏆",
             rankEmpty: "暂无参与记录～",
             disabled: "看图猜成语功能已关闭，请联系管理员开启",
+            autoStop: "游戏因长时间无人操作，已自动结束"
         },
         chengyuJielong: {
             start: "成语接龙比赛开始！本次共 {0} 回合～我先来～",
@@ -312,6 +326,7 @@ function apply(ctx, cfg) {
             rankTitle: "🏆 排行榜 🏆",
             rankEmpty: "暂无参与记录～",
             disabled: "成语接龙功能已关闭，请联系管理员开启",
+            autoStop: "游戏因长时间无人操作，已自动结束"
         },
         common: {
             gameRunning: "当前已有游戏在运行中，请先结束当前游戏后再开始新游戏！",
@@ -348,20 +363,6 @@ function apply(ctx, cfg) {
             doAutoPlay(session, key, st);
         }, delay);
     };
-    const scheduleStop = (session, key, st) => {
-        clearTimeout(st.chengyuJielong.stopTimer);
-        st.chengyuJielong.stopTimer = setTimeout(() => {
-            st.chengyuJielong.started = false;
-            clearAllTimers(st);
-            session.send(d.common.gameStoppedByInactive);
-            if (cfg.chengyuJielong.showRank && !isPrivate(session)) {
-                const rankText = generateRankText(st.chengyuJielong.players);
-                session.send(rankText);
-            }
-            clearGameData(st.chengyuJielong);
-            gameStates.set(key, st);
-        }, cfg.autoStopInactiveTime * 1000);
-    };
     const doAutoPlay = async (session, key, st) => {
         if (!st.chengyuJielong.started)
             return;
@@ -371,7 +372,7 @@ function apply(ctx, cfg) {
             session.send(d.chengyuJielong.autoPlayTooMany.replace('{0}', String(cfg.autoPlayMaxCount)));
             st.chengyuJielong.hasTriggeredAutoPlay = true;
             gameStates.set(key, st);
-            scheduleStop(session, key, st);
+            setupAutoStop(session, st.chengyuJielong, cfg, d.chengyuJielong.autoStop, cfg.chengyuJielong.showRank);
             return;
         }
         st.chengyuJielong.hasTriggeredAutoPlay = true;
@@ -422,7 +423,7 @@ function apply(ctx, cfg) {
             await session.send(d.chengyuJielong.apiError);
         }
         gameStates.set(key, st);
-        scheduleStop(session, key, st);
+        setupAutoStop(session, st.chengyuJielong, cfg, d.chengyuJielong.autoStop, cfg.chengyuJielong.showRank);
     };
     ctx.middleware(async (session, next) => {
         if (!session.content)
@@ -435,11 +436,13 @@ function apply(ctx, cfg) {
         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);
                 st.chengyuJielong.participants.push(playerKey);
             }
             if (!isFourCharIdiom(content)) {
+                setupAutoStop(session, st.chengyuJielong, cfg, d.chengyuJielong.autoStop, cfg.chengyuJielong.showRank);
                 scheduleAutoPlay(session, key, st);
                 return next();
             }
@@ -489,6 +492,7 @@ 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, d.chengyuJielong.autoStop, cfg.chengyuJielong.showRank);
                         scheduleAutoPlay(session, key, st);
                     }
                 }
@@ -501,12 +505,14 @@ function apply(ctx, cfg) {
             }
             catch (error) {
                 await session.send(d.chengyuJielong.apiError);
+                setupAutoStop(session, st.chengyuJielong, cfg, d.chengyuJielong.autoStop, cfg.chengyuJielong.showRank);
                 scheduleAutoPlay(session, key, st);
             }
             gameStates.set(key, st);
             return;
         }
         if (cfg.enableChengyuImage && st.chengyuImage.started) {
+            clearGameTimer(st.chengyuImage);
             if (!st.chengyuImage.players[playerKey]) {
                 st.chengyuImage.players[playerKey] = getPlayerData(session);
                 st.chengyuImage.participants.push(playerKey);
@@ -531,10 +537,13 @@ function apply(ctx, cfg) {
                 catch (error) {
                     await session.send(d.chengyuImage.hintError);
                 }
+                setupAutoStop(session, st.chengyuImage, cfg, d.chengyuImage.autoStop, cfg.chengyuImage.showRank);
                 return;
             }
-            if (!isFourCharIdiom(content))
+            if (!isFourCharIdiom(content)) {
+                setupAutoStop(session, st.chengyuImage, cfg, d.chengyuImage.autoStop, cfg.chengyuImage.showRank);
                 return next();
+            }
             try {
                 const r = await axios_1.default.get('https://jcy.lvlong.xyz/api/api/chengyu.php', {
                     params: {
@@ -554,6 +563,7 @@ function apply(ctx, cfg) {
                         st.chengyuImage.currentRound += 1;
                         if (st.chengyuImage.currentRound > st.chengyuImage.totalRounds) {
                             st.chengyuImage.started = false;
+                            clearGameTimer(st.chengyuImage);
                             await session.send(reply);
                             await session.send(d.chengyuImage.gameEnd);
                             if (cfg.chengyuImage.showRank && !isPrivate(session)) {
@@ -585,6 +595,7 @@ function apply(ctx, cfg) {
                             else {
                                 await session.send('获取下一题失败，比赛结束！');
                                 st.chengyuImage.started = false;
+                                clearGameTimer(st.chengyuImage);
                                 if (cfg.chengyuImage.showRank && !isPrivate(session)) {
                                     const rankText = generateRankText(st.chengyuImage.players);
                                     await session.send(rankText);
@@ -605,10 +616,12 @@ function apply(ctx, cfg) {
             catch (error) {
                 await session.send(d.chengyuImage.apiError);
             }
+            setupAutoStop(session, st.chengyuImage, cfg, d.chengyuImage.autoStop, cfg.chengyuImage.showRank);
             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);
                 st.wzHero.participants.push(playerKey);
@@ -628,6 +641,7 @@ function apply(ctx, cfg) {
                         st.wzHero.currentRound += 1;
                         if (st.wzHero.currentRound > st.wzHero.totalRounds) {
                             st.wzHero.started = false;
+                            clearGameTimer(st.wzHero);
                             await session.send(text);
                             await session.send(d.wzHero.gameEnd);
                             if (cfg.wzHero.showRank && !isPrivate(session)) {
@@ -664,23 +678,28 @@ function apply(ctx, cfg) {
             catch (error) {
                 await session.send(d.wzHero.apiError);
             }
+            setupAutoStop(session, st.wzHero, cfg, d.wzHero.autoStop, cfg.wzHero.showRank);
             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);
                 st.guessNumber.participants.push(playerKey);
             }
             const num = parseInt(content);
-            if (isNaN(num))
+            if (isNaN(num)) {
+                setupAutoStop(session, st.guessNumber, cfg, d.guessNumber.autoStop, cfg.guessNumber.showRank);
                 return next();
+            }
             if (num === st.guessNumber.target) {
                 await session.send(d.guessNumber.correct);
                 addScoreToOthers(st.guessNumber.players, playerKey);
                 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);
@@ -700,6 +719,7 @@ function apply(ctx, cfg) {
             else {
                 await session.send(d.guessNumber.tooBig.replace('{0}', num.toString()).replace('{1}', st.guessNumber.currentMin.toString()));
             }
+            setupAutoStop(session, st.guessNumber, cfg, d.guessNumber.autoStop, cfg.guessNumber.showRank);
             gameStates.set(key, st);
             return;
         }
@@ -741,6 +761,7 @@ function apply(ctx, cfg) {
                         t = d.wzHero.start.replace('{0}', cfg.wzHero.totalRounds.toString()) + '\n' + t;
                         st.wzHero.currentAnswer = dt.hint || '';
                         await s.send(t);
+                        setupAutoStop(s, st.wzHero, cfg, d.wzHero.autoStop, cfg.wzHero.showRank);
                     }
                     else {
                         await s.send(dt.message || '开始失败');
@@ -753,6 +774,7 @@ function apply(ctx, cfg) {
             }
             else if (action === 'stop') {
                 st.wzHero.started = false;
+                clearGameTimer(st.wzHero);
                 await s.send(d.wzHero.stop);
                 if (cfg.wzHero.showRank && !isPrivate(s)) {
                     const rankText = generateRankText(st.wzHero.players);
@@ -799,6 +821,7 @@ function apply(ctx, cfg) {
                         await s.send(d.chengyuImage.start.replace('{0}', cfg.chengyuImage.totalRounds.toString()));
                         await s.send(`第 1 题来啦！\n请从选项中选择4个字组成成语\n选项：${dt.data.question.options.join('、')}`);
                         await s.send(koishi_1.segment.image(dt.data.question.image_url));
+                        setupAutoStop(s, st.chengyuImage, cfg, d.chengyuImage.autoStop, cfg.chengyuImage.showRank);
                     }
                     else {
                         await s.send('获取题目失败，请稍后再试');
@@ -812,6 +835,7 @@ function apply(ctx, cfg) {
             }
             else if (action === 'stop') {
                 st.chengyuImage.started = false;
+                clearGameTimer(st.chengyuImage);
                 await s.send(d.chengyuImage.stop);
                 if (cfg.chengyuImage.showRank && !isPrivate(s)) {
                     const rankText = generateRankText(st.chengyuImage.players);
@@ -875,6 +899,7 @@ function apply(ctx, cfg) {
                 catch (error) {
                     await s.send(d.chengyuJielong.apiError);
                 }
+                setupAutoStop(s, st.chengyuJielong, cfg, d.chengyuJielong.autoStop, cfg.chengyuJielong.showRank);
                 gameStates.set(key, st);
                 scheduleAutoPlay(s, key, st);
             }
@@ -917,9 +942,11 @@ function apply(ctx, cfg) {
                 gameStates.set(key, st);
                 await s.send(d.guessNumber.start.replace('{0}', cfg.guessNumber.totalRounds.toString()));
                 await s.send(`猜数字范围：${st.guessNumber.currentMin} - ${st.guessNumber.currentMax}，开始你的猜测吧！`);
+                setupAutoStop(s, st.guessNumber, cfg, d.guessNumber.autoStop, cfg.guessNumber.showRank);
             }
             else if (action === 'stop') {
                 st.guessNumber.started = false;
+                clearGameTimer(st.guessNumber);
                 await s.send(d.guessNumber.stop);
                 if (cfg.guessNumber.showRank && !isPrivate(s)) {
                     const rankText = generateRankText(st.guessNumber.players);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "koishi-plugin-game-mini",
-  "version": "0.2.1",
+  "version": "0.2.2",
   "description": "一款包含猜数字、猜王者英雄、看图猜成语、成语接龙的多功能小游戏插件",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",