koishi-plugin-ggcevo-game 1.2.39 → 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",
@@ -337,6 +338,7 @@ function apply(ctx, config) {
       description: "用于隐秘射击的最佳武器，但是无法穿透护甲",
       price: 550,
       tagEffects: {
+        "护盾": 0.8,
         "轻甲": 0.5,
         "重甲": 0.2
       }
@@ -396,7 +398,7 @@ function apply(ctx, config) {
       },
       {
         name: "王权增幅",
-        effect: "攻击伤害+10%"
+        effect: "攻击伤害+5%"
       },
       {
         name: "金柚赐福",
@@ -768,8 +770,8 @@ function apply(ctx, config) {
       endTime: { $gte: /* @__PURE__ */ new Date() }
     });
     if (sovereignEffect) {
-      damage *= 1.1;
-      effectMessage.push(`👑 王权增幅祈愿生效(攻击伤害+10%)`);
+      damage *= 1.05;
+      effectMessage.push(`👑 王权增幅祈愿生效(攻击伤害+5%)`);
     }
     if (lamentEffect) {
       const levelBonus = 0.1 * (equippedWeapon.level + 1);
@@ -941,7 +943,7 @@ function apply(ctx, config) {
     const totalBosses = await ctx.database.select("ggcevo_boss").execute((row) => import_koishi.$.count(row.name));
     if (totalBosses === 0) {
       await activateNextBossGroup();
-      ctx.broadcast(config.groupId, `🔄 BOSS系统已初始化，首个主宰已登场！`);
+      await ctx.broadcast(config.groupId, [`🔄 咕咕PVE系统已初始化，首个主宰已登场！`]);
       return;
     }
     const now = /* @__PURE__ */ new Date();
@@ -955,9 +957,9 @@ function apply(ctx, config) {
         groupId: group.groupId
       });
       await activateNextBossGroup(group.groupId);
-      ctx.broadcast(
+      await ctx.broadcast(
         config.groupId,
-        `🔄 新的主宰已刷新，快去挑战吧！`
+        [`🔄 新的主宰已刷新，快去挑战吧！`]
       );
     }
   }, 60 * 1e3);
@@ -1305,7 +1307,7 @@ ${itemDetails.join("\n")}`;
     if (!backpack) return "您还没有签到。";
     const memberInfo = await session.event?.member?.roles;
     if (memberInfo?.includes("member")) {
-      return "❌拒绝访问，仅限管理员和群主领取每月津贴。";
+      return "❌ 拒绝访问，仅限管理员和群主领取每月津贴。";
     }
     const now = /* @__PURE__ */ new Date();
     const chinatime = convertUTCtoChinaTime(now);
@@ -1523,7 +1525,7 @@ ${itemDetails.join("\n")}`;
       }
     }
   }, 60 * 60 * 1e3);
-  ctx.command("ggcevo/数据同步", { authority: 3 }).action(async () => {
+  ctx.command("ggcevo/胜点榜数据同步", { authority: 3 }).action(async () => {
     try {
       const ggcmap = await ctx.database.get("sc2arcade_map", { guildId: config.ggcqun });
       const lastdate = ggcmap[0].lastdate;
@@ -1579,7 +1581,7 @@ ${itemDetails.join("\n")}`;
           lastdate: new Date(currentMaxDate.toISOString())
         });
       }
-      return "✅ 胜点榜数据手动同步成功！";
+      return "✅ 胜点榜数据同步成功！";
     } catch (err) {
       console.error("错误:", err);
       return "服务器繁忙，请稍后尝试。";
@@ -2037,6 +2039,9 @@ ${output}`;
     if (existingEntries.length > 0) {
       return `❌ 拒绝访问，您已被列入黑名单。`;
     }
+    await session.send(`您确定要使用3张兑换券换取一枚扭蛋币吗？(请在30秒内回复“是”确认)`);
+    const confirm = await session.prompt(3e4);
+    if (confirm !== "是") return "已取消操作。";
     const [backpack] = await ctx.database.get("ggcevo_backpack", { handle, itemId: 3 });
     const [coupon] = await ctx.database.get("ggcevo_backpack", { handle, itemId: 2 });
     if (!coupon || coupon.quantity < 3) {
@@ -2103,7 +2108,7 @@ ${output}`;
     try {
       const handleRegex = /^([1235])-S2-([12])-(\d+)$/;
       if (!handleRegex.test(handle)) {
-        return "句柄格式错误，请重新输入";
+        return "句柄格式错误，请重新输入。";
       }
       const existingEntries = await ctx.database.get("ggcevo_blacklist", { handle });
       if (existingEntries.length > 0) {
@@ -2317,14 +2322,23 @@ ${achievementList.join("\n")}`;
       const parsedUser = import_koishi.h.parse(user)[0];
       if (!parsedUser || parsedUser.type !== "at" || !parsedUser.attrs.id) return "参数格式错误，请输入“pk @指定pk玩家”。";
       const targetUserId = parsedUser.attrs.id;
-      const targetUsername = session.bot.getGuildMember(config.ggcqun, targetUserId);
+      const targetUsername = await session.bot.getGuildMember(config.ggcqun, targetUserId);
       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}`;
-      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,
@@ -2337,6 +2351,7 @@ ${achievementList.join("\n")}`;
       };
       let targetPK = {
         handle: targetHandle,
+        name: targetRankname,
         total: 0,
         wins: 0,
         todayCount: 0,
@@ -2388,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 || (await targetUsername).name;
       const [initiatorSign, targetSign] = await Promise.all([
         ctx.database.get("ggcevo_sign", initiatorHandle),
         ctx.database.get("ggcevo_sign", targetHandle)
@@ -2420,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,
@@ -2432,6 +2440,7 @@ ${achievementList.join("\n")}`;
           // 应战者记录（新增部分）
           {
             handle: targetHandle,
+            name: targetRankname,
             total: targetPK.total + 1,
             wins: !isWin ? targetPK.wins + 1 : targetPK.wins,
             // 应战者胜利时增加
@@ -2488,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(" | ");
@@ -2503,7 +2513,7 @@ ${achievementList.join("\n")}`;
       pageNum < totalPages ? `输入 pk榜 ${pageNum + 1} 查看下一页` : "已是最后一页"
     ].join("\n");
   });
-  ctx.command("ggcevo/切换pk状态", "切换玩家对战状态").action(async ({ session }) => {
+  ctx.command("ggcevo/切换pk状态", "切换玩家对战状态").alias("切换pk").action(async ({ session }) => {
     const [profile] = await ctx.database.get("sc2arcade_player", { userId: session.userId });
     if (!profile) return "您暂未绑定句柄。";
     const handle = `${profile.regionId}-S2-${profile.realmId}-${profile.profileId}`;
@@ -2591,6 +2601,10 @@ ${validTypes.join("、")}`;
     const [profile] = await ctx.database.get("sc2arcade_player", { userId: session.userId });
     if (!profile) return "您暂未绑定句柄";
     const handle = `${profile.regionId}-S2-${profile.realmId}-${profile.profileId}`;
+    const existingEntries = await ctx.database.get("ggcevo_blacklist", { handle });
+    if (existingEntries.length > 0) {
+      return `❌ 拒绝访问，您已被列入黑名单。`;
+    }
     const [signInfo] = await ctx.database.get("ggcevo_sign", { handle });
     if (!weapon) return "如果您想购买武器，请输入“购买 武器名称”。";
     if (!weaponConfig[weapon]) return "无效的武器名称，请重新输入。";
@@ -2680,6 +2694,10 @@ ${validTypes.join("、")}`;
     if (!weaponConfig[weapon]) return "请输入“装备 武器名称”来装备一把你拥有的武器。";
     const config2 = weaponConfig[weapon];
     const handle = `${profile.regionId}-S2-${profile.realmId}-${profile.profileId}`;
+    const existingEntries = await ctx.database.get("ggcevo_blacklist", { handle });
+    if (existingEntries.length > 0) {
+      return `❌ 拒绝访问，您已被列入黑名单。`;
+    }
     const [owned] = await ctx.database.get("ggcevo_equipment", {
       handle,
       weaponId: config2.id
@@ -2707,6 +2725,10 @@ ${validTypes.join("、")}`;
     const [profile] = await ctx.database.get("sc2arcade_player", { userId: session.userId });
     if (!profile) return "您暂未绑定句柄。";
     const handle = `${profile.regionId}-S2-${profile.realmId}-${profile.profileId}`;
+    const existingEntries = await ctx.database.get("ggcevo_blacklist", { handle });
+    if (existingEntries.length > 0) {
+      return `❌ 拒绝访问，您已被列入黑名单。`;
+    }
     const [signInfo] = await ctx.database.get("ggcevo_sign", { handle });
     const [equipment] = await ctx.database.get("ggcevo_equipment", {
       handle,
@@ -2785,6 +2807,10 @@ ${validTypes.join("、")}`;
     const [profile] = await ctx.database.get("sc2arcade_player", { userId: session.userId });
     if (!profile) return "您暂未绑定句柄";
     const handle = `${profile.regionId}-S2-${profile.realmId}-${profile.profileId}`;
+    const existingEntries = await ctx.database.get("ggcevo_blacklist", { handle });
+    if (existingEntries.length > 0) {
+      return `❌ 拒绝访问，您已被列入黑名单。`;
+    }
     const [signInfo] = await ctx.database.get("ggcevo_sign", { handle });
     const [equipment] = await ctx.database.get("ggcevo_equipment", {
       handle,
@@ -2865,7 +2891,7 @@ ${validTypes.join("、")}`;
       handle,
       equipped: true
     });
-    if (!equippedWeapon) return "请先装备武器再挑战主宰。";
+    if (!equippedWeapon) return "请先装备武器再攻击。";
     const activeBosses = await ctx.database.get("ggcevo_boss", { isActive: true });
     if (!activeBosses.length) return "当前没有存活的主宰。";
     const targetBoss = normalizedTarget === "主宰" ? activeBosses.find((b) => b.type === "主宰") : activeBosses.find((b) => b.type === "子代");
@@ -2874,7 +2900,7 @@ ${validTypes.join("、")}`;
     const [weaponName, weaponData] = weaponConfigEntry;
     const { damage: baseDamage, hasCrit, effectMessage } = await calculateTotalDamage(ctx, session, equippedWeapon, targetBoss);
     const bossGroup = bossPool.find((g) => g.main.id === targetBoss.groupId);
-    if (!bossGroup) return "无法获取BOSS组配置";
+    if (!bossGroup) return "无法获取BOSS组配置。";
     const maxHP = targetBoss.type === "主宰" ? bossGroup.main.maxHP : bossGroup.minions.find((m) => m.name === targetBoss.name)?.maxHP || 0;
     let initialDamage = Math.min(baseDamage, targetBoss.HP);
     let currentHP = targetBoss.HP - initialDamage;
@@ -2923,8 +2949,8 @@ ${validTypes.join("、")}`;
         });
         await ctx.database.upsert("ggcevo_boss", updates, ["name"]);
         healMessages.push(
-          `❄️ ${targetBoss.name} 触发【冰霜环绕】，自身恢复45%最大生命值(+${healAmount}HP)`,
-          `🌪️ 寒霜地狱降临！所有存活的异形获得30%减伤效果`
+          `❄️ ${targetBoss.name} 触发【冰霜环绕】，自身回复45%最大生命值(+${healAmount}HP)`,
+          `🌪️ 【寒霜地狱】降临！所有存活的主宰和子代将获得30%减伤效果`
         );
       }
       if (targetBoss.type === "子代" && targetBoss.skills.includes("冰霜回复") && hpPercentage <= 0.3) {
@@ -2945,7 +2971,7 @@ ${validTypes.join("、")}`;
           );
         }
         triggeredSkills.push("冰霜回复");
-        healMessages.push(`❄️ ${targetBoss.name} 触发【冰霜回复】，自身恢复20%最大生命值(+${selfHeal}HP)，主宰恢复20%最大生命值(+${mainHeal}HP)`);
+        healMessages.push(`❄️ ${targetBoss.name} 触发【冰霜回复】，自身回复20%最大生命值(+${selfHeal}HP)，主宰回复20%最大生命值(+${mainHeal}HP)`);
       }
     }
     const isDefeated = currentHP <= 0;
@@ -3200,8 +3226,7 @@ ${validTypes.join("、")}`;
       ] : [],
       // 冰霜进化特殊处理（新增条件判断）
       ...targetBoss.skills.includes("冰霜进化") && weaponName === "零度之下" ? [
-        `❄️ ${targetBoss.name} 触发【冰霜进化】免疫冰霜伤害！`,
-        `🩹 反而恢复 ${baseDamage} 生命值`
+        `❄️ ${targetBoss.name} 触发【冰霜进化】免疫冰霜伤害！并且回复 ${baseDamage} 生命值`
       ] : [
         `造成伤害：${initialDamage}${hasCrit ? "(✨ 暴击)" : ""}`,
         ...healMessages
@@ -3215,7 +3240,7 @@ ${validTypes.join("、")}`;
     if (broadcastMessage) {
       const finalBroadcast = Array.isArray(broadcastMessage) ? broadcastMessage.join("\n") : broadcastMessage;
       await new Promise((resolve) => setTimeout(resolve, 500));
-      ctx.broadcast(config2.groupId, finalBroadcast);
+      await ctx.broadcast(config2.groupId, finalBroadcast);
     }
     return;
   });

package/package.json

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