koishi-plugin-ggcevo-game 1.3.54 → 1.3.56

package/lib/index.js

@@ -491,7 +491,7 @@ function apply(ctx, config) {
       description: "一个小型辛迪加机器人，可以破坏电子银行账户",
       price: 0,
       redCrystalCost: 60,
-      effects: "此物品存放于仓库，仅在处于辛迪加海盗阵营时生效。每日签到金币奖励+50%，每拥有100金币，增加1%(至多增加100%)"
+      effects: "此物品存放于仓库自动生效(阵营必须为辛迪加海盗)。每日签到金币奖励+50%，每拥有100金币，增加1%(至多增加100%)"
     },
     "脉冲手雷": {
       id: 4,
@@ -507,7 +507,7 @@ function apply(ctx, config) {
       description: "这是一款未来派音乐设备",
       price: 0,
       redCrystalCost: 10,
-      effects: "主动PK对战结果失败时上交给对方的金币-50%"
+      effects: "此物品存放于仓库自动生效(阵营必须为辛迪加海盗)。主动发起的PK对战结果为失败时上交给对方的金币-50%"
     }
   };
   const modConfig = {
@@ -991,7 +991,7 @@ function apply(ctx, config) {
     },
     {
       professionName: "辛迪加财务经理",
-      effect: "每日签到能额外获得红晶; 主动PK对战结果胜利时，额外奖励1红晶",
+      effect: "每日签到能额外获得红晶; 主动发起的PK对战结果为胜利时，额外奖励1红晶",
       requirements: "当月累计签到14天及以上",
       Jobtransfer: true,
       costcoins: 0,
@@ -999,7 +999,7 @@ function apply(ctx, config) {
     },
     {
       professionName: "计算机专家",
-      effect: "黑市订购设备工具类物品享有50%折扣; 被动PK对战结果失败时，不会损失金币",
+      effect: "黑市订购设备工具类物品享有50%折扣; 被动应对的PK对战结果为失败时，不会损失金币",
       requirements: "仓库中拥有一个黑市订购的设备工具类物品",
       Jobtransfer: true,
       costcoins: 0,
@@ -2845,7 +2845,7 @@ function apply(ctx, config) {
       if (itemConfig2.id === 3 || itemConfig2.id === 5) {
         return {
           success: false,
-          message: `此物品无法使用，存放于仓库即刻生效。`
+          message: `此物品无法使用。`
         };
       }
       if (itemConfig2.id === 4) {
@@ -4489,14 +4489,10 @@ ${items.join("、")}
       const initiatorHandle = `${profile.regionId}-S2-${profile.realmId}-${profile.profileId}`;
       const targetHandle = `${targetprofile.regionId}-S2-${targetprofile.realmId}-${targetprofile.profileId}`;
       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 initiatorPower = await calculateTotalPower(initiatorHandle);
       const targetPower = await calculateTotalPower(targetHandle);
-      const initiatorRankname = initiatorData[0]?.name || session.username;
-      const targetRankname = targetData[0]?.name || (targetUsername.name || targetUsername.user.name);
+      const initiatorRankname = session.username;
+      const targetRankname = targetUsername.nick || targetUsername.name;
       const [initiatorCareer] = await ctx.database.get("ggcevo_careers", {
         handle: initiatorHandle
       });
@@ -4529,36 +4525,31 @@ ${items.join("、")}
           return `🛡️ 该玩家是人类联盟成员，尚在30天保护期内（剩余${30 - diffInDays}天），无法挑战`;
         }
       }
-      let initiatorPK = {
-        handle: initiatorHandle,
-        name: initiatorRankname,
-        total: 0,
-        wins: 0,
-        todayCount: 0,
-        lastPK: /* @__PURE__ */ new Date(0),
-        // 明确初始化 lastPK
-        enable: false,
-        // 新增默认值
-        lastToggle: /* @__PURE__ */ new Date(0)
-        // 新增默认值
-      };
-      let targetPK = {
-        handle: targetHandle,
-        name: targetRankname,
-        total: 0,
-        wins: 0,
-        todayCount: 0,
-        lastPK: /* @__PURE__ */ new Date(0),
-        enable: false,
-        // 新增默认值
-        lastToggle: /* @__PURE__ */ new Date(0)
-        // 新增默认值
-      };
+      let initiatorPK;
+      let targetPK;
       await ctx.database.withTransaction(async () => {
         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);
+        initiatorPK = Object.assign({
+          handle: initiatorHandle,
+          name: initiatorRankname,
+          total: 0,
+          wins: 0,
+          todayCount: 0,
+          lastPK: /* @__PURE__ */ new Date(0),
+          enable: false,
+          lastToggle: /* @__PURE__ */ new Date(0)
+        }, dbInitiator || {});
+        targetPK = Object.assign({
+          handle: targetHandle,
+          name: targetRankname,
+          total: 0,
+          wins: 0,
+          todayCount: 0,
+          lastPK: /* @__PURE__ */ new Date(0),
+          enable: false,
+          lastToggle: /* @__PURE__ */ new Date(0)
+        }, dbTarget || {});
       });
       if (initiatorCareer.group === "人类联盟" && !initiatorPK.enable) {
         let joinDate;
@@ -4663,27 +4654,15 @@ ${items.join("、")}
             total: initiatorPK.total + 1,
             wins: isWin ? initiatorPK.wins + 1 : initiatorPK.wins,
             todayCount: initiatorPK.todayCount + 1,
-            lastPK: /* @__PURE__ */ new Date(),
-            enable: initiatorPK.enable,
-            // 包含新字段
-            lastToggle: initiatorPK.lastToggle
-            // 包含新字段
+            lastPK: /* @__PURE__ */ new Date()
           },
           // 应战者记录（新增部分）
           {
             handle: targetHandle,
             name: targetRankname,
             total: targetPK.total + 1,
-            wins: !isWin ? targetPK.wins + 1 : targetPK.wins,
+            wins: !isWin ? targetPK.wins + 1 : targetPK.wins
             // 应战者胜利时增加
-            todayCount: targetPK.todayCount,
-            // 不消耗应战者次数
-            lastPK: targetPK.lastPK,
-            // 保留原有时间不更新
-            enable: targetPK.enable,
-            // 包含新字段
-            lastToggle: targetPK.lastToggle
-            // 包含新字段
           }
         ]);
         await ctx.database.create("ggcevo_pk_logs", {
@@ -4737,23 +4716,23 @@ ${items.join("、")}
         `🎰 金币变动：${stealPercentage}%`
       ];
       if (targetCareer.group === "人类联盟" && isWin) {
-        result.push(`🛡️ 人类联盟保护：应战者失败仅损失1%金币`);
+        result.push(`🛡️ 人类联盟保护：${targetRankname} 被动应对的PK失败时仅损失1%的金币`);
       }
       if (computerExpertProtection) {
-        result.push(`💻 计算机专家职业加成：被动PK失败不损失金币`);
+        result.push(`💻 计算机专家职业加成：${targetRankname} 被动应对的PK失败时不损失金币`);
       } else if (isWin) {
         result.push(`💰 您从对方的口袋里抢夺了${goldTransfer}枚金币`);
       } else {
         result.push(`💸 您从口袋里拿出了${goldTransfer}枚金币上交给对方`);
       }
       if (mp3Effect) {
-        result.push(`💿 MP3播放器生效：失败上交的金币减少50%`);
+        result.push(`💿 MP3播放器生效：${initiatorRankname} 主动发起的PK失败时上交的金币减少50%`);
       }
       if (initiatorCareer?.group === "辛迪加海盗") {
-        result.push(`🔴 辛迪加海盗阵营加成：获得1枚红晶`);
+        result.push(`🔴 辛迪加海盗阵营加成：${initiatorRankname} 获得1枚红晶`);
       }
       if (isWin && initiatorCareer?.career === "辛迪加财务经理") {
-        result.push(`💰 辛迪加财务经理职业加成：胜利额外获得1枚红晶`);
+        result.push(`💰 辛迪加财务经理职业加成：${initiatorRankname} 额外获得1枚红晶`);
       }
       result.push(`📅 剩余挑战次数：${config.dailyPKLimit - (initiatorPK.todayCount + 1)}`);
       return result.join("\n");
@@ -4769,10 +4748,10 @@ ${items.join("、")}
     if (pageNum < 1) return "请输入有效的页码。";
     const offset = (pageNum - 1) * 10;
     const [records, total] = await Promise.all([
-      // 获取当前页记录（仅显示启用PK功能的用户）
-      ctx.database.select("ggcevo_pk").where({ enable: true }).orderBy("wins", "desc").limit(10).offset(offset).execute(),
+      // 获取当前页记录
+      ctx.database.select("ggcevo_pk").orderBy("wins", "desc").limit(10).offset(offset).execute(),
       // 获取总记录数（启用PK的用户总数）
-      ctx.database.select("ggcevo_pk").where({ enable: true }).execute((row) => import_koishi.$.count(row.handle))
+      ctx.database.select("ggcevo_pk").execute((row) => import_koishi.$.count(row.handle))
     ]);
     const totalPages = Math.ceil(total / 10);
     if (pageNum > totalPages) return `查询失败，最多有 ${totalPages} 页`;
@@ -4787,7 +4766,7 @@ ${items.join("、")}
       ].join(" | ");
     }).join("\n");
     return [
-      "🏆 PK排行榜(已启用PK功能的玩家)",
+      "🏆 PK排行榜 🏆",
       "──────────────",
       rankingText,
       "──────────────",
@@ -6118,7 +6097,7 @@ ${scatterEffectMessages.map((m) => `▸ ${m}`).join("\n")}`
           infoCard.push("", "〓 科技研发 〓", ...activeTechs);
         }
       }
-      const promptMessage = careerData.group === "辛迪加海盗" ? "💡 提示：红晶可通过主动PK获得(无论胜负)" : "💡 提示：使用「转职」指令可变更职业";
+      const promptMessage = careerData.group === "辛迪加海盗" ? "💡 提示：红晶可通过主动发起PK获得(无论胜负)" : "💡 提示：使用「转职」指令可变更职业";
       return [
         `〓 职业档案 〓`,
         ...infoCard,
@@ -6333,7 +6312,10 @@ ${scatterEffectMessages.map((m) => `▸ ${m}`).join("\n")}`
     const redcrystal = careerData[0]?.redcrystal || 0;
     const message = [`【${handle}的仓库】`];
     message.push(`💰 金币：${totalRewards}`);
-    if (redcrystal > 0) message.push(`🔴 红晶：${redcrystal}`);
+    if (redcrystal > 0) {
+      message.push(`🔴 红晶：${redcrystal}`);
+      message.push("――――――――――――――");
+    }
     const validItems = items.filter(
       (item) => Object.values(SyndicatedItems).some(
         (specialItem) => specialItem.id === item.itemId
@@ -6350,14 +6332,12 @@ ${scatterEffectMessages.map((m) => `▸ ${m}`).join("\n")}`
           const [itemName, itemData] = entry;
           return [
             `${itemName}`,
-            // 移除数量显示在标题
             `类型：${itemData.type} | 持有数量：${warehouseItem.quantity}`,
-            // 从warehouse表读取实际数量
             `效果：${itemData.effects}`,
             `描述：${itemData.description}`,
             "――――――――――――――"
           ].join("\n");
-        }).join("\n\n")
+        }).join("\n")
       );
     }
     return message.join("\n");

package/package.json

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