koishi-plugin-ggcevo-game 1.2.40 → 1.2.41

package/lib/index.d.ts

@@ -121,6 +121,7 @@ export interface Achievement {
 }
 export interface PKRecord {
     handle: string;
+    name: string;
     total: number;
     wins: number;
     todayCount: number;

package/lib/index.js

@@ -194,6 +194,7 @@ function apply(ctx, config) {
   });
   ctx.model.extend("ggcevo_pk", {
     handle: "string",
+    name: "string",
     total: "unsigned",
     wins: "unsigned",
     todayCount: "unsigned",
@@ -2326,9 +2327,18 @@ ${achievementList.join("\n")}`;
       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 "不能挑战自己。";
+      if (initiatorHandle === targetHandle) return "抱歉，您不能挑战自己。";
+      const [initiatorData, targetData] = await Promise.all([
+        ctx.database.get("ggcevo_rank", { handle: initiatorHandle, rankseason: config.rankseason }),
+        ctx.database.get("ggcevo_rank", { handle: targetHandle, rankseason: config.rankseason })
+      ]);
+      const initiatorRank = initiatorData[0]?.rank || 0;
+      const targetRank = targetData[0]?.rank || 0;
+      const initiatorRankname = initiatorData[0]?.name || session.username;
+      const targetRankname = targetData[0]?.name || (targetUsername.name || targetUsername.user.name);
       let initiatorPK = {
         handle: initiatorHandle,
+        name: initiatorRankname,
         total: 0,
         wins: 0,
         todayCount: 0,
@@ -2341,6 +2351,7 @@ ${achievementList.join("\n")}`;
       };
       let targetPK = {
         handle: targetHandle,
+        name: targetRankname,
         total: 0,
         wins: 0,
         todayCount: 0,
@@ -2392,14 +2403,6 @@ ${achievementList.join("\n")}`;
           return `该玩家今日已被挑战太多次(最多${config.maxDailyBeChallenged}次)。`;
         }
       }
-      const [initiatorData, targetData] = await Promise.all([
-        ctx.database.get("ggcevo_rank", { handle: initiatorHandle, rankseason: config.rankseason }),
-        ctx.database.get("ggcevo_rank", { handle: targetHandle, rankseason: config.rankseason })
-      ]);
-      const initiatorRank = initiatorData[0]?.rank || 0;
-      const targetRank = targetData[0]?.rank || 0;
-      const initiatorRankname = initiatorData[0]?.name || session.username;
-      const targetRankname = targetData[0]?.name || (targetUsername.name || targetUsername.user.name);
       const [initiatorSign, targetSign] = await Promise.all([
         ctx.database.get("ggcevo_sign", initiatorHandle),
         ctx.database.get("ggcevo_sign", targetHandle)
@@ -2424,6 +2427,7 @@ ${achievementList.join("\n")}`;
           // 发起者记录
           {
             handle: initiatorHandle,
+            name: initiatorRankname,
             total: initiatorPK.total + 1,
             wins: isWin ? initiatorPK.wins + 1 : initiatorPK.wins,
             todayCount: initiatorPK.todayCount + 1,
@@ -2436,6 +2440,7 @@ ${achievementList.join("\n")}`;
           // 应战者记录（新增部分）
           {
             handle: targetHandle,
+            name: targetRankname,
             total: targetPK.total + 1,
             wins: !isWin ? targetPK.wins + 1 : targetPK.wins,
             // 应战者胜利时增加
@@ -2492,8 +2497,9 @@ ${achievementList.join("\n")}`;
     if (!records.length) return "暂无PK记录";
     const rankingText = records.map((record, index) => {
       const winRate = record.total > 0 ? `${(record.wins / record.total * 100).toFixed(1)}%` : "N/A";
+      const rankname = record.name || record.handle;
       return [
-        `${offset + index + 1}. ${record.handle}`,
+        `${offset + index + 1}. ${rankname}`,
         `总PK: ${record.total}次`,
         `胜率: ${winRate}`
       ].join(" | ");

package/package.json

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