koishi-plugin-game-mini 0.1.9 → 0.2.0

package/lib/index.js

@@ -26,23 +26,23 @@ exports.Config = koishi_1.Schema.object({
         min: koishi_1.Schema.number().min(0).default(0),
         max: koishi_1.Schema.number().min(1).default(100),
         botParticipateInGroup: koishi_1.Schema.boolean().default(true),
-        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),
+        showRank: koishi_1.Schema.boolean().default(true),
     }),
     wzHero: koishi_1.Schema.object({
         botParticipateInGroup: koishi_1.Schema.boolean().default(false),
-        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),
+        showRank: koishi_1.Schema.boolean().default(true),
     }),
     chengyuImage: koishi_1.Schema.object({
         botParticipateInGroup: koishi_1.Schema.boolean().default(false),
-        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),
+        showRank: koishi_1.Schema.boolean().default(true),
     }),
     chengyuJielong: koishi_1.Schema.object({
         botParticipateInGroup: koishi_1.Schema.boolean().default(true),
-        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),
+        showRank: koishi_1.Schema.boolean().default(true),
     }),
     apiConfig: koishi_1.Schema.object({
         timeout: koishi_1.Schema.number().default(5000),
@@ -51,12 +51,11 @@ exports.Config = koishi_1.Schema.object({
 const logger = new koishi_1.Logger('game-mini');
 const gameStates = new Map();
 const getSessionKey = (s) => s.channelId ? `g:${s.channelId}` : `p:${s.userId}`;
-// 修复：处理userId可能为undefined的情况
-const getPlayerKey = (platform, userId) => {
-    const safeUserId = userId || 'unknown_user';
-    return `${platform}_${safeUserId}`;
+const getIntUserId = (session) => {
+    const userIdStr = session.userId || '0';
+    const hash = userIdStr.split('').reduce((acc, char) => acc + char.charCodeAt(0), 0);
+    return hash || 1000000;
 };
-// 修复：确保返回的PlayerData中所有字段都是string类型
 const getPlayerData = (session) => {
     const safeUserId = session.userId || 'unknown_user';
     return {
@@ -166,7 +165,6 @@ const addScoreToOthers = (players, excludePlayerKey) => {
     });
 };
 function apply(ctx, cfg) {
-    // 修复：为wzHero添加缺失的start属性
     const d = {
         guessNumber: {
             usage: "用法错误！正确用法：guess start/stop 或 直接输入数字",
@@ -183,7 +181,7 @@ function apply(ctx, cfg) {
             disabled: "猜数字功能已关闭，请联系管理员开启",
         },
         wzHero: {
-            start: "王者英雄猜谜开始！本次共 {0} 回合～", // 新增缺失的start属性
+            start: "王者英雄猜谜开始！本次共 {0} 回合～",
             startUsage: "用法错误！正确用法：wzhero start [难度] 开始游戏",
             stop: "王者英雄猜谜比赛已停止",
             notStarted: "王者英雄猜谜比赛尚未开始，请输入 wzhero start [难度] 开始游戏",
@@ -298,9 +296,16 @@ function apply(ctx, cfg) {
         st.chengyuJielong.autoPlayCount += 1;
         gameStates.set(key, st);
         try {
-            // 修复：传入可能为undefined的userId，函数内部已处理
+            const intUserId = getIntUserId(session);
             const r = await axios_1.default.get('https://api.suol.cc/v1/game_cyjl.php', {
-                params: { id: getPlayerKey(session.platform, session.userId), msg: '我接' }, timeout: cfg.apiConfig.timeout
+                params: {
+                    id: intUserId,
+                    msg: '我接'
+                },
+                timeout: cfg.apiConfig.timeout,
+                headers: {
+                    'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36'
+                }
             });
             const dt = r.data;
             let m = '';
@@ -310,7 +315,7 @@ function apply(ctx, cfg) {
                 st.chengyuJielong.lastChar = dt.data.current_char || '';
             }
             else {
-                m = d.chengyuJielong.botWin;
+                m = dt.msg || d.chengyuJielong.botWin;
                 st.chengyuJielong.currentRound += 1;
                 if (st.chengyuJielong.currentRound > st.chengyuJielong.totalRounds) {
                     st.chengyuJielong.started = false;
@@ -345,8 +350,7 @@ function apply(ctx, cfg) {
         if (isPrivate(session) && !cfg.enablePrivateGame)
             return next();
         const content = session.content.trim();
-        // 修复：传入可能为undefined的userId，函数内部已处理
-        const playerKey = getPlayerKey(session.platform, session.userId);
+        const playerKey = `${session.platform}_${session.userId || 'unknown'}`;
         if (cfg.enableChengyuJielong && st.chengyuJielong.started) {
             refreshActive(st);
             if (!st.chengyuJielong.players[playerKey]) {
@@ -358,14 +362,22 @@ function apply(ctx, cfg) {
                 return next();
             }
             try {
+                const intUserId = getIntUserId(session);
                 const r = await axios_1.default.get('https://api.suol.cc/v1/game_cyjl.php', {
-                    params: { id: playerKey, msg: `我接${content}` }, timeout: cfg.apiConfig.timeout
+                    params: {
+                        id: intUserId,
+                        msg: `我接${content}`
+                    },
+                    timeout: cfg.apiConfig.timeout,
+                    headers: {
+                        'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36'
+                    }
                 });
                 const dt = r.data;
                 let m = '';
                 if (dt.code === 200) {
                     m = dt.msg + '\n';
-                    if (dt.data.user) {
+                    if (dt.data?.user) {
                         st.chengyuJielong.players[playerKey].score += 1;
                         st.chengyuJielong.players[playerKey].correctCount += 1;
                         m += d.chengyuJielong.correct.replace('{0}', st.chengyuJielong.players[playerKey].score.toString()) + '\n';
@@ -375,7 +387,7 @@ function apply(ctx, cfg) {
                         addScoreToOthers(st.chengyuJielong.players, playerKey);
                         m += d.chengyuJielong.wrong.replace('{1}', st.chengyuJielong.players[playerKey].score.toString()) + '\n';
                     }
-                    if (dt.data.system) {
+                    if (dt.data?.system) {
                         m += `我的接龙：${dt.data.system.idiom}（${dt.data.system.pinyin}）\n释义：${dt.data.system.meaning}`;
                         st.chengyuJielong.lastChar = dt.data.current_char || '';
                     }
@@ -435,7 +447,6 @@ function apply(ctx, cfg) {
                     }
                 }
                 catch (error) {
-                    logger.error(error);
                     await session.send(d.chengyuImage.hintError);
                 }
                 return;
@@ -510,7 +521,6 @@ function apply(ctx, cfg) {
                 }
             }
             catch (error) {
-                logger.error(error);
                 await session.send(d.chengyuImage.apiError);
             }
             gameStates.set(key, st);
@@ -523,7 +533,7 @@ function apply(ctx, cfg) {
             }
             try {
                 const r = await axios_1.default.get('https://api.suol.cc/v1/game_wz.php', {
-                    params: { id: playerKey, msg: content }, timeout: cfg.apiConfig.timeout
+                    params: { id: getIntUserId(session), msg: content }, timeout: cfg.apiConfig.timeout
                 });
                 const dt = r.data;
                 if (dt.status === 'success') {
@@ -549,7 +559,7 @@ function apply(ctx, cfg) {
                         else {
                             text += '\n' + d.wzHero.roundEnd.replace('{0}', st.wzHero.currentRound.toString()).replace('{1}', (st.wzHero.totalRounds - st.wzHero.currentRound).toString());
                             const nextR = await axios_1.default.get('https://api.suol.cc/v1/game_wz.php', {
-                                params: { id: playerKey, msg: `开始游戏${st.wzHero.difficulty}` }, timeout: cfg.apiConfig.timeout
+                                params: { id: getIntUserId(session), msg: `开始游戏${st.wzHero.difficulty}` }, timeout: cfg.apiConfig.timeout
                             });
                             const nextDt = nextR.data;
                             if (nextDt.status === 'success') {
@@ -639,15 +649,13 @@ function apply(ctx, cfg) {
                 st.wzHero.participants = [];
                 gameStates.set(key, st);
                 try {
-                    // 修复：传入可能为undefined的userId，函数内部已处理
                     const r = await axios_1.default.get('https://api.suol.cc/v1/game_wz.php', {
-                        params: { id: getPlayerKey(s.platform, s.userId), msg: `开始游戏${fd}` }, timeout: cfg.apiConfig.timeout
+                        params: { id: getIntUserId(s), msg: `开始游戏${fd}` }, timeout: cfg.apiConfig.timeout
                     });
                     const dt = r.data;
                     if (dt.status === 'success') {
                         let t = `${dt.message}\n${dt.hint}\n剩余提示次数：${dt.remaining_hints}\n${dt.guide}`;
                         t = t.replace(/\\n/g, '\n');
-                        // 现在d.wzHero.start已存在，不会报错
                         t = d.wzHero.start.replace('{0}', cfg.wzHero.totalRounds.toString()) + '\n' + t;
                         st.wzHero.currentAnswer = dt.hint || '';
                         await s.send(t);
@@ -716,7 +724,6 @@ function apply(ctx, cfg) {
                     }
                 }
                 catch (error) {
-                    logger.error(error);
                     await s.send(d.chengyuImage.apiError);
                     st.chengyuImage.started = false;
                 }
@@ -763,9 +770,16 @@ function apply(ctx, cfg) {
                 refreshActive(st);
                 gameStates.set(key, st);
                 try {
-                    // 修复：传入可能为undefined的userId，函数内部已处理
+                    const intUserId = getIntUserId(s);
                     const r = await axios_1.default.get('https://api.suol.cc/v1/game_cyjl.php', {
-                        params: { id: getPlayerKey(s.platform, s.userId), msg: '开始成语接龙' }, timeout: cfg.apiConfig.timeout
+                        params: {
+                            id: intUserId,
+                            msg: '开始成语接龙'
+                        },
+                        timeout: cfg.apiConfig.timeout,
+                        headers: {
+                            'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36'
+                        }
                     });
                     const dt = r.data;
                     let m = d.chengyuJielong.start.replace('{0}', cfg.chengyuJielong.totalRounds.toString());

package/lib/locales/locales/zh-CN.yml

@@ -1,3 +1,4 @@
+# zh-CN.yml
 guessNumber:
   usage: "用法错误！正确用法：guess start/stop 或 直接输入数字"
   start: "猜数字比赛开始！本次共 {0} 回合～"
@@ -13,6 +14,7 @@ guessNumber:
   disabled: "猜数字功能已关闭，请联系管理员开启"
 
 wzHero:
+  start: "王者英雄猜谜开始！本次共 {0} 回合～"
   startUsage: "用法错误！正确用法：wzhero start [难度] 开始游戏"
   stop: "王者英雄猜谜比赛已停止"
   notStarted: "王者英雄猜谜比赛尚未开始，请输入 wzhero start [难度] 开始游戏"

package/package.json

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