koishi-plugin-ggcevo-game 1.1.0 → 1.1.2

package/lib/index.d.ts

@@ -118,6 +118,8 @@ export interface PKRecord {
     wins: number;
     todayCount: number;
     lastPK: Date;
+    enable: boolean;
+    lastToggle: Date;
 }
 interface PKLog {
     id: number;

package/lib/index.js

@@ -175,7 +175,15 @@ function apply(ctx, config) {
     total: "unsigned",
     wins: "unsigned",
     todayCount: "unsigned",
-    lastPK: "timestamp"
+    lastPK: "timestamp",
+    enable: {
+      // 新增字段
+      type: "boolean",
+      initial: true
+      // 默认开启
+    },
+    lastToggle: "timestamp"
+    // 新增字段
   }, {
     primary: "handle"
   });
@@ -297,7 +305,7 @@ function apply(ctx, config) {
     }
     const quantity = backpack.quantity;
     if (quantity < 1) {
-      return "您的咕咕币不足";
+      return "您的咕咕币不足~";
     }
     await ctx.database.upsert("ggcevo_backpack", [{
       handle,
@@ -335,7 +343,7 @@ function apply(ctx, config) {
       return "您还没有进行过签到。";
     }
     if (backpack.quantity < 1) {
-      return "您的咕咕币不足";
+      return "您的咕咕币不足~";
     }
     await ctx.database.upsert("ggcevo_backpack", [{
       handle,
@@ -368,7 +376,7 @@ function apply(ctx, config) {
       return "您还没有进行过签到。";
     }
     if (backpack.quantity < 10) {
-      return "您的咕咕币不足";
+      return "您的咕咕币不足~";
     }
     await ctx.database.upsert("ggcevo_backpack", [{
       handle,
@@ -421,7 +429,7 @@ function apply(ctx, config) {
       const [itemName, itemData] = entry;
       return `${itemName} × ${userItem.quantity}：${itemData.description}`;
     });
-    return `【你的背包】
+    return `【${handle}的背包】
 ${itemDetails.join("\n")}`;
   });
   ctx.command("ggcevo/签到").action(async (argv) => {
@@ -966,22 +974,22 @@ ID：${activity.id}
       let targetUsername = parsedUser.attrs.name || targetUserId;
       const [profile] = await ctx.database.get("sc2arcade_player", { userId: targetUsername });
       if (!profile) {
-        return "他/她的 QQ 未绑定句柄。";
+        return "对方的 QQ 未绑定句柄。";
       }
       const { regionId, realmId, profileId } = profile;
       const handle = `${regionId}-S2-${realmId}-${profileId}`;
       const [user] = await ctx.database.get("ggcevo_rank", {
         handle
       });
-      if (!user) return "未找到他/她的排名信息。";
-      if (user.Blacklist) return "❌他/她已经被禁止参加本赛季胜点榜。";
+      if (!user) return "未找到对方的排名信息。";
+      if (user.Blacklist) return "❌对方已经被禁止参加本赛季胜点榜。";
       const allRanks = await ctx.database.select("ggcevo_rank").where({ Blacklist: false }).orderBy("rank", "desc").execute();
       const userRank = allRanks.findIndex(
         (u) => u.handle === handle
       ) + 1;
       const isSafe = await checkSensitiveWord(user.name);
       const displayName = isSafe ? user.name : (user.name[0] || "") + "***";
-      return `🎮 他/她的 GGCEvo 排名信息 🎮
+      return `🎮 对方的 GGCEvo 排名信息 🎮
 ------------------------------
 昵称：${displayName}
 句柄：${user.handle}
@@ -1031,7 +1039,7 @@ ID：${activity.id}
       let targetUsername = parsedUser.attrs.name || targetUserId;
       const [profile] = await ctx.database.get("sc2arcade_player", { userId: targetUsername });
       if (!profile) {
-        return "他/她的 QQ 未绑定句柄。";
+        return "对方的 QQ 未绑定句柄。";
       }
       const { regionId, realmId, profileId } = profile;
       handle = `${regionId}-S2-${realmId}-${profileId}`;
@@ -1504,6 +1512,11 @@ ${achievementList.join("\n")}`;
       if (!user) return '缺少参数，请输入"pk @指定对战玩家"';
       const [profile] = await ctx.database.get("sc2arcade_player", { userId: session.userId });
       if (!profile) return "您的 QQ 未绑定句柄。";
+      const handle = `${profile.regionId}-S2-${profile.realmId}-${profile.profileId}`;
+      const existingEntries = await ctx.database.get("ggcevo_blacklist", { handle });
+      if (existingEntries.length > 0) {
+        return `❌拒绝访问，您已被列入活动黑名单。`;
+      }
       const parsedUser = import_koishi.h.parse(user)[0];
       if (!parsedUser || parsedUser.type !== "at") return '参数格式错误，请输入"pk @指定对战玩家"';
       const targetUserId = parsedUser.attrs.id;
@@ -1518,15 +1531,23 @@ ${achievementList.join("\n")}`;
         total: 0,
         wins: 0,
         todayCount: 0,
-        lastPK: /* @__PURE__ */ new Date(0)
+        lastPK: /* @__PURE__ */ new Date(0),
         // 明确初始化 lastPK
+        enable: true,
+        // 新增默认值
+        lastToggle: /* @__PURE__ */ new Date(0)
+        // 新增默认值
       };
       let targetPK = {
         handle: targetHandle,
         total: 0,
         wins: 0,
         todayCount: 0,
-        lastPK: /* @__PURE__ */ new Date(0)
+        lastPK: /* @__PURE__ */ new Date(0),
+        enable: true,
+        // 新增默认值
+        lastToggle: /* @__PURE__ */ new Date(0)
+        // 新增默认值
       };
       await ctx.database.withTransaction(async () => {
         const [dbInitiator] = await ctx.database.get("ggcevo_pk", { handle: initiatorHandle });
@@ -1534,6 +1555,12 @@ ${achievementList.join("\n")}`;
         const [dbTarget] = await ctx.database.get("ggcevo_pk", { handle: targetHandle });
         if (dbTarget) Object.assign(targetPK, dbTarget);
       });
+      if (!initiatorPK.enable) {
+        return "您已关闭PK功能，无法发起挑战";
+      }
+      if (!targetPK.enable) {
+        return "对方已关闭PK功能，无法接受挑战";
+      }
       const now = convertUTCtoChinaTime(/* @__PURE__ */ new Date());
       if (!isSameDate(convertUTCtoChinaTime(initiatorPK.lastPK), now)) {
         initiatorPK.todayCount = 0;
@@ -1564,6 +1591,13 @@ ${achievementList.join("\n")}`;
           return `该玩家今日已被挑战太多次（最多${config.maxDailyBeChallenged}次）`;
         }
       }
+      const [finalInitiator, finalTarget] = await Promise.all([
+        ctx.database.get("ggcevo_pk", initiatorHandle),
+        ctx.database.get("ggcevo_pk", targetHandle)
+      ]);
+      if (!finalInitiator[0]?.enable || !finalTarget[0]?.enable) {
+        return "对战状态已发生变化，请重新发起挑战";
+      }
       const [initiatorData, targetData] = await Promise.all([
         ctx.database.get("ggcevo_rank", initiatorHandle),
         ctx.database.get("ggcevo_rank", targetHandle)
@@ -1601,7 +1635,11 @@ ${achievementList.join("\n")}`;
             total: initiatorPK.total + 1,
             wins: isWin ? initiatorPK.wins + 1 : initiatorPK.wins,
             todayCount: initiatorPK.todayCount + 1,
-            lastPK: /* @__PURE__ */ new Date()
+            lastPK: /* @__PURE__ */ new Date(),
+            enable: initiatorPK.enable,
+            // 包含新字段
+            lastToggle: initiatorPK.lastToggle
+            // 包含新字段
           },
           // 应战者记录（新增部分）
           {
@@ -1611,8 +1649,12 @@ ${achievementList.join("\n")}`;
             // 应战者胜利时增加
             todayCount: targetPK.todayCount,
             // 不消耗应战者次数
-            lastPK: targetPK.lastPK
+            lastPK: targetPK.lastPK,
             // 保留原有时间不更新
+            enable: targetPK.enable,
+            // 包含新字段
+            lastToggle: targetPK.lastToggle
+            // 包含新字段
           }
         ]);
         await ctx.database.create("ggcevo_pk_logs", {
@@ -1643,6 +1685,56 @@ ${achievementList.join("\n")}`;
       return "对战功能暂时不可用，请稍后重试";
     }
   });
+  ctx.command("ggcevo/切换pk状态", "切换玩家对战状态").action(async ({ session }) => {
+    const [profile] = await ctx.database.get("sc2arcade_player", { userId: session.userId });
+    if (!profile) return "您的 QQ 未绑定句柄";
+    const handle = `${profile.regionId}-S2-${profile.realmId}-${profile.profileId}`;
+    const existingEntries = await ctx.database.get("ggcevo_blacklist", { handle });
+    if (existingEntries.length > 0) {
+      return `❌拒绝访问，您已被列入活动黑名单。`;
+    }
+    const [pkRecord] = await ctx.database.get("ggcevo_pk", { handle }) || [null];
+    const currentState = pkRecord?.enable ?? true;
+    const lastToggle = pkRecord?.lastToggle ?? /* @__PURE__ */ new Date(0);
+    if (!pkRecord) {
+      await ctx.database.create("ggcevo_pk", {
+        handle,
+        total: 0,
+        wins: 0,
+        todayCount: 0,
+        lastPK: /* @__PURE__ */ new Date(0),
+        enable: true,
+        // 默认初始状态为开启
+        lastToggle: /* @__PURE__ */ new Date(0)
+      });
+    }
+    const now = convertUTCtoChinaTime(/* @__PURE__ */ new Date());
+    const lastToggleTime = convertUTCtoChinaTime(lastToggle);
+    const diffDays = Math.floor((now.getTime() - lastToggleTime.getTime()) / (1e3 * 3600 * 24));
+    if (diffDays < 3 && lastToggleTime.getTime() !== 0) {
+      const remaining = 3 - diffDays;
+      return `状态切换冷却中，${remaining}天后再试（下次可切换时间：${new Date(lastToggle.getTime() + 3 * 864e5).toLocaleDateString("zh-CN")}）`;
+    }
+    const action = currentState ? "关闭" : "开启";
+    await session.send(`您当前的PK状态为【${currentState ? "开启" : "关闭"}】，确认要${action}吗？(30秒内回复“是”确认)`);
+    const confirm = await session.prompt(3e4);
+    if (confirm !== "是") return "已取消操作";
+    await ctx.database.upsert("ggcevo_pk", [{
+      handle,
+      enable: !currentState,
+      lastToggle: /* @__PURE__ */ new Date(),
+      // 保持其他字段不变
+      total: pkRecord?.total || 0,
+      wins: pkRecord?.wins || 0,
+      todayCount: pkRecord?.todayCount || 0,
+      lastPK: pkRecord?.lastPK || /* @__PURE__ */ new Date(0)
+    }], ["handle"]);
+    return `PK状态已${!currentState ? "开启" : "关闭"}，下次可切换时间：${new Date(Date.now() + 3 * 864e5).toLocaleDateString("zh-CN", {
+      year: "numeric",
+      month: "2-digit",
+      day: "2-digit"
+    })}`;
+  });
 }
 __name(apply, "apply");
 function simpleDraw() {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-ggcevo-game",
   "description": "星际争霸2游戏大厅咕咕虫-Evo地图专属插件",
-  "version": "1.1.0",
+  "version": "1.1.2",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "files": [
@@ -17,7 +17,7 @@
   "peerDependencies": {
     "koishi": "^4.18.7",
     "@koishijs/plugin-proxy-agent": "^0.3.3",
-    "koishi-plugin-sc2arcade-search": "^1.0.3"
+    "koishi-plugin-sc2arcade-search": "^1.1.0"
   },
   "koishi": {
     "service": {