koishi-plugin-xxck-1 0.2.5 → 0.2.7

package/lib/index.js

@@ -196,6 +196,7 @@ function splitAndPreserveNames(str) {
 }
 __name(splitAndPreserveNames, "splitAndPreserveNames");
 var CARD_LEVEL_MAX = 5;
+var battlePending = /* @__PURE__ */ new Map();
 function build_msg(session, content) {
   const userId = session.userId ?? "";
   if (session.channelId?.startsWith("private")) {
@@ -1741,95 +1742,85 @@ function getBattleDay() {
   return `${d.getFullYear()}${String(d.getMonth() + 1).padStart(2, "0")}${String(d.getDate()).padStart(2, "0")}`;
 }
 __name(getBattleDay, "getBattleDay");
-async function getTopStar(ctx, qq) {
-  const cards = await ctx.database.get("gacha_user_card", { qq });
+async function getUserTopStar(ctx, qq) {
+  const userCards = await ctx.database.get("gacha_user_card", { qq });
   const pool = await ctx.database.get("gacha_card_pool", {});
   const event = await ctx.database.get("gacha_event_pool", {});
-  const all = [...pool, ...event];
-  let max = 0;
-  for (const uc of cards) {
-    const c = all.find((x) => x.card_id === uc.card_id);
-    if (!c) continue;
-    const s = c.card_star;
+  const allCards = [...pool, ...event];
+  let maxStar = 0;
+  for (const uc of userCards) {
+    const card = allCards.find((c) => c.card_id === uc.card_id);
+    if (!card) continue;
+    const s = card.card_star;
     if (s === 6 || s === 7) {
-      if (s > max) max = s;
+      if (s > maxStar) maxStar = s;
     }
   }
-  return max;
+  return maxStar;
 }
-__name(getTopStar, "getTopStar");
-var battlePending = /* @__PURE__ */ new Map();
-async function doBattleChallenge(ctx, session, tqq) {
-  const qq = session.userId;
-  if (!qq || !tqq) return;
-  if (qq === tqq) return await session.send("不能挑战自己～");
+__name(getUserTopStar, "getUserTopStar");
+async function doBattleChallenge(ctx, session, targetQQ) {
+  const qq = session.userId?.toString();
+  if (!qq || !targetQQ) return;
+  if (qq === targetQQ) return await session.send(build_msg(session, "不能挑战自己！"));
   const today = getBattleDay();
-  const me = await ctx.database.get("gacha_battle_user", { qq });
-  const m = me[0] || { qq, win: 0, lose: 0, streak: 0, max_streak: 0, day_count: 0, day_date: today };
-  if (m.day_date !== today) m.day_count = 0;
-  if (m.day_count >= 10) return await session.send("今日对战次数已用完（每日10场）");
-  const starMe = await getTopStar(ctx, qq);
-  const starYou = await getTopStar(ctx, tqq);
-  if (starMe < 6 || starYou < 6) return await session.send("双方必须拥有6星或7星卡才能对战");
-  if (starMe !== starYou) return await session.send(`必须同星级对战！你的最高：${starMe}星，对方最高：${starYou}星`);
-  battlePending.set(tqq, { from: qq, to: tqq, star: starMe, time: Date.now() });
-  await session.send(`✅ 已向【${tqq}】发起挑战，请对方回复：同意 / 拒绝`);
+  let me = await ctx.database.get("gacha_battle_user", { qq });
+  let userData = me[0] || { qq, win: 0, lose: 0, streak: 0, max_streak: 0, day_count: 0, day_date: today };
+  if (userData.day_date !== today) userData.day_count = 0;
+  if (userData.day_count >= 10) return await session.send(build_msg(session, "今日对战次数已达上限（10场）"));
+  const starMe = await getUserTopStar(ctx, qq);
+  const starYou = await getUserTopStar(ctx, targetQQ);
+  if (starMe < 6 || starYou < 6) return await session.send(build_msg(session, "双方必须拥有6星或7星卡"));
+  if (starMe !== starYou) return await session.send(build_msg(session, `必须同星级对战！你：${starMe}星，对方：${starYou}星`));
+  battlePending.set(targetQQ, { from: qq, to: targetQQ, star: starMe, time: Date.now() });
+  await session.send(build_msg(session, `✅ 已向【${targetQQ}】发起挑战，请对方回复：同意`));
 }
 __name(doBattleChallenge, "doBattleChallenge");
 async function doBattleAgree(ctx, session) {
-  const qq = session.userId;
+  const qq = session.userId?.toString();
   if (!qq || !battlePending.has(qq)) return;
   const pen = battlePending.get(qq);
   battlePending.delete(qq);
-  const star = pen.star;
   const p1 = pen.from;
   const p2 = qq;
+  const star = pen.star;
   const power1 = star * 100 + Math.floor(Math.random() * 51);
   const power2 = star * 100 + Math.floor(Math.random() * 51);
-  const win = power1 >= power2 ? p1 : p2;
-  const lose = win === p1 ? p2 : p1;
-  const wd = await ctx.database.get("gacha_battle_user", { qq: win });
-  const w = wd[0] || { qq: win, win: 0, lose: 0, streak: 0, max_streak: 0, day_count: 0, day_date: getBattleDay() };
+  const winQQ = power1 >= power2 ? p1 : p2;
+  const loseQQ = winQQ === p1 ? p2 : p1;
+  let winData = await ctx.database.get("gacha_battle_user", { qq: winQQ });
+  let w = winData[0] || { qq: winQQ, win: 0, lose: 0, streak: 0, max_streak: 0, day_count: 0, day_date: getBattleDay() };
   w.win++;
   w.streak++;
   if (w.streak > w.max_streak) w.max_streak = w.streak;
   const x = Math.min(w.streak, 10);
   const reward = Math.floor(50 * (1 + 0.1 * x));
-  const ld = await ctx.database.get("gacha_battle_user", { qq: lose });
-  const l = ld[0] || { qq: lose, win: 0, lose: 0, streak: 0, max_streak: 0, day_count: 0, day_date: getBattleDay() };
+  let loseData = await ctx.database.get("gacha_battle_user", { qq: loseQQ });
+  let l = loseData[0] || { qq: loseQQ, win: 0, lose: 0, streak: 0, max_streak: 0, day_count: 0, day_date: getBattleDay() };
   l.lose++;
   l.streak = 0;
   const today = getBattleDay();
-  const p1data = await ctx.database.get("gacha_battle_user", { qq: p1 });
-  const p1d = p1data[0] || { qq: p1, day_count: 0, day_date: today };
+  let p1Data = await ctx.database.get("gacha_battle_user", { qq: p1 });
+  let p1d = p1Data[0] || { qq: p1, day_count: 0, day_date: today };
   if (p1d.day_date !== today) p1d.day_count = 0;
   p1d.day_count++;
   await ctx.database.upsert("gacha_battle_user", [w, l, p1d]);
-  await ctx.database.create("gacha_battle_log", {
-    qq1: p1,
-    qq2: p2,
-    star,
-    win_qq: win,
-    time: Date.now()
-  });
-  const asset = await ctx.database.get("gacha_user_draw_count", { qq: win });
-  const v = asset[0]?.water_vapor || 0;
-  await ctx.database.upsert("gacha_user_draw_count", [{
-    qq: win,
-    water_vapor: v + reward
-  }]);
-  await session.send(`
+  await ctx.database.create("gacha_battle_log", { qq1: p1, qq2: p2, star, win_qq: winQQ, time: Date.now() });
+  let asset = await ctx.database.get("gacha_user_draw_count", { qq: winQQ });
+  let vapor = asset[0]?.water_vapor || 0;
+  await ctx.database.upsert("gacha_user_draw_count", [{ qq: winQQ, water_vapor: vapor + reward }]);
+  await session.send(build_msg(session, `
 ⚔️ 对战结果
 【${p1}】${star}星 战力：${power1}
 【${p2}】${star}星 战力：${power2}
-🎉 胜利：${win}（奖励水汽 +${reward}）`);
+🎉 胜利：${winQQ}（水汽 +${reward}）`));
 }
 __name(doBattleAgree, "doBattleAgree");
 async function doBattleRecord(ctx, session) {
-  const qq = session.userId;
+  const qq = session.userId?.toString();
   if (!qq) return;
-  const d = await ctx.database.get("gacha_battle_user", { qq });
-  const u = d[0] || { qq, win: 0, lose: 0, streak: 0, max_streak: 0 };
+  let data = await ctx.database.get("gacha_battle_user", { qq });
+  let u = data[0] || { qq, win: 0, lose: 0, streak: 0, max_streak: 0 };
   const total = u.win + u.lose;
   const rate = total > 0 ? (u.win / total * 100).toFixed(1) : "0.0";
   const logs = await ctx.database.get("gacha_battle_log", {
@@ -1838,14 +1829,13 @@ async function doBattleRecord(ctx, session) {
   let msg = `📊 对战数据
 胜场：${u.win} | 负场：${u.lose} | 胜率：${rate}%
 当前连胜：${u.streak} | 最大连胜：${u.max_streak}
-
 最近5场：`;
   for (const log of logs) {
     const res = log.win_qq === qq ? "胜" : "负";
     msg += `
 ${res} ${log.qq1} vs ${log.qq2}`;
   }
-  await session.send(msg);
+  await session.send(build_msg(session, msg));
 }
 __name(doBattleRecord, "doBattleRecord");
 async function _do_help(ctx, session) {
@@ -2093,36 +2083,46 @@ async function apply(ctx, config) {
     const msg = content.join(" ").trim();
     await _do_broadcast(ctx, session, msg, config.masterQQ);
   });
-  ctx.command("WWC对战", "挑战他人对战（必须@）").action(async (argv) => {
+  ctx.command("WWC对战", "挑战他人对战").action(async (argv) => {
     const session = argv.session;
     if (!session) return;
+    const content = session.content || "";
     let targetQQ = null;
-    if (session.quote?.user.id) {
-      targetQQ = String(session.quote.user.id);
+    const cqMatch = content.match(/\[CQ:at,qq=(\d+)\]/i);
+    if (cqMatch) {
+      targetQQ = cqMatch[1];
     } else {
-      const match = session.content?.match(/\[CQ:at,qq=(\d+)\]/);
-      if (match) targetQQ = match[1];
+      const atMatch = content.match(/@(\d+)/);
+      if (atMatch) {
+        targetQQ = atMatch[1];
+      }
     }
     if (!targetQQ) {
-      return await session.send(build_msg(session, "请@你要挑战的人，如：WWC对战@XXX"));
+      return await session.send(build_msg(session, "请@你要挑战的人，如：WWC对战@123456"));
     }
     await doBattleChallenge(ctx, session, targetQQ);
   });
   ctx.command("同意", "同意对战").action(async (argv) => {
     const session = argv.session;
     if (!session) return;
+    const qq = session.userId?.toString();
+    if (!qq || !battlePending2.has(qq)) {
+      return await session.send(build_msg(session, "没有待处理的对战请求"));
+    }
     await doBattleAgree(ctx, session);
   });
   ctx.command("拒绝", "拒绝对战").action(async (argv) => {
     const session = argv.session;
     if (!session) return;
-    const qq = session.userId;
-    if (battlePending2.has(qq)) {
+    const qq = session.userId?.toString();
+    if (qq && battlePending2.has(qq)) {
       battlePending2.delete(qq);
       await session.send(build_msg(session, "已拒绝对战"));
+    } else {
+      await session.send(build_msg(session, "没有待处理的对战请求"));
     }
   });
-  ctx.command("WWC对战记录", "查看对战数据、胜率、连胜、最近5场").action(async (argv) => {
+  ctx.command("WWC对战记录", "查看对战记录").action(async (argv) => {
     const session = argv.session;
     if (session) await doBattleRecord(ctx, session);
   });

package/package.json

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