koishi-plugin-xxck-1 0.2.13 → 0.2.14

package/lib/index.d.ts

@@ -128,6 +128,12 @@ declare module 'koishi' {
             win_qq: string;
             time: number;
         };
+        gacha_group_member: {
+            group_id: string;
+            qq: string;
+            group_nickname: string;
+            card: string;
+        };
     }
     interface Context {
         canvas: {

package/lib/index.js

@@ -1793,6 +1793,18 @@ async function doBattleAgree(ctx, session) {
   const power2 = star * 100 + Math.floor(Math.random() * 51);
   const winQQ = power1 >= power2 ? p1 : p2;
   const loseQQ = winQQ === p1 ? p2 : p1;
+  const groupId = session.guildId;
+  let name1 = p1, name2 = p2;
+  try {
+    if (groupId) {
+      const m1 = await ctx.database.get("gacha_group_member", { group_id: groupId, qq: p1 });
+      if (m1.length) name1 = m1[0].card || m1[0].group_nickname || p1;
+      const m2 = await ctx.database.get("gacha_group_member", { group_id: groupId, qq: p2 });
+      if (m2.length) name2 = m2[0].card || m2[0].group_nickname || p2;
+    }
+  } catch (e) {
+  }
+  let winName = winQQ === p1 ? name1 : name2;
   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++;
@@ -1816,9 +1828,9 @@ async function doBattleAgree(ctx, session) {
   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}
-🎉 胜利：${winQQ}（水汽 +${reward}）`));
+【${name1}】${star}星 战力：${power1}
+【${name2}】${star}星 战力：${power2}
+🎉 胜利：${winName}（水汽 +${reward}）`));
 }
 __name(doBattleAgree, "doBattleAgree");
 async function doBattleRecord(ctx, session) {
@@ -1961,6 +1973,12 @@ async function apply(ctx, config) {
     win_qq: { type: "string" },
     time: { type: "integer" }
   }, { primary: ["id"] });
+  ctx.model.extend("gacha_group_member", {
+    group_id: { type: "string" },
+    qq: { type: "string" },
+    group_nickname: { type: "string" },
+    card: { type: "string" }
+  }, { primary: ["group_id", "qq"] });
   const battlePending2 = /* @__PURE__ */ new Map();
   await ctx.database.upsert("gacha_global_switch", [{ id: 1, status: 0 }]);
   await ctx.database.upsert("gacha_sign_config", [{ id: 1, reset_hour: config.signResetHour, reset_minute: config.signResetMinute }]);
@@ -1974,6 +1992,28 @@ async function apply(ctx, config) {
       groupMsgCounter.set(key, { count: 0, lastValidMsg: { text: "", images: [] } });
     }
   });
+  ctx.on("guild-added", async (session) => {
+    const guildId = session.guildId;
+    if (!guildId) return;
+    ctx.logger.info("[WWC] 群已加入，等待用户发言自动缓存昵称");
+  });
+  ctx.on("message", async (session) => {
+    const guildId = session.guildId;
+    const userId = session.userId;
+    if (!guildId || !userId) return;
+    try {
+      const member = await session.bot.getGuildMember(guildId, userId);
+      if (member) {
+        await ctx.database.upsert("gacha_group_member", [{
+          group_id: guildId,
+          qq: userId,
+          group_nickname: member.name || "",
+          card: member.card || ""
+        }]);
+      }
+    } catch (e) {
+    }
+  });
   ctx.command("WWC注册 <昵称>", "注册/修改WWC账号，首次使用必须注册").alias("wwc注册").alias("WWC绑定").action(async (argv, nickname) => {
     if (!argv.session) return;
     const session = argv.session;
@@ -2105,13 +2145,32 @@ async function apply(ctx, config) {
       await session.send(build_msg(session, "请@你要挑战的玩家"));
       return;
     }
+    const groupId = session.guildId;
     let showName = targetQQ;
     try {
-      const userList = session.bot?.user || {};
-      if (userList[targetQQ]) {
-        showName = userList[targetQQ].nick || userList[targetQQ].name || targetQQ;
+      if (groupId) {
+        const member = await ctx.database.get("gacha_group_member", {
+          group_id: groupId,
+          qq: targetQQ
+        });
+        if (member.length) {
+          const card = member[0].card || "";
+          const groupNick = member[0].group_nickname || "";
+          showName = card || groupNick || targetQQ;
+        } else {
+          const memberNew = await ctx.database.get("gacha_group_member", {
+            group_id: groupId,
+            qq: targetQQ
+          });
+          if (memberNew.length) {
+            const card = memberNew[0].card || "";
+            const groupNick = memberNew[0].group_nickname || "";
+            showName = card || groupNick || targetQQ;
+          }
+        }
       }
-    } catch (e) {
+    } catch (err) {
+      ctx.logger.error("[WWC对战] 获取昵称失败：", err);
     }
     await session.send(build_msg(session, `✅ 已向【${showName}】发起挑战，请对方回复：同意`));
     await doBattleChallenge(ctx, session, targetQQ);
@@ -2124,18 +2183,55 @@ async function apply(ctx, config) {
       await session.send(build_msg(session, "没有待处理的对战请求"));
       return;
     }
+    const pen = battlePending2.get(qq);
+    const fromQQ = pen.from;
+    const groupId = session.guildId;
+    let fromName = fromQQ;
+    try {
+      if (groupId) {
+        const member = await ctx.database.get("gacha_group_member", {
+          group_id: groupId,
+          qq: fromQQ
+        });
+        if (member.length) {
+          const card = member[0].card || "";
+          const groupNick = member[0].group_nickname || "";
+          fromName = card || groupNick || fromQQ;
+        }
+      }
+    } catch (e) {
+    }
+    await session.send(build_msg(session, `✅ 已同意【${fromName}】的对战请求，开始对战！`));
     await doBattleAgree(ctx, session);
   });
   ctx.command("拒绝", "拒绝对战").action(async (argv) => {
     const session = argv.session;
     if (!session) return;
     const qq = session.userId?.toString();
-    if (qq && battlePending2.has(qq)) {
-      battlePending2.delete(qq);
-      await session.send(build_msg(session, "已拒绝对战"));
-    } else {
+    if (!qq || !battlePending2.has(qq)) {
       await session.send(build_msg(session, "没有待处理的对战请求"));
+      return;
+    }
+    const pen = battlePending2.get(qq);
+    const fromQQ = pen.from;
+    const groupId = session.guildId;
+    let fromName = fromQQ;
+    try {
+      if (groupId) {
+        const member = await ctx.database.get("gacha_group_member", {
+          group_id: groupId,
+          qq: fromQQ
+        });
+        if (member.length) {
+          const card = member[0].card || "";
+          const groupNick = member[0].group_nickname || "";
+          fromName = card || groupNick || fromQQ;
+        }
+      }
+    } catch (e) {
     }
+    battlePending2.delete(qq);
+    await session.send(build_msg(session, `❌ 已拒绝【${fromName}】的对战请求`));
   });
   ctx.command("WWC对战记录", "查看对战记录").action(async (argv) => {
     const session = argv.session;

package/package.json

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