koishi-plugin-vsinger-gacha 1.2.0 → 1.2.1

package/lib/handbook.js

@@ -334,69 +334,107 @@ async function render({ game, store, uid, displayName, outDir, tagsDir, thumbsDi
 /**
  * 抽卡结果图（不依赖合并转发，任何平台都能发）
  * @param {object} opts
- * @param {Array} opts.results [{h, card, tier, laser}]
- * @param {string} opts.title  标题（如「zb 抽了 10 张（-100 分，剩 233）」）
+ * @param {Array} opts.results [{hash|h, card, tier, laser}]
+ * @param {string} opts.title
  */
 async function renderResult({ results, title, outDir, tagsDir, thumbsDir }) {
   const Canvas = getCanvas();
   const fs = require('node:fs');
   const path = require('node:path');
 
-  const W_CARD = TW;
-  const H_CARD = TH;
-  const LABEL = 44;
-  const GAP = 12;
-  const PAD = 24;
-  const PER_ROW = Math.min(5, Math.max(1, results.length));
-  const rows = Math.max(1, Math.ceil(results.length / PER_ROW));
-  const W = PAD * 2 + PER_ROW * W_CARD + (PER_ROW - 1) * GAP;
-  const HEAD = 92;
-  const H = HEAD + rows * (H_CARD + LABEL + GAP) + PAD;
+  const TIER_NAME = { 40: '大隐藏', 30: '小隐藏', 20: '稀有', 10: '普通' };
+  const TIER_COLOR = { 40: '#ff6d84', 30: '#ffb44d', 20: '#8fc0ff', 10: '#c3cad8' };
+  const tierOf = (card) => {
+    const sc = Number((card && card.card_scarcity) || 10);
+    return sc === 40 ? 40 : sc === 30 ? 30 : sc === 20 ? 20 : 10;
+  };
+
+  const n = Math.max(1, results.length);
+  const PER_ROW = n <= 3 ? n : Math.min(5, n);
+  const rows = Math.ceil(n / PER_ROW);
+  const CW = n === 1 ? 300 : 170;         // 卡宽（1 张时放大）
+  const CH = Math.round(CW * 1.43);
+  const LABEL = 58;
+  const GAP = 16;
+  const PAD = 32;
+  const HEAD = 108;
+  const W = Math.max(520, PAD * 2 + PER_ROW * CW + (PER_ROW - 1) * GAP);
+  const H = HEAD + rows * (CH + LABEL + GAP) + PAD;
 
   const canvas = Canvas.createCanvas(W, H);
   const g = canvas.getContext('2d');
-  const bg = g.createLinearGradient(0, 0, W, H);
-  bg.addColorStop(0, '#101a2e');
-  bg.addColorStop(1, '#16304f');
+  g.textBaseline = 'top';
+
+  // 背景：深蓝渐变 + 顶部柔光
+  const bg = g.createLinearGradient(0, 0, W * 0.6, H);
+  bg.addColorStop(0, '#111c33');
+  bg.addColorStop(0.55, '#16263f');
+  bg.addColorStop(1, '#0d1524');
   g.fillStyle = bg;
   g.fillRect(0, 0, W, H);
+  const glow = g.createRadialGradient(W * 0.25, 0, 10, W * 0.25, 0, Math.max(W, H) * 0.75);
+  glow.addColorStop(0, 'rgba(120,180,255,0.28)');
+  glow.addColorStop(1, 'rgba(120,180,255,0)');
+  g.fillStyle = glow;
+  g.fillRect(0, 0, W, H);
 
+  // 标题
   g.fillStyle = '#ffffff';
-  g.font = 'bold 30px VSingerSans, sans-serif';
-  g.textBaseline = 'top';
-  g.fillText(String(title).slice(0, 40), PAD, 26);
-
-  const TIER_NAME = { 40: '大隐藏', 30: '小隐藏', 20: '稀有', 10: '普通' };
-  const TIER_COLOR = { 40: '#ff6078', 30: '#ffb050', 20: '#96beff', 10: '#bec4d2' };
+  g.font = 'bold 32px VSingerSans, sans-serif';
+  const t = String(title || '').replace(/\s+/g, ' ');
+  const maxTitle = W - PAD * 2;
+  let tt = t;
+  while (tt.length > 2 && g.measureText(tt).width > maxTitle) tt = tt.slice(0, -1);
+  if (tt !== t) tt = tt.slice(0, -1) + '…';
+  g.fillText(tt, PAD, 30);
+  g.fillStyle = 'rgba(200,215,240,0.65)';
+  g.font = '18px VSingerSans, sans-serif';
+  g.fillText(`共 ${n} 张 ｜ 抽卡结果`, PAD, 72);
+
+  const rowW = PER_ROW * CW + (PER_ROW - 1) * GAP;
+  const x0 = Math.round((W - rowW) / 2);
 
   for (let i = 0; i < results.length; i++) {
     const r = results[i];
+    const hash = r.hash || r.h;
     const col = i % PER_ROW;
     const row = Math.floor(i / PER_ROW);
-    const x = PAD + col * (W_CARD + GAP);
-    const y = HEAD + row * (H_CARD + LABEL + GAP);
-
-    g.fillStyle = 'rgba(0,0,0,0.45)';
-    g.fillRect(x, y, W_CARD, H_CARD);
-
-    const thumb = path.join(thumbsDir, r.h + '.jpg');
-    if (fs.existsSync(thumb)) {
+    const x = x0 + col * (CW + GAP);
+    const y = HEAD + row * (CH + LABEL + GAP);
+    const tier = tierOf(r.card);
+
+    // 卡片底
+    g.save();
+    g.beginPath();
+    g.roundRect(x, y, CW, CH, 14);
+    g.clip();
+    g.fillStyle = '#1b2436';
+    g.fillRect(x, y, CW, CH);
+    const thumb = hash ? path.join(thumbsDir, hash + '.jpg') : '';
+    if (thumb && fs.existsSync(thumb)) {
       try {
         const img = await Canvas.loadImage(thumb);
-        g.drawImage(img, x, y, W_CARD, H_CARD);
+        g.drawImage(img, x, y, CW, CH);
       } catch { /* 忽略 */ }
     }
-    const tier = Number(r.card && r.card.card_scarcity) === 40 ? 40
-      : Number(r.card && r.card.card_scarcity) === 30 ? 30
-        : Number(r.card && r.card.card_scarcity) === 20 ? 20 : 10;
-
-    // 角标
+    g.restore();
+
+    // 边框（按档位上色）
+    g.save();
+    g.beginPath();
+    g.roundRect(x + 1, y + 1, CW - 2, CH - 2, 13);
+    g.strokeStyle = TIER_COLOR[tier];
+    g.lineWidth = 3;
+    g.stroke();
+    g.restore();
+
+    // 档位角标
     const tag = tier === 40 ? path.join(tagsDir, 'tag_40.webp') : tier === 30 ? path.join(tagsDir, 'tag_30.webp') : null;
     if (tag && fs.existsSync(tag)) {
       try {
         const ti = await Canvas.loadImage(tag);
-        const tw = W_CARD * 0.46;
-        g.drawImage(ti, x + 3, y + 3, tw, (ti.height / ti.width) * tw);
+        const tw = CW * 0.46;
+        g.drawImage(ti, x + 4, y + 4, tw, (ti.height / ti.width) * tw);
       } catch { /* 忽略 */ }
     }
     if (r.laser) {
@@ -404,25 +442,29 @@ async function renderResult({ results, title, outDir, tagsDir, thumbsDir }) {
       if (fs.existsSync(holo)) {
         try {
           const hi = await Canvas.loadImage(holo);
-          const hw = W_CARD * 0.36;
+          const hw = CW * 0.36;
           const hh = (hi.height / hi.width) * hw;
-          g.drawImage(hi, x + (W_CARD - hw) / 2, y + H_CARD - hh - 4, hw, hh);
+          g.drawImage(hi, x + (CW - hw) / 2, y + CH - hh - 6, hw, hh);
         } catch { /* 忽略 */ }
       }
     }
 
+    // 名称 + 档位/概率
     g.fillStyle = '#ffffff';
-    g.font = '16px VSingerSans, sans-serif';
-    const name = String((r.card && r.card.card_name) || '').slice(0, 12);
-    g.fillText(name, x, y + H_CARD + 6);
+    g.font = 'bold 19px VSingerSans, sans-serif';
+    const name = String((r.card && r.card.card_name) || '');
+    let nn = name;
+    while (nn.length > 1 && g.measureText(nn).width > CW) nn = nn.slice(0, -1);
+    g.fillText(nn === name ? nn : nn.slice(0, -1) + '…', x, y + CH + 8);
     g.fillStyle = TIER_COLOR[tier];
-    g.font = '13px VSingerSans, sans-serif';
-    g.fillText(`${TIER_NAME[tier]} ${r.card && r.card.rate_pct != null ? r.card.rate_pct + '%' : ''}`, x, y + H_CARD + 26);
+    g.font = '15px VSingerSans, sans-serif';
+    const rate = r.card && r.card.rate_pct != null ? ` ${r.card.rate_pct}%` : '';
+    g.fillText(`${TIER_NAME[tier]}${rate}`, x, y + CH + 34);
   }
 
   fs.mkdirSync(outDir, { recursive: true });
   const out = path.join(outDir, `draw_${Date.now()}.jpg`);
-  fs.writeFileSync(out, await canvas.encode('jpeg', 88));
+  fs.writeFileSync(out, await canvas.encode('jpeg', 90));
   return out;
 }
 

package/lib/index.js

@@ -29,6 +29,8 @@ const Config = Schema.intersect([
       .description('普卡出镭射版的概率'),
     idMapFile: Schema.string().default('')
       .description('可选：openid ↔ QQ 映射表（如 /root/qqbot/data/id-map.json），用于统一用户标识'),
+    ignoreAtOthers: Schema.boolean().default(true)
+      .description('消息里 @ 的是别的机器人/别人时，本插件不响应（避免同群两个机器人重复回复）'),
     debug: Schema.boolean().default(false)
       .description('调试模式：把收到的每条消息打到日志里'),
     resultImage: Schema.union(['auto', 'always', 'off']).default('auto')
@@ -222,6 +224,20 @@ function apply(ctx, config) {
     logger.info('抽卡数据就绪：%d 张卡 / %d 个奖池（卡图齐全）', game.cards.length, game.pools.size);
   }
 
+  // ★ 同群多机器人时：消息 @ 的不是自己 → 不处理（避免重复回复）
+  if (config.ignoreAtOthers !== false) {
+    ctx.middleware((session, next) => {
+      try {
+        const els = (session.event && session.event.message && session.event.message.elements) || [];
+        const ats = els.filter((e) => e && e.type === 'at').map((e) => String(e.attrs && e.attrs.id || ''));
+        if (ats.length && !ats.includes('all') && !ats.includes(String(session.selfId || ''))) {
+          return;                        // 拦截：这条是给别的机器人的
+        }
+      } catch { /* 忽略 */ }
+      return next();
+    }, true);
+  }
+
   if (config.debug) {
     ctx.middleware((session, next) => {
       try {

package/package.json

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