koishi-plugin-vsinger-gacha 1.4.0 → 1.4.2

package/lib/handbook.js

@@ -41,8 +41,8 @@ const LABEL_H = 62;
 const GAP = 12;
 const PAD = 24;
 const HEAD = 128;
-const POOL_TITLE_H = 34;
-const SERIES_H = 44;
+const POOL_TITLE_H = 46;
+const SERIES_H = 50;
 const COLS_PER_COL = 8;
 const COLW = COLS_PER_COL * TW + (COLS_PER_COL - 1) * GAP;
 const ROWH = TH + LABEL_H;
@@ -134,12 +134,17 @@ async function render({ game, store, uid, displayName, outDir, tagsDir, thumbsDi
 
   // 每池一块（顺序填充）
   const blocks = [];
+  let _lastAct = null;
   for (const [act, pm] of seriesMap) {
     for (const [pool, arr] of pm) {
       arr.sort((a, b) => Number(b.v.rate_pct || 0) - Number(a.v.rate_pct || 0));
       const rows = Math.max(1, Math.ceil(arr.length / COLS_PER_COL));
       const got = arr.filter((c) => (owned[c.h] || 0) > 0).length;
-      blocks.push({ act, pool, arr, got, h: POOL_TITLE_H + rows * ROWH + 12 });
+      const isNewSeries = act !== _lastAct;
+      // ★ 2026-11-05：系列头也要占高度，否则下一块会压到上一块的卡片上
+      const h = POOL_TITLE_H + rows * ROWH + 12 + (isNewSeries ? SERIES_H : 0);
+      blocks.push({ act, pool, arr, got, series: isNewSeries, h });
+      _lastAct = act;
     }
   }
   const totalH = blocks.reduce((a, b) => a + b.h, 0);
@@ -231,24 +236,32 @@ async function render({ game, store, uid, displayName, outDir, tagsDir, thumbsDi
       let prevAct = null;
       for (const blk of grp) {
         if (blk.act !== prevAct) {
-          kit.panel(g, x0, y, COLW, SERIES_H - 8, { radius: 14, fill: 'rgba(255,255,255,0.88)' });
+          const sh = SERIES_H - 8;
+          kit.panel(g, x0, y + 2, COLW, sh, { radius: 14, fill: 'rgba(255,255,255,0.88)' });
           g.fillStyle = COLOR.accent;
-          kit.roundRect(g, x0 + 12, y + 12, 5, SERIES_H - 32, 3);
+          kit.roundRect(g, x0 + 12, y + 2 + (sh - 20) / 2, 5, 20, 3);
           g.fill();
           g.fillStyle = COLOR.text;
-          g.font = 'bold 21px VSingerSans, sans-serif';
-          g.fillText(blk.act, x0 + 26, y + 22);
+          g.font = 'bold 20px VSingerSans, sans-serif';
+          g.textBaseline = 'middle';
+          g.fillText(blk.act, x0 + 26, y + 2 + sh / 2);
+          g.textBaseline = 'top';
           y += SERIES_H;
           prevAct = blk.act;
         }
         // 池标题（玻璃条）
-        kit.panel(g, x0, y, COLW, POOL_TITLE_H - 10, { radius: 12, fill: 'rgba(255,255,255,0.78)' });
+        const ph = POOL_TITLE_H - 10;
+        kit.panel(g, x0, y + 1, COLW, ph, { radius: 12, fill: 'rgba(255,255,255,0.78)' });
+        g.textBaseline = 'middle';
         g.fillStyle = COLOR.accent;
-        g.font = 'bold 21px VSingerSans, sans-serif';
-        g.fillText(`${blk.pool}`, x0 + 12, y + 12);
+        g.font = 'bold 18px VSingerSans, sans-serif';
+        g.fillText(kit.fit(g, blk.pool, 'bold 18px VSingerSans, sans-serif', COLW - 100), x0 + 12, y + 1 + ph / 2);
         g.fillStyle = COLOR.textSub;
-        g.font = '18px VSingerSans, sans-serif';
-        g.fillText(`${blk.got}/${blk.arr.length}`, x0 + COLW - 82, y + 14);
+        g.font = '16px VSingerSans, sans-serif';
+        g.textAlign = 'right';
+        g.fillText(`${blk.got}/${blk.arr.length}`, x0 + COLW - 12, y + 1 + ph / 2);
+        g.textAlign = 'left';
+        g.textBaseline = 'top';
 
         for (let i = 0; i < blk.arr.length; i++) {
           const c = blk.arr[i];

package/lib/render/kit.js

@@ -76,16 +76,20 @@ function header(g, o) {
   const W = o.W;
 
   // 圆形图标
-  const R = 22;
+  const R = 24;
+  const cx = x + R;
+  const cy = y + R;
   g.save();
   g.beginPath();
-  g.arc(x + R, y + R + 4, R, 0, Math.PI * 2);
+  g.arc(cx, cy, R, 0, Math.PI * 2);
   g.fillStyle = COLOR.accent;
   g.fill();
   g.fillStyle = '#fff';
-  g.font = `bold 22px ${FONT}`;
+  g.font = `bold 26px ${FONT}`;
+  g.textAlign = 'center';
   g.textBaseline = 'middle';
-  g.fillText('♪', x + R - 8, y + R + 4);
+  g.fillText('♪', cx, cy + 1);
+  g.textAlign = 'left';
   g.restore();
 
   g.textBaseline = 'top';
@@ -193,12 +197,12 @@ async function card(g, Canvas, o) {
 
   g.fillStyle = o.owned === false ? COLOR.textDim : COLOR.text;
   g.font = `bold ${o.nameSize || FONT_SIZE.h3}px ${FONT}`;
-  g.fillText(fit(g, o.name, `bold ${o.nameSize || FONT_SIZE.h3}px ${FONT}`, w), o.x, o.y + h + 8);
+  g.fillText(fit(g, o.name, `bold ${o.nameSize || FONT_SIZE.h3}px ${FONT}`, w), o.x, o.y + h + 6);
   if (o.rate != null || o.tierName) {
     g.fillStyle = tc;
     g.font = `${o.metaSize || FONT_SIZE.meta}px ${FONT}`;
     const meta = `${o.tierName || (TIER[tier] || TIER[10]).name}${o.rate != null ? ' ' + o.rate + '%' : ''}`;
-    g.fillText(fit(g, meta, `${o.metaSize || FONT_SIZE.meta}px ${FONT}`, w), o.x, o.y + h + 32);
+    g.fillText(fit(g, meta, `${o.metaSize || FONT_SIZE.meta}px ${FONT}`, w), o.x, o.y + h + 30);
   }
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "koishi-plugin-vsinger-gacha",
-  "version": "1.4.0",
+  "version": "1.4.2",
   "description": "VSinger 收藏集抽卡 / 签到积分 / 图鉴（Koishi 插件，一次性安装）",
   "main": "lib/index.js",
   "files": [