koishi-plugin-rocom 1.0.18 → 1.0.24

package/lib/commands/egg.js

@@ -111,10 +111,19 @@ function register(deps) {
             let fallback = '';
             if (height != null && weight != null) {
                 const heightInMeters = heightMeters ?? height / 100;
-                const backendResults = await client.queryPetSize(ctx, heightInMeters, weight, 'magic', 1, 30, session?.userId || '');
-                if (backendResults) {
-                    data = eggService.buildSizeSearchDataFromApi(height, weight, backendResults, heightDisplay);
-                    fallback = eggService.buildSizeSearchTextFromApi(height, weight, backendResults, heightDisplay);
+                const userId = session?.userId || '';
+                // 后端查蛋优先，失败后回退 Wiki 尺寸接口，再回退本地引擎。成功空集不回退。
+                const eggApiResults = await client.searchEggBySize(ctx, heightInMeters, weight, 1, 30, userId);
+                if (eggApiResults) {
+                    data = eggService.buildSizeSearchDataFromApi(height, weight, eggApiResults, heightDisplay);
+                    fallback = eggService.buildSizeSearchTextFromApi(height, weight, eggApiResults, heightDisplay);
+                }
+                else {
+                    const wikiResults = await client.queryPetSize(ctx, heightInMeters, weight, 'magic', 1, 30, userId);
+                    if (wikiResults) {
+                        data = eggService.buildSizeSearchDataFromApi(height, weight, wikiResults, heightDisplay);
+                        fallback = eggService.buildSizeSearchTextFromApi(height, weight, wikiResults, heightDisplay);
+                    }
                 }
             }
             if (!data) {
@@ -128,6 +137,59 @@ function register(deps) {
         const name = nameParts.join(' ');
         if (!name)
             return '请输入精灵名称。用法：洛克.查蛋 <精灵名>';
+        // 后端查蛋优先：pet-groups → group-pets，接口不可用才回退 Wiki。
+        const userId = session?.userId || '';
+        const eggCandidatesRes = await client.getEggPetGroups(ctx, name, 20, userId);
+        if (eggCandidatesRes !== null) {
+            const eggCandidates = Array.isArray(eggCandidatesRes)
+                ? eggCandidatesRes
+                : (Array.isArray(eggCandidatesRes?.items) ? eggCandidatesRes.items : []);
+            if (!eggCandidates.length)
+                return `未找到名为「${name}」的精灵，请检查名称后重试。`;
+            let selected = eggCandidates.find((item) => {
+                const itemName = String(item?.name || '').trim();
+                const itemForm = String(item?.form || '').trim();
+                const display = itemForm && !itemName.includes(itemForm) ? `${itemName}（${itemForm}）` : itemName;
+                return String(item?.id || '') === name
+                    || itemName === name
+                    || display === name
+                    || (itemForm && `${itemName}${itemForm}` === name);
+            });
+            if (!selected && eggCandidates.length === 1)
+                selected = eggCandidates[0];
+            if (!selected) {
+                const data = eggService.buildCandidatesFromEggApi(name, eggCandidates);
+                const candidateText = [
+                    `找到多个查蛋候选（${eggCandidates.length}），请使用更精确名称：`,
+                    ...eggCandidates.slice(0, 10).map((item, index) => `${index + 1}. ${item?.name || '未知精灵'} #${item?.id || '-'}`),
+                ].join('\n');
+                await sendEggImage(deps, session, 'searcheggs/candidates', data, candidateText);
+                return;
+            }
+            const compatibleByGroup = {};
+            const groupIds = [];
+            for (const group of selected?.egg_groups || []) {
+                if (!group || typeof group !== 'object')
+                    continue;
+                const groupId = group.group_id || group.id;
+                if (groupId)
+                    groupIds.push(groupId);
+            }
+            if (groupIds.length) {
+                compatibleByGroup['__all__'] = await client.getEggGroupPets(ctx, groupIds, 'any', 1, 1, userId) || {};
+            }
+            for (const group of selected?.egg_groups || []) {
+                if (!group || typeof group !== 'object')
+                    continue;
+                const groupId = group.group_id || group.id;
+                if (!groupId)
+                    continue;
+                compatibleByGroup[String(groupId)] = await client.getEggGroupPets(ctx, [groupId], 'any', 1, 60, userId) || {};
+            }
+            const data = eggService.buildSearchDataFromEggApi(selected, compatibleByGroup);
+            await sendEggImage(deps, session, 'searcheggs', data, eggService.buildSearchTextFromWiki(data));
+            return;
+        }
         let backendDetail = null;
         let backendProfile = null;
         const backendList = await client.listWikiPets(ctx, name, 1, 10);

package/lib/commands/merchant.d.ts

@@ -1,2 +1,107 @@
 import { PluginDeps } from '../types';
+import { type ImageMetrics } from '../icon-metrics';
+type MerchantCategoryKey = 'normal' | 'round' | 'weekend';
+type MerchantProductForRender = {
+    name: string;
+    image: string;
+    time_label: string;
+    category: MerchantCategoryKey;
+    round_id: number | null;
+    is_active: boolean;
+    start_time: number | null;
+    end_time: number | null;
+    price: number | null;
+    limit: number | null;
+    item_category: string;
+    allDay: boolean;
+    goods_id: string;
+};
+type MerchantCardItem = {
+    goods_name: string;
+    iconUrl: string;
+    price: string | number;
+    num: string;
+    category: MerchantCategoryKey;
+    roundId: number;
+    isHot: boolean;
+    isEnded: boolean;
+    remainingStr: string;
+    top: number;
+};
+export declare function buildMerchantRenderParams(pageHeight: number): {
+    pageHeight: number;
+    renderWidth: number;
+    renderHeight: number;
+    renderBaseWidth: number;
+    renderBaseHeight: number;
+    renderScale: number;
+    renderZoom: number;
+    renderDeviceScaleFactor: number;
+    renderStroke11: number;
+    renderStroke10: number;
+    renderStrokeName: number;
+    renderOffset3: number;
+};
+export declare function buildMerchantCardItems(products: MerchantProductForRender[], options: {
+    includeEnded: boolean;
+    iconMetrics?: Map<string, ImageMetrics>;
+}): {
+    pageHeight: number;
+    renderWidth: number;
+    renderHeight: number;
+    renderBaseWidth: number;
+    renderBaseHeight: number;
+    renderScale: number;
+    renderZoom: number;
+    renderDeviceScaleFactor: number;
+    renderStroke11: number;
+    renderStroke10: number;
+    renderStrokeName: number;
+    renderOffset3: number;
+    goods: {
+        num: string;
+        top: number;
+        iconScale: number;
+        iconOffsetX: number;
+        iconOffsetY: number;
+        goods_name: string;
+        iconUrl: string;
+        price: string | number;
+        category: MerchantCategoryKey;
+        roundId: number;
+        isHot: boolean;
+        isEnded: boolean;
+        remainingStr: string;
+    }[];
+    bottomFrameTop: number;
+};
+/**
+ * 今日卡片按轮次分行：热销（roundId 0，全天/跨天在架）置顶，第 1~4 轮升序。
+ * 每件商品落在哪一轮由商品数据的 roundId 事先算好。
+ */
+export declare function buildTodayRows(goods: MerchantCardItem[], currentRoundId: number | null, iconMetrics?: Map<string, ImageMetrics>): {
+    roundId: number;
+    label: string;
+    timeLabel: string;
+    isCurrent: boolean;
+    top: number;
+    cellWidth: number;
+    iconSize: number;
+    items: {
+        iconScale: number;
+        iconOffsetX: number;
+        iconOffsetY: number;
+        goods_name: string;
+        iconUrl: string;
+        price: string | number;
+        num: string;
+        category: MerchantCategoryKey;
+        roundId: number;
+        isHot: boolean;
+        isEnded: boolean;
+        remainingStr: string;
+        top: number;
+    }[];
+}[];
 export declare function register(deps: PluginDeps): void;
+export {};