koishi-plugin-xxck-1 0.1.21 → 0.1.22

package/lib/index.js

@@ -61,7 +61,7 @@ function getToday() {
 __name(getToday, "getToday");
 async function _warehouse_draw_image(ctx, user_cards, show_name) {
   try {
-    logger.info("开始绘制 WWC 仓库图片（去重+最高等级）");
+    logger.info("开始绘制 WWC 仓库图片（限定卡独立显示）");
     const STAR_COLOR = {
       7: "#FF00FF",
       6: "#C00000",
@@ -78,9 +78,28 @@ async function _warehouse_draw_image(ctx, user_cards, show_name) {
     const ROW_HEIGHT = 26;
     const PADDING = 20;
     const TITLE_HEIGHT = 50;
-    const allCards = await ctx.database.get("gacha_card_pool", {});
+    const [normalCards, eventCards] = await Promise.all([
+      ctx.database.get("gacha_card_pool", {}),
+      ctx.database.get("gacha_event_pool", {})
+      // 读取所有限时卡池
+    ]);
     const cardPool = /* @__PURE__ */ new Map();
-    for (const c of allCards) cardPool.set(c.card_id, c);
+    normalCards.forEach((c) => cardPool.set(c.card_id, {
+      name: c.card_name,
+      star: c.card_star,
+      isLimit: false
+      // 标记普通卡
+    }));
+    eventCards.forEach((c) => {
+      if (!cardPool.has(c.card_id)) {
+        cardPool.set(c.card_id, {
+          name: c.card_name,
+          star: c.card_star,
+          isLimit: true
+          // 标记限定卡
+        });
+      }
+    });
     const cardMap = /* @__PURE__ */ new Map();
     for (const item of user_cards || []) {
       const card_id = item.card_id;
@@ -99,13 +118,15 @@ async function _warehouse_draw_image(ctx, user_cards, show_name) {
       const pool = cardPool.get(item.card_id) || {};
       return {
         id: item.card_id,
-        name: pool.card_name || "未知",
+        name: pool.name || "未知",
         level: item.card_level ?? 0,
-        // ✅ 正确读取等级
-        star: pool.card_star || 0
+        star: pool.star || 0,
+        isLimit: pool.isLimit || false
+        // 传递限定标记
       };
     });
     const sortedCards = [...validCards].sort((a, b) => {
+      if (a.isLimit !== b.isLimit) return b.isLimit ? 1 : -1;
       if (b.star !== a.star) return b.star - a.star;
       return String(a.id).localeCompare(String(b.id), void 0, { numeric: true });
     });
@@ -123,18 +144,19 @@ async function _warehouse_draw_image(ctx, user_cards, show_name) {
     ctx2d.textAlign = "left";
     ctx2d.font = "20px Microsoft YaHei";
     ctx2d.fillStyle = "#000";
-    ctx2d.fillText(`玩家：${show_name}`, PADDING, PADDING);
+    ctx2d.fillText(`玩家：${show_name}（带【限定】标记为限时卡）`, PADDING, PADDING);
     const getStarText = /* @__PURE__ */ __name((star) => {
       const s = Math.max(0, Math.min(7, star));
       return "★".repeat(s) + "☆".repeat(7 - s);
     }, "getStarText");
     sortedCards.forEach((card, index) => {
-      const { level, id, name: name2, star } = card;
+      const { level, id, name: name2, star, isLimit } = card;
       const col = Math.floor(index / COL_MAX);
       const row = index % COL_MAX;
       const x = PADDING + col * (COLUMN_WIDTH + COLUMN_GAP);
       const y = TITLE_HEIGHT + row * ROW_HEIGHT;
-      const text = `[${level}] ${id.padStart(4, "0")} ${name2} ${getStarText(star)}`;
+      const limitTag = isLimit ? "【限定】" : "";
+      const text = `[${level}] ${id.padStart(4, "0")} ${name2} ${limitTag}${getStarText(star)}`;
       ctx2d.font = "16px Microsoft YaHei";
       ctx2d.fillStyle = STAR_COLOR[star] || "#333";
       ctx2d.fillText(text, x, y);
@@ -195,17 +217,73 @@ async function _shop_draw_image(ctx, shopCards, user_disturbance, user_water_vap
 }
 __name(_shop_draw_image, "_shop_draw_image");
 async function _collection_draw_image(ctx, show_name, total_collected, total_all, categoryProgress, categoryCards) {
-  logger.info("开始绘制收藏图片（绝对对齐+带？+支持4字名）");
+  logger.info("开始绘制收藏图片（含限定卡，不同步普通卡池）");
   try {
     if (!ctx.canvas) return null;
     const BASE_X = 40;
     const CARD_SIZE = 70;
     const CARD_GAP = 10;
     const ROW_HEIGHT = CARD_SIZE + CARD_GAP;
+    const [normalCards, eventCards] = await Promise.all([
+      ctx.database.get("gacha_card_pool", {}),
+      ctx.database.get("gacha_event_pool", {})
+    ]);
+    const allCardMap = /* @__PURE__ */ new Map();
+    normalCards.forEach((c) => allCardMap.set(c.card_id, {
+      name: c.card_name,
+      star: c.card_star,
+      category: c.category,
+      isLimit: false
+    }));
+    eventCards.forEach((c) => {
+      if (!allCardMap.has(c.card_id)) {
+        allCardMap.set(c.card_id, {
+          name: c.card_name,
+          star: c.card_star,
+          category: c.card_type,
+          // 限定卡类别用 card_type
+          isLimit: true
+        });
+      }
+    });
+    const allMergedCards = Array.from(allCardMap.values());
+    total_all = allMergedCards.length;
+    const newCategoryCards = {};
+    const newCategoryTotal = {};
+    allMergedCards.forEach((card) => {
+      const category = card.category;
+      if (!category) return;
+      if (!newCategoryCards[category]) {
+        newCategoryCards[category] = [];
+        newCategoryTotal[category] = 0;
+      }
+      newCategoryCards[category].push(card.card_id);
+      newCategoryTotal[category]++;
+    });
+    const newCategoryProgress = {};
+    for (const category in newCategoryCards) {
+      const cards = newCategoryCards[category];
+      let collected = 0;
+      const cardMap = {};
+      cards.forEach((cid) => {
+        const card = allCardMap.get(cid);
+        if (card) {
+          const isCollected = categoryProgress[category]?.[2]?.[cid] || false;
+          if (isCollected) collected++;
+          cardMap[cid] = {
+            name: card.name,
+            star: card.star,
+            isLimit: card.isLimit
+          };
+        }
+      });
+      newCategoryProgress[category] = [collected, newCategoryTotal[category], cardMap];
+    }
+    total_collected = Object.values(newCategoryProgress).reduce((sum, [collected]) => sum + collected, 0);
     let totalHeight = 140;
-    const years = Object.keys(categoryProgress);
+    const years = Object.keys(newCategoryProgress);
     for (const year of years) {
-      const cardCount = categoryCards[year]?.length || 0;
+      const cardCount = newCategoryCards[year]?.length || 0;
       const rows = Math.ceil(cardCount / 10);
       totalHeight += 35 + 40 + rows * ROW_HEIGHT + 30;
     }
@@ -227,7 +305,7 @@ async function _collection_draw_image(ctx, show_name, total_collected, total_all
     ctx2d.fillStyle = "#000";
     ctx2d.textAlign = "center";
     ctx2d.font = "28px Microsoft YaHei";
-    ctx2d.fillText(`${show_name} 的收藏进度`, 450, 50);
+    ctx2d.fillText(`${show_name} 的收藏进度（含限定卡）`, 450, 50);
     ctx2d.font = "22px Microsoft YaHei";
     ctx2d.fillStyle = "#E53E3E";
     const pct = total_all > 0 ? (total_collected / total_all * 100).toFixed(1) : "0.0";
@@ -237,8 +315,8 @@ async function _collection_draw_image(ctx, show_name, total_collected, total_all
     ctx2d.textBaseline = "alphabetic";
     ctx2d.font = "20px Microsoft YaHei";
     for (const year of years) {
-      const [collected, total, cardMap] = categoryProgress[year];
-      const cids = categoryCards[year] || [];
+      const [collected, total, cardMap] = newCategoryProgress[year];
+      const cids = newCategoryCards[year] || [];
       const cardCount = cids.length;
       ctx2d.fillStyle = "#222";
       ctx2d.fillText(`【${year}】`, BASE_X, y);
@@ -258,7 +336,8 @@ async function _collection_draw_image(ctx, show_name, total_collected, total_all
           y += ROW_HEIGHT;
         }
         ctx2d.fillStyle = "#fff";
-        ctx2d.strokeStyle = "#e5e5e5";
+        ctx2d.strokeStyle = card?.isLimit ? "#FF0000" : "#e5e5e5";
+        ctx2d.lineWidth = card?.isLimit ? 2 : 1;
         ctx2d.fillRect(x, y, CARD_SIZE, CARD_SIZE);
         ctx2d.strokeRect(x, y, CARD_SIZE, CARD_SIZE);
         ctx2d.textAlign = "center";
@@ -266,7 +345,8 @@ async function _collection_draw_image(ctx, show_name, total_collected, total_all
         if (hasCard) {
           const star = card.star || 0;
           ctx2d.fillStyle = STAR_COLOR[star];
-          ctx2d.fillText(`${card.name}`, x + CARD_SIZE / 2, y + CARD_SIZE / 2 + 5);
+          const displayName = card.isLimit ? `${card.name}限` : card.name;
+          ctx2d.fillText(displayName, x + CARD_SIZE / 2, y + CARD_SIZE / 2 + 5);
         } else {
           ctx2d.fillStyle = "#999";
           ctx2d.fillText("？", x + CARD_SIZE / 2, y + CARD_SIZE / 2 + 5);
@@ -279,7 +359,7 @@ async function _collection_draw_image(ctx, show_name, total_collected, total_all
       ctx2d.font = "20px Microsoft YaHei";
     }
     const buffer = await canvas.toBuffer("image/png");
-    logger.info("收藏图片生成成功 ✅");
+    logger.info("收藏图片生成成功（含限定卡）✅");
     return import_koishi.h.image(buffer, "image/png");
   } catch (err) {
     logger.error("收藏绘图失败：", err);
@@ -865,7 +945,7 @@ async function _do_exchange(ctx, session, exchange_num) {
 }
 __name(_do_exchange, "_do_exchange");
 async function _do_collection(ctx, session) {
-  logger.info("收到指令：WWC收藏");
+  logger.info("收到指令：WWC收藏（含限定卡统计）");
   try {
     const qq = session.userId;
     const user = await ctx.database.get("gacha_user", { qq });
@@ -873,15 +953,41 @@ async function _do_collection(ctx, session) {
     const show_name = user[0].status === 1 ? user[0].nickname : qq;
     const userCards = await ctx.database.get("gacha_user_card", { qq });
     const cardIds = userCards.map((uc) => uc.card_id);
-    const allCards = await ctx.database.get("gacha_card_pool", {});
+    const [normalCards, eventCards] = await Promise.all([
+      ctx.database.get("gacha_card_pool", {}),
+      ctx.database.get("gacha_event_pool", {})
+    ]);
+    const allCardMap = /* @__PURE__ */ new Map();
+    normalCards.forEach((c) => allCardMap.set(c.card_id, {
+      name: c.card_name,
+      star: c.card_star,
+      category: c.category,
+      isLimit: false
+    }));
+    eventCards.forEach((c) => {
+      if (!allCardMap.has(c.card_id)) {
+        allCardMap.set(c.card_id, {
+          name: c.card_name,
+          star: c.card_star,
+          category: c.card_type,
+          isLimit: true
+        });
+      }
+    });
+    const allCards = Array.from(allCardMap.values());
     const collectedSet = /* @__PURE__ */ new Set();
     const cardStarMap = {};
     for (const card of allCards) {
       if (!card.category) continue;
-      if (cardIds.includes(card.card_id)) {
-        collectedSet.add(`${card.category}-${card.card_id}`);
+      const cardId = Array.from(allCardMap.keys()).find((id) => allCardMap.get(id) === card);
+      if (cardIds.includes(cardId)) {
+        collectedSet.add(`${card.category}-${cardId}`);
         if (!cardStarMap[card.category]) cardStarMap[card.category] = {};
-        cardStarMap[card.category][card.card_id] = { name: card.card_name, star: card.card_star };
+        cardStarMap[card.category][cardId] = {
+          name: card.name,
+          star: card.star,
+          isLimit: card.isLimit
+        };
       }
     }
     const total_collected = collectedSet.size;
@@ -890,11 +996,12 @@ async function _do_collection(ctx, session) {
     const categoryTotal = {};
     for (const card of allCards) {
       if (!card.category) continue;
+      const cardId = Array.from(allCardMap.keys()).find((id) => allCardMap.get(id) === card);
       if (!categoryCards[card.category]) {
         categoryCards[card.category] = [];
         categoryTotal[card.category] = 0;
       }
-      categoryCards[card.category].push(card.card_id);
+      categoryCards[card.category].push(cardId);
       categoryTotal[card.category]++;
     }
     const categoryProgress = {};
@@ -902,7 +1009,7 @@ async function _do_collection(ctx, session) {
       const collected = Object.keys(cardStarMap[category] || {}).length;
       categoryProgress[category] = [collected, categoryTotal[category], cardStarMap[category] || {}];
     }
-    logger.info("收藏数据获取成功，开始生成图片");
+    logger.info("收藏数据获取成功（含限定卡），开始生成图片");
     const img_base64 = await _collection_draw_image(ctx, show_name, total_collected, total_all, categoryProgress, categoryCards);
     if (!img_base64) {
       logger.error("收藏图片生成失败！");

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-xxck-1",
   "description": "自用（？）抽卡系统（自行设置卡池内容，0-7星划分）（加入限时卡池系统，商店，收藏，排行，仓库）（部分内容开发中，大部分已经可用）",
-  "version": "0.1.21",
+  "version": "0.1.22",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "files": [