koishi-plugin-xxck-1 0.2.7 → 0.2.9

package/lib/index.js

@@ -879,7 +879,7 @@ async function _do_draw(ctx, session, draw_times) {
     const starText = get_star_symbol(card.star);
     await session.send(build_msg(
       session,
-      session.text("draw.broadcast.getCard", { name: showName, star: starText, id: card.id, cardName: card.card_name })
+      session.text("draw.broadcast.getCard", { name: showName, star: starText, id: card.id, cardName: card.name })
     ));
     await new Promise((r) => setTimeout(r, 1e3));
   }
@@ -1649,7 +1649,7 @@ async function _do_event_draw(ctx, session, data) {
     await session.send(build_msg(session, session.text("draw.broadcast.title")));
     await new Promise((r) => setTimeout(r, 3e3));
     const starText = get_star_symbol(card.card_star);
-    await session.send(build_msg(session, session.text("draw.broadcast.getCard", { name: showName, star: starText, id: card.card_id, cardName: card.card_id })));
+    session.text("draw.broadcast.getCard", { name: showName, star: starText, id: card.card_id, cardName: card.card_name });
     await new Promise((r) => setTimeout(r, 1e3));
   }
   let msg = session.text("tip.draw.complete", { name: showName }) + "\n";
@@ -2088,17 +2088,13 @@ async function apply(ctx, config) {
     if (!session) return;
     const content = session.content || "";
     let targetQQ = null;
-    const cqMatch = content.match(/\[CQ:at,qq=(\d+)\]/i);
-    if (cqMatch) {
-      targetQQ = cqMatch[1];
-    } else {
-      const atMatch = content.match(/@(\d+)/);
-      if (atMatch) {
-        targetQQ = atMatch[1];
-      }
+    const atArr = content.match(/\[CQ:at,qq=(\d+)\]/g);
+    if (atArr && atArr.length) {
+      const q = atArr[0].match(/qq=(\d+)/)?.[1];
+      if (q) targetQQ = q;
     }
     if (!targetQQ) {
-      return await session.send(build_msg(session, "请@你要挑战的人，如：WWC对战@123456"));
+      return await session.send(build_msg(session, "请@你要挑战的人"));
     }
     await doBattleChallenge(ctx, session, targetQQ);
   });

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-xxck-1",
   "description": "自用（？）抽卡系统|完整指令说明见readme|建议使用skia-canvas|指令与本地化已经基本完成",
-  "version": "0.2.7",
+  "version": "0.2.9",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "files": [