koishi-plugin-ggcevo-game 1.0.18 → 1.0.20

package/lib/index.js

@@ -1487,22 +1487,40 @@ ${achievementList.join("\n")}`;
       ctx.logger.error("SC2大厅监控失败:", error);
     }
   }, config.checkInterval * 1e3);
-  ctx.command("ggcevo/pk <user>", "发起玩家对战").alias("挑战").action(async ({ session }, user) => {
+  ctx.command("ggcevo/pk <user>", "发起玩家对战").alias("挑战").action(async (argv, user) => {
     try {
+      const session = argv.session;
       const [profile] = await ctx.database.get("sc2arcade_player", { userId: session.userId });
       if (!profile) return "您的 QQ 未绑定句柄。";
       const parsedUser = import_koishi.h.parse(user)[0];
       if (!parsedUser || parsedUser.type !== "at") return "请使用@指定对战玩家";
       const targetUserId = parsedUser.attrs.id;
-      const [targetprofile] = await ctx.database.get("sc2arcade_player", { userId: targetUserId });
+      let targetUsername = parsedUser.attrs.name || targetUserId;
+      const [targetprofile] = await ctx.database.get("sc2arcade_player", { userId: targetUsername });
       if (!targetprofile) return "对方尚未绑定句柄";
       const initiatorHandle = `${profile.regionId}-S2-${profile.realmId}-${profile.profileId}`;
       const targetHandle = `${targetprofile.regionId}-S2-${targetprofile.realmId}-${targetprofile.profileId}`;
       if (initiatorHandle === targetHandle) return "不能挑战自己哦~";
-      let initiatorPK, targetPK;
+      let initiatorPK = {
+        handle: initiatorHandle,
+        total: 0,
+        wins: 0,
+        todayCount: 0,
+        lastPK: /* @__PURE__ */ new Date(0)
+        // 明确初始化 lastPK
+      };
+      let targetPK = {
+        handle: targetHandle,
+        total: 0,
+        wins: 0,
+        todayCount: 0,
+        lastPK: /* @__PURE__ */ new Date(0)
+      };
       await ctx.database.withTransaction(async () => {
-        [initiatorPK] = await ctx.database.get("ggcevo_pk", initiatorHandle) || [{ handle: initiatorHandle, total: 0, wins: 0, todayCount: 0, lastPK: /* @__PURE__ */ new Date(0) }];
-        [targetPK] = await ctx.database.get("ggcevo_pk", targetHandle) || [{ handle: targetHandle, total: 0, wins: 0, todayCount: 0, lastPK: /* @__PURE__ */ new Date(0) }];
+        const [dbInitiator] = await ctx.database.get("ggcevo_pk", { handle: initiatorHandle });
+        if (dbInitiator) Object.assign(initiatorPK, dbInitiator);
+        const [dbTarget] = await ctx.database.get("ggcevo_pk", { handle: targetHandle });
+        if (dbTarget) Object.assign(targetPK, dbTarget);
       });
       const now = convertUTCtoChinaTime(/* @__PURE__ */ new Date());
       if (!isSameDate(convertUTCtoChinaTime(initiatorPK.lastPK), now)) {
@@ -1515,6 +1533,12 @@ ${achievementList.join("\n")}`;
         ctx.database.get("ggcevo_rank", initiatorHandle),
         ctx.database.get("ggcevo_rank", targetHandle)
       ]);
+      if (!initiatorData[0]?.rank) {
+        return "发起者尚未有积分数据，无法发起挑战";
+      }
+      if (!targetData[0]?.rank) {
+        return "对方尚未有积分数据，无法接受挑战";
+      }
       const [initiatorSign, targetSign] = await Promise.all([
         ctx.database.get("ggcevo_sign", initiatorHandle),
         ctx.database.get("ggcevo_sign", targetHandle)
@@ -1535,13 +1559,27 @@ ${achievementList.join("\n")}`;
         return `${isWin ? "对方" : "你"}的金币不足以完成交易`;
       }
       await ctx.database.withTransaction(async () => {
-        await ctx.database.upsert("ggcevo_pk", [{
-          ...initiatorPK,
-          total: initiatorPK.total + 1,
-          wins: isWin ? initiatorPK.wins + 1 : initiatorPK.wins,
-          todayCount: initiatorPK.todayCount + 1,
-          lastPK: /* @__PURE__ */ new Date()
-        }]);
+        await ctx.database.upsert("ggcevo_pk", [
+          // 发起者记录
+          {
+            handle: initiatorHandle,
+            total: initiatorPK.total + 1,
+            wins: isWin ? initiatorPK.wins + 1 : initiatorPK.wins,
+            todayCount: initiatorPK.todayCount + 1,
+            lastPK: /* @__PURE__ */ new Date()
+          },
+          // 应战者记录（新增部分）
+          {
+            handle: targetHandle,
+            total: targetPK.total + 1,
+            wins: !isWin ? targetPK.wins + 1 : targetPK.wins,
+            // 应战者胜利时增加
+            todayCount: targetPK.todayCount,
+            // 不消耗应战者次数
+            lastPK: /* @__PURE__ */ new Date()
+            // 更新最后参与时间
+          }
+        ]);
         if (isWin) {
           await ctx.database.set("ggcevo_sign", targetHandle, { totalRewards: targetGold - goldTransfer });
           await ctx.database.set("ggcevo_sign", initiatorHandle, { totalRewards: initiatorGold + goldTransfer });
@@ -1557,7 +1595,7 @@ ${achievementList.join("\n")}`;
         `📊 胜率预测：${winRate.toFixed(1)}%`,
         `🎰 金币变动：${stealPercentage}%`
       ];
-      isWin ? result.push(`💰 +${goldTransfer}`, `💸 对方损失 ${goldTransfer}`) : result.push(`💸 -${goldTransfer}`, `💰 对方获得 ${goldTransfer}`);
+      isWin ? result.push(`💰您获得 ${goldTransfer}`, `💸 对方损失 ${goldTransfer}`) : result.push(`💸您损失 ${goldTransfer}`, `💰 对方获得 ${goldTransfer}`);
       result.push(`📅 剩余挑战次数：${config.dailyPKLimit - (initiatorPK.todayCount + 1)}`);
       return result.join("\n");
     } catch (error) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-ggcevo-game",
   "description": "星际争霸2游戏大厅咕咕虫-Evo地图专属插件",
-  "version": "1.0.18",
+  "version": "1.0.20",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "files": [