koishi-plugin-ggcevo-game 1.1.5 → 1.1.6

package/lib/index.js

@@ -1536,10 +1536,9 @@ ${achievementList.join("\n")}`;
         return `❌拒绝访问，您已被列入活动黑名单。`;
       }
       const parsedUser = import_koishi.h.parse(user)[0];
-      if (!parsedUser || parsedUser.type !== "at") return '参数格式错误，请输入"pk @指定对战玩家"';
+      if (!parsedUser || parsedUser.type !== "at" || !parsedUser.attrs.id) return '参数格式错误，请输入"pk @指定对战玩家"';
       const targetUserId = parsedUser.attrs.id;
-      let targetUsername = parsedUser.attrs.name || targetUserId;
-      const [targetprofile] = await ctx.database.get("sc2arcade_player", { userId: targetUsername });
+      const [targetprofile] = await ctx.database.get("sc2arcade_player", { userId: targetUserId });
       if (!targetprofile) return "对方尚未绑定句柄";
       const initiatorHandle = `${profile.regionId}-S2-${profile.realmId}-${profile.profileId}`;
       const targetHandle = `${targetprofile.regionId}-S2-${targetprofile.realmId}-${targetprofile.profileId}`;
@@ -1614,18 +1613,16 @@ ${achievementList.join("\n")}`;
         ctx.database.get("ggcevo_pk", targetHandle)
       ]);
       if (!finalInitiator[0]?.enable || !finalTarget[0]?.enable) {
-        return "对战状态已发生变化，请重新发起挑战";
+        return "对战状态已发生变化，请重新发起挑战。";
       }
       const [initiatorData, targetData] = await Promise.all([
         ctx.database.get("ggcevo_rank", initiatorHandle),
         ctx.database.get("ggcevo_rank", targetHandle)
       ]);
-      if (!initiatorData[0]?.rank) {
-        return "发起者尚未有积分数据，无法发起挑战";
-      }
-      if (!targetData[0]?.rank) {
-        return "对方尚未有积分数据，无法接受挑战";
-      }
+      const initiatorRank = initiatorData[0]?.rank || 0;
+      const targetRank = targetData[0]?.rank || 0;
+      const initiatorRankname = initiatorData[0]?.name || session.username;
+      const targetRankname = targetData[0]?.name || parsedUser.attrs.name;
       const [initiatorSign, targetSign] = await Promise.all([
         ctx.database.get("ggcevo_sign", initiatorHandle),
         ctx.database.get("ggcevo_sign", targetHandle)
@@ -1634,7 +1631,7 @@ ${achievementList.join("\n")}`;
       const targetGold = targetSign[0]?.totalRewards || 0;
       if (initiatorGold < 100) return "发起者需要至少100金币才能挑战！";
       if (targetGold < 100) return "对方金币不足100，无法应战";
-      const rankDiff = (initiatorData[0]?.rank || 0) - (targetData[0]?.rank || 0);
+      const rankDiff = initiatorRank - targetRank;
       const clampedDiff = Math.min(Math.max(rankDiff, -1e4), 1e4);
       const winRate = Math.min(Math.max(50 + clampedDiff * 5e-3, 5), 95);
       const isWin = Math.random() * 100 < winRate;
@@ -1690,8 +1687,8 @@ ${achievementList.join("\n")}`;
       });
       const result = [
         `⚔️【对战结果】${isWin ? "胜利" : "失败"}`,
-        `🏅 挑战者：${initiatorData[0]?.name}（积分 ${initiatorData[0]?.rank}）`,
-        `🛡️ 应战者：${targetData[0]?.name}（积分 ${targetData[0]?.rank}）`,
+        `🏅 挑战者：${initiatorRankname}（积分 ${initiatorRank}）`,
+        `🛡️ 应战者：${targetRankname}（积分 ${targetRank}）`,
         `📊 胜率预测：${winRate.toFixed(1)}%`,
         `🎰 金币变动：${stealPercentage}%`
       ];

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-ggcevo-game",
   "description": "《星际争霸2》咕咕虫-evolved地图的专属游戏助手插件，集成天梯排行、抽奖系统、签到福利、兑换商城等丰富功能。",
-  "version": "1.1.5",
+  "version": "1.1.6",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "files": [
@@ -19,7 +19,7 @@
   "peerDependencies": {
     "@koishijs/plugin-proxy-agent": "^0.3.3",
     "koishi": "^4.18.7",
-    "koishi-plugin-sc2arcade-search": "^1.1.6"
+    "koishi-plugin-sc2arcade-search": "^1.1.8"
   },
   "koishi": {
     "service": {