koishi-plugin-vsinger-gacha 1.1.4 → 1.2.1

package/README.md

@@ -74,6 +74,7 @@ npm i @napi-rs/canvas
 | **图鉴** | 需要可选依赖 `@napi-rs/canvas`；没装时其它功能不受影响 |
 | **字体** | 包内自带中文子集，不依赖系统字体 |
 | **合并转发** | 配置 `forwardMode: auto / off` |
+| **结果图** | 不支持合并转发的平台（如 QQ 官方群机器人）自动把抽卡结果渲染成**一张图**；`resultImage: auto / always / off` |
 
 ## 指令
 

package/lib/handbook.js

@@ -330,4 +330,142 @@ async function render({ game, store, uid, displayName, outDir, tagsDir, thumbsDi
   return files;
 }
 
-module.exports = { render };
+
+/**
+ * 抽卡结果图（不依赖合并转发，任何平台都能发）
+ * @param {object} opts
+ * @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 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');
+  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 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 = 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, CW, CH);
+      } catch { /* 忽略 */ }
+    }
+    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 = CW * 0.46;
+        g.drawImage(ti, x + 4, y + 4, tw, (ti.height / ti.width) * tw);
+      } catch { /* 忽略 */ }
+    }
+    if (r.laser) {
+      const holo = path.join(tagsDir, 'tag_holo.png');
+      if (fs.existsSync(holo)) {
+        try {
+          const hi = await Canvas.loadImage(holo);
+          const hw = CW * 0.36;
+          const hh = (hi.height / hi.width) * hw;
+          g.drawImage(hi, x + (CW - hw) / 2, y + CH - hh - 6, hw, hh);
+        } catch { /* 忽略 */ }
+      }
+    }
+
+    // 名称 + 档位/概率
+    g.fillStyle = '#ffffff';
+    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 = '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', 90));
+  return out;
+}
+
+module.exports = { render, renderResult };

package/lib/index.js

@@ -29,8 +29,12 @@ 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')
+      .description('抽卡结果图：auto=不能合并转发时渲染成一张图；always=总是；off=纯文本'),
     forwardMode: Schema.union(['auto', 'off']).default('auto')
       .description('合并转发：auto=支持就转发、不支持自动退回普通消息；off=永远普通消息'),
     imageMode: Schema.union(['auto', 'buffer', 'file']).default('auto')
@@ -220,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 {
@@ -325,7 +343,7 @@ function apply(ctx, config) {
           nodes.push({ type: 'node', data: { name: botName(session), uin: botUin(session), content } });
         });
       }
-      const ok = config.forwardMode !== 'off' && nodes.length && await sendForward(session, nodes);
+      const ok = config.resultImage !== 'always' && config.forwardMode !== 'off' && nodes.length && await sendForward(session, nodes);
       if (!ok && nodes.length) logger.warn('合并转发不可用（%s），退回普通发送', sendForward.lastError || 'unknown');
 
       // ★ 动态卡：单独发 mp4（OneBot 要求视频独占一条消息）
@@ -341,14 +359,33 @@ function apply(ctx, config) {
         }
       }
       if (!ok) {
-        const lines = results.map((r, i) => {
-          const rate = r.card.rate_pct == null ? '' : ` ${r.card.rate_pct}%`;
-          return `${i + 1}. ${r.tier}｜${r.card.card_name}${rate}${r.laser ? '｜✦镭射版' : ''}${r.card.video ? '｜动态' : ''}`;
-        });
-        await session.send(title + '\n' + lines.join('\n'));
-        for (const f of pics) {
-          if (!f) continue;
-          try { await session.send(fileEl(f, null, config.imageMode)); } catch (e) { logger.warn('发卡图失败：%s', e.message); }
+        // ★ 优先渲染成一张结果图（官方群机器人等不支持合并转发的平台）
+        let sentImage = false;
+        if (config.resultImage !== 'off' && handbook) {
+          try {
+            const out = await handbook.renderResult({
+              results,
+              title,
+              outDir: path.join(dataDir, 'out'),
+              tagsDir,
+              thumbsDir: path.join(assetsDir, 'thumbs'),
+            });
+            await session.send(fileEl(out, 'image/jpeg', config.imageMode));
+            sentImage = true;
+          } catch (e) {
+            logger.warn('结果图渲染失败：%s', e.message);
+          }
+        }
+        if (!sentImage) {
+          const lines = results.map((r, i) => {
+            const rate = r.card.rate_pct == null ? '' : ` ${r.card.rate_pct}%`;
+            return `${i + 1}. ${r.tier}｜${r.card.card_name}${rate}${r.laser ? '｜✦镭射版' : ''}${r.card.video ? '｜动态' : ''}`;
+          });
+          await session.send(title + '\n' + lines.join('\n'));
+          for (const f of pics) {
+            if (!f) continue;
+            try { await session.send(fileEl(f, null, config.imageMode)); } catch (e) { logger.warn('发卡图失败：%s', e.message); }
+          }
         }
       }
       return;

package/package.json

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