koishi-plugin-ggcevo-game 1.2.13 → 1.2.14

package/lib/index.js

@@ -50,7 +50,7 @@ var Config = import_koishi.Schema.intersect([
     dailyPKLimit: import_koishi.Schema.number().description("每日最大发起PK次数").default(3),
     sameOpponentLimit: import_koishi.Schema.boolean().description("同玩家每日单次限制").default(true),
     maxDailyBeChallenged: import_koishi.Schema.number().description("最大被挑战次数(0=无限制)").default(5),
-    unlimitedBossAttack: import_koishi.Schema.boolean().description("开启无限制攻击主宰").default(false)
+    unlimitedBossAttack: import_koishi.Schema.boolean().description("开启无限制PVE攻击").default(false)
   }).description("对战限制"),
   // 通知系统配置组
   import_koishi.Schema.object({
@@ -59,7 +59,7 @@ var Config = import_koishi.Schema.intersect([
   }).description("通知设置").collapse(),
   // 权限管理组
   import_koishi.Schema.object({
-    admins: import_koishi.Schema.array(import_koishi.Schema.string()).description("管理员QQ列表").default([])
+    admins: import_koishi.Schema.array(import_koishi.Schema.string()).description("管理员列表").default([])
   }).description("权限管理")
 ]);
 var inject = {
@@ -102,8 +102,11 @@ function apply(ctx, config) {
   ctx.model.extend("ggcevo_activity", {
     id: "unsigned",
     name: "string",
+    // 存储活动名称
     description: "text",
     quantity: "unsigned",
+    itemId: "unsigned",
+    // 新增物品ID字段
     startTime: "timestamp",
     endTime: "timestamp",
     creator: "string",
@@ -124,7 +127,6 @@ function apply(ctx, config) {
     // 比赛次数
     Blacklist: {
       type: "boolean",
-      // 该字段的默认值
       initial: false
     }
   }, {
@@ -196,13 +198,11 @@ function apply(ctx, config) {
     todayCount: "unsigned",
     lastPK: "timestamp",
     enable: {
-      // 新增字段
       type: "boolean",
       initial: true
       // 默认开启
     },
     lastToggle: "timestamp"
-    // 新增字段
   }, {
     primary: "handle"
   });
@@ -276,11 +276,11 @@ function apply(ctx, config) {
       id: 3,
       type: "热能武器",
       damage: 15,
-      description: "基于热能的强大武器",
+      description: "基于热能的强大武器，烧烬一切",
       price: 450,
       tagEffects: {
-        "生物": 1.5,
         "惧热": 2,
+        "生物": 1.2,
         "护盾": 0.5
       }
     },
@@ -288,11 +288,24 @@ function apply(ctx, config) {
       id: 4,
       type: "能量武器",
       damage: 28,
-      description: "由激光步枪改良而来，高效的能量武器",
+      description: "由激光步枪改良而来，高效的对重甲武器",
       price: 850,
       tagEffects: {
         "重甲": 2,
-        "护盾": 0.8
+        "机械": 0.5,
+        "护盾": 0.2
+      }
+    },
+    "狙击步枪": {
+      id: 5,
+      type: "实弹武器",
+      damage: 60,
+      description: "用于隐秘射击的最佳武器，但是无法穿透护甲",
+      price: 550,
+      tagEffects: {
+        "轻甲": 0.7,
+        "护盾": 0.5,
+        "重甲": 0.2
       }
     }
   };
@@ -326,9 +339,18 @@ function apply(ctx, config) {
     }
   };
   const passiveConfig = {
-    "弱化形态": { effect: 0.1 },
-    "坚固外壳": { effect: -0.2 },
-    "孤立无援": { effect: 0.2 }
+    "弱化形态": {
+      effect: 0.1,
+      description: "子代的防御薄弱，受到的伤害+10%"
+    },
+    "坚固外壳": {
+      effect: -0.2,
+      description: "拥有坚硬的生物甲壳，受到的伤害-20%"
+    },
+    "孤立无援": {
+      effect: 0.2,
+      description: "没有存活的子代，受到的伤害+20%"
+    }
   };
   const bossPool = [
     {
@@ -353,6 +375,96 @@ function apply(ctx, config) {
       ]
     }
   ];
+  function calculateModifiers(equippedWeapon, weaponName) {
+    let totalModAdd = 0;
+    let hasCrit = false;
+    let hasCrystal = false;
+    let hasOverload = false;
+    equippedWeapon.installedMods.forEach((mod) => {
+      if (mod === "动能增幅") {
+        totalModAdd += 0.2;
+      }
+      if (mod === "裂甲核心" && weaponName === modConfig[mod].exclusiveTo) {
+        totalModAdd += 0.4;
+      }
+      if (mod === "棱镜水晶") hasCrystal = true;
+      if (mod === "棱镜超载核心" && weaponName === modConfig[mod].exclusiveTo) {
+        hasOverload = true;
+      }
+    });
+    const totalCritRate = (hasCrystal ? 20 : 0) + (hasOverload ? 80 : 0);
+    if (totalCritRate > 0 && Math.random() < totalCritRate / 100) {
+      hasCrit = true;
+      totalModAdd += 1;
+    }
+    return { totalModAdd, hasCrit };
+  }
+  __name(calculateModifiers, "calculateModifiers");
+  function calculateTagEffects(weaponData, targetBossConfig, equippedWeapon) {
+    let totalTagAdd = 0;
+    const armorTags = targetBossConfig.tags?.filter((tag) => ["重甲", "轻甲", "护盾"].includes(tag)) || [];
+    const voidTags = targetBossConfig.tags?.filter((tag) => ["惧热", "惧寒"].includes(tag)) || [];
+    const typeTags = targetBossConfig.tags?.filter((tag) => ["生物", "机械", "灵能"].includes(tag)) || [];
+    armorTags.forEach((tag) => {
+      let effectValue = weaponData.tagEffects?.[tag] ?? 1;
+      if (tag === "重甲" && equippedWeapon.installedMods.includes("裂甲核心")) {
+        effectValue = 1.2;
+      }
+      totalTagAdd += effectValue - 1;
+    });
+    voidTags.forEach((tag) => {
+      const effectValue = weaponData.tagEffects?.[tag] ?? 1;
+      totalTagAdd += effectValue - 1;
+    });
+    typeTags.forEach((tag) => {
+      const effectValue = weaponData.tagEffects?.[tag] ?? 1;
+      totalTagAdd += effectValue - 1;
+    });
+    return totalTagAdd;
+  }
+  __name(calculateTagEffects, "calculateTagEffects");
+  function calculatePassiveEffects(targetBossConfig, activeMinionsCount) {
+    let passiveEffect = 0;
+    const effectivePassives = [...targetBossConfig.passive || []];
+    if (targetBossConfig.type === "主宰" && effectivePassives.includes("孤立无援")) {
+      if (activeMinionsCount !== 0) {
+        effectivePassives.splice(effectivePassives.indexOf("孤立无援"), 1);
+      }
+    }
+    effectivePassives.forEach((passive) => {
+      const effect = passiveConfig[passive]?.effect || 0;
+      passiveEffect += effect;
+    });
+    return passiveEffect;
+  }
+  __name(calculatePassiveEffects, "calculatePassiveEffects");
+  function calculateRankBonus(rankRecord) {
+    if (!rankRecord || rankRecord.rank <= 0) return 0;
+    return Math.floor(rankRecord.rank / 400) * 0.01;
+  }
+  __name(calculateRankBonus, "calculateRankBonus");
+  async function calculateTotalDamage(ctx2, session, equippedWeapon, targetBoss) {
+    const weaponConfigEntry = Object.entries(weaponConfig).find(([_, c]) => c.id === equippedWeapon.weaponId);
+    const [weaponName, weaponData] = weaponConfigEntry;
+    let damage = weaponData.damage * (1 + 0.1 * equippedWeapon.level);
+    const { totalModAdd, hasCrit } = calculateModifiers(equippedWeapon, weaponName);
+    damage *= 1 + totalModAdd;
+    const targetBossConfig = targetBoss.type === "主宰" ? bossPool.find((g) => g.main.name === targetBoss.name).main : bossPool.find((g) => g.minions.some((m) => m.name === targetBoss.name)).minions[0];
+    const tagMultiplier = calculateTagEffects(weaponData, targetBossConfig, equippedWeapon);
+    damage *= 1 + tagMultiplier;
+    const activeMinions = await ctx2.database.get("ggcevo_boss", {
+      groupId: targetBoss.groupId,
+      type: "子代",
+      isActive: true
+    });
+    const passiveMultiplier = calculatePassiveEffects(targetBossConfig, activeMinions.length);
+    damage *= 1 + passiveMultiplier;
+    const [rankRecord] = await ctx2.database.get("ggcevo_rank", { handle: session.handle });
+    const rankBonus = calculateRankBonus(rankRecord);
+    damage *= 1 + rankBonus;
+    return { damage: Math.round(damage), hasCrit };
+  }
+  __name(calculateTotalDamage, "calculateTotalDamage");
   const initDefaultItems = {
     "咕咕币": { id: 1, type: "抽奖道具", description: "用于进行抽奖" },
     "兑换券": { id: 2, type: "兑换货币", description: "用于兑换赞助物品" },
@@ -522,7 +634,7 @@ function apply(ctx, config) {
       await activateNextBossGroup(group.groupId);
       ctx.broadcast(
         config.groupId,
-        `🔄 BOSS已刷新！新的BOSS组已出现，快去挑战吧！`
+        `🔄 新的主宰已刷新，快去挑战吧！`
       );
     }
   }, 60 * 1e3);
@@ -532,21 +644,21 @@ function apply(ctx, config) {
     let hiddenWinCount = 0;
     const [profile] = await ctx.database.get("sc2arcade_player", { userId: session.userId });
     if (!profile) {
-      return "您的 QQ 未绑定句柄。";
+      return "您暂未绑定句柄。";
     }
     const { regionId, realmId, profileId } = profile;
     const handle = `${regionId}-S2-${realmId}-${profileId}`;
     const existingEntries = await ctx.database.get("ggcevo_blacklist", { handle });
     if (existingEntries.length > 0) {
-      return `❌拒绝访问，您已被列入活动黑名单。`;
+      return `❌ 拒绝访问，您已被列入黑名单。`;
     }
     const [backpack] = await ctx.database.get("ggcevo_backpack", { handle, itemId: 1 });
     if (!backpack) {
-      return "您还没有进行过签到。";
+      return "您还没有签到。";
     }
     const quantity = backpack.quantity;
     if (quantity < 1) {
-      return "您的咕咕币不足~";
+      return "您的咕咕币不足。";
     }
     await ctx.database.upsert("ggcevo_backpack", [{
       handle,
@@ -571,20 +683,20 @@ function apply(ctx, config) {
     const session = argv.session;
     const [profile] = await ctx.database.get("sc2arcade_player", { userId: session.userId });
     if (!profile) {
-      return "您的 QQ 未绑定句柄。";
+      return "您暂未绑定句柄。";
     }
     const { regionId, realmId, profileId } = profile;
     const handle = `${regionId}-S2-${realmId}-${profileId}`;
     const existingEntries = await ctx.database.get("ggcevo_blacklist", { handle });
     if (existingEntries.length > 0) {
-      return `❌拒绝访问，您已被列入活动黑名单。`;
+      return `❌ 拒绝访问，您已被列入黑名单。`;
     }
     const [backpack] = await ctx.database.get("ggcevo_backpack", { handle, itemId: 1 });
     if (!backpack) {
-      return "您还没有进行过签到。";
+      return "您还没有签到。";
     }
     if (backpack.quantity < 1) {
-      return "您的咕咕币不足~";
+      return "您的咕咕币不足。";
     }
     await ctx.database.upsert("ggcevo_backpack", [{
       handle,
@@ -604,20 +716,20 @@ function apply(ctx, config) {
     let hiddenWinCount = 0;
     const [profile] = await ctx.database.get("sc2arcade_player", { userId: session.userId });
     if (!profile) {
-      return "您的 QQ 未绑定句柄。";
+      return "您暂未绑定句柄。";
     }
     const { regionId, realmId, profileId } = profile;
     const handle = `${regionId}-S2-${realmId}-${profileId}`;
     const existingEntries = await ctx.database.get("ggcevo_blacklist", { handle });
     if (existingEntries.length > 0) {
-      return `❌拒绝访问，您已被列入活动黑名单。`;
+      return `❌ 拒绝访问，您已被列入黑名单。`;
     }
     const [backpack] = await ctx.database.get("ggcevo_backpack", { handle, itemId: 1 });
     if (!backpack) {
-      return "您还没有进行过签到。";
+      return "您还没有签到。";
     }
     if (backpack.quantity < 10) {
-      return "您的咕咕币不足~";
+      return "您的咕咕币不足。";
     }
     await ctx.database.upsert("ggcevo_backpack", [{
       handle,
@@ -642,7 +754,7 @@ function apply(ctx, config) {
     const session = argv.session;
     const [profile] = await ctx.database.get("sc2arcade_player", { userId: session.userId });
     if (!profile) {
-      return "您的 QQ 未绑定句柄。";
+      return "您暂未绑定句柄。";
     }
     const { regionId, realmId, profileId } = profile;
     const handle = `${regionId}-S2-${realmId}-${profileId}`;
@@ -661,7 +773,7 @@ function apply(ctx, config) {
     const handle = `${profile.regionId}-S2-${profile.realmId}-${profile.profileId}`;
     const items = await ctx.database.get("ggcevo_backpack", { handle });
     const validItems = items.filter((item) => item.quantity > 0);
-    if (!validItems.length) return "你的背包空空如也~";
+    if (!validItems.length) return "你的背包空空如也。";
     const itemDetails = validItems.map((userItem) => {
       const entry = Object.entries(initDefaultItems).find(
         ([, item]) => item.id === userItem.itemId
@@ -678,11 +790,11 @@ ${itemDetails.join("\n")}`;
       const session = argv.session;
       let latestTime;
       const [profile] = await ctx.database.get("sc2arcade_player", { userId: session.userId });
-      if (!profile) return "您的 QQ 未绑定句柄。";
+      if (!profile) return "您暂未绑定句柄。";
       const { regionId, realmId, profileId } = profile;
       const handle = `${regionId}-S2-${realmId}-${profileId}`;
       const existingEntries = await ctx.database.get("ggcevo_blacklist", { handle });
-      if (existingEntries.length > 0) return "❌拒绝访问，您已被列入活动黑名单。";
+      if (existingEntries.length > 0) return "❌ 拒绝访问，您已被列入黑名单。";
       const now = /* @__PURE__ */ new Date();
       const currentChinaTime = convertUTCtoChinaTime(now);
       if (config.signrequire) {
@@ -700,18 +812,18 @@ ${itemDetails.join("\n")}`;
       } else {
         latestTime = currentChinaTime;
       }
-      if (!latestTime) return "您还没有游玩过 咕咕虫-evolved 地图";
+      if (!latestTime) return "您还没有游玩过“咕咕虫-evolved”。";
       const targetDateChina = new Date(latestTime);
       targetDateChina.setUTCDate(targetDateChina.getUTCDate() + 1);
       if (!isSameDate(latestTime, currentChinaTime) && !isSameDate(targetDateChina, currentChinaTime)) {
-        return "暂未查询到您最近两天内游玩过 咕咕虫-evolved 地图，请游玩1次后签到(对局记录上传有延迟)";
+        return "暂未查询到您最近两天内游玩过“咕咕虫-evolved”，请游玩1次后签到(对局记录上传有延迟)";
       }
       const [record] = await ctx.database.get("ggcevo_sign", { handle });
       const [backpack] = await ctx.database.get("ggcevo_backpack", { handle, itemId: 1 });
       if (record) {
         const lastSignChina = convertUTCtoChinaTime(record.lastSign);
         if (lastSignChina.getUTCDate() === currentChinaTime.getUTCDate()) {
-          return `您今天已经签到过了！本月累计签到 ${record.monthlyDays} 天`;
+          return `您今天已经签到过了！本月累计签到${record.monthlyDays}天。`;
         }
       }
       let monthlyDays = 1;
@@ -754,7 +866,7 @@ ${itemDetails.join("\n")}`;
         itemId: 1,
         quantity: (backpack?.quantity || 0) + tickets
       }]);
-      return `签到成功！本月累计签到 ${monthlyDays} 天，获得 ${points} 金币和 ${tickets} 枚咕咕币`;
+      return `签到成功！本月累计签到${monthlyDays}天，获得${points}枚金币和${tickets}枚咕咕币`;
     } catch (error) {
       console.error("签到命令时发生错误:", error);
       return "服务器繁忙，请稍后尝试。";
@@ -764,13 +876,13 @@ ${itemDetails.join("\n")}`;
     try {
       const session = argv.session;
       const [profile] = await ctx.database.get("sc2arcade_player", { userId: session.userId });
-      if (!profile) return "您的 QQ 未绑定句柄。";
+      if (!profile) return "您暂未绑定句柄。";
       const { regionId, realmId, profileId } = profile;
       const handle = `${regionId}-S2-${realmId}-${profileId}`;
       const existingEntries = await ctx.database.get("ggcevo_blacklist", { handle });
-      if (existingEntries.length > 0) return "❌拒绝访问，您已被列入活动黑名单。";
+      if (existingEntries.length > 0) return "❌ 拒绝访问，您已被列入黑名单。";
       const [record] = await ctx.database.get("ggcevo_sign", { handle });
-      if (!record) return "请先完成一次正常签到后再进行补签。";
+      if (!record) return "您还没有签到。";
       const lastSignChina = convertUTCtoChinaTime(record.lastSign);
       const targetDateChina = new Date(lastSignChina);
       const nowChina = convertUTCtoChinaTime(/* @__PURE__ */ new Date());
@@ -783,7 +895,7 @@ ${itemDetails.join("\n")}`;
       }
       const costPoints = 50;
       if (record.totalRewards < costPoints) {
-        return `补签需要消耗 ${costPoints} 金币，当前金币不足。`;
+        return `补签需要消耗${costPoints}枚金币，您的金币不足。`;
       }
       const newMonthlyDays = record.monthlyDays + 1;
       let tickets = 3, points = 0;
@@ -809,14 +921,8 @@ ${itemDetails.join("\n")}`;
       await ctx.database.set("ggcevo_backpack", { handle, itemId: 1 }, {
         quantity: (backpack?.quantity || 0) + tickets
       });
-      const formattedDate = targetDateChina.toLocaleString("zh-CN", {
-        timeZone: "Asia/Shanghai",
-        year: "numeric",
-        month: "2-digit",
-        day: "2-digit"
-      });
-      const rewardsMessage = points > 0 ? `获得 ${points} 金币和 ${tickets} 枚咕咕币` : `获得 ${tickets} 枚咕咕币`;
-      return `补签成功！本月累计签到 ${newMonthlyDays} 天，消耗 ${costPoints} 金币，${rewardsMessage}`;
+      const rewardsMessage = points > 0 ? `获得${points}枚金币和${tickets}枚咕咕币` : `获得${tickets}枚咕咕币`;
+      return `补签成功！本月累计签到${newMonthlyDays}天，消耗${costPoints}枚金币，${rewardsMessage}`;
     } catch (error) {
       console.error("补签错误:", error);
       return "补签失败，请稍后重试。";
@@ -825,11 +931,11 @@ ${itemDetails.join("\n")}`;
   ctx.command("ggcevo/签到记录").action(async (argv) => {
     const session = argv.session;
     const [profile] = await ctx.database.get("sc2arcade_player", { userId: session.userId });
-    if (!profile) return "您的 QQ 未绑定句柄。";
+    if (!profile) return "您暂未绑定句柄。";
     const { regionId, realmId, profileId } = profile;
     const handle = `${regionId}-S2-${realmId}-${profileId}`;
     const [record] = await ctx.database.get("ggcevo_sign", { handle });
-    if (!record) return "您还没有签到过哦";
+    if (!record) return "您还没有签到。";
     const chinaTime = record.lastSign.toLocaleString("zh-CN", {
       timeZone: "Asia/Shanghai",
       year: "numeric",
@@ -843,25 +949,25 @@ ${itemDetails.join("\n")}`;
     return [
       `您的句柄：${handle}`,
       `📅 最后签到时间：${chinaTime}`,
-      `🔥 累计签到：${record.monthlyDays} 天`,
-      `💰 累计获得：${record.totalRewards} 金币`
+      `🔥 累计签到：${record.monthlyDays}天`,
+      `💰 拥有财富：${record.totalRewards}枚金币`
     ].join("\n");
   });
   ctx.guild().command("ggcevo/每月津贴").action(async (argv) => {
     const session = argv.session;
     const [profile] = await ctx.database.get("sc2arcade_player", { userId: session.userId });
-    if (!profile) return "您的 QQ 未绑定句柄。";
+    if (!profile) return "您暂未绑定句柄。";
     const { regionId, realmId, profileId } = profile;
     const handle = `${regionId}-S2-${realmId}-${profileId}`;
     const existingEntries = await ctx.database.get("ggcevo_blacklist", { handle });
     if (existingEntries.length > 0) {
-      return `❌拒绝访问，您已被列入活动黑名单。`;
+      return `❌ 拒绝访问，您已被列入黑名单。`;
     }
     const [backpack] = await ctx.database.get("ggcevo_backpack", { handle, itemId: 1 });
-    if (!backpack) return "您还没有签到过哦";
+    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);
@@ -875,7 +981,7 @@ ${itemDetails.join("\n")}`;
       const lastYear = lastSignTime.getUTCFullYear();
       const lastMonth = lastSignTime.getUTCMonth();
       if (lastYear === currentYear && lastMonth === currentMonth) {
-        return `本月管理津贴已领取，${currentMonth + 2} 月1日可再次领取`;
+        return `您的本月管理津贴已领取，${currentMonth + 2}月1日后可再次领取`;
       }
     }
     await ctx.database.upsert("ggcevo_adminbenefit", [{
@@ -890,111 +996,109 @@ ${itemDetails.join("\n")}`;
       itemId: 1,
       quantity: (backpack.quantity || 0) + 50
     }]);
-    return `[管理专属] 成功领取本月津贴！累计领取 ${adminRecord ? adminRecord.signmonth + 1 : 1} 个月`;
+    return `[管理专属] 成功领取本月津贴，获得了50枚咕咕币！`;
   });
-  ctx.command("ggcevo/领取福利").action(async (argv) => {
+  ctx.command("ggcevo/领取 [name]").action(async (argv, name2) => {
     const session = argv.session;
-    await session.send("请在30秒内输入活动名称:");
-    const name2 = await session.prompt(3e4);
     if (!name2) {
-      return "输入超时，请重新输入指令。";
+      await session.send("请在30秒内输入活动名称");
+      name2 = await session.prompt(3e4);
+      if (!name2) return "输入超时，请重新输入。";
+    }
+    const itemIdToName = {};
+    for (const [name3, item] of Object.entries(initDefaultItems)) {
+      itemIdToName[item.id] = name3;
     }
     const [profile] = await ctx.database.get("sc2arcade_player", { userId: session.userId });
-    if (!profile) return "您的 QQ 未绑定句柄。";
-    const { regionId, realmId, profileId } = profile;
-    const handle = `${regionId}-S2-${realmId}-${profileId}`;
+    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 [backpack] = await ctx.database.get("ggcevo_backpack", { handle, itemId: 1 });
-    if (!backpack) return "您还没有签到过哦";
+    if (existingEntries.length > 0) return "❌ 拒绝访问，您已被列入黑名单。";
     const [activity] = await ctx.database.get("ggcevo_activity", {
       name: name2,
       status: "进行中"
-      // 新增状态条件
     });
-    if (!activity) {
-      return "当前咕咕币活动未在进行中，请输入 咕咕币活动 查询活动名称。";
-    }
-    const id = activity.id;
-    const quantity = activity.quantity;
+    if (!activity) return "活动未进行中。";
     const existing = await ctx.database.get("ggcevo_welfare", {
       handle,
-      activity: id
+      activity: activity.id
     });
-    if (existing.length > 0) {
-      const chinaTime = existing[0].lastdate.toLocaleString("zh-CN", {
-        timeZone: "Asia/Shanghai",
-        year: "numeric",
-        month: "2-digit",
-        day: "2-digit",
-        hour: "2-digit",
-        minute: "2-digit",
-        second: "2-digit",
-        hour12: false
+    if (existing.length) {
+      const time = existing[0].lastdate.toLocaleString("zh-CN", {
+        timeZone: "Asia/Shanghai"
+      });
+      return `您已领取过该活动奖励(领取时间：${time})。`;
+    }
+    if (activity.itemId === 0) {
+      const [sign] = await ctx.database.get("ggcevo_sign", { handle });
+      await ctx.database.upsert("ggcevo_sign", [{
+        handle,
+        totalRewards: (sign?.totalRewards || 0) + activity.quantity,
+        lastSign: sign?.lastSign || /* @__PURE__ */ new Date(0),
+        monthlyDays: sign?.monthlyDays || 0
+      }]);
+    } else {
+      const [item] = await ctx.database.get("ggcevo_backpack", {
+        handle,
+        itemId: activity.itemId
       });
-      return `您已领取过该咕咕币活动福利（领取时间：${chinaTime}）`;
+      await ctx.database.upsert("ggcevo_backpack", [{
+        handle,
+        itemId: activity.itemId,
+        quantity: (item?.quantity || 0) + activity.quantity
+      }]);
     }
     await ctx.database.create("ggcevo_welfare", {
       handle,
-      activity: id,
+      activity: activity.id,
       lastdate: /* @__PURE__ */ new Date()
     });
-    await ctx.database.upsert("ggcevo_backpack", [{
-      handle,
-      itemId: 1,
-      quantity: (backpack.quantity || 0) + quantity
-    }]);
-    return `[活动福利] 成功领取 ${name2} 咕咕币活动奖励，获得 ${quantity} 枚咕咕币`;
+    return `您成功领取 ${name2} 活动奖励：${activity.itemId === 0 ? `${activity.quantity}枚金币` : `${activity.quantity}个${itemIdToName[activity.itemId] || "未知物品"}`}`;
   });
-  ctx.command("ggcevo/创建活动 <name> <description> <quantity:number>", "创建新活动", { authority: 3 }).option("start", "-s <startTime:date>", { fallback: Date.now() }).option("duration", "-d <days:number>", { fallback: 7 }).action(async ({ session, options }, name2, description, quantity) => {
-    if (!name2 || !name2.trim()) {
-      return "活动名称不能为空";
-    }
-    const existing = await ctx.database.get("ggcevo_activity", { name: name2 });
-    if (existing.length > 0) {
-      return `活动名称 "${name2}" 已存在，请换用其他名称`;
-    }
-    const now = Date.now();
-    const startTime = new Date(options.start);
-    const endTime = new Date(startTime.getTime() + options.duration * 864e5);
-    const status = startTime.getTime() <= now ? "进行中" : "未开始";
-    const activity = await ctx.database.create("ggcevo_activity", {
-      name: name2,
+  ctx.command("ggcevo/创建活动 <activityName> <itemName> <quantity:number> <description>", "创建新活动", { authority: 3 }).option("start", "-s <startTime:date>", { fallback: Date.now() }).option("duration", "-d <days:number>", { fallback: 7 }).action(async ({ session, options }, activityName, itemName, quantity, description) => {
+    if (!activityName) return "活动名称不能为空。";
+    if (!itemName) return "物品名称不能为空。";
+    let itemId;
+    if (itemName === "金币") {
+      itemId = 0;
+    } else {
+      const entry = Object.entries(initDefaultItems).find(([name2]) => name2 === itemName);
+      if (!entry) return `物品 ${itemName} 不存在`;
+      itemId = entry[1].id;
+    }
+    const [existing] = await ctx.database.get("ggcevo_activity", { name: activityName });
+    if (existing) return "同名活动已存在。";
+    const start = new Date(options.start);
+    const end = new Date(start.getTime() + options.duration * 864e5);
+    const status = start <= /* @__PURE__ */ new Date() ? "进行中" : "未开始";
+    await ctx.database.create("ggcevo_activity", {
+      name: activityName,
       description,
       quantity,
-      startTime,
-      endTime,
-      creator: session.userId,
-      status
-      // 动态状态
+      itemId,
+      startTime: start,
+      endTime: end,
+      status,
+      creator: session.userId
     });
-    return `活动创建成功！
-ID：${activity.id}
-状态：${status}`;
+    return `活动【${activityName}】创建成功！奖励内容：${itemName} ×${quantity}。`;
   });
-  ctx.command("ggcevo/咕咕币活动", "查看进行中的咕咕币活动").action(async () => {
-    const activities = await ctx.database.get("ggcevo_activity", {
-      status: "进行中"
-      // 完全依赖数据库状态
-    }, {
-      sort: { startTime: "desc" }
-    });
-    const formatTime = /* @__PURE__ */ __name((date) => date.toLocaleString("zh-CN", {
-      timeZone: "Asia/Shanghai",
-      year: "numeric",
-      month: "2-digit",
-      day: "2-digit"
-    }), "formatTime");
-    const output = activities.map((activity) => [
-      `活动： ${activity.name}`,
-      `时间：${formatTime(activity.startTime)} ~ ${formatTime(activity.endTime)}`,
-      `描述：${activity.description}`,
-      `奖励：${activity.quantity} 枚咕咕币`,
-      "━━━━━━━━━━━━━━"
-    ].join("\n"));
-    return output.length ? output.join("\n\n") : "当前没有进行中的咕咕币活动";
+  ctx.command("ggcevo/活动列表").action(async () => {
+    const activities = await ctx.database.get(
+      "ggcevo_activity",
+      { status: "进行中" },
+      { sort: { startTime: "desc" } }
+    );
+    const itemMap = /* @__PURE__ */ new Map();
+    Object.entries(initDefaultItems).forEach(([name2, data]) => itemMap.set(data.id, name2));
+    itemMap.set(0, "金币");
+    return activities.length ? activities.map((a) => [
+      `活动名称：${a.name}`,
+      `活动时间：${formatDate(a.startTime)} - ${formatDate(a.endTime)}`,
+      `活动描述：${a.description}`,
+      `活动奖励：${a.quantity} × ${itemMap.get(a.itemId) || "未知物品"}`,
+      "━".repeat(20)
+    ].join("\n")).join("\n\n") : "当前没有进行中的活动。";
   });
   ctx.setInterval(async () => {
     const now = /* @__PURE__ */ new Date();
@@ -1077,7 +1181,7 @@ ID：${activity.id}
       }
     }
   }, 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;
@@ -1132,13 +1236,13 @@ ID：${activity.id}
           lastdate: new Date(currentMaxDate.toISOString())
         });
       }
-      return "数据同步成功";
+      return "✅ 胜点榜数据同步成功！";
     } catch (err) {
       console.error("错误:", err);
       return "服务器繁忙，请稍后尝试。";
     }
   });
-  ctx.command("ggcevo/胜点榜 [page]").alias("排行榜").usage("输入 rank [页码] 查看对应页的排行榜，每页10条").action(async (_, page) => {
+  ctx.command("ggcevo/胜点榜 [page]").alias("排行榜").usage("输入 胜点榜 [页码] 查看对应页的排行榜，每页10条").action(async (_, page) => {
     const pageNum = parseInt(page) || 1;
     if (pageNum < 1) return "请输入有效的页码。";
     const offset = (pageNum - 1) * 10;
@@ -1160,9 +1264,8 @@ ID：${activity.id}
       (item, index) => `${offset + index + 1}. ${item.displayName} | 积分: ${item.rank} | 胜率: ${item.matches === 0 ? "0.00%" : (item.wins / item.matches * 100).toFixed(2) + "%"}`
     ).join("\n");
     return [
-      `🏆 GGCEvo S1赛季胜点榜 🏆`,
-      `本赛季从4月1日至5月15日23点`,
-      `数据同步时间: ${lastdate.toLocaleString("zh-CN", {
+      `🏆 咕咕胜点榜 ${config.rankseason}赛季 🏆`,
+      `数据最新同步时间: ${lastdate.toLocaleString("zh-CN", {
         timeZone: "Asia/Shanghai",
         year: "numeric",
         month: "2-digit",
@@ -1175,7 +1278,7 @@ ID：${activity.id}
       rankingText,
       "------------------------------",
       `第 ${pageNum} 页 / 共 ${totalPages} 页`,
-      pageNum < totalPages ? `输入 胜点榜 ${pageNum + 1} 查看下一页` : "已是最后一页"
+      pageNum < totalPages ? `输入“胜点榜 ${pageNum + 1}”查看下一页` : "已是最后一页"
     ].join("\n");
   });
   ctx.command("ggcevo/排名 [player]", "查询个人排名").alias("rank").usage("输入“排名”查看自己的排名信息").action(async (argv, player) => {
@@ -1183,29 +1286,29 @@ ID：${activity.id}
     if (!player) {
       const [profile] = await ctx.database.get("sc2arcade_player", { userId: session.userId });
       if (!profile) {
-        return "您的 QQ 未绑定句柄。";
+        return "您暂未绑定句柄。";
       }
       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 `🎮 您的咕咕胜点榜排名信息 🎮
 ------------------------------
 昵称：${displayName}
 句柄：${user.handle}
 当前积分：${user.rank}
 参赛次数：${user.matches} 次
 胜率: ${user.matches === 0 ? "0.00%" : (user.wins / user.matches * 100).toFixed(2) + "%"}
-全服排名：第 ${userRank} 位
+全服排名：第 ${userRank} 名
 ------------------------------`;
     } else {
       const parsedUser = import_koishi.h.parse(player)[0];
@@ -1216,51 +1319,67 @@ ID：${activity.id}
       let targetUsername = parsedUser.attrs.name || targetUserId;
       const [profile] = await ctx.database.get("sc2arcade_player", { userId: targetUsername });
       if (!profile) {
-        return "对方的 QQ 未绑定句柄。";
+        return "对方暂未绑定句柄。";
       }
       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 `🎮 对方的咕咕胜点榜排名信息 🎮
 ------------------------------
 昵称：${displayName}
 句柄：${user.handle}
 当前积分：${user.rank}
 参赛次数：${user.matches} 次
 胜率: ${user.matches === 0 ? "0.00%" : (user.wins / user.matches * 100).toFixed(2) + "%"}
-全服排名：第 ${userRank} 位
+全服排名：第 ${userRank} 名
 ------------------------------`;
     }
   });
-  ctx.command("ggcevo/给予 <handle> <itemId:number> <amount:number>", "增加指定用户的物品", { authority: 3 }).action(async (_, handle, itemId, amount) => {
+  ctx.command("ggcevo/给予 <handle> <itemName:string> <amount:number>", "增加用户物品/金币", { authority: 3 }).action(async (_, handle, itemName, amount) => {
     try {
-      if (!handle || !itemId || !amount) {
-        return `请输入正确的指令格式`;
+      if (!handle || !itemName || amount <= 0) {
+        return "参数格式错误，正确格式：给予 用户句柄 物品名称 数量";
       }
-      const itemIdToNameMap = Object.fromEntries(
-        Object.entries(initDefaultItems).map(([name2, item]) => [item.id, name2])
-      );
-      const itemName = itemIdToNameMap[itemId];
-      const [backpack] = await ctx.database.get("ggcevo_backpack", { handle, itemId });
+      if (itemName === "金币") {
+        const [signData] = await ctx.database.get("ggcevo_sign", { handle });
+        await ctx.database.upsert("ggcevo_sign", [{
+          handle,
+          totalRewards: (signData?.totalRewards || 0) + Math.floor(amount),
+          lastSign: signData?.lastSign || /* @__PURE__ */ new Date(0),
+          // 保持原有最后签到时间
+          monthlyDays: signData?.monthlyDays || 0
+          // 保持月签到天数
+        }]);
+        return `成功为 ${handle} 添加 ${amount} 金币！当前金币总数：${(signData?.totalRewards || 0) + amount}`;
+      }
+      const validItems = Object.keys(initDefaultItems);
+      if (!validItems.includes(itemName)) {
+        return `无效物品名称，可用物品：${validItems.join("、")}`;
+      }
+      const itemId = initDefaultItems[itemName].id;
+      const [backpack] = await ctx.database.get("ggcevo_backpack", {
+        handle,
+        itemId
+      });
       await ctx.database.upsert("ggcevo_backpack", [{
         handle,
         itemId,
-        quantity: (backpack?.quantity || 0) + amount
+        quantity: (backpack?.quantity || 0) + Math.floor(amount)
       }], ["handle", "itemId"]);
-      return `成功为 ${handle} 增加 ${amount} 个${itemName}！`;
+      return `成功为 ${handle} 添加 ${amount} 个${itemName}！当前总数：${(backpack?.quantity || 0) + amount}`;
     } catch (err) {
-      console.error("数据库操作失败:", err);
-      return "操作失败，请稍后再试";
+      console.error("[给予命令错误]", err);
+      return "操作失败：" + (err instanceof Error ? err.message : "数据库异常");
     }
   });
   ctx.command("ggcevo/违规记录 [user]", "违规记录查询").usage("输入 违规记录 [@用户] -p 页码 查看处罚记录，每页1条").option("p", "-p <page:number> 指定页码").action(async (argv) => {
@@ -1270,7 +1389,7 @@ ID：${activity.id}
     let handle;
     if (!user) {
       const [profile] = await ctx.database.get("sc2arcade_player", { userId: session.userId });
-      if (!profile) return "您的 QQ 未绑定句柄。";
+      if (!profile) return "您暂未绑定句柄。";
       handle = `${profile.regionId}-S2-${profile.realmId}-${profile.profileId}`;
     } else {
       const parsedUser = import_koishi.h.parse(user)[0];
@@ -1281,7 +1400,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 "对方暂未绑定句柄。";
       }
       const { regionId, realmId, profileId } = profile;
       handle = `${regionId}-S2-${realmId}-${profileId}`;
@@ -1313,17 +1432,17 @@ ID：${activity.id}
       "------------------------------",
       recordText,
       "------------------------------",
-      pageNum < totalPages ? `输入 违规记录 -p ${pageNum + 1} 查看下一条` : "已是最后一页"
+      pageNum < totalPages ? `输入 违规记录 (@用户) -p ${pageNum + 1} 查看下一条` : "已是最后一页"
     ].join("\n");
   });
   ctx.command("ggcevo/兑换", "兑换物品").action(async ({ session }) => {
     try {
       const [profile] = await ctx.database.get("sc2arcade_player", { userId: session.userId });
-      if (!profile) return "您的 QQ 未绑定句柄";
+      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 `❌拒绝访问，您已被列入活动黑名单。`;
+        return `❌ 拒绝访问，您已被列入黑名单。`;
       }
       const currentSeason = config.rankseason;
       const qualityGroups = {};
@@ -1349,7 +1468,7 @@ ID：${activity.id}
         qualityGroups[quality].push(`${itemName}${quantityText}`);
       }
       const order = ["t0", "t1", "t2", "t3"];
-      let message = "请在30秒内输入可兑换物品（显示格式：物品名 [剩余/总量]）:\n";
+      let message = "请在30秒内输入可兑换物品(显示格式：物品名 [剩余/总量]):\n";
       for (const quality of order) {
         const items = qualityGroups[quality] || [];
         if (!items.length) continue;
@@ -1360,11 +1479,11 @@ ${items.join("、")}
       }
       await session.send(message);
       const name2 = await session.prompt(3e4);
-      if (!name2) return "输入超时，请重新输入指令。";
+      if (!name2) return "输入超时，请重新输入。";
       const configname = itemConfig[name2];
-      if (!configname) return "无效的物品名称，请重新输入";
+      if (!configname) return "无效的物品名称，请重新输入。";
       const userRecords = await ctx.database.get("ggcevo_exchange", { handle, item: name2 });
-      if (userRecords.length > 0) return "您已经兑换过该物品";
+      if (userRecords.length > 0) return "您已经兑换过该物品。";
       if (configname.quantity !== void 0 && (configname.isLimited || config.ignoreGlobalLimit === false)) {
         const queryConditions = {
           item: name2,
@@ -1374,7 +1493,7 @@ ${items.join("、")}
           queryConditions.season = currentSeason;
         }
         const globalRecords = await ctx.database.get("ggcevo_exchange", queryConditions);
-        if (globalRecords.length >= configname.quantity) return "该物品已被兑换尽";
+        if (globalRecords.length >= configname.quantity) return "该物品已被兑换完了。";
       }
       const qualityMap = { "t3": 4, "t2": 5, "t1": 6, "t0": 7 };
       const petItems = new Set(
@@ -1397,7 +1516,7 @@ ${items.join("、")}
       }
       const [coupon] = await ctx.database.get("ggcevo_backpack", { handle, itemId });
       if (!coupon || coupon.quantity < cost) {
-        const requireMsg = petItems.has(name2) ? `需要 1 个${configname.quality}级宠物扭蛋 或 ${configname.cost}个兑奖券` : `需要 ${configname.cost}个兑奖券`;
+        const requireMsg = petItems.has(name2) ? `需要1个${configname.quality}级宠物扭蛋 或${configname.cost}张兑奖券` : `需要${configname.cost}张兑奖券`;
         return `${requireMsg}
 当前持有：${coupon?.quantity || 0}个${couponName}`;
       }
@@ -1420,7 +1539,7 @@ ${items.join("、")}
           season: currentSeason
         });
       });
-      return `兑换成功！消耗 ${cost} 个${couponName}获得【${name2}】`;
+      return `兑换成功！消耗${cost}个${couponName}获得【${name2}】`;
     } catch (error) {
       console.error("兑换失败:", error);
       return "兑换失败";
@@ -1428,7 +1547,7 @@ ${items.join("、")}
   });
   ctx.command("ggcevo/兑换记录").action(async ({ session }) => {
     const [profile] = await ctx.database.get("sc2arcade_player", { userId: session.userId });
-    if (!profile) return "您的 QQ 未绑定句柄";
+    if (!profile) return "您暂未绑定句柄";
     const handle = `${profile.regionId}-S2-${profile.realmId}-${profile.profileId}`;
     const exchanges = await ctx.database.get("ggcevo_exchange", { handle });
     if (!exchanges.length) return "您暂无兑换记录";
@@ -1447,16 +1566,16 @@ ${output}`;
   });
   ctx.command("ggcevo/兑换扭蛋币").action(async ({ session }) => {
     const [profile] = await ctx.database.get("sc2arcade_player", { userId: session.userId });
-    if (!profile) return "您的 QQ 未绑定句柄";
+    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 `❌拒绝访问，您已被列入活动黑名单。`;
+      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) {
-      return `兑换扭蛋币需要 3 张兑奖券，当前持有：${coupon?.quantity || 0}`;
+      return `兑换扭蛋币需要3张兑奖券，当前持有：${coupon?.quantity || 0}`;
     }
     await ctx.database.set(
       "ggcevo_backpack",
@@ -1468,19 +1587,19 @@ ${output}`;
       itemId: 3,
       quantity: (backpack?.quantity || 0) + 1
     }]);
-    return `兑换成功！消耗 3 张兑奖券获得 1 个扭蛋币`;
+    return `兑换成功！消耗3张兑奖券获得1枚扭蛋币`;
   });
   ctx.command("ggcevo/扭蛋").action(async (argv) => {
     const session = argv.session;
     const [profile] = await ctx.database.get("sc2arcade_player", { userId: session.userId });
     if (!profile) {
-      return "您的 QQ 未绑定句柄。";
+      return "您暂未绑定句柄。";
     }
     const { regionId, realmId, profileId } = profile;
     const handle = `${regionId}-S2-${realmId}-${profileId}`;
     const existingEntries = await ctx.database.get("ggcevo_blacklist", { handle });
     if (existingEntries.length > 0) {
-      return `❌拒绝访问，您已被列入活动黑名单。`;
+      return `❌ 拒绝访问，您已被列入黑名单。`;
     }
     const [backpack] = await ctx.database.get("ggcevo_backpack", { handle, itemId: 3 });
     if (!backpack || backpack.quantity < 1) {
@@ -1506,16 +1625,16 @@ ${output}`;
       itemId: itemData.id,
       quantity: currentQuantity + 1
     }]);
-    return `🎉 恭喜获得：${itemName}`;
+    return `🎉 恭喜您获得：${itemName}`;
   });
-  ctx.command("ggcevo/活动拉黑", "添加用户到活动黑名单").action(async (argv) => {
+  ctx.command("ggcevo/拉黑", "添加用户到黑名单").action(async (argv) => {
     const session = argv.session;
     if (!ctx.config.admins.includes(session.userId)) {
-      return "⚠️ 没有操作权限，请联系机器人管理员";
+      return "⚠️ 没有操作权限。";
     }
     await session.send("请在30秒内输入需要拉黑的句柄:\n(句柄格式为: [区域ID]-S2-[服务器ID]-[档案ID])");
     const handle = await session.prompt(3e4);
-    if (!handle) return "输入超时，请重新输入指令。";
+    if (!handle) return "输入超时，请重新输入。";
     try {
       const handleRegex = /^([1235])-S2-([12])-(\d+)$/;
       if (!handleRegex.test(handle)) {
@@ -1523,40 +1642,40 @@ ${output}`;
       }
       const existingEntries = await ctx.database.get("ggcevo_blacklist", { handle });
       if (existingEntries.length > 0) {
-        return `${handle} 已在活动黑名单中`;
+        return `${handle}已在黑名单中。`;
       }
       await ctx.database.create("ggcevo_blacklist", {
         handle,
         createdAt: /* @__PURE__ */ new Date()
       });
-      return `✅ 用户 ${handle} 已被列入活动黑名单（永久）`;
+      return `✅ 用户${handle}已被列入黑名单。`;
     } catch (error) {
       console.error("黑名单操作失败:", error);
       return "操作失败，请稍后重试。错误详情已记录";
     }
   });
-  ctx.command("ggcevo/胜点榜拉黑", "添加用户到胜点榜黑名单").action(async (argv) => {
+  ctx.command("ggcevo/标记", "标记用户到胜点榜黑名单").action(async (argv) => {
     const session = argv.session;
     if (!ctx.config.admins.includes(session.userId)) {
-      return "⚠️ 没有操作权限，请联系机器人管理员";
+      return "⚠️ 没有操作权限。";
     }
-    await session.send("请在30秒内输入需要拉黑的句柄:\n(句柄格式为: [区域ID]-S2-[服务器ID]-[档案ID])");
+    await session.send("请在30秒内输入需要标记的句柄:\n(句柄格式为: [区域ID]-S2-[服务器ID]-[档案ID])");
     const handle = await session.prompt(3e4);
-    if (!handle) return "输入超时，请重新输入指令。";
+    if (!handle) return "输入超时，请重新输入。";
     try {
       const handleRegex = /^([1235])-S2-([12])-(\d+)$/;
       if (!handleRegex.test(handle)) {
-        return "句柄格式错误，请重新输入";
+        return "句柄格式错误，请重新输入。";
       }
       const existingEntries = await ctx.database.get("ggcevo_rank", { handle, Blacklist: true });
       if (existingEntries.length > 0) {
-        return `${handle} 已在胜点榜黑名单中`;
+        return `${handle}已被标记在咕咕胜点榜黑名单中。`;
       }
       await ctx.database.upsert("ggcevo_rank", [{
         handle,
         Blacklist: true
       }]);
-      return `✅ 用户 ${handle} 已被列入胜点榜黑名单（仅限当前赛季）`;
+      return `✅ 用户${handle}已被标记在咕咕胜点榜黑名单。`;
     } catch (error) {
       console.error("黑名单操作失败:", error);
       return "操作失败，请稍后重试。错误详情已记录";
@@ -1565,14 +1684,14 @@ ${output}`;
   ctx.command("ggcevo/成就").action(async ({ session }) => {
     const [profile] = await ctx.database.get("sc2arcade_player", { userId: session.userId });
     if (!profile) {
-      return "您的 QQ 未绑定句柄。";
+      return "您暂未绑定句柄。";
     }
     const { regionId, realmId, profileId } = profile;
     const achievements = await ctx.database.get("ggcevo_achievements", {
       handle: `${regionId}-S2-${realmId}-${profileId}`
     });
     if (!achievements.length) {
-      return "你还没有获得任何成就哦~";
+      return "你还没有获得任何成就。";
     }
     const achievementList = achievements.map((achievement) => {
       const date = new Date(achievement.gaintime);
@@ -1590,7 +1709,7 @@ ${achievementList.join("\n")}`;
     const session = argv.session;
     const output = [];
     const [profile] = await ctx.database.get("sc2arcade_player", { userId: session.userId });
-    if (!profile) return "您的 QQ 未绑定游戏句柄。";
+    if (!profile) return "您暂未绑定句柄。";
     const { regionId, realmId, profileId } = profile;
     const handle = `${regionId}-S2-${realmId}-${profileId}`;
     output.push(`🎮 游戏句柄：${handle}
@@ -1721,22 +1840,22 @@ ${achievementList.join("\n")}`;
   ctx.command("ggcevo/pk [user]", "发起玩家对战").alias("挑战").action(async (argv, user) => {
     try {
       const session = argv.session;
-      if (!user) return '缺少参数，请输入"pk @指定对战玩家"';
+      if (!user) return "缺少参数，请输入“pk @指定pk玩家”。";
       const [profile] = await ctx.database.get("sc2arcade_player", { userId: session.userId });
-      if (!profile) return "您的 QQ 未绑定句柄。";
+      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 `❌拒绝访问，您已被列入活动黑名单。`;
+        return `❌ 拒绝访问，您已被列入黑名单。`;
       }
       const parsedUser = import_koishi.h.parse(user)[0];
-      if (!parsedUser || parsedUser.type !== "at" || !parsedUser.attrs.id) return '参数格式错误，请输入"pk @指定对战玩家"';
+      if (!parsedUser || parsedUser.type !== "at" || !parsedUser.attrs.id) return "参数格式错误，请输入“pk @指定pk玩家”。";
       const targetUserId = parsedUser.attrs.id;
       const [targetprofile] = await ctx.database.get("sc2arcade_player", { userId: targetUserId });
-      if (!targetprofile) return "对方尚未绑定句柄";
+      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 "不能挑战自己。";
       let initiatorPK = {
         handle: initiatorHandle,
         total: 0,
@@ -1767,17 +1886,17 @@ ${achievementList.join("\n")}`;
         if (dbTarget) Object.assign(targetPK, dbTarget);
       });
       if (!initiatorPK.enable) {
-        return "您已关闭PK功能，无法发起挑战";
+        return "您已关闭PK功能，无法发起挑战。";
       }
       if (!targetPK.enable) {
-        return "对方已关闭PK功能，无法接受挑战";
+        return "对方已关闭PK功能，无法接受挑战。";
       }
       const now = convertUTCtoChinaTime(/* @__PURE__ */ new Date());
       if (!isSameDate(convertUTCtoChinaTime(initiatorPK.lastPK), now)) {
         initiatorPK.todayCount = 0;
       }
       if (initiatorPK.todayCount >= config.dailyPKLimit) {
-        return `今日挑战次数已用尽（${config.dailyPKLimit}次/日）`;
+        return `今日挑战次数已用尽(${config.dailyPKLimit}次/日)。`;
       }
       const nowChina = convertUTCtoChinaTime(/* @__PURE__ */ new Date());
       const todayStart = new Date(nowChina);
@@ -1790,7 +1909,7 @@ ${achievementList.join("\n")}`;
           date: { $gte: adjustedTime }
         }).execute((row) => import_koishi.$.count(row.id));
         if (sameOpponentCount > 0) {
-          return "您今天已经挑战过该玩家，请明天再试";
+          return "您今天已经挑战过该玩家，请明天再试。";
         }
       }
       if (config.maxDailyBeChallenged > 0) {
@@ -1799,7 +1918,7 @@ ${achievementList.join("\n")}`;
           date: { $gte: adjustedTime }
         }).execute((row) => import_koishi.$.count(row.id));
         if (beChallengedCount >= config.maxDailyBeChallenged) {
-          return `该玩家今日已被挑战太多次（最多${config.maxDailyBeChallenged}次）`;
+          return `该玩家今日已被挑战太多次(最多${config.maxDailyBeChallenged}次)。`;
         }
       }
       const [initiatorData, targetData] = await Promise.all([
@@ -1816,8 +1935,8 @@ ${achievementList.join("\n")}`;
       ]);
       const initiatorGold = initiatorSign[0]?.totalRewards || 0;
       const targetGold = targetSign[0]?.totalRewards || 0;
-      if (initiatorGold < 100) return "发起者需要至少100金币才能挑战！";
-      if (targetGold < 100) return "对方金币不足100，无法应战";
+      if (initiatorGold < 100) return "发起者需要至少100金币才能发起挑战。";
+      if (targetGold < 100) return "对方金币不足100，无法应战。";
       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);
@@ -1874,8 +1993,8 @@ ${achievementList.join("\n")}`;
       });
       const result = [
         `⚔️【对战结果】${isWin ? "胜利" : "失败"}`,
-        `🏅 挑战者：${initiatorRankname}（积分 ${initiatorRank}）`,
-        `🛡️ 应战者：${targetRankname}（积分 ${targetRank}）`,
+        `🏅 挑战者：${initiatorRankname}(积分 ${initiatorRank})`,
+        `🛡️ 应战者：${targetRankname}(积分 ${targetRank})`,
         `📊  胜率预测：${winRate.toFixed(1)}%`,
         `🎰 金币变动：${stealPercentage}%`
       ];
@@ -1889,12 +2008,8 @@ ${achievementList.join("\n")}`;
   });
   ctx.command("ggcevo/切换pk状态", "切换玩家对战状态").action(async ({ session }) => {
     const [profile] = await ctx.database.get("sc2arcade_player", { userId: session.userId });
-    if (!profile) return "您的 QQ 未绑定句柄";
+    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 [pkRecord] = await ctx.database.get("ggcevo_pk", { handle }) || [null];
     const currentState = pkRecord?.enable ?? true;
     const lastToggle = pkRecord?.lastToggle ?? /* @__PURE__ */ new Date(0);
@@ -1915,10 +2030,10 @@ ${achievementList.join("\n")}`;
     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")}）`;
+      return `状态切换冷却中，${remaining}天后再试(下次可切换时间：${new Date(lastToggle.getTime() + 3 * 864e5).toLocaleDateString("zh-CN")})。`;
     }
     const action = currentState ? "关闭" : "开启";
-    await session.send(`您当前的PK状态为【${currentState ? "开启" : "关闭"}】，确认要${action}吗？(30秒内回复“是”确认)`);
+    await session.send(`您当前的PK状态为【${currentState ? "开启" : "关闭"}】，确认要${action}吗？(s30秒内回复“是”确认)`);
     const confirm = await session.prompt(3e4);
     if (confirm !== "是") return "已取消操作";
     await ctx.database.upsert("ggcevo_pk", [{
@@ -1937,8 +2052,26 @@ ${achievementList.join("\n")}`;
       day: "2-digit"
     })}`;
   });
-  ctx.command("ggcevo/武器库").action(async ({ session }) => {
-    const items = Object.entries(weaponConfig).map(([name2, config2]) => {
+  ctx.command("ggcevo/武器库 [type]").usage("输入“武器库”查看类型，或“武器库 类型”查看详细武器信息").action(async ({ session }, type) => {
+    const typeStats = Object.values(weaponConfig).reduce((stats, weapon) => {
+      stats[weapon.type] = (stats[weapon.type] || 0) + 1;
+      return stats;
+    }, {});
+    if (!type) {
+      return [
+        "🏪 咕咕军火武器库分类 🏪",
+        '使用 "武器库 类型名称" 查看详细列表',
+        "====================",
+        ...Object.entries(typeStats).map(([typeName, count]) => `▸ ${typeName} (${count}种)`)
+      ].join("\n");
+    }
+    const validTypes = Object.keys(typeStats);
+    const normalizedType = validTypes.find((t) => t === type);
+    if (!normalizedType) {
+      return `无效武器类型，可用类型：
+${validTypes.join("、")}`;
+    }
+    const items = Object.entries(weaponConfig).filter(([_, config2]) => config2.type === normalizedType).map(([name2, config2]) => {
       const tagEffectsDesc = config2.tagEffects ? Object.entries(config2.tagEffects).map(([tag, multiplier]) => `▸ 对${tag}目标造成${(multiplier * 100).toFixed(0)}%伤害`).join("\n") : "▸ 无特殊加成效果";
       return [
         `【${name2}】`,
@@ -1951,7 +2084,7 @@ ${achievementList.join("\n")}`;
       ].join("\n");
     });
     return [
-      "🏪 咕咕军火武器库 🏪",
+      `🏪 咕咕军火武器库 - ${normalizedType} 🏪`,
       "使用“购买 武器名称”命令进行购买",
       "====================",
       ...items
@@ -2009,15 +2142,14 @@ ${achievementList.join("\n")}`;
       ].join("\n");
     }));
     return [
-      "🛡️ 当前武器列表",
+      "🛡️ 当前拥有的武器列表",
       '使用"装备 武器名称"切换武器',
       "⚡表示当前装备武器",
       "────────────────",
       ...weaponDetails.length ? weaponDetails : ["空空如也，快去武器库看看吧！"],
       "────────────────",
       "💡 武器效果说明：",
-      "⚡ 已装备武器会在战斗中生效",
-      "🔧 改装效果仅在战斗时计算"
+      "🔧 改装效果会在战斗中生效"
     ].join("\n");
   });
   ctx.command("ggcevo/装备 <weapon>").action(async ({ session }, weapon) => {
@@ -2159,6 +2291,7 @@ ${achievementList.join("\n")}`;
   });
   ctx.command("ggcevo/攻击 <targetType>").usage("使用 攻击 主宰/zz 或 攻击 子代/zd 来选择攻击目标").action(async (argv, targetType) => {
     const session = argv.session;
+    let broadcastMessage = null;
     const targetAliases = {
       "主宰": ["主宰", "zz"],
       "子代": ["子代", "zd"]
@@ -2172,10 +2305,10 @@ ${achievementList.join("\n")}`;
     }
     if (!normalizedTarget) return "请指定正确的攻击目标：主宰/zz 或 子代/zd";
     const [profile] = await ctx.database.get("sc2arcade_player", { userId: session.userId });
-    if (!profile) return "您的 QQ 未绑定句柄。";
+    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 "❌拒绝访问，您已被列入活动黑名单。";
+    if (existingEntries.length > 0) return "❌ 拒绝访问，您已被列入黑名单。";
     const config2 = ctx.config;
     const unlimitedBossAttack = config2.unlimitedBossAttack;
     if (!unlimitedBossAttack) {
@@ -2192,93 +2325,17 @@ ${achievementList.join("\n")}`;
       handle,
       equipped: true
     });
-    if (!equippedWeapon) return "请先装备武器再挑战主宰";
+    if (!equippedWeapon) return "请先装备武器再挑战主宰。";
     const activeBosses = await ctx.database.get("ggcevo_boss", { isActive: true });
-    if (!activeBosses.length) return "当前没有存活的主宰";
+    if (!activeBosses.length) return "当前没有存活的主宰。";
     const targetBoss = normalizedTarget === "主宰" ? activeBosses.find((b) => b.type === "主宰") : activeBosses.find((b) => b.type === "子代");
-    if (!targetBoss) return `当前没有可攻击的${normalizedTarget === "主宰" ? "主宰" : "子代"}`;
+    if (!targetBoss) return `当前没有可攻击的${normalizedTarget === "主宰" ? "主宰" : "子代"}。`;
     const bossGroup = bossPool.find((group) => group.main.id === targetBoss.groupId);
-    if (!bossGroup) return "无法获取BOSS组信息，请联系管理员";
+    if (!bossGroup) return "无法获取BOSS组信息，请联系管理员。";
     const weaponConfigEntry = Object.entries(weaponConfig).find(([_, c]) => c.id === equippedWeapon.weaponId);
     const [weaponName, weaponData] = weaponConfigEntry;
-    let damage = weaponData.damage * (1 + 0.1 * equippedWeapon.level);
-    let totalModAdd = 0;
-    let hasCrit = false;
-    let hasCrystal = false;
-    let hasOverload = false;
-    equippedWeapon.installedMods.forEach((mod) => {
-      if (mod === "动能增幅") {
-        totalModAdd += 0.2;
-      }
-      if (mod === "裂甲核心") {
-        if (weaponName === modConfig["裂甲核心"].exclusiveTo) {
-          totalModAdd += 0.4;
-        }
-      }
-      if (mod === "棱镜水晶") {
-        hasCrystal = true;
-      }
-      if (mod === "棱镜超载核心") {
-        if (weaponName === modConfig["棱镜超载核心"].exclusiveTo) {
-          hasOverload = true;
-        }
-      }
-    });
-    const totalCritRate = (hasCrystal ? 20 : 0) + (hasOverload ? 80 : 0);
-    if (totalCritRate > 0 && Math.random() < totalCritRate / 100) {
-      hasCrit = true;
-      totalModAdd += 1;
-    }
-    damage = damage * (1 + totalModAdd);
-    const targetBossConfig = targetBoss.type === "主宰" ? bossGroup.main : bossGroup.minions[0];
-    if (targetBossConfig.tags && targetBossConfig.tags.length > 0) {
-      const armorTags = targetBossConfig.tags.filter((tag) => ["重甲", "轻甲", "护盾"].includes(tag));
-      const voidTags = targetBossConfig.tags.filter((tag) => ["惧热", "惧寒"].includes(tag));
-      const typeTags = targetBossConfig.tags.filter((tag) => ["生物", "机械", "灵能"].includes(tag));
-      let totalTagAdd = 0;
-      armorTags.forEach((tag) => {
-        let effectValue = weaponData.tagEffects?.[tag] ?? 1;
-        if (tag === "重甲" && equippedWeapon.installedMods.includes("裂甲核心")) {
-          effectValue = 1.2;
-        }
-        totalTagAdd += effectValue - 1;
-      });
-      voidTags.forEach((tag) => {
-        const effectValue = weaponData.tagEffects?.[tag] ?? 1;
-        totalTagAdd += effectValue - 1;
-      });
-      typeTags.forEach((tag) => {
-        const effectValue = weaponData.tagEffects?.[tag] ?? 1;
-        totalTagAdd += effectValue - 1;
-      });
-      damage *= 1 + totalTagAdd;
-    }
-    if (targetBossConfig.passive?.length) {
-      let passiveEffect = 0;
-      const effectivePassives = [...targetBossConfig.passive];
-      if (targetBoss.type === "主宰" && effectivePassives.includes("孤立无援")) {
-        const activeMinions = await ctx.database.get("ggcevo_boss", {
-          groupId: targetBoss.groupId,
-          type: "子代",
-          isActive: true
-        });
-        if (activeMinions.length !== 0) {
-          effectivePassives.splice(effectivePassives.indexOf("孤立无援"), 1);
-        }
-      }
-      effectivePassives.forEach((passive) => {
-        const effect = passiveConfig[passive]?.effect || 0;
-        passiveEffect += effect;
-      });
-      damage *= 1 + passiveEffect;
-    }
-    const [rankRecord] = await ctx.database.get("ggcevo_rank", { handle });
-    if (rankRecord?.rank > 0) {
-      const rankBonus = Math.floor(rankRecord.rank / 400) * 0.01;
-      damage *= 1 + rankBonus;
-    }
-    damage = Math.round(damage);
-    const actualDamage = Math.min(damage, targetBoss.HP);
+    const { damage: baseDamage, hasCrit } = await calculateTotalDamage(ctx, session, equippedWeapon, targetBoss);
+    const actualDamage = Math.min(baseDamage, targetBoss.HP);
     const updatedHP = targetBoss.HP - actualDamage;
     const isDefeated = updatedHP <= 0;
     const [existingRecord] = await ctx.database.get("ggcevo_boss_damage", {
@@ -2290,6 +2347,7 @@ ${achievementList.join("\n")}`;
         handle,
         bossGroupId: targetBoss.groupId
       }, {
+        playerName: session.username,
         totalDamage: existingRecord.totalDamage + actualDamage,
         // 改为实际伤害
         attackCount: existingRecord.attackCount + 1,
@@ -2413,13 +2471,13 @@ ${achievementList.join("\n")}`;
         await ctx.database.remove("ggcevo_boss_damage", {
           bossGroupId: targetBoss.groupId
         });
-        ctx.broadcast(config2.groupId, [
-          `🎯 主宰 ${targetBoss.name} 已被击败！`,
-          `所有子代已消失，下一个主宰将在1小时后出现`,
+        broadcastMessage = [
+          `🎯 主宰 ${targetBoss.name} 已被 ${session.username} 击破！`,
+          `所有子代已消失，下一个主宰将在1小时后重生`,
           "",
-          "🎁 奖励发放结果：",
+          "🏆 伤害排行榜奖励：",
           ...rewardMessages
-        ].join("\n"));
+        ];
       } else {
         await ctx.database.set(
           "ggcevo_boss",
@@ -2429,11 +2487,10 @@ ${achievementList.join("\n")}`;
             HP: 0
           }
         );
-        ctx.broadcast(
-          config2.groupId,
-          `🎯 子代 ${targetBoss.name} 已被击败！
-主宰仍然存在，但是将额外遭受20%的易伤，继续战斗！`
-        );
+        broadcastMessage = [
+          `⚡ ${session.username} 击破了子代 ${targetBoss.name}！`,
+          `【连锁效果】主宰获得 20% 易伤状态！`
+        ];
       }
     } else {
       await ctx.database.set(
@@ -2455,15 +2512,20 @@ ${achievementList.join("\n")}`;
         // 改为实际伤害
       });
     }
-    return [
+    const resultMessage = [
       `🔥 ${session.username} 使用武器 ${weaponName} 对 ${targetBoss.name} 发起攻击！`,
       `造成伤害：${actualDamage}${hasCrit ? "（✨ 暴击！）" : ""}`,
-      // 改为实际伤害
       `获得金币：${actualDamage}`,
-      // 改为实际伤害
       `目标剩余HP：${isDefeated ? 0 : updatedHP}/${targetBoss.type === "主宰" ? bossGroup.main.maxHP : bossGroup.minions[0].maxHP}`,
       isDefeated ? `🎉 成功击败 ${targetBoss.name}！` : ""
-    ].filter((line) => line !== "").join("\n");
+    ].filter((line) => line).join("\n");
+    await session.send(resultMessage);
+    if (broadcastMessage) {
+      const finalBroadcast = Array.isArray(broadcastMessage) ? broadcastMessage.join("\n") : broadcastMessage;
+      await new Promise((resolve) => setTimeout(resolve, 500));
+      ctx.broadcast(config2.groupId, finalBroadcast);
+    }
+    return;
   });
   ctx.command("ggcevo/初始化主宰", "初始化或重置主宰系统", { authority: 3 }).action(async () => {
     try {
@@ -2509,19 +2571,15 @@ ${achievementList.join("\n")}`;
       pageNum < totalPages ? `输入 伤害榜 ${pageNum + 1} 查看下一页` : "已是最后一页"
     ].join("\n");
   });
-  ctx.command("ggcevo/主宰状态", "查看当前主宰信息").alias("zz状态").action(async () => {
+  ctx.command("ggcevo/主宰信息", "查看当前主宰信息").alias("zz信息").action(async () => {
     const activeBosses = await ctx.database.get("ggcevo_boss", { isActive: true });
-    if (!activeBosses.length) return "当前没有激活的BOSS";
+    if (!activeBosses.length) return "当前没有存活的主宰。";
     const mainBoss = activeBosses.find((b) => b.type === "主宰");
     const minions = activeBosses.filter((b) => b.type === "子代");
     if (!mainBoss) return "当前BOSS数据异常，请联系管理员";
     const bossGroup = bossPool.find((group) => group.main.name === mainBoss.name);
     if (!bossGroup) return "BOSS配置数据异常，请联系管理员";
     const mainBossHpBar = createHpBar(mainBoss.HP, bossGroup.main.maxHP);
-    const formatEffect = /* @__PURE__ */ __name((value) => {
-      const percentage = Math.abs(value * 100);
-      return value > 0 ? `受到的伤害+${percentage}%` : `受到的伤害-${percentage}%`;
-    }, "formatEffect");
     let passiveDisplay = [];
     if (bossGroup.main.passive) {
       const activeMinions = await ctx.database.get("ggcevo_boss", {
@@ -2533,8 +2591,7 @@ ${achievementList.join("\n")}`;
         if (p === "孤立无援") return activeMinions.length === 0;
         return true;
       }).map((p) => {
-        const effect = passiveConfig[p].effect;
-        return `${p}：${formatEffect(effect)}`;
+        return `${p}：${passiveConfig[p].description}`;
       });
     }
     const result = [
@@ -2544,12 +2601,12 @@ ${achievementList.join("\n")}`;
       `被动：${passiveDisplay.join("，") || "无"}`
     ];
     if (minions.length > 0) {
-      result.push("", "🟠 子代信息：");
+      result.push("", "🟠 子代：");
       minions.forEach((minion) => {
         const minionConfig = bossGroup.minions.find((m) => m.name === minion.name);
         if (minionConfig) {
           const minionHpBar = createHpBar(minion.HP, minionConfig.maxHP);
-          const minionPassives = (minionConfig.passive || []).map((p) => `${p}：${formatEffect(passiveConfig[p].effect)}`).join("，");
+          const minionPassives = (minionConfig.passive || []).map((p) => `${p}：${passiveConfig[p].description}`).join("，");
           result.push(
             `${minion.name}`,
             `${minionHpBar} (${minion.HP}/${minionConfig.maxHP})`,
@@ -2618,6 +2675,17 @@ function convertUTCtoChinaTime(input) {
   return new Date(chinaTimestamp);
 }
 __name(convertUTCtoChinaTime, "convertUTCtoChinaTime");
+function formatDate(d) {
+  return d.toLocaleString("zh-CN", {
+    timeZone: "Asia/Shanghai",
+    year: "numeric",
+    month: "2-digit",
+    day: "2-digit",
+    hour: "2-digit",
+    minute: "2-digit"
+  });
+}
+__name(formatDate, "formatDate");
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   Config,