koishi-plugin-xxck-1 0.0.113 → 0.0.115

package/lib/index.js

@@ -85,8 +85,8 @@ async function _warehouse_draw_image(ctx, user_cards, show_name) {
     const col_width = 320;
     const col_gap = 10;
     const row_height = 26;
-    const title_height = 60;
     const padding = 15;
+    const start_y = 45;
     const validCards = (user_cards || []).filter((card) => Array.isArray(card) && card.length >= 4);
     const sortedCards = [...validCards].sort((a, b) => {
       const starA = a[3] ?? 0;
@@ -96,43 +96,40 @@ async function _warehouse_draw_image(ctx, user_cards, show_name) {
       if (starB !== starA) {
         return starB - starA;
       }
-      return String(idA).localeCompare(String(idB), void 0, { numeric: true, sensitivity: "base" });
+      return String(idA).localeCompare(String(idB), void 0, { numeric: true });
     });
     const total_cards = sortedCards.length;
     const col_count = Math.ceil(total_cards / COL_NUM);
     const max_rows = Math.min(COL_NUM, Math.max(total_cards, 1));
-    const img_width = padding + col_count * (col_width + col_gap) - col_gap;
-    const img_height = title_height + max_rows * row_height + padding * 2;
+    const img_width = padding + col_count * (col_width + col_gap);
+    const img_height = start_y + max_rows * row_height + padding;
     const canvas = ctx.canvas.createCanvas(img_width, img_height);
+    const buffer = await canvas.toBuffer("image/png");
     const ctx2d = canvas.getContext("2d");
-    if (!ctx2d) {
-      logger.error("[仓库绘图] 获取画布上下文失败");
-      return null;
-    }
+    if (!ctx2d) return null;
     ctx2d.textBaseline = "alphabetic";
     ctx2d.textAlign = "left";
     ctx2d.fillStyle = "#ffffff";
     ctx2d.fillRect(0, 0, img_width, img_height);
     ctx2d.font = "20px Microsoft YaHei";
     ctx2d.fillStyle = "#000000";
-    ctx2d.fillText(`用户：${show_name}`, padding, padding + 25);
-    if (!total_cards) {
-      ctx2d.fillText("暂无卡片", padding, title_height + padding);
-    } else {
-      sortedCards.forEach((card, idx) => {
-        const [card_level, card_id, card_name, card_star] = card;
-        const col = Math.floor(idx / COL_NUM);
-        const row = idx % COL_NUM;
-        const x = padding + col * (col_width + col_gap);
-        const y = title_height + row * row_height;
-        const starText = get_star_symbol(card_star);
-        const displayText = `[${card_level}] ${card_id} ${card_name} ${starText}`;
-        ctx2d.fillStyle = STAR_COLOR[card_star];
-        ctx2d.font = "16px Microsoft YaHei";
-        ctx2d.fillText(displayText, x, y + 18);
-      });
+    ctx2d.fillText(`用户：${show_name}`, padding, 30);
+    if (total_cards === 0) {
+      ctx2d.fillText("暂无卡片", padding, start_y);
+      return import_koishi.h.image(buffer, "image/png");
     }
-    const buffer = await canvas.toBuffer("image/png");
+    sortedCards.forEach((card, idx) => {
+      const [card_level, card_id, card_name, card_star] = card;
+      const col = Math.floor(idx / COL_NUM);
+      const row = idx % COL_NUM;
+      const x = padding + col * (col_width + col_gap);
+      const y = start_y + row * row_height;
+      const starText = get_star_symbol(card_star);
+      const displayText = `[${card_level}] ${card_id} ${card_name} ${starText}`;
+      ctx2d.fillStyle = STAR_COLOR[card_star];
+      ctx2d.font = "16px Microsoft YaHei";
+      ctx2d.fillText(displayText, x, y + 18);
+    });
     logger.info("仓库图片生成成功 ✅");
     return import_koishi.h.image(buffer, "image/png");
   } catch (err) {
@@ -202,11 +199,11 @@ async function _shop_draw_image(ctx, enrichedShopCards, user_disturbance, user_w
 }
 __name(_shop_draw_image, "_shop_draw_image");
 async function _collection_draw_image(ctx, show_name, total_collected, total_all, categoryProgress, categoryCards) {
-  logger.info("开始绘制收藏图片（修复首个年份错位·终极版）");
+  logger.info("开始绘制收藏图片（绝对对齐+带？+支持4字名）");
   try {
     if (!ctx.canvas) return null;
-    const BASE_X = 50;
-    const CARD_SIZE = 60;
+    const BASE_X = 40;
+    const CARD_SIZE = 70;
     const CARD_GAP = 10;
     const ROW_HEIGHT = CARD_SIZE + CARD_GAP;
     let totalHeight = 140;
@@ -265,7 +262,7 @@ async function _collection_draw_image(ctx, show_name, total_collected, total_all
           y += ROW_HEIGHT;
         }
         ctx2d.fillStyle = "#fff";
-        ctx2d.strokeStyle = "#ddd";
+        ctx2d.strokeStyle = "#e5e5e5";
         ctx2d.fillRect(x, y, CARD_SIZE, CARD_SIZE);
         ctx2d.strokeRect(x, y, CARD_SIZE, CARD_SIZE);
         ctx2d.textAlign = "center";
@@ -289,7 +286,7 @@ async function _collection_draw_image(ctx, show_name, total_collected, total_all
     logger.info("收藏图片生成成功 ✅");
     return import_koishi.h.image(buffer, "image/png");
   } catch (err) {
-    logger.error("绘图失败：", err);
+    logger.error("收藏绘图失败：", err);
     return null;
   }
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-xxck-1",
   "description": "自用抽卡",
-  "version": "0.0.113",
+  "version": "0.0.115",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "files": [