koishi-plugin-rocom 1.0.3 → 1.0.4

package/lib/client.d.ts

@@ -14,12 +14,12 @@ export declare class RocomClient {
     private sanitizeForLog;
     private headersForLog;
     private stringifyForLog;
-    private isApiKeyPermissionUndeclaredError;
     private logRequestFailureDetails;
     private get;
     private post;
     private delete;
     private requestWithStatus;
+    private requestIngameWithFallback;
     private getIngameTask;
     qqQrLogin(ctx: Context, userIdentifier: string): Promise<any>;
     qqQrStatus(ctx: Context, fwToken: string, userIdentifier: string): Promise<any>;

package/lib/client.js

@@ -99,11 +99,6 @@ class RocomClient {
             return String(value);
         }
     }
-    isApiKeyPermissionUndeclaredError(message) {
-        if (!message)
-            return false;
-        return /未声明\s*api\s*key\s*权限|api\s*key\s*permission|api key 权限/i.test(message);
-    }
     logRequestFailureDetails(method, path, headers, params, body, errorOrResponse) {
         const err = errorOrResponse;
         const response = err?.response;
@@ -235,23 +230,58 @@ class RocomClient {
             const body = response?.data !== undefined ? response.data : response;
             if (body?.code !== undefined && body.code !== 0) {
                 this.setLastError(body.message || body.msg || '接口返回异常');
-                this.logRequestFailureDetails(method, path, headers, options.params, options.json, body);
+                if (!options.silentFailureDetails) {
+                    this.logRequestFailureDetails(method, path, headers, options.params, options.json, body);
+                }
                 return { status: null, data: null };
             }
             const data = body?.code !== undefined ? (body.data ?? {}) : (body ?? {});
             if (!acceptedStatuses.includes(status)) {
                 this.setLastError(`HTTP ${status}`);
-                this.logRequestFailureDetails(method, path, headers, options.params, options.json, response);
+                if (!options.silentFailureDetails) {
+                    this.logRequestFailureDetails(method, path, headers, options.params, options.json, response);
+                }
+                return { status: null, data: null };
             }
             return { status, data };
         }
         catch (e) {
             const message = this.formatHttpError(e);
             this.setLastError(message);
-            this.logRequestFailureDetails(method, path, headers, options.params, options.json, e);
+            if (!options.silentFailureDetails) {
+                this.logRequestFailureDetails(method, path, headers, options.params, options.json, e);
+            }
             return { status: null, data: null };
         }
     }
+    async requestIngameWithFallback(ctx, path, payload, options = {}) {
+        const acceptedStatuses = options.acceptedStatuses || [200, 202];
+        const requestOnce = async (includeApiKey, silentFailureDetails) => {
+            const headers = this.wegameHeaders('', '', '', '', includeApiKey);
+            let result = await this.requestWithStatus(ctx, 'POST', path, headers, {
+                json: payload,
+                acceptedStatuses,
+                silentFailureDetails,
+            });
+            if (result.status === null) {
+                result = await this.requestWithStatus(ctx, 'GET', path, headers, {
+                    params: payload,
+                    acceptedStatuses,
+                    silentFailureDetails,
+                });
+            }
+            return result;
+        };
+        let result = await requestOnce(false, Boolean(this.apiKey));
+        if (result.status !== null)
+            return { ...result, usedApiKey: false };
+        if (this.apiKey) {
+            result = await requestOnce(true, false);
+            if (result.status !== null)
+                return { ...result, usedApiKey: true };
+        }
+        return { status: null, data: null, usedApiKey: false };
+    }
     async getIngameTask(ctx, taskId, includeApiKey = true) {
         return this.requestWithStatus(ctx, 'GET', `/api/v1/games/rocom/ingame/tasks/${taskId}`, this.wegameHeaders('', '', '', '', includeApiKey), { acceptedStatuses: [200, 202] });
     }
@@ -339,52 +369,14 @@ class RocomClient {
     async ingamePlayerSearch(ctx, uid) {
         const sanitizedUid = this.sanitizeUid(uid);
         if (!sanitizedUid) {
-            this.setLastError('UID 涓嶈兘涓虹┖');
+            this.setLastError('UID 不能为空');
             return null;
         }
         const path = '/api/v1/games/rocom/ingame/player/search';
-        let includeApiKey = true;
-        let headers = this.wegameHeaders();
         const payload = { uid: sanitizedUid, wait_ms: 5000 };
-        let { status, data } = await this.requestWithStatus(ctx, 'POST', path, headers, {
-            json: payload,
-            acceptedStatuses: [200, 202],
-        });
+        const { status, data, usedApiKey } = await this.requestIngameWithFallback(ctx, path, payload);
         if (status === 200 && data && this.isIngamePlayerPayload(data))
             return data;
-        if (status === null) {
-            const fallback = await this.requestWithStatus(ctx, 'GET', path, headers, {
-                params: payload,
-                acceptedStatuses: [200, 202],
-            });
-            status = fallback.status;
-            data = fallback.data;
-            if (status === 200 && data && this.isIngamePlayerPayload(data))
-                return data;
-        }
-        if (status === null && includeApiKey && this.apiKey && this.isApiKeyPermissionUndeclaredError(this.getLastError(''))) {
-            logger.warn('ingame/player/search rejected X-API-Key, retrying without API key');
-            includeApiKey = false;
-            headers = this.wegameHeaders('', '', '', '', false);
-            const retry = await this.requestWithStatus(ctx, 'POST', path, headers, {
-                json: payload,
-                acceptedStatuses: [200, 202],
-            });
-            status = retry.status;
-            data = retry.data;
-            if (status === 200 && data && this.isIngamePlayerPayload(data))
-                return data;
-            if (status === null) {
-                const fallback = await this.requestWithStatus(ctx, 'GET', path, headers, {
-                    params: payload,
-                    acceptedStatuses: [200, 202],
-                });
-                status = fallback.status;
-                data = fallback.data;
-                if (status === 200 && data && this.isIngamePlayerPayload(data))
-                    return data;
-            }
-        }
         if (!data)
             return null;
         if (this.isIngamePlayerPayload(data))
@@ -397,7 +389,7 @@ class RocomClient {
         }
         for (let i = 0; i < 8; i++) {
             await new Promise(resolve => setTimeout(resolve, 1000));
-            const task = await this.getIngameTask(ctx, taskId, includeApiKey);
+            const task = await this.getIngameTask(ctx, taskId, usedApiKey);
             if (task.status === 200)
                 return task.data;
             if (task.status === null)
@@ -429,52 +421,14 @@ class RocomClient {
     async ingameHomeInfo(ctx, uid, waitMs = 5000) {
         const sanitizedUid = this.sanitizeUid(uid);
         if (!sanitizedUid) {
-            this.setLastError('UID 涓嶈兘涓虹┖');
+            this.setLastError('UID 不能为空');
             return null;
         }
         const path = '/api/v1/games/rocom/ingame/home/info';
-        let includeApiKey = true;
-        let headers = this.wegameHeaders();
         const payload = { uid: sanitizedUid, wait_ms: waitMs };
-        let { status, data } = await this.requestWithStatus(ctx, 'POST', path, headers, {
-            json: payload,
-            acceptedStatuses: [200, 202],
-        });
+        const { status, data, usedApiKey } = await this.requestIngameWithFallback(ctx, path, payload);
         if (status === 200 && data && !(data.task_id || data.taskId || data.taskID))
             return data;
-        if (status === null) {
-            const fallback = await this.requestWithStatus(ctx, 'GET', path, headers, {
-                params: payload,
-                acceptedStatuses: [200, 202],
-            });
-            status = fallback.status;
-            data = fallback.data;
-            if (status === 200 && data && !(data.task_id || data.taskId || data.taskID))
-                return data;
-        }
-        if (status === null && includeApiKey && this.apiKey && this.isApiKeyPermissionUndeclaredError(this.getLastError(''))) {
-            logger.warn('ingame/home/info rejected X-API-Key, retrying without API key');
-            includeApiKey = false;
-            headers = this.wegameHeaders('', '', '', '', false);
-            const retry = await this.requestWithStatus(ctx, 'POST', path, headers, {
-                json: payload,
-                acceptedStatuses: [200, 202],
-            });
-            status = retry.status;
-            data = retry.data;
-            if (status === 200 && data && !(data.task_id || data.taskId || data.taskID))
-                return data;
-            if (status === null) {
-                const fallback = await this.requestWithStatus(ctx, 'GET', path, headers, {
-                    params: payload,
-                    acceptedStatuses: [200, 202],
-                });
-                status = fallback.status;
-                data = fallback.data;
-                if (status === 200 && data && !(data.task_id || data.taskId || data.taskID))
-                    return data;
-            }
-        }
         const taskId = data?.task_id || data?.taskId || data?.taskID;
         if (!taskId) {
             if (status === 202)
@@ -483,7 +437,7 @@ class RocomClient {
         }
         for (let i = 0; i < 10; i++) {
             await new Promise(resolve => setTimeout(resolve, 1000));
-            const task = await this.getIngameTask(ctx, taskId, includeApiKey);
+            const task = await this.getIngameTask(ctx, taskId, usedApiKey);
             if (task.status === 200)
                 return task.data;
             if (task.status === null)
@@ -494,22 +448,8 @@ class RocomClient {
     }
     async ingameMerchantInfo(ctx, shopId) {
         const params = { shop_id: shopId };
-        let headers = this.wegameHeaders();
-        const data = await this.get(ctx, '/api/v1/games/rocom/ingame/merchant/info', headers, params, { silentFailureDetails: true });
-        if (data)
-            return data;
-        const postData = await this.post(ctx, '/api/v1/games/rocom/ingame/merchant/info', headers, params);
-        if (postData)
-            return postData;
-        if (this.apiKey && this.isApiKeyPermissionUndeclaredError(this.getLastError(''))) {
-            logger.warn('ingame/merchant/info rejected X-API-Key, retrying without API key');
-            headers = this.wegameHeaders('', '', '', '', false);
-            const fallbackData = await this.get(ctx, '/api/v1/games/rocom/ingame/merchant/info', headers, params, { silentFailureDetails: true });
-            if (fallbackData)
-                return fallbackData;
-            return this.post(ctx, '/api/v1/games/rocom/ingame/merchant/info', headers, params);
-        }
-        return null;
+        const { status, data } = await this.requestIngameWithFallback(ctx, '/api/v1/games/rocom/ingame/merchant/info', params);
+        return status === null ? null : data;
     }
     async getFriendship(ctx, fwToken, userIds, userIdentifier = '') {
         return this.get(ctx, '/api/v1/games/rocom/social/friendship', this.rocomHeaders(fwToken, userIdentifier), { user_ids: userIds });

package/lib/commands/account.js

@@ -66,6 +66,7 @@ async function saveBindingWithRoleInfo(deps, session, fwToken, loginType, userId
 function register(deps) {
     const { ctx, client, userMgr } = deps;
     ctx.command('洛克').subcommand('.QQ登录', 'QQ 扫码登录')
+        .alias('洛克QQ登录')
         .action(async ({ session }) => {
         const userId = session.userId;
         const qrData = await client.qqQrLogin(ctx, userId);
@@ -91,6 +92,7 @@ function register(deps) {
         return '登录超时或失败，请重试。';
     });
     ctx.command('洛克').subcommand('.微信登录', '微信扫码登录')
+        .alias('洛克微信登录')
         .action(async ({ session }) => {
         const userId = session.userId;
         const qrData = await client.wechatQrLogin(ctx, userId);
@@ -115,6 +117,7 @@ function register(deps) {
         return '登录超时或失败，请重试。';
     });
     ctx.command('洛克').subcommand('.导入 <tgpId:string> <tgpTicket:string>', '导入 WeGame 凭证')
+        .alias('洛克导入')
         .action(async ({ session }, tgpId, tgpTicket) => {
         if (!tgpId || !tgpTicket)
             return '用法：洛克.导入 <tgp_id> <tgp_ticket>';
@@ -125,6 +128,7 @@ function register(deps) {
         await saveBindingWithRoleInfo(deps, session, res.frameworkToken, 'manual', userId);
     });
     ctx.command('洛克').subcommand('.绑定列表', '查看已绑定账号')
+        .alias('洛克绑定列表')
         .action(async ({ session }) => {
         const bindings = userMgr.getUserBindings(session.userId);
         if (!bindings.length)
@@ -153,6 +157,7 @@ function register(deps) {
         await (0, send_image_1.sendImageWithFallback)(session, png, fallbackLines.join('\n'), 'account:bind-list', deps.config);
     });
     ctx.command('洛克').subcommand('.切换 <index:number>', '切换主账号')
+        .alias('洛克切换')
         .action(async ({ session }, index) => {
         if (!index)
             return '用法：洛克.切换 <序号>';
@@ -161,6 +166,7 @@ function register(deps) {
             : '序号无效。';
     });
     ctx.command('洛克').subcommand('.解绑 <index:number>', '解绑账号')
+        .alias('洛克解绑')
         .action(async ({ session }, index) => {
         if (!index)
             return '用法：洛克.解绑 <序号>';
@@ -181,6 +187,7 @@ function register(deps) {
         return `已解绑账号：${removed.nickname}`;
     });
     ctx.command('洛克').subcommand('.刷新', '刷新当前主账号凭证')
+        .alias('洛克刷新')
         .action(async ({ session }) => {
         const userId = session.userId;
         const binding = userMgr.getPrimaryBinding(userId);

package/lib/commands/admin.js

@@ -10,6 +10,7 @@ function register(deps) {
         return config.adminUserIds.includes(userId);
     }
     ctx.command('洛克').subcommand('.刷新所有凭证', '刷新所有用户凭证（管理员）')
+        .alias('洛克刷新所有凭证')
         .action(async ({ session }) => {
         if (!isAdmin(session.userId))
             return '此指令仅限管理员使用。';
@@ -44,6 +45,7 @@ function register(deps) {
         return `刷新完成：成功 ${success}，失败 ${fail}`;
     });
     ctx.command('洛克').subcommand('.删除失效绑定', '清理失效绑定（管理员）')
+        .alias('洛克删除失效绑定')
         .action(async ({ session }) => {
         if (!isAdmin(session.userId))
             return '此指令仅限管理员使用。';

package/lib/commands/egg.js

@@ -48,6 +48,7 @@ async function sendEggImage(deps, session, templateName, data, fallback) {
 function register(deps) {
     const { ctx, client, eggService } = deps;
     ctx.command('洛克').subcommand('.查蛋 [arg1:string] [arg2:string]', '查询精灵蛋组')
+        .alias('洛克查蛋')
         .action(async ({ session }, arg1, arg2) => {
         if (!arg1) {
             return [
@@ -143,6 +144,7 @@ function register(deps) {
         await sendEggImage(deps, session, 'searcheggs', data, hint + eggService.buildSearchText(pet));
     });
     ctx.command('洛克').subcommand('.配种 <nameA:string> [nameB:string]', '配种查询')
+        .alias('洛克配种')
         .action(async ({ session }, nameA, nameB) => {
         if (!nameA) {
             return [

package/lib/commands/merchant.js

@@ -228,6 +228,7 @@ function register(deps) {
         return '\u2705 \u5df2\u53d6\u6d88\u8fdc\u884c\u5546\u4eba\u8ba2\u9605\u3002';
     });
     ctx.command('洛克').subcommand('.调试远行商人订阅', '立即执行一次远行商人订阅检查')
+        .alias('洛克调试远行商人订阅')
         .action(async ({ session }) => {
         if (!isBotAdmin(session, config.adminUserIds))
             return '此指令仅限管理员使用。';

package/lib/commands/query.js

@@ -777,6 +777,7 @@ async function checkHomeSubscriptions(deps) {
 function register(deps) {
     const { ctx, client } = deps;
     ctx.command('洛克').subcommand('.档案', '查看个人档案')
+        .alias('洛克档案')
         .action(async ({ session }) => {
         const fwToken = await (0, account_1.getPrimaryToken)(deps, session.userId);
         if (!fwToken)
@@ -952,6 +953,7 @@ function register(deps) {
         await sendImage(deps, session, 'personal-card', data, fallback);
     });
     ctx.command('洛克').subcommand('.战绩 [page:number]', '查看对战战绩')
+        .alias('洛克战绩')
         .action(async ({ session }, _page = 1) => {
         const fwToken = await (0, account_1.getPrimaryToken)(deps, session.userId);
         if (!fwToken)
@@ -999,6 +1001,7 @@ function register(deps) {
         await sendImage(deps, session, 'record', data, `【${role.name}的战绩】胜率:${bo.win_rate || 0}% 场次:${bo.total_match || 0}`);
     });
     ctx.command('洛克').subcommand('.背包 [arg1:string] [arg2:string]', '查看精灵背包')
+        .alias('洛克背包')
         .action(async ({ session }, arg1, arg2) => {
         const fwToken = await (0, account_1.getPrimaryToken)(deps, session.userId);
         if (!fwToken)
@@ -1058,6 +1061,7 @@ function register(deps) {
         await sendImage(deps, session, 'package', data, `【背包 - ${category}精灵】共${petRes.total || 0}只`);
     });
     ctx.command('洛克').subcommand('.阵容 [arg1:string] [arg2:string]', '查看阵容推荐')
+        .alias('洛克阵容')
         .action(async ({ session }, arg1, arg2) => {
         const fwToken = await (0, account_1.getPrimaryToken)(deps, session.userId);
         if (!fwToken)
@@ -1147,6 +1151,7 @@ function register(deps) {
         await sendImage(deps, session, 'lineup-detail', data, fallback);
     });
     ctx.command('洛克').subcommand('.交换大厅 [page:number]', '查看交换大厅')
+        .alias('洛克交换大厅')
         .action(async ({ session }, page = 1) => {
         const fwToken = await (0, account_1.getPrimaryToken)(deps, session.userId);
         if (!fwToken)
@@ -1187,6 +1192,7 @@ function register(deps) {
         await sendImage(deps, session, 'exchange-hall', data, `【交换大厅】第${page}页`);
     });
     ctx.command('洛克').subcommand('.玩家 <uid:string>', '通过 ingame 接口查询玩家基础资料')
+        .alias('洛克玩家')
         .action(async ({ session }, uid) => {
         if (!uid)
             return '请提供玩家 UID。用法：洛克.玩家 <UID>';
@@ -1196,6 +1202,7 @@ function register(deps) {
         await sendImage(deps, session, 'player-search', buildPlayerSearchRenderData(res, uid), `【洛克玩家】UID ${uid}`);
     });
     ctx.command('洛克').subcommand('.家园 [uid:string]', '通过 UID 查询家园菜园、守卫和室内精灵')
+        .alias('洛克家园')
         .action(async ({ session }, uid = '') => {
         let targetUid = String(uid || '').trim();
         if (!targetUid) {
@@ -1210,6 +1217,7 @@ function register(deps) {
         await sendImage(deps, session, 'home', buildHomeRenderData(deps, res, targetUid), `【洛克家园】UID ${targetUid}`);
     });
     ctx.command('洛克').subcommand('.商店 <shopId:string>', '通过 ingame 接口查询商店信息')
+        .alias('洛克商店')
         .action(async ({ session }, shopId) => {
         if (!shopId)
             return '请提供商店 ID。用法：洛克.商店 <shop_id>';
@@ -1219,6 +1227,7 @@ function register(deps) {
         await sendImage(deps, session, 'ingame-shop', buildShopRenderData(res, shopId), `【洛克商店】shop_id=${shopId}`);
     });
     ctx.command('洛克').subcommand('.好友关系 <userIds:string>', '查询好友关系')
+        .alias('洛克好友关系')
         .action(async ({ session }, userIds) => {
         if (!userIds)
             return '请提供要查询的用户 ID 列表。用法：洛克.好友关系 <id1,id2>';
@@ -1231,6 +1240,7 @@ function register(deps) {
         await sendImage(deps, session, 'friendship', buildFriendshipRenderData(res, userIds), `【好友关系】${userIds}`);
     });
     ctx.command('洛克').subcommand('.学生 [area:number] [accountType:number]', '查询学生认证状态与学生活动福利')
+        .alias('洛克学生')
         .action(async ({ session }, area = 101, accountType = 0) => {
         const fwToken = await (0, account_1.getPrimaryToken)(deps, session.userId);
         if (!fwToken)
@@ -1260,6 +1270,7 @@ function register(deps) {
         return deleted ? `已取消 ${deleted} 条家园订阅。` : '当前会话没有匹配的家园订阅。';
     });
     ctx.command('洛克').subcommand('.调试家园订阅', '立即执行一次家园订阅检查')
+        .alias('洛克调试家园订阅')
         .action(async ({ session }) => {
         if (!isBotAdmin(session, deps.config.adminUserIds))
             return '此指令仅限管理员使用。';

package/lib/commands/wiki.js

@@ -5,7 +5,9 @@ const WIKI_CLOSED_MESSAGE = '该功能暂时关闭';
 function register(deps) {
     const { ctx } = deps;
     ctx.command('洛克').subcommand('.wiki <name:text>', '查询精灵 wiki')
+        .alias('洛克wiki')
         .action(() => WIKI_CLOSED_MESSAGE);
     ctx.command('洛克').subcommand('.技能 <name:text>', '查询技能 wiki')
+        .alias('洛克技能')
         .action(() => WIKI_CLOSED_MESSAGE);
 }

package/lib/index.js

@@ -37,6 +37,7 @@ __export(src_exports, {
 });
 module.exports = __toCommonJS(src_exports);
 var import_koishi11 = require("koishi");
+var import_node_fs5 = __toESM(require("node:fs"));
 var import_node_path5 = __toESM(require("node:path"));
 
 // src/client.ts
@@ -123,10 +124,6 @@ var RocomClient = class {
       return String(value);
     }
   }
-  isApiKeyPermissionUndeclaredError(message) {
-    if (!message) return false;
-    return /未声明\s*api\s*key\s*权限|api\s*key\s*permission|api key 权限/i.test(message);
-  }
   logRequestFailureDetails(method, path6, headers, params, body, errorOrResponse) {
     const err = errorOrResponse;
     const response = err?.response;
@@ -253,22 +250,55 @@ ${this.stringifyForLog(details)}`);
       const body = response?.data !== void 0 ? response.data : response;
       if (body?.code !== void 0 && body.code !== 0) {
         this.setLastError(body.message || body.msg || "接口返回异常");
-        this.logRequestFailureDetails(method, path6, headers, options.params, options.json, body);
+        if (!options.silentFailureDetails) {
+          this.logRequestFailureDetails(method, path6, headers, options.params, options.json, body);
+        }
         return { status: null, data: null };
       }
       const data = body?.code !== void 0 ? body.data ?? {} : body ?? {};
       if (!acceptedStatuses.includes(status)) {
         this.setLastError(`HTTP ${status}`);
-        this.logRequestFailureDetails(method, path6, headers, options.params, options.json, response);
+        if (!options.silentFailureDetails) {
+          this.logRequestFailureDetails(method, path6, headers, options.params, options.json, response);
+        }
+        return { status: null, data: null };
       }
       return { status, data };
     } catch (e) {
       const message = this.formatHttpError(e);
       this.setLastError(message);
-      this.logRequestFailureDetails(method, path6, headers, options.params, options.json, e);
+      if (!options.silentFailureDetails) {
+        this.logRequestFailureDetails(method, path6, headers, options.params, options.json, e);
+      }
       return { status: null, data: null };
     }
   }
+  async requestIngameWithFallback(ctx, path6, payload, options = {}) {
+    const acceptedStatuses = options.acceptedStatuses || [200, 202];
+    const requestOnce = /* @__PURE__ */ __name(async (includeApiKey, silentFailureDetails) => {
+      const headers = this.wegameHeaders("", "", "", "", includeApiKey);
+      let result2 = await this.requestWithStatus(ctx, "POST", path6, headers, {
+        json: payload,
+        acceptedStatuses,
+        silentFailureDetails
+      });
+      if (result2.status === null) {
+        result2 = await this.requestWithStatus(ctx, "GET", path6, headers, {
+          params: payload,
+          acceptedStatuses,
+          silentFailureDetails
+        });
+      }
+      return result2;
+    }, "requestOnce");
+    let result = await requestOnce(false, Boolean(this.apiKey));
+    if (result.status !== null) return { ...result, usedApiKey: false };
+    if (this.apiKey) {
+      result = await requestOnce(true, false);
+      if (result.status !== null) return { ...result, usedApiKey: true };
+    }
+    return { status: null, data: null, usedApiKey: false };
+  }
   async getIngameTask(ctx, taskId, includeApiKey = true) {
     return this.requestWithStatus(
       ctx,
@@ -358,48 +388,13 @@ ${this.stringifyForLog(details)}`);
   async ingamePlayerSearch(ctx, uid) {
     const sanitizedUid = this.sanitizeUid(uid);
     if (!sanitizedUid) {
-      this.setLastError("UID 涓嶈兘涓虹┖");
+      this.setLastError("UID 不能为空");
       return null;
     }
     const path6 = "/api/v1/games/rocom/ingame/player/search";
-    let includeApiKey = true;
-    let headers = this.wegameHeaders();
     const payload = { uid: sanitizedUid, wait_ms: 5e3 };
-    let { status, data } = await this.requestWithStatus(ctx, "POST", path6, headers, {
-      json: payload,
-      acceptedStatuses: [200, 202]
-    });
+    const { status, data, usedApiKey } = await this.requestIngameWithFallback(ctx, path6, payload);
     if (status === 200 && data && this.isIngamePlayerPayload(data)) return data;
-    if (status === null) {
-      const fallback = await this.requestWithStatus(ctx, "GET", path6, headers, {
-        params: payload,
-        acceptedStatuses: [200, 202]
-      });
-      status = fallback.status;
-      data = fallback.data;
-      if (status === 200 && data && this.isIngamePlayerPayload(data)) return data;
-    }
-    if (status === null && includeApiKey && this.apiKey && this.isApiKeyPermissionUndeclaredError(this.getLastError(""))) {
-      logger.warn("ingame/player/search rejected X-API-Key, retrying without API key");
-      includeApiKey = false;
-      headers = this.wegameHeaders("", "", "", "", false);
-      const retry = await this.requestWithStatus(ctx, "POST", path6, headers, {
-        json: payload,
-        acceptedStatuses: [200, 202]
-      });
-      status = retry.status;
-      data = retry.data;
-      if (status === 200 && data && this.isIngamePlayerPayload(data)) return data;
-      if (status === null) {
-        const fallback = await this.requestWithStatus(ctx, "GET", path6, headers, {
-          params: payload,
-          acceptedStatuses: [200, 202]
-        });
-        status = fallback.status;
-        data = fallback.data;
-        if (status === 200 && data && this.isIngamePlayerPayload(data)) return data;
-      }
-    }
     if (!data) return null;
     if (this.isIngamePlayerPayload(data)) return data;
     const taskId = data.task_id || data.taskId || data.taskID;
@@ -409,7 +404,7 @@ ${this.stringifyForLog(details)}`);
     }
     for (let i = 0; i < 8; i++) {
       await new Promise((resolve) => setTimeout(resolve, 1e3));
-      const task = await this.getIngameTask(ctx, taskId, includeApiKey);
+      const task = await this.getIngameTask(ctx, taskId, usedApiKey);
       if (task.status === 200) return task.data;
       if (task.status === null) return null;
     }
@@ -438,48 +433,13 @@ ${this.stringifyForLog(details)}`);
   async ingameHomeInfo(ctx, uid, waitMs = 5e3) {
     const sanitizedUid = this.sanitizeUid(uid);
     if (!sanitizedUid) {
-      this.setLastError("UID 涓嶈兘涓虹┖");
+      this.setLastError("UID 不能为空");
       return null;
     }
     const path6 = "/api/v1/games/rocom/ingame/home/info";
-    let includeApiKey = true;
-    let headers = this.wegameHeaders();
     const payload = { uid: sanitizedUid, wait_ms: waitMs };
-    let { status, data } = await this.requestWithStatus(ctx, "POST", path6, headers, {
-      json: payload,
-      acceptedStatuses: [200, 202]
-    });
+    const { status, data, usedApiKey } = await this.requestIngameWithFallback(ctx, path6, payload);
     if (status === 200 && data && !(data.task_id || data.taskId || data.taskID)) return data;
-    if (status === null) {
-      const fallback = await this.requestWithStatus(ctx, "GET", path6, headers, {
-        params: payload,
-        acceptedStatuses: [200, 202]
-      });
-      status = fallback.status;
-      data = fallback.data;
-      if (status === 200 && data && !(data.task_id || data.taskId || data.taskID)) return data;
-    }
-    if (status === null && includeApiKey && this.apiKey && this.isApiKeyPermissionUndeclaredError(this.getLastError(""))) {
-      logger.warn("ingame/home/info rejected X-API-Key, retrying without API key");
-      includeApiKey = false;
-      headers = this.wegameHeaders("", "", "", "", false);
-      const retry = await this.requestWithStatus(ctx, "POST", path6, headers, {
-        json: payload,
-        acceptedStatuses: [200, 202]
-      });
-      status = retry.status;
-      data = retry.data;
-      if (status === 200 && data && !(data.task_id || data.taskId || data.taskID)) return data;
-      if (status === null) {
-        const fallback = await this.requestWithStatus(ctx, "GET", path6, headers, {
-          params: payload,
-          acceptedStatuses: [200, 202]
-        });
-        status = fallback.status;
-        data = fallback.data;
-        if (status === 200 && data && !(data.task_id || data.taskId || data.taskID)) return data;
-      }
-    }
     const taskId = data?.task_id || data?.taskId || data?.taskID;
     if (!taskId) {
       if (status === 202) this.setLastError("家园查询任务已入队，但未返回 task_id");
@@ -487,7 +447,7 @@ ${this.stringifyForLog(details)}`);
     }
     for (let i = 0; i < 10; i++) {
       await new Promise((resolve) => setTimeout(resolve, 1e3));
-      const task = await this.getIngameTask(ctx, taskId, includeApiKey);
+      const task = await this.getIngameTask(ctx, taskId, usedApiKey);
       if (task.status === 200) return task.data;
       if (task.status === null) return null;
     }
@@ -496,31 +456,12 @@ ${this.stringifyForLog(details)}`);
   }
   async ingameMerchantInfo(ctx, shopId) {
     const params = { shop_id: shopId };
-    let headers = this.wegameHeaders();
-    const data = await this.get(
+    const { status, data } = await this.requestIngameWithFallback(
       ctx,
       "/api/v1/games/rocom/ingame/merchant/info",
-      headers,
-      params,
-      { silentFailureDetails: true }
+      params
     );
-    if (data) return data;
-    const postData = await this.post(ctx, "/api/v1/games/rocom/ingame/merchant/info", headers, params);
-    if (postData) return postData;
-    if (this.apiKey && this.isApiKeyPermissionUndeclaredError(this.getLastError(""))) {
-      logger.warn("ingame/merchant/info rejected X-API-Key, retrying without API key");
-      headers = this.wegameHeaders("", "", "", "", false);
-      const fallbackData = await this.get(
-        ctx,
-        "/api/v1/games/rocom/ingame/merchant/info",
-        headers,
-        params,
-        { silentFailureDetails: true }
-      );
-      if (fallbackData) return fallbackData;
-      return this.post(ctx, "/api/v1/games/rocom/ingame/merchant/info", headers, params);
-    }
-    return null;
+    return status === null ? null : data;
   }
   async getFriendship(ctx, fwToken, userIds, userIdentifier = "") {
     return this.get(
@@ -1493,6 +1434,7 @@ var Renderer = class {
           ".student-state-page",
           ".student-perks-page",
           ".student-page",
+          ".merchant-page",
           ".home-page"
         ];
         let target = null;
@@ -1880,7 +1822,7 @@ async function saveBindingWithRoleInfo(deps, session, fwToken, loginType, userId
 __name(saveBindingWithRoleInfo, "saveBindingWithRoleInfo");
 function register(deps) {
   const { ctx, client, userMgr } = deps;
-  ctx.command("洛克").subcommand(".QQ登录", "QQ 扫码登录").action(async ({ session }) => {
+  ctx.command("洛克").subcommand(".QQ登录", "QQ 扫码登录").alias("洛克QQ登录").action(async ({ session }) => {
     const userId = session.userId;
     const qrData = await client.qqQrLogin(ctx, userId);
     if (!qrData?.qr_image) return "获取 QQ 二维码失败。";
@@ -1907,7 +1849,7 @@ function register(deps) {
     }
     return "登录超时或失败，请重试。";
   });
-  ctx.command("洛克").subcommand(".微信登录", "微信扫码登录").action(async ({ session }) => {
+  ctx.command("洛克").subcommand(".微信登录", "微信扫码登录").alias("洛克微信登录").action(async ({ session }) => {
     const userId = session.userId;
     const qrData = await client.wechatQrLogin(ctx, userId);
     if (!qrData?.qr_image) return "获取微信登录链接失败。";
@@ -1929,14 +1871,14 @@ ${qrUrl}`);
     }
     return "登录超时或失败，请重试。";
   });
-  ctx.command("洛克").subcommand(".导入 <tgpId:string> <tgpTicket:string>", "导入 WeGame 凭证").action(async ({ session }, tgpId, tgpTicket) => {
+  ctx.command("洛克").subcommand(".导入 <tgpId:string> <tgpTicket:string>", "导入 WeGame 凭证").alias("洛克导入").action(async ({ session }, tgpId, tgpTicket) => {
     if (!tgpId || !tgpTicket) return "用法：洛克.导入 <tgp_id> <tgp_ticket>";
     const userId = session.userId;
     const res = await client.importToken(ctx, tgpId, tgpTicket, userId);
     if (!res?.frameworkToken) return "凭证导入失败。";
     await saveBindingWithRoleInfo(deps, session, res.frameworkToken, "manual", userId);
   });
-  ctx.command("洛克").subcommand(".绑定列表", "查看已绑定账号").action(async ({ session }) => {
+  ctx.command("洛克").subcommand(".绑定列表", "查看已绑定账号").alias("洛克绑定列表").action(async ({ session }) => {
     const bindings = userMgr.getUserBindings(session.userId);
     if (!bindings.length) return "暂无绑定账号。";
     const bindItems = bindings.map((binding, index) => ({
@@ -1962,11 +1904,11 @@ ${qrUrl}`);
     const png = await deps.renderer.renderHtml(ctx, "bind-list", data);
     await sendImageWithFallback(session, png, fallbackLines.join("\n"), "account:bind-list", deps.config);
   });
-  ctx.command("洛克").subcommand(".切换 <index:number>", "切换主账号").action(async ({ session }, index) => {
+  ctx.command("洛克").subcommand(".切换 <index:number>", "切换主账号").alias("洛克切换").action(async ({ session }, index) => {
     if (!index) return "用法：洛克.切换 <序号>";
     return userMgr.switchPrimary(session.userId, index) ? `成功切换到序号 ${index} 账号。` : "序号无效。";
   });
-  ctx.command("洛克").subcommand(".解绑 <index:number>", "解绑账号").action(async ({ session }, index) => {
+  ctx.command("洛克").subcommand(".解绑 <index:number>", "解绑账号").alias("洛克解绑").action(async ({ session }, index) => {
     if (!index) return "用法：洛克.解绑 <序号>";
     const removed = userMgr.deleteUserBinding(session.userId, index);
     if (!removed) return "序号无效。";
@@ -1981,7 +1923,7 @@ ${qrUrl}`);
     }
     return `已解绑账号：${removed.nickname}`;
   });
-  ctx.command("洛克").subcommand(".刷新", "刷新当前主账号凭证").action(async ({ session }) => {
+  ctx.command("洛克").subcommand(".刷新", "刷新当前主账号凭证").alias("洛克刷新").action(async ({ session }) => {
     const userId = session.userId;
     const binding = userMgr.getPrimaryBinding(userId);
     if (!binding) return notLoggedInHint();
@@ -2772,7 +2714,7 @@ async function checkHomeSubscriptions(deps) {
 __name(checkHomeSubscriptions, "checkHomeSubscriptions");
 function register2(deps) {
   const { ctx, client } = deps;
-  ctx.command("洛克").subcommand(".档案", "查看个人档案").action(async ({ session }) => {
+  ctx.command("洛克").subcommand(".档案", "查看个人档案").alias("洛克档案").action(async ({ session }) => {
     const fwToken = await getPrimaryToken(deps, session.userId);
     if (!fwToken) return notLoggedInHint();
     const userIdentifier = session.userId;
@@ -2940,7 +2882,7 @@ function register2(deps) {
 评分:${ev.score || "0"} 收藏:${cl.current_collection_count || 0}/${cl.total_collection_count || 0}`;
     await sendImage(deps, session, "personal-card", data, fallback);
   });
-  ctx.command("洛克").subcommand(".战绩 [page:number]", "查看对战战绩").action(async ({ session }, _page = 1) => {
+  ctx.command("洛克").subcommand(".战绩 [page:number]", "查看对战战绩").alias("洛克战绩").action(async ({ session }, _page = 1) => {
     const fwToken = await getPrimaryToken(deps, session.userId);
     if (!fwToken) return notLoggedInHint();
     const userIdentifier = session.userId;
@@ -2984,7 +2926,7 @@ function register2(deps) {
     };
     await sendImage(deps, session, "record", data, `【${role.name}的战绩】胜率:${bo.win_rate || 0}% 场次:${bo.total_match || 0}`);
   });
-  ctx.command("洛克").subcommand(".背包 [arg1:string] [arg2:string]", "查看精灵背包").action(async ({ session }, arg1, arg2) => {
+  ctx.command("洛克").subcommand(".背包 [arg1:string] [arg2:string]", "查看精灵背包").alias("洛克背包").action(async ({ session }, arg1, arg2) => {
     const fwToken = await getPrimaryToken(deps, session.userId);
     if (!fwToken) return notLoggedInHint();
     const catMap = { "全部": 0, "了不起": 1, "异色": 2, "炫彩": 3 };
@@ -3036,7 +2978,7 @@ function register2(deps) {
     };
     await sendImage(deps, session, "package", data, `【背包 - ${category}精灵】共${petRes.total || 0}只`);
   });
-  ctx.command("洛克").subcommand(".阵容 [arg1:string] [arg2:string]", "查看阵容推荐").action(async ({ session }, arg1, arg2) => {
+  ctx.command("洛克").subcommand(".阵容 [arg1:string] [arg2:string]", "查看阵容推荐").alias("洛克阵容").action(async ({ session }, arg1, arg2) => {
     const fwToken = await getPrimaryToken(deps, session.userId);
     if (!fwToken) return notLoggedInHint();
     const userIdentifier = session.userId;
@@ -3113,7 +3055,7 @@ function register2(deps) {
     const fallback = `【阵容详情】${targetLineup.name || "未知阵容"} | 阵容码: ${normalizedLineupId}`;
     await sendImage(deps, session, "lineup-detail", data, fallback);
   });
-  ctx.command("洛克").subcommand(".交换大厅 [page:number]", "查看交换大厅").action(async ({ session }, page = 1) => {
+  ctx.command("洛克").subcommand(".交换大厅 [page:number]", "查看交换大厅").alias("洛克交换大厅").action(async ({ session }, page = 1) => {
     const fwToken = await getPrimaryToken(deps, session.userId);
     if (!fwToken) return notLoggedInHint();
     const userIdentifier = session.userId;
@@ -3152,13 +3094,13 @@ function register2(deps) {
     };
     await sendImage(deps, session, "exchange-hall", data, `【交换大厅】第${page}页`);
   });
-  ctx.command("洛克").subcommand(".玩家 <uid:string>", "通过 ingame 接口查询玩家基础资料").action(async ({ session }, uid) => {
+  ctx.command("洛克").subcommand(".玩家 <uid:string>", "通过 ingame 接口查询玩家基础资料").alias("洛克玩家").action(async ({ session }, uid) => {
     if (!uid) return "请提供玩家 UID。用法：洛克.玩家 <UID>";
     const res = await client.ingamePlayerSearch(ctx, uid);
     if (!res) return `玩家搜索失败：${client.getLastError()}`;
     await sendImage(deps, session, "player-search", buildPlayerSearchRenderData(res, uid), `【洛克玩家】UID ${uid}`);
   });
-  ctx.command("洛克").subcommand(".家园 [uid:string]", "通过 UID 查询家园菜园、守卫和室内精灵").action(async ({ session }, uid = "") => {
+  ctx.command("洛克").subcommand(".家园 [uid:string]", "通过 UID 查询家园菜园、守卫和室内精灵").alias("洛克家园").action(async ({ session }, uid = "") => {
     let targetUid = String(uid || "").trim();
     if (!targetUid) {
       const binding = deps.userMgr.getPrimaryBinding(session.userId);
@@ -3169,13 +3111,13 @@ function register2(deps) {
     if (!res) return `家园查询失败：${client.getLastError()}`;
     await sendImage(deps, session, "home", buildHomeRenderData(deps, res, targetUid), `【洛克家园】UID ${targetUid}`);
   });
-  ctx.command("洛克").subcommand(".商店 <shopId:string>", "通过 ingame 接口查询商店信息").action(async ({ session }, shopId) => {
+  ctx.command("洛克").subcommand(".商店 <shopId:string>", "通过 ingame 接口查询商店信息").alias("洛克商店").action(async ({ session }, shopId) => {
     if (!shopId) return "请提供商店 ID。用法：洛克.商店 <shop_id>";
     const res = await client.ingameMerchantInfo(ctx, shopId);
     if (!res) return `商店查询失败：${client.getLastError()}`;
     await sendImage(deps, session, "ingame-shop", buildShopRenderData(res, shopId), `【洛克商店】shop_id=${shopId}`);
   });
-  ctx.command("洛克").subcommand(".好友关系 <userIds:string>", "查询好友关系").action(async ({ session }, userIds) => {
+  ctx.command("洛克").subcommand(".好友关系 <userIds:string>", "查询好友关系").alias("洛克好友关系").action(async ({ session }, userIds) => {
     if (!userIds) return "请提供要查询的用户 ID 列表。用法：洛克.好友关系 <id1,id2>";
     const fwToken = await getPrimaryToken(deps, session.userId);
     if (!fwToken) return notLoggedInHint();
@@ -3183,7 +3125,7 @@ function register2(deps) {
     if (!res) return `好友关系查询失败：${client.getLastError()}`;
     await sendImage(deps, session, "friendship", buildFriendshipRenderData(res, userIds), `【好友关系】${userIds}`);
   });
-  ctx.command("洛克").subcommand(".学生 [area:number] [accountType:number]", "查询学生认证状态与学生活动福利").action(async ({ session }, area = 101, accountType = 0) => {
+  ctx.command("洛克").subcommand(".学生 [area:number] [accountType:number]", "查询学生认证状态与学生活动福利").alias("洛克学生").action(async ({ session }, area = 101, accountType = 0) => {
     const fwToken = await getPrimaryToken(deps, session.userId);
     if (!fwToken) return notLoggedInHint();
     const userIdentifier = session.userId;
@@ -3204,7 +3146,7 @@ function register2(deps) {
     const deleted = deps.homeSubMgr.deleteMatching(target, kindMap[String(kind || "全部")] ?? "", String(uid || "").trim());
     return deleted ? `已取消 ${deleted} 条家园订阅。` : "当前会话没有匹配的家园订阅。";
   });
-  ctx.command("洛克").subcommand(".调试家园订阅", "立即执行一次家园订阅检查").action(async ({ session }) => {
+  ctx.command("洛克").subcommand(".调试家园订阅", "立即执行一次家园订阅检查").alias("洛克调试家园订阅").action(async ({ session }) => {
     if (!isBotAdmin(session, deps.config.adminUserIds)) return "此指令仅限管理员使用。";
     const result = await checkHomeSubscriptions(deps);
     return `家园订阅检查完成：订阅 ${result.subscriptions} 条，检查 ${result.checked} 条，推送 ${result.pushed} 档提醒。`;
@@ -3434,7 +3376,7 @@ function register3(deps) {
     merchantSubMgr.delete(target.key);
     return "✅ 已取消远行商人订阅。";
   });
-  ctx.command("洛克").subcommand(".调试远行商人订阅", "立即执行一次远行商人订阅检查").action(async ({ session }) => {
+  ctx.command("洛克").subcommand(".调试远行商人订阅", "立即执行一次远行商人订阅检查").alias("洛克调试远行商人订阅").action(async ({ session }) => {
     if (!isBotAdmin2(session, config.adminUserIds)) return "此指令仅限管理员使用。";
     const result = await checkMerchantSubscriptions(deps);
     return `远行商人订阅检查完成：订阅 ${result.subscriptions} 条，命中 ${result.matched} 条，推送 ${result.pushed} 条。`;
@@ -3451,8 +3393,8 @@ __name(register3, "register");
 var WIKI_CLOSED_MESSAGE = "该功能暂时关闭";
 function register4(deps) {
   const { ctx } = deps;
-  ctx.command("洛克").subcommand(".wiki <name:text>", "查询精灵 wiki").action(() => WIKI_CLOSED_MESSAGE);
-  ctx.command("洛克").subcommand(".技能 <name:text>", "查询技能 wiki").action(() => WIKI_CLOSED_MESSAGE);
+  ctx.command("洛克").subcommand(".wiki <name:text>", "查询精灵 wiki").alias("洛克wiki").action(() => WIKI_CLOSED_MESSAGE);
+  ctx.command("洛克").subcommand(".技能 <name:text>", "查询技能 wiki").alias("洛克技能").action(() => WIKI_CLOSED_MESSAGE);
 }
 __name(register4, "register");
 
@@ -3497,7 +3439,7 @@ async function sendEggImage(deps, session, templateName, data, fallback) {
 __name(sendEggImage, "sendEggImage");
 function register5(deps) {
   const { ctx, client, eggService } = deps;
-  ctx.command("洛克").subcommand(".查蛋 [arg1:string] [arg2:string]", "查询精灵蛋组").action(async ({ session }, arg1, arg2) => {
+  ctx.command("洛克").subcommand(".查蛋 [arg1:string] [arg2:string]", "查询精灵蛋组").alias("洛克查蛋").action(async ({ session }, arg1, arg2) => {
     if (!arg1) {
       return [
         "查蛋用法：",
@@ -3588,7 +3530,7 @@ function register5(deps) {
 ` : "";
     await sendEggImage(deps, session, "searcheggs", data, hint + eggService.buildSearchText(pet));
   });
-  ctx.command("洛克").subcommand(".配种 <nameA:string> [nameB:string]", "配种查询").action(async ({ session }, nameA, nameB) => {
+  ctx.command("洛克").subcommand(".配种 <nameA:string> [nameB:string]", "配种查询").alias("洛克配种").action(async ({ session }, nameA, nameB) => {
     if (!nameA) {
       return [
         "配种用法：",
@@ -3647,7 +3589,7 @@ function register6(deps) {
     return config.adminUserIds.includes(userId);
   }
   __name(isAdmin, "isAdmin");
-  ctx.command("洛克").subcommand(".刷新所有凭证", "刷新所有用户凭证（管理员）").action(async ({ session }) => {
+  ctx.command("洛克").subcommand(".刷新所有凭证", "刷新所有用户凭证（管理员）").alias("洛克刷新所有凭证").action(async ({ session }) => {
     if (!isAdmin(session.userId)) return "此指令仅限管理员使用。";
     await session.send("正在刷新所有用户的凭证...");
     const allUsers = userMgr.getAllUsersBindings();
@@ -3676,7 +3618,7 @@ function register6(deps) {
     }
     return `刷新完成：成功 ${success}，失败 ${fail}`;
   });
-  ctx.command("洛克").subcommand(".删除失效绑定", "清理失效绑定（管理员）").action(async ({ session }) => {
+  ctx.command("洛克").subcommand(".删除失效绑定", "清理失效绑定（管理员）").alias("洛克删除失效绑定").action(async ({ session }) => {
     if (!isAdmin(session.userId)) return "此指令仅限管理员使用。";
     await session.send("正在检查所有用户的绑定有效性...");
     const allUsers = userMgr.getAllUsersBindings();
@@ -3849,7 +3791,8 @@ function apply(ctx, config) {
   const homeSubMgr = new HomeSubscriptionManager(dataDir);
   const resPath = import_node_path5.default.resolve(__dirname, "..");
   const renderer = new Renderer(resPath);
-  const searcheggsDir = import_node_path5.default.join(resPath, "src", "render-templates", "searcheggs");
+  const renderTemplateRoot = import_node_fs5.default.existsSync(import_node_path5.default.join(resPath, "lib", "render-templates")) ? import_node_path5.default.join(resPath, "lib", "render-templates") : import_node_path5.default.join(resPath, "src", "render-templates");
+  const searcheggsDir = import_node_path5.default.join(renderTemplateRoot, "searcheggs");
   const eggService = new EggService(searcheggsDir);
   const deps = { ctx, config, client, userMgr, merchantSubMgr, homeSubMgr, eggService, renderer };
   ctx.on("ready", () => {

package/lib/render-templates/menu/index.html

@@ -6,12 +6,11 @@
   <title>{{pageTitle}}</title>
   <link rel="stylesheet" href="{{_res_path}}render/menu/style.css">
 </head>
-<body class="page-out-client">
-  <div class="menu-cont page-section-main">
-    <img class="xiaoluoke-overlay" src="{{_res_path}}img/xueyingwawa.png" onerror="this.style.display='none'">
-    <div class="menu-page">
-      <div class="header-center">
-        <div class="page-title">{{pageTitle}}</div>
+<body class="page-out-client">
+  <div class="menu-cont page-section-main">
+    <div class="menu-page">
+      <div class="header-center">
+        <div class="page-title">{{pageTitle}}</div>
         <div class="page-subtitle">{{pageSubtitle}}</div>
       </div>
       <main class="menu-content">

package/lib/render-templates/menu/style.css

@@ -8,22 +8,24 @@
     --helper-font-family-mianfeiziti: 'mianfeiziti', system-ui, "calibri", "Roboto", verdana, "PingFang SC", sans-serif;
 }
 
-body {
-  margin: 0;
-  padding: 30px;
-  background-color: #FAF6ED;
-  display: inline-block;
-  font-family: var(--helper-font-family-mianfeiziti);
-}
-
-.menu-cont {
-  width: 780px;
-  background: url("../../img/ercode-bg.D1ccSQKH.png") no-repeat center center;
-  background-size: 100% 100%;
-  position: relative;
-  padding: 40px 50px;
-  box-sizing: border-box;
-}
+html,
+body {
+  margin: 0;
+  padding: 30px;
+  background-color: #f3eee2;
+  display: inline-block;
+  font-family: var(--helper-font-family-mianfeiziti);
+}
+
+.menu-cont {
+  width: 780px;
+  background: url("../../img/ercode-bg.D1ccSQKH.png") center/cover no-repeat;
+  background-color: #f3eee2;
+  position: relative;
+  padding: 40px 50px;
+  box-sizing: border-box;
+  overflow: hidden;
+}
 
 .menu-cont::before {
   content: "";
@@ -34,20 +36,10 @@ body {
   pointer-events: none;
 }
 
-.xiaoluoke-overlay {
-  position: absolute;
-  bottom: -15px;
-  right: -30px;
-  width: 320px;
-  opacity: 0.15;
-  z-index: 2;
-  pointer-events: none;
-}
-
-.menu-page {
-  position: relative;
-  z-index: 3;
-}
+.menu-page {
+  position: relative;
+  z-index: 3;
+}
 
 .header-center {
   text-align: center;
@@ -86,28 +78,34 @@ body {
   border-left: 5px solid #ffc65f;
 }
 
-.group-items {
-  display: grid;
-  grid-template-columns: repeat(2, 1fr);
-  gap: 15px;
-}
-
-.menu-item {
-  width: 100%;
+.group-items {
+  display: grid;
+  grid-template-columns: repeat(2, minmax(0, 1fr));
+  gap: 15px;
+}
+
+.menu-item {
+  width: 100%;
   min-height: 85px;
   background: url("../../img/player-bg.png") no-repeat center center;
   background-size: 100% 100%;
   display: flex;
   flex-direction: column;
   justify-content: center;
-  padding: 12px 50px 12px 25px;
-  box-sizing: border-box;
-}
-
-.menu-item-cmd {
-  font-size: 22px;
-  font-weight: bold;
-  color: #5a3e1b;
+  padding: 12px 50px 12px 25px;
+  box-sizing: border-box;
+}
+
+.group-items > .menu-item:last-child:nth-child(odd) {
+  grid-column: 1 / -1;
+  width: calc((100% - 15px) / 2);
+  justify-self: center;
+}
+
+.menu-item-cmd {
+  font-size: 22px;
+  font-weight: bold;
+  color: #5a3e1b;
   margin-bottom: 8px;
   line-height: 1.2;
 }

package/lib/render.js

@@ -151,6 +151,7 @@ class Renderer {
                     '.student-state-page',
                     '.student-perks-page',
                     '.student-page',
+                    '.merchant-page',
                     '.home-page',
                 ];
                 let target = null;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-rocom",
   "description": "洛克王国查询与订阅插件",
-  "version": "1.0.3",
+  "version": "1.0.4",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "homepage": "https://github.com/staytomorrow/koishi-plugin-rocom",