koishi-plugin-rocom 1.0.11 → 1.0.12

package/lib/commands/merchant.js

@@ -15,6 +15,49 @@ const TEXT = {
     defaultSource: '\u9ed8\u8ba4',
     customSource: '\u81ea\u5b9a\u4e49',
 };
+const CATEGORY_ORDER = ['normal', 'round', 'weekend'];
+const CATEGORY_LABELS = {
+    normal: '热销商品',
+    round: '常规商品',
+    weekend: '周末限定',
+};
+const CHINA_TIMEZONE = 'Asia/Shanghai';
+const chinaPartsFormatter = new Intl.DateTimeFormat('zh-CN', {
+    timeZone: CHINA_TIMEZONE,
+    year: 'numeric',
+    month: '2-digit',
+    day: '2-digit',
+    hour: '2-digit',
+    minute: '2-digit',
+    hour12: false,
+});
+function getChinaParts(timestampMs) {
+    const parts = {};
+    for (const item of chinaPartsFormatter.formatToParts(new Date(timestampMs))) {
+        if (item.type !== 'literal')
+            parts[item.type] = item.value;
+    }
+    return {
+        hour: Number(parts.hour || '0'),
+        minute: Number(parts.minute || '0'),
+    };
+}
+function classifyMerchantItem(item) {
+    const start = normalizeTimestamp(item?.start_time);
+    const end = normalizeTimestamp(item?.end_time);
+    if (!start || !end)
+        return 'normal';
+    const durationDays = (end - start) / (1000 * 60 * 60 * 24);
+    if (durationDays >= 2)
+        return 'weekend';
+    const startParts = getChinaParts(start);
+    const endParts = getChinaParts(end);
+    const startHour = startParts.hour + startParts.minute / 60;
+    const endHour = endParts.hour + endParts.minute / 60;
+    if (startHour <= 8 && endHour >= 23.5)
+        return 'normal';
+    return 'round';
+}
 function normalizeTimestamp(value) {
     if (value === null || value === undefined || value === '')
         return null;
@@ -54,13 +97,34 @@ function getMerchantActivity(res) {
 }
 function getActiveProducts(res) {
     const activity = getMerchantActivity(res);
-    const products = activity?.products || activity?.product_list || activity?.get_props || [];
-    return products.filter((p) => {
-        const now = Date.now();
-        const start = normalizeTimestamp(p.start_time) ?? 0;
-        const end = normalizeTimestamp(p.end_time) ?? Infinity;
-        return now >= start && now < end;
-    });
+    const groups = [];
+    if (Array.isArray(activity?.products))
+        groups.push(activity.products);
+    if (Array.isArray(activity?.product_list))
+        groups.push(activity.product_list);
+    if (Array.isArray(activity?.get_props))
+        groups.push(activity.get_props);
+    if (Array.isArray(activity?.get_extra_props))
+        groups.push(activity.get_extra_props);
+    if (Array.isArray(activity?.get_pets))
+        groups.push(activity.get_pets);
+    const merged = [];
+    const seen = new Set();
+    const now = Date.now();
+    for (const list of groups) {
+        for (const item of list) {
+            const start = normalizeTimestamp(item?.start_time) ?? 0;
+            const end = normalizeTimestamp(item?.end_time) ?? Infinity;
+            if (now < start || now >= end)
+                continue;
+            const key = `${item?.id ?? ''}|${item?.name ?? ''}|${start}|${end === Infinity ? 'inf' : end}`;
+            if (seen.has(key))
+                continue;
+            seen.add(key);
+            merged.push(item);
+        }
+    }
+    return merged;
 }
 function getCurrentMerchantRound() {
     const now = new Date();
@@ -132,23 +196,56 @@ function buildMerchantRenderPayload(res) {
     const products = getActiveProducts(res);
     const roundInfo = getCurrentMerchantRound();
     const activity = getMerchantActivity(res);
+    const renderedProducts = products.map((p) => ({
+        name: p.name || TEXT.unknown,
+        image: p.icon_url || '',
+        time_label: formatProductWindow(p),
+        category: classifyMerchantItem(p),
+    }));
+    const categoryMap = {
+        normal: [],
+        round: [],
+        weekend: [],
+    };
+    for (const product of renderedProducts) {
+        categoryMap[product.category].push(product);
+    }
+    const categories = CATEGORY_ORDER
+        .filter(key => categoryMap[key].length > 0)
+        .map(key => ({
+        key,
+        label: CATEGORY_LABELS[key],
+        products: categoryMap[key],
+    }));
     const data = {
         background: '',
         title: activity.name || TEXT.merchant,
         subtitle: activity.start_date || '\u6bcf\u65e5 08:00 / 12:00 / 16:00 / 20:00 \u5237\u65b0',
         titleIcon: true,
-        product_count: products.length,
+        product_count: renderedProducts.length,
         round_info: roundInfo,
-        products: products.map((p) => ({
-            name: p.name || TEXT.unknown,
-            image: p.icon_url || '',
-            time_label: formatProductWindow(p),
-        })),
+        categories,
+        products: renderedProducts,
     };
-    const fallback = products.length
-        ? `\u8fdc\u884c\u5546\u4eba\u5f53\u524d\u5546\u54c1\uff1a${products.map((p) => p.name || TEXT.unknown).join('\u3001')}\n\u8f6e\u6b21\uff1a${roundInfo.current || TEXT.notOpen}\n\u5269\u4f59\uff1a${roundInfo.countdown}`
-        : '\u5f53\u524d\u8fdc\u884c\u5546\u4eba\u6682\u65e0\u5546\u54c1\u3002';
-    return { products, roundInfo, data, fallback };
+    const fallbackLines = [];
+    if (renderedProducts.length) {
+        fallbackLines.push(`\u8fdc\u884c\u5546\u4eba\u5f53\u524d\u5546\u54c1\uff08\u5171 ${renderedProducts.length} \u4ef6\uff09`);
+        fallbackLines.push(`\u8f6e\u6b21\uff1a${roundInfo.current || TEXT.notOpen}\uff0c\u5269\u4f59\uff1a${roundInfo.countdown}`);
+        fallbackLines.push('');
+        for (const cat of categories) {
+            fallbackLines.push(`\u3010${cat.label}\u3011`);
+            cat.products.forEach((product, index) => {
+                const tail = product.time_label ? ` (${product.time_label})` : '';
+                fallbackLines.push(`  ${index + 1}. ${product.name}${tail}`);
+            });
+            fallbackLines.push('');
+        }
+    }
+    else {
+        fallbackLines.push('\u5f53\u524d\u8fdc\u884c\u5546\u4eba\u6682\u65e0\u5546\u54c1\u3002');
+    }
+    const fallback = fallbackLines.join('\n').trimEnd();
+    return { products: renderedProducts, roundInfo, data, fallback };
 }
 async function checkMerchantSubscriptions(deps) {
     const { ctx, client, merchantSubMgr, renderer, config } = deps;

package/lib/commands/query.js

@@ -258,16 +258,28 @@ function normalizeDurationSeconds(value) {
 function formatHomeRemaining(targetTs, nowTs = Math.floor(Date.now() / 1000)) {
     if (!targetTs)
         return '未开始';
-    const remain = Math.max(0, targetTs - nowTs);
-    if (remain <= 0)
+    if (nowTs >= targetTs)
         return '已完成';
-    const hours = Math.floor(remain / 3600);
+    const remain = Math.max(0, targetTs - nowTs);
+    const days = Math.floor(remain / 86400);
+    const hours = Math.floor((remain % 86400) / 3600);
     const minutes = Math.floor((remain % 3600) / 60);
-    if (hours >= 24)
-        return `${Math.floor(hours / 24)}天${hours % 24}小时`;
+    const seconds = remain % 60;
+    if (days > 0)
+        return hours > 0 ? `${days}天${hours}小时` : `${days}天`;
     if (hours > 0)
         return `${hours}小时${minutes}分钟`;
-    return `${minutes}分钟`;
+    if (minutes > 0)
+        return `${minutes}分${seconds}秒`;
+    return `${seconds}秒`;
+}
+function formatEggRemaining(targetTs, nowTs = Math.floor(Date.now() / 1000)) {
+    if (!targetTs || nowTs >= targetTs)
+        return '0分钟';
+    const remain = Math.max(0, targetTs - nowTs);
+    const totalHours = Math.floor(remain / 3600);
+    const minutes = Math.floor((remain % 3600) / 60);
+    return `${totalHours}小时${minutes}分钟`;
 }
 function homeInfoPayload(res) {
     const payload = res || {};
@@ -856,31 +868,59 @@ function extractHomePet(raw, index, guard = false) {
     const petId = homePet.pet_cfg_id || homePet.pet_id || homePet.pet_base_id || raw.pet_cfg_id || raw.pet_id || raw.id;
     if (['', '0'].includes(String(petId || '0')) && !guard)
         return null;
-    const feedInfo = homePet.feed_info && typeof homePet.feed_info === 'object' ? homePet.feed_info : {};
-    const beginTime = normalizeEpochSeconds(feedInfo.begin_time);
-    const timeCost = normalizeDurationSeconds(feedInfo.time_cost);
-    let readyAt = normalizeEpochSeconds(homePet.pet_rip_time || raw.pet_rip_time || raw.rip_time);
-    if (!readyAt && beginTime && timeCost)
-        readyAt = beginTime + timeCost;
     const nowTs = Math.floor(Date.now() / 1000);
-    const hasInspiration = Boolean(readyAt);
-    const inspireReady = hasInspiration && nowTs >= readyAt;
-    const isGuard = guard || Boolean(raw.is_guard || raw.guard) || ['2', 'guard', '守卫'].includes(String(raw.status).toLowerCase());
-    const statusText = isGuard && !hasInspiration ? '守卫中' : inspireReady ? '灵感已完成' : hasInspiration ? '灵感收集中' : '未喂食';
-    const statusClass = isGuard && !hasInspiration ? 'guard' : inspireReady ? 'ready' : hasInspiration ? 'progress' : 'idle';
+    const hasEgg = Boolean(raw.have_egg);
+    const predictedEggTime = normalizeEpochSeconds(raw.predicted_egg_time);
+    const eggReady = hasEgg || (predictedEggTime > 0 && nowTs >= predictedEggTime);
+    const feedRound = Number(homePet.feed_round || raw.feed_round || 0) || 0;
+    const gender = Number(display.gender || raw.gender || 0) || 0;
+    const isMale = gender === 1;
+    const status = homePet.status ?? raw.status;
+    const isGuard = guard || Boolean(raw.is_guard || raw.guard) || ['2', 'guard', '守卫'].includes(String(status).toLowerCase());
+    const hasInspiration = feedRound > 0;
+    const inspireReady = hasInspiration;
+    const statusText = isGuard && !hasInspiration ? '守卫中'
+        : (inspireReady ? '可收取灵感'
+            : (hasInspiration ? '灵感收集中'
+                : '未喂食'));
+    const statusClass = isGuard && !hasInspiration ? 'guard'
+        : (eggReady ? 'ready'
+            : (inspireReady ? 'progress'
+                : (hasInspiration ? 'progress'
+                    : 'idle')));
+    let note;
+    if (isGuard && String(petId) === '0') {
+        note = '家园守卫位';
+    }
+    else if (eggReady) {
+        note = '可收取';
+    }
+    else if (predictedEggTime > 0) {
+        note = `${formatEggRemaining(predictedEggTime, nowTs)}后生蛋`;
+    }
+    else if (feedRound > 0) {
+        note = isMale ? '' : '等待生蛋';
+    }
+    else if (isGuard) {
+        note = '家园守卫位';
+    }
+    else {
+        note = '未喂食';
+    }
     return {
         id: String(petId || ''),
         pos: raw.pos || raw.position || index + 1,
         name: String(homePet.name || homePet.pet_name || raw.name || raw.pet_name || `精灵 ${petId || ''}`),
         level: display.level || raw.level || homePet.level || '--',
         iconUrl: homePetIcon(petId, raw.icon_url || raw.pet_img_url || raw.petIcon || ''),
-        badge: isGuard ? '守' : '',
+        badge: isGuard ? '守' : (hasEgg ? '蛋' : ''),
         isGuard,
         statusText,
         statusClass,
-        note: hasInspiration ? formatHomeRemaining(readyAt, nowTs) : (isGuard ? '家园守卫位' : '暂无灵感倒计时'),
-        inspireReady,
-        readyAt,
+        note,
+        inspireReady: eggReady,
+        readyAt: predictedEggTime || 0,
+        gender,
     };
 }
 function homePetSources(homeInfo) {
@@ -1011,6 +1051,18 @@ function buildHomeRenderData(deps, res, uid) {
         if (item)
             guardPets.push(item);
     });
+    indoorPets.sort((a, b) => {
+        if (a.gender === 2 && b.gender !== 2)
+            return -1;
+        if (a.gender !== 2 && b.gender === 2)
+            return 1;
+        if (a.gender === 2) {
+            const ta = a.readyAt || Number.MAX_SAFE_INTEGER;
+            const tb = b.readyAt || Number.MAX_SAFE_INTEGER;
+            return ta - tb;
+        }
+        return 0;
+    });
     const gardenPlots = extractHomePlants(deps, homeInfo);
     const createdAt = normalizeEpochSeconds(res?.meta?.created_at);
     return {

package/lib/index.js

@@ -2667,25 +2667,28 @@ function normalizeEpochSeconds(value) {
   return Math.floor(ts);
 }
 __name(normalizeEpochSeconds, "normalizeEpochSeconds");
-function normalizeDurationSeconds(value) {
-  const seconds = Number(value);
-  if (!Number.isFinite(seconds)) return 0;
-  if (seconds > 1e9) return Math.floor(seconds / 1e6);
-  if (seconds > 1e6) return Math.floor(seconds / 1e3);
-  return Math.floor(seconds);
-}
-__name(normalizeDurationSeconds, "normalizeDurationSeconds");
 function formatHomeRemaining(targetTs, nowTs = Math.floor(Date.now() / 1e3)) {
   if (!targetTs) return "未开始";
+  if (nowTs >= targetTs) return "已完成";
   const remain = Math.max(0, targetTs - nowTs);
-  if (remain <= 0) return "已完成";
-  const hours = Math.floor(remain / 3600);
+  const days = Math.floor(remain / 86400);
+  const hours = Math.floor(remain % 86400 / 3600);
   const minutes = Math.floor(remain % 3600 / 60);
-  if (hours >= 24) return `${Math.floor(hours / 24)}天${hours % 24}小时`;
+  const seconds = remain % 60;
+  if (days > 0) return hours > 0 ? `${days}天${hours}小时` : `${days}天`;
   if (hours > 0) return `${hours}小时${minutes}分钟`;
-  return `${minutes}分钟`;
+  if (minutes > 0) return `${minutes}分${seconds}秒`;
+  return `${seconds}秒`;
 }
 __name(formatHomeRemaining, "formatHomeRemaining");
+function formatEggRemaining(targetTs, nowTs = Math.floor(Date.now() / 1e3)) {
+  if (!targetTs || nowTs >= targetTs) return "0分钟";
+  const remain = Math.max(0, targetTs - nowTs);
+  const totalHours = Math.floor(remain / 3600);
+  const minutes = Math.floor(remain % 3600 / 60);
+  return `${totalHours}小时${minutes}分钟`;
+}
+__name(formatEggRemaining, "formatEggRemaining");
 function homeInfoPayload(res) {
   const payload = res || {};
   if (payload.result?.home_info) return payload.result.home_info;
@@ -3259,30 +3262,47 @@ function extractHomePet(raw, index, guard = false) {
   const display = raw.display_info && typeof raw.display_info === "object" ? raw.display_info : {};
   const petId = homePet.pet_cfg_id || homePet.pet_id || homePet.pet_base_id || raw.pet_cfg_id || raw.pet_id || raw.id;
   if (["", "0"].includes(String(petId || "0")) && !guard) return null;
-  const feedInfo = homePet.feed_info && typeof homePet.feed_info === "object" ? homePet.feed_info : {};
-  const beginTime = normalizeEpochSeconds(feedInfo.begin_time);
-  const timeCost = normalizeDurationSeconds(feedInfo.time_cost);
-  let readyAt = normalizeEpochSeconds(homePet.pet_rip_time || raw.pet_rip_time || raw.rip_time);
-  if (!readyAt && beginTime && timeCost) readyAt = beginTime + timeCost;
   const nowTs = Math.floor(Date.now() / 1e3);
-  const hasInspiration = Boolean(readyAt);
-  const inspireReady = hasInspiration && nowTs >= readyAt;
-  const isGuard = guard || Boolean(raw.is_guard || raw.guard) || ["2", "guard", "守卫"].includes(String(raw.status).toLowerCase());
-  const statusText = isGuard && !hasInspiration ? "守卫中" : inspireReady ? "灵感已完成" : hasInspiration ? "灵感收集中" : "未喂食";
-  const statusClass = isGuard && !hasInspiration ? "guard" : inspireReady ? "ready" : hasInspiration ? "progress" : "idle";
+  const hasEgg = Boolean(raw.have_egg);
+  const predictedEggTime = normalizeEpochSeconds(raw.predicted_egg_time);
+  const eggReady = hasEgg || predictedEggTime > 0 && nowTs >= predictedEggTime;
+  const feedRound = Number(homePet.feed_round || raw.feed_round || 0) || 0;
+  const gender = Number(display.gender || raw.gender || 0) || 0;
+  const isMale = gender === 1;
+  const status = homePet.status ?? raw.status;
+  const isGuard = guard || Boolean(raw.is_guard || raw.guard) || ["2", "guard", "守卫"].includes(String(status).toLowerCase());
+  const hasInspiration = feedRound > 0;
+  const inspireReady = hasInspiration;
+  const statusText = isGuard && !hasInspiration ? "守卫中" : inspireReady ? "可收取灵感" : hasInspiration ? "灵感收集中" : "未喂食";
+  const statusClass = isGuard && !hasInspiration ? "guard" : eggReady ? "ready" : inspireReady ? "progress" : hasInspiration ? "progress" : "idle";
+  let note;
+  if (isGuard && String(petId) === "0") {
+    note = "家园守卫位";
+  } else if (eggReady) {
+    note = "可收取";
+  } else if (predictedEggTime > 0) {
+    note = `${formatEggRemaining(predictedEggTime, nowTs)}后生蛋`;
+  } else if (feedRound > 0) {
+    note = isMale ? "" : "等待生蛋";
+  } else if (isGuard) {
+    note = "家园守卫位";
+  } else {
+    note = "未喂食";
+  }
   return {
     id: String(petId || ""),
     pos: raw.pos || raw.position || index + 1,
     name: String(homePet.name || homePet.pet_name || raw.name || raw.pet_name || `精灵 ${petId || ""}`),
     level: display.level || raw.level || homePet.level || "--",
     iconUrl: homePetIcon(petId, raw.icon_url || raw.pet_img_url || raw.petIcon || ""),
-    badge: isGuard ? "守" : "",
+    badge: isGuard ? "守" : hasEgg ? "蛋" : "",
     isGuard,
     statusText,
     statusClass,
-    note: hasInspiration ? formatHomeRemaining(readyAt, nowTs) : isGuard ? "家园守卫位" : "暂无灵感倒计时",
-    inspireReady,
-    readyAt
+    note,
+    inspireReady: eggReady,
+    readyAt: predictedEggTime || 0,
+    gender
   };
 }
 __name(extractHomePet, "extractHomePet");
@@ -3399,6 +3419,16 @@ function buildHomeRenderData(deps, res, uid) {
     const item = extractHomePet(raw, index, true);
     if (item) guardPets.push(item);
   });
+  indoorPets.sort((a, b) => {
+    if (a.gender === 2 && b.gender !== 2) return -1;
+    if (a.gender !== 2 && b.gender === 2) return 1;
+    if (a.gender === 2) {
+      const ta = a.readyAt || Number.MAX_SAFE_INTEGER;
+      const tb = b.readyAt || Number.MAX_SAFE_INTEGER;
+      return ta - tb;
+    }
+    return 0;
+  });
   const gardenPlots = extractHomePlants(deps, homeInfo);
   const createdAt = normalizeEpochSeconds(res?.meta?.created_at);
   return {
@@ -4165,6 +4195,47 @@ var TEXT = {
   defaultSource: "默认",
   customSource: "自定义"
 };
+var CATEGORY_ORDER = ["normal", "round", "weekend"];
+var CATEGORY_LABELS = {
+  normal: "热销商品",
+  round: "常规商品",
+  weekend: "周末限定"
+};
+var CHINA_TIMEZONE = "Asia/Shanghai";
+var chinaPartsFormatter = new Intl.DateTimeFormat("zh-CN", {
+  timeZone: CHINA_TIMEZONE,
+  year: "numeric",
+  month: "2-digit",
+  day: "2-digit",
+  hour: "2-digit",
+  minute: "2-digit",
+  hour12: false
+});
+function getChinaParts(timestampMs) {
+  const parts = {};
+  for (const item of chinaPartsFormatter.formatToParts(new Date(timestampMs))) {
+    if (item.type !== "literal") parts[item.type] = item.value;
+  }
+  return {
+    hour: Number(parts.hour || "0"),
+    minute: Number(parts.minute || "0")
+  };
+}
+__name(getChinaParts, "getChinaParts");
+function classifyMerchantItem(item) {
+  const start = normalizeTimestamp(item?.start_time);
+  const end = normalizeTimestamp(item?.end_time);
+  if (!start || !end) return "normal";
+  const durationDays = (end - start) / (1e3 * 60 * 60 * 24);
+  if (durationDays >= 2) return "weekend";
+  const startParts = getChinaParts(start);
+  const endParts = getChinaParts(end);
+  const startHour = startParts.hour + startParts.minute / 60;
+  const endHour = endParts.hour + endParts.minute / 60;
+  if (startHour <= 8 && endHour >= 23.5) return "normal";
+  return "round";
+}
+__name(classifyMerchantItem, "classifyMerchantItem");
 function normalizeTimestamp(value) {
   if (value === null || value === void 0 || value === "") return null;
   const timestamp = Number(value);
@@ -4203,13 +4274,27 @@ function getMerchantActivity(res) {
 __name(getMerchantActivity, "getMerchantActivity");
 function getActiveProducts(res) {
   const activity = getMerchantActivity(res);
-  const products = activity?.products || activity?.product_list || activity?.get_props || [];
-  return products.filter((p) => {
-    const now = Date.now();
-    const start = normalizeTimestamp(p.start_time) ?? 0;
-    const end = normalizeTimestamp(p.end_time) ?? Infinity;
-    return now >= start && now < end;
-  });
+  const groups = [];
+  if (Array.isArray(activity?.products)) groups.push(activity.products);
+  if (Array.isArray(activity?.product_list)) groups.push(activity.product_list);
+  if (Array.isArray(activity?.get_props)) groups.push(activity.get_props);
+  if (Array.isArray(activity?.get_extra_props)) groups.push(activity.get_extra_props);
+  if (Array.isArray(activity?.get_pets)) groups.push(activity.get_pets);
+  const merged = [];
+  const seen = /* @__PURE__ */ new Set();
+  const now = Date.now();
+  for (const list of groups) {
+    for (const item of list) {
+      const start = normalizeTimestamp(item?.start_time) ?? 0;
+      const end = normalizeTimestamp(item?.end_time) ?? Infinity;
+      if (now < start || now >= end) continue;
+      const key = `${item?.id ?? ""}|${item?.name ?? ""}|${start}|${end === Infinity ? "inf" : end}`;
+      if (seen.has(key)) continue;
+      seen.add(key);
+      merged.push(item);
+    }
+  }
+  return merged;
 }
 __name(getActiveProducts, "getActiveProducts");
 function getCurrentMerchantRound() {
@@ -4284,23 +4369,53 @@ function buildMerchantRenderPayload(res) {
   const products = getActiveProducts(res);
   const roundInfo = getCurrentMerchantRound();
   const activity = getMerchantActivity(res);
+  const renderedProducts = products.map((p) => ({
+    name: p.name || TEXT.unknown,
+    image: p.icon_url || "",
+    time_label: formatProductWindow(p),
+    category: classifyMerchantItem(p)
+  }));
+  const categoryMap = {
+    normal: [],
+    round: [],
+    weekend: []
+  };
+  for (const product of renderedProducts) {
+    categoryMap[product.category].push(product);
+  }
+  const categories = CATEGORY_ORDER.filter((key) => categoryMap[key].length > 0).map((key) => ({
+    key,
+    label: CATEGORY_LABELS[key],
+    products: categoryMap[key]
+  }));
   const data = {
     background: "",
     title: activity.name || TEXT.merchant,
     subtitle: activity.start_date || "每日 08:00 / 12:00 / 16:00 / 20:00 刷新",
     titleIcon: true,
-    product_count: products.length,
+    product_count: renderedProducts.length,
     round_info: roundInfo,
-    products: products.map((p) => ({
-      name: p.name || TEXT.unknown,
-      image: p.icon_url || "",
-      time_label: formatProductWindow(p)
-    }))
+    categories,
+    products: renderedProducts
   };
-  const fallback = products.length ? `远行商人当前商品：${products.map((p) => p.name || TEXT.unknown).join("、")}
-轮次：${roundInfo.current || TEXT.notOpen}
-剩余：${roundInfo.countdown}` : "当前远行商人暂无商品。";
-  return { products, roundInfo, data, fallback };
+  const fallbackLines = [];
+  if (renderedProducts.length) {
+    fallbackLines.push(`远行商人当前商品（共 ${renderedProducts.length} 件）`);
+    fallbackLines.push(`轮次：${roundInfo.current || TEXT.notOpen}，剩余：${roundInfo.countdown}`);
+    fallbackLines.push("");
+    for (const cat of categories) {
+      fallbackLines.push(`【${cat.label}】`);
+      cat.products.forEach((product, index) => {
+        const tail = product.time_label ? ` (${product.time_label})` : "";
+        fallbackLines.push(`  ${index + 1}. ${product.name}${tail}`);
+      });
+      fallbackLines.push("");
+    }
+  } else {
+    fallbackLines.push("当前远行商人暂无商品。");
+  }
+  const fallback = fallbackLines.join("\n").trimEnd();
+  return { products: renderedProducts, roundInfo, data, fallback };
 }
 __name(buildMerchantRenderPayload, "buildMerchantRenderPayload");
 async function checkMerchantSubscriptions(deps) {
@@ -4631,7 +4746,7 @@ __name(register5, "register");
 var import_koishi10 = require("koishi");
 
 // src/activities-service.ts
-var CHINA_TIMEZONE = "Asia/Shanghai";
+var CHINA_TIMEZONE2 = "Asia/Shanghai";
 var DAY_MS = 24 * 60 * 60 * 1e3;
 var ACTIVITY_THEMES = ["gold", "green", "brown"];
 var LOOKBACK_DAYS = 10;
@@ -4639,12 +4754,12 @@ var MAX_LOOKAHEAD_DAYS = 50;
 var TRAILING_DAYS_AFTER_LAST_ACTIVITY = 3;
 var MIN_LOOKAHEAD_DAYS = 7;
 var chinaDateFormatter = new Intl.DateTimeFormat("zh-CN", {
-  timeZone: CHINA_TIMEZONE,
+  timeZone: CHINA_TIMEZONE2,
   month: "2-digit",
   day: "2-digit"
 });
 var chinaDateTimeFormatter = new Intl.DateTimeFormat("zh-CN", {
-  timeZone: CHINA_TIMEZONE,
+  timeZone: CHINA_TIMEZONE2,
   month: "2-digit",
   day: "2-digit",
   hour: "2-digit",
@@ -4652,7 +4767,7 @@ var chinaDateTimeFormatter = new Intl.DateTimeFormat("zh-CN", {
   hour12: false
 });
 var chinaDatePartsFormatter = new Intl.DateTimeFormat("zh-CN", {
-  timeZone: CHINA_TIMEZONE,
+  timeZone: CHINA_TIMEZONE2,
   year: "numeric",
   month: "2-digit",
   day: "2-digit"

package/lib/render-templates/yuanxing-shangren/index.html

@@ -31,6 +31,16 @@
     --card-bg: rgba(255, 252, 247, 0.82);
     --tag-bg: rgba(255, 214, 153, 0.4);
     --tag-text: #9a5f19;
+    --accent-color: #a0631d;
+    --warning-color: #bf5f3f;
+    --border-color: rgba(179, 123, 45, 0.2);
+    --border-color-light: rgba(118, 97, 74, 0.14);
+    --weekend-color: #c04030;
+    --normal-color: #2a8040;
+    --round-color: #2a60b0;
+    --weekend-bg: rgba(220, 80, 60, 0.15);
+    --normal-bg: rgba(60, 160, 80, 0.15);
+    --round-bg: rgba(60, 120, 220, 0.15);
 }
 
 html,
@@ -39,7 +49,7 @@ body {
     height: auto;
     font-family: var(--font-family);
     color: var(--text-1);
-    background: #ece3d3;
+    background: linear-gradient(135deg, #fff8eb, #fff0d2);
 }
 
 .merchant-page {
@@ -47,7 +57,7 @@ body {
     width: min(1280px, 100%);
     margin: 0 auto;
     overflow: hidden;
-    background: #ece3d3;
+    background: linear-gradient(135deg, #fff8eb, #fff0d2);
 }
 
 .background {
@@ -133,14 +143,14 @@ body {
     padding: 10px 16px;
     border-radius: 999px;
     background: rgba(255,255,255,0.72);
-    border: 1px solid rgba(179, 123, 45, 0.2);
+    border: 1px solid var(--border-color);
     color: var(--text-2);
     font-size: 18px;
 }
 
 .summary-chip strong {
     font-family: var(--font-family-accent);
-    color: #a0631d;
+    color: var(--accent-color);
     font-size: 28px;
     margin-left: 8px;
 }
@@ -163,14 +173,14 @@ body {
 }
 
 .countdown-pill {
-    color: #bf5f3f;
+    color: var(--warning-color);
     font-weight: 700;
 }
 
 .products-grid {
-    display: grid;
-    grid-template-columns: 1fr;
-    gap: 16px;
+    display: flex;
+    flex-direction: column;
+    gap: 20px;
     margin-top: 18px;
 }
 
@@ -181,17 +191,17 @@ body {
     align-items: center;
     min-height: 148px;
     padding: 18px 28px;
-    border: 1px solid rgba(118, 97, 74, 0.14);
+    border: 1px solid rgba(200, 140, 40, 0.4);
     border-radius: 22px;
-    background: linear-gradient(135deg, rgba(255,255,255,0.72), rgba(244,236,224,0.88));
-    box-shadow: 0 10px 26px rgba(58, 39, 21, 0.06);
+    background: linear-gradient(135deg, rgba(255,248,235,0.88), rgba(255,240,210,0.9));
+    box-shadow: 0 6px 22px rgba(180, 120, 20, 0.08);
 }
 
 .product-image-container {
     width: 120px;
     height: 120px;
     border-radius: 50%;
-    background: radial-gradient(circle at 30% 30%, rgba(255,255,255,0.94), rgba(239,228,210,0.92));
+    background: radial-gradient(circle at 30% 30%, rgba(255,255,255,0.94), rgba(255,240,210,0.92));
     display: flex;
     align-items: center;
     justify-content: center;
@@ -244,8 +254,8 @@ body {
     padding: 10px 14px;
     border-radius: 16px;
     background: rgba(255,255,255,0.72);
-    border: 1px solid rgba(179, 123, 45, 0.18);
-    color: #8b5e2b;
+    border: 1px solid var(--border-color);
+    color: var(--accent-color);
     font-size: 18px;
     font-weight: 700;
 }
@@ -254,10 +264,53 @@ body {
     text-align: center;
     padding: 30px 18px;
     border-radius: 22px;
-    border: 1px dashed rgba(120, 102, 81, 0.35);
+    border: 1px dashed rgba(200, 140, 40, 0.35);
     color: #5c4a37;
     font-size: 22px;
-    background: rgba(255,255,255,0.52);
+    background: rgba(255,248,235,0.6);
+}
+
+.category-section {
+    margin-top: 16px;
+    display: flex;
+    flex-direction: column;
+    gap: 14px;
+}
+
+.category-header {
+    display: flex;
+    align-items: center;
+    gap: 10px;
+    padding: 0 4px;
+}
+
+.category-title {
+    font-family: var(--font-family-accent);
+    font-size: 22px;
+    font-weight: 800;
+    color: var(--text-1);
+}
+
+.category-tag {
+    padding: 3px 10px;
+    border-radius: 999px;
+    font-size: 14px;
+    font-weight: 700;
+}
+
+.category-tag.weekend {
+    background: var(--weekend-bg);
+    color: var(--weekend-color);
+}
+
+.category-tag.normal {
+    background: var(--normal-bg);
+    color: var(--normal-color);
+}
+
+.category-tag.round {
+    background: var(--round-bg);
+    color: var(--round-color);
 }
 
 @media (max-width: 760px) {
@@ -345,20 +398,24 @@ body {
             </div>
 
             <div class="products-grid">
-                {{if products && products.length > 0}}
-                {{each products product}}
-                <div class="product-card">
-                    <div class="product-image-container">
-                        <img class="product-image" src="{{product.image}}" alt="{{product.name}}">
-                    </div>
-                    <div class="product-main">
-                        <div class="product-name">{{product.name}}</div>
-                        <div class="product-sub">远行商人当前轮次商品</div>
-                        <div class="product-time">北京时间 {{product.time_label}}</div>
+                {{if categories && categories.length > 0}}
+                {{each categories cat}}
+                <div class="category-section">
+                    <div class="category-header">
+                        <span class="category-title">{{cat.label}}</span>
+                        <span class="category-tag {{cat.key}}">{{cat.products.length}} 件</span>
                     </div>
-                    <div class="product-side">
-                        <div class="product-slot">本轮商品</div>
+                    {{each cat.products product}}
+                    <div class="product-card">
+                        <div class="product-image-container">
+                            <img class="product-image" src="{{product.image}}" alt="{{product.name}}">
+                        </div>
+                        <div class="product-main">
+                            <div class="product-name">{{product.name}}</div>
+                            <div class="product-time">北京时间 {{product.time_label}}</div>
+                        </div>
                     </div>
+                    {{/each}}
                 </div>
                 {{/each}}
                 {{else}}

package/package.json

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