koishi-plugin-ggcevo-game 1.3.16 → 1.3.17

package/lib/index.js

@@ -528,7 +528,7 @@ function apply(ctx, config) {
       },
       {
         name: "暴击韵律",
-        effect: "攻击时，暴击率+20%"
+        effect: "攻击暴击率+20%"
       },
       {
         name: "酥手空空",
@@ -585,7 +585,7 @@ function apply(ctx, config) {
     },
     "冷适应": {
       effect: 0,
-      description: "受到10次寒冷伤害后，永久获得“惧热”标签，同时免疫寒冷伤害"
+      description: "受到10次寒冷伤害后，自身获得“惧热”标签，并且免疫寒冷伤害"
     },
     "感染空间站": {
       effect: 0,
@@ -597,11 +597,11 @@ function apply(ctx, config) {
     },
     "霉菌滋生": {
       effect: 0,
-      description: "自身每受到1次攻击，若“空间站哨枪塔”存活，则为其回复1%的最大生命值"
+      description: "受到攻击后，若“空间站哨枪塔”存活，则为其回复1%的最大生命值"
     },
     "岗哨机枪": {
       effect: 0,
-      description: "自己的职责为“保护感染虫”，受到10次攻击后，为存活的机械感染虫和主宰回复10%的最大生命值(可重复触发)"
+      description: "受到10次攻击后，为存活的异形回复其10%的最大生命值(可重复触发)"
     },
     "结构装甲": {
       effect: 0,
@@ -609,15 +609,15 @@ function apply(ctx, config) {
     },
     "吸血唾液": {
       effect: 0,
-      description: "受到攻击将会获得一层“吸血”，每层“吸血”提供5%的减伤，至多10层"
+      description: "受到攻击将会获得一层“吸血”，每层“吸血”提供5%的减伤(至多10层)"
     },
     "进食": {
       effect: 0,
-      description: "当“吸血”层数达到10层后，下一次受到攻击，将会消耗所有层数回复自身20%的最大生命值"
+      description: "当“吸血”达到10层后，下一次受到攻击将会消耗所有层数回复自身20%的最大生命值"
     },
     "嗜血狂暴": {
       effect: 0,
-      description: "血量低于50%时，每次受到攻击将会额外叠加一层吸血唾液，并且受到的伤害-20%"
+      description: "血量低于50%时，每次受到攻击将会额外活到一层“吸血”，并且受到的伤害-20%"
     },
     "吐血": {
       effect: 0,
@@ -1010,34 +1010,56 @@ function apply(ctx, config) {
       ]
     }
   ];
-  function calculateModifiers(equippedWeapon, weaponName, hasCritRhythm) {
-    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;
-      }
-    });
-    let totalCritRate = (hasCrystal ? 20 : 0) + (hasOverload ? 80 : 0);
-    if (hasCritRhythm) {
-      totalCritRate = Math.min(totalCritRate + 20, 100);
-    }
-    if (totalCritRate > 0 && Math.random() < totalCritRate / 100) {
-      hasCrit = true;
-      totalModAdd += 1;
+  async function calculateTotalDamage(ctx2, session, equippedWeapon, targetBoss, options) {
+    let effectMessage = [];
+    const finalTags = options?.customTags || targetBoss.tags || [];
+    const [profile] = await ctx2.database.get("sc2arcade_player", { userId: session.userId });
+    const { regionId, realmId, profileId } = profile;
+    const handle = `${regionId}-S2-${realmId}-${profileId}`;
+    const weaponConfigEntry = Object.entries(weaponConfig).find(([_, c]) => c.id === equippedWeapon.weaponId);
+    const [weaponName, weaponData] = weaponConfigEntry;
+    const baseDamage = weaponData.damage * (1 + 0.1 * equippedWeapon.level);
+    let totalAdditive = 0;
+    const tagAdditive = await calculateTagMultiplier(weaponData, finalTags, equippedWeapon);
+    totalAdditive += tagAdditive;
+    const { totalModAdd, hasCrit } = calculateModifiers(
+      equippedWeapon,
+      weaponName,
+      await checkCritRhythm(ctx2, handle)
+    );
+    totalAdditive += totalModAdd;
+    if (hasCrit) effectMessage.push("✨ 触发暴击！");
+    const careerBonus = await calculateCareerAdditive(ctx2, handle, weaponData.type, weaponData.id);
+    totalAdditive += careerBonus.value;
+    if (careerBonus.message) effectMessage.push(careerBonus.message);
+    const wishAdditive = await calculateWishAdditive(ctx2, handle, equippedWeapon);
+    totalAdditive += wishAdditive.value;
+    if (wishAdditive.message) effectMessage.push(wishAdditive.message);
+    const [rankRecord] = await ctx2.database.get("ggcevo_rank", { handle, rankseason: config.rankseason });
+    totalAdditive += calculateRankAdditive(rankRecord);
+    let finalDamage = baseDamage * (1 + totalAdditive);
+    const minDamage = baseDamage * 0.01;
+    if (finalDamage < minDamage) {
+      finalDamage = minDamage;
+      effectMessage.push("⚠️ 触发保底机制：造成基础伤害的1%");
     }
-    return { totalModAdd, hasCrit };
+    return {
+      damage: Math.round(finalDamage),
+      hasCrit,
+      effectMessage
+    };
   }
-  __name(calculateModifiers, "calculateModifiers");
+  __name(calculateTotalDamage, "calculateTotalDamage");
+  async function checkCritRhythm(ctx2, handle) {
+    const [record] = await ctx2.database.get("ggcevo_Wish_Record", {
+      handle,
+      wishname: "暴击韵律",
+      startTime: { $lte: /* @__PURE__ */ new Date() },
+      endTime: { $gte: /* @__PURE__ */ new Date() }
+    });
+    return !!record;
+  }
+  __name(checkCritRhythm, "checkCritRhythm");
   async function calculateTagMultiplier(weaponData, tags, equippedWeapon) {
     const MOD_EFFECTS = [
       { mod: "裂甲核心", tag: "重甲", value: 1.2 },
@@ -1054,135 +1076,118 @@ function apply(ctx, config) {
     return totalAdditive;
   }
   __name(calculateTagMultiplier, "calculateTagMultiplier");
-  function calculatePassiveEffects(passives) {
-    let passiveEffect = 0;
-    passives.forEach((passive) => {
-      const effect = passiveConfig[passive]?.effect || 0;
-      passiveEffect += effect;
+  function calculateModifiers(equippedWeapon, weaponName, hasCritRhythm) {
+    let totalModAdd = 0;
+    let hasCrit = false;
+    let crystalCrit = 0;
+    let overloadCrit = 0;
+    let rhythmCrit = 0;
+    equippedWeapon.installedMods.forEach((mod) => {
+      if (mod === "动能增幅") {
+        totalModAdd += 0.2;
+      }
+      if (mod === "裂甲核心" && weaponName === modConfig[mod].exclusiveTo) {
+        totalModAdd += 0.4;
+      }
+      if (mod === "棱镜水晶") {
+        crystalCrit = 20;
+      }
+      if (mod === "棱镜超载核心" && weaponName === modConfig[mod].exclusiveTo) {
+        overloadCrit = 80;
+      }
     });
-    return passiveEffect;
+    rhythmCrit = hasCritRhythm ? 20 : 0;
+    const totalCritRate = Math.min(
+      crystalCrit + overloadCrit + rhythmCrit,
+      100
+    );
+    if (totalCritRate > 0) {
+      const roll = Math.random() * 100;
+      if (roll <= totalCritRate) {
+        hasCrit = true;
+        totalModAdd += 1;
+      }
+    }
+    return { totalModAdd, hasCrit };
   }
-  __name(calculatePassiveEffects, "calculatePassiveEffects");
-  async function calculateCareerBonus(ctx2, handle, currentDamage, weaponType, weaponId) {
+  __name(calculateModifiers, "calculateModifiers");
+  async function calculateCareerAdditive(ctx2, handle, weaponType, weaponId) {
     const [careerData] = await ctx2.database.get("ggcevo_careers", { handle });
-    const career = careerData?.career;
-    const faction = careerData?.group;
+    let value = 0;
     let message = "";
-    let multiplier = 1;
-    if (career === "警卫长") {
-      multiplier = 1.05;
+    if (careerData?.career === "警卫长") {
+      value += 0.05;
       message = "⚔️ 职业加成：警卫长(攻击伤害+5%)";
-    } else if (career === "武器中士") {
-      multiplier = 1.15;
+    }
+    if (careerData?.career === "武器中士") {
+      value += 0.15;
       message = "⚔️ 职业加成：武器中士(攻击伤害+15%)";
     }
-    if (faction === "辛迪加海盗" && career === "能量武器专家") {
+    if (careerData?.career === "能量武器专家") {
       if (weaponType === "能量武器") {
-        multiplier *= 1.2;
-        message = "⚡ 职业加成：能量武器专家(能量武器伤害+20%)";
-      } else {
-        message = "⚠️ 能量武器专家：未装备能量武器，加成未生效";
+        value += 0.2;
+        message = "⚔️ 职业加成：能量武器专家(能量武器伤害+20%)";
       }
     }
-    if (faction === "辛迪加海盗" && career === "纵火狂") {
+    if (careerData?.career === "纵火狂") {
       if (weaponType === "热能武器") {
-        multiplier *= 1.2;
-        message = "⚡ 职业加成：纵火狂(热能武器伤害+20%)";
-      } else {
-        message = "⚠️ 纵火狂：未装备热能武器，加成未生效";
+        value += 0.2;
+        message = "⚔️ 职业加成：纵火狂(热能武器伤害+20%)";
       }
     }
-    if (faction === "辛迪加海盗" && career === "猩红杀手") {
+    if (careerData?.career === "猩红杀手") {
       if (weaponId === 7) {
-        multiplier *= 1.15;
-        message = "⚡ 职业加成：猩红杀手(侦查步枪伤害+15%)";
-      } else {
-        message = "⚠️ 猩红杀手：未装备侦查步枪，加成未生效";
+        value += 0.15;
+        message = "⚔️ 职业加成：猩红杀手(侦查步枪伤害+15%)";
       }
     }
-    return {
-      damage: currentDamage * multiplier,
-      message: message || void 0
-    };
-  }
-  __name(calculateCareerBonus, "calculateCareerBonus");
-  function calculateRankBonus(rankRecord) {
-    if (!rankRecord || rankRecord.rank <= 0) return 0;
-    return Math.floor(rankRecord.rank / 400) * 0.01;
+    return { value, message };
   }
-  __name(calculateRankBonus, "calculateRankBonus");
-  async function calculateTotalDamage(ctx2, session, equippedWeapon, targetBoss, options) {
-    let effectMessage = [];
-    const finalTags = options?.customTags || targetBoss.tags || [];
-    const finalPassives = options?.customPassives || targetBoss.skills || [];
-    const [profile] = await ctx2.database.get("sc2arcade_player", { userId: session.userId });
-    const { regionId, realmId, profileId } = profile;
-    const handle = `${regionId}-S2-${realmId}-${profileId}`;
-    const weaponConfigEntry = Object.entries(weaponConfig).find(([_, c]) => c.id === equippedWeapon.weaponId);
-    const [weaponName, weaponData] = weaponConfigEntry;
-    const weaponType = weaponData.type;
-    const weaponId = weaponData.id;
-    let damage = weaponData.damage * (1 + 0.1 * equippedWeapon.level);
-    const [critRhythmEffect] = await ctx2.database.get("ggcevo_Wish_Record", {
+  __name(calculateCareerAdditive, "calculateCareerAdditive");
+  async function calculateWishAdditive(ctx2, handle, weapon) {
+    let value = 0;
+    const messages = [];
+    const [sovereign] = await ctx2.database.get("ggcevo_Wish_Record", {
       handle,
-      wishname: "暴击韵律",
+      wishname: "王权增幅",
       startTime: { $lte: /* @__PURE__ */ new Date() },
       endTime: { $gte: /* @__PURE__ */ new Date() }
     });
-    const { totalModAdd, hasCrit } = calculateModifiers(
-      equippedWeapon,
-      weaponName,
-      !!critRhythmEffect
-    );
-    damage *= 1 + totalModAdd;
-    if (critRhythmEffect) {
-      effectMessage.push("🎵 暴击韵律祈愿生效(武器暴击率+20%)");
-    }
-    const tagMultiplier = await calculateTagMultiplier(weaponData, finalTags, equippedWeapon);
-    damage *= 1 + tagMultiplier;
-    const passiveMultiplier = calculatePassiveEffects(finalPassives);
-    damage *= 1 + passiveMultiplier;
-    const { damage: careerDamage, message: careerMessage } = await calculateCareerBonus(
-      ctx2,
-      handle,
-      damage,
-      weaponType,
-      // 新增参数
-      weaponId
-    );
-    damage = careerDamage;
-    if (careerMessage) effectMessage.push(careerMessage);
-    const [sovereignEffect] = await ctx2.database.get("ggcevo_Wish_Record", {
+    if (sovereign) {
+      value += 0.05;
+      messages.push("👑 王权增幅(攻击伤害+5%)");
+    }
+    const [lament] = await ctx2.database.get("ggcevo_Wish_Record", {
       handle,
-      wishname: "王权增幅",
+      wishname: "悲鸣之锋",
       startTime: { $lte: /* @__PURE__ */ new Date() },
       endTime: { $gte: /* @__PURE__ */ new Date() }
     });
-    const [lamentEffect] = await ctx2.database.get("ggcevo_Wish_Record", {
+    if (lament) {
+      const levelBonus = 0.1 * (weapon.level + 1);
+      value += levelBonus;
+      messages.push(`🗡️ 悲鸣之锋(攻击伤害+${Math.round(levelBonus * 100)}%)`);
+    }
+    const [critRhythm] = await ctx2.database.get("ggcevo_Wish_Record", {
       handle,
-      wishname: "悲鸣之锋",
+      wishname: "暴击韵律",
       startTime: { $lte: /* @__PURE__ */ new Date() },
       endTime: { $gte: /* @__PURE__ */ new Date() }
     });
-    if (sovereignEffect) {
-      damage *= 1.05;
-      effectMessage.push(`👑 王权增幅祈愿生效(攻击伤害+5%)`);
-    }
-    if (lamentEffect) {
-      const levelBonus = 0.1 * (equippedWeapon.level + 1);
-      damage *= 1 + levelBonus;
-      effectMessage.push(`🗡️ 悲鸣之锋祈愿生效(基于武器等级，攻击伤害+${(levelBonus * 100).toFixed(0)}%)`);
-    }
-    const [rankRecord] = await ctx2.database.get("ggcevo_rank", { handle: session.handle, rankseason: config.rankseason });
-    const rankBonus = calculateRankBonus(rankRecord);
-    damage *= 1 + rankBonus;
+    if (critRhythm) {
+      messages.push("🎵 暴击韵律(攻击暴击率+20%)");
+    }
     return {
-      damage: Math.round(damage),
-      hasCrit,
-      effectMessage
+      value,
+      message: messages.join("，")
     };
   }
-  __name(calculateTotalDamage, "calculateTotalDamage");
+  __name(calculateWishAdditive, "calculateWishAdditive");
+  function calculateRankAdditive(rankRecord) {
+    if (!rankRecord || rankRecord.rank <= 0) return 0;
+    return Math.floor(rankRecord.rank / 400) * 0.01;
+  }
+  __name(calculateRankAdditive, "calculateRankAdditive");
   const initDefaultItems = {
     "咕咕币": { id: 1, type: "抽奖道具", description: "用于进行抽奖" },
     "兑换券": { id: 2, type: "兑换货币", description: "用于兑换赞助物品" },
@@ -1361,20 +1366,21 @@ function apply(ctx, config) {
   }, 60 * 1e3);
   const PassiveHandler = {
     // 冰霜进化处理（免疫冰霜伤害）
-    handleFrostEvolution: /* @__PURE__ */ __name(function(targetBoss, weaponName, baseDamage, currentHP, maxHP) {
+    handleFrostEvolution: /* @__PURE__ */ __name(function(targetBoss, weaponName, damage, maxHP) {
       if (targetBoss.skills.includes("冰霜进化") && weaponName === "零度之下") {
-        const healAmount = baseDamage;
+        const healAmount = damage;
         return {
           updatedHP: Math.min(targetBoss.HP + healAmount, maxHP),
           initialDamage: 0,
-          messages: [`❄️ ${targetBoss.name} 触发【冰霜进化】免疫冰霜伤害！并且回复 ${healAmount} 生命值`]
+          // 直接设置伤害为0
+          messages: [`❄️ 【冰霜进化】生效：免疫冰霜伤害，${targetBoss.name}回复 ${healAmount} 生命值`]
         };
       }
       return null;
     }, "handleFrostEvolution"),
     // 冰霜环绕处理（主宰专用）
-    handleFrostSurround: /* @__PURE__ */ __name(async (ctx2, targetBoss, currentHP, maxHP, bossGroup) => {
-      if (targetBoss.type !== "主宰" || !targetBoss.skills.includes("冰霜环绕") || currentHP <= 0 || // 新增血量必须大于0的判断
+    handleFrostSurround: /* @__PURE__ */ __name(async (ctx2, targetBoss, currentHP, maxHP) => {
+      if (!targetBoss.skills.includes("冰霜环绕") || currentHP <= 0 || // 新增血量必须大于0的判断
       currentHP / maxHP > 0.3) {
         return null;
       }
@@ -1400,14 +1406,14 @@ function apply(ctx, config) {
         updatedHP,
         skillUpdates,
         messages: [
-          `❄️ ${targetBoss.name} 触发【冰霜环绕】，自身回复45%最大生命值(+${healAmount}HP)`,
-          `🌪️ 【寒霜地狱】降临！主宰和所有存活的子代将获得30%减伤效果`
+          `❄️ 【冰霜环绕】生效，${targetBoss.name}回复45%最大生命值(+${healAmount}HP)`,
+          `🌪️ 警告！【寒霜地狱】降临，所有存活的异形获得30%减伤效果`
         ]
       };
     }, "handleFrostSurround"),
     // 冰霜回复处理（子代专用）
     handleFrostRecovery: /* @__PURE__ */ __name(async (ctx2, targetBoss, currentHP, maxHP, activeBosses, bossGroup) => {
-      if (targetBoss.type !== "子代" || !targetBoss.skills.includes("冰霜回复") || currentHP <= 0 || // 新增血量必须大于0的判断
+      if (!targetBoss.skills.includes("冰霜回复") || currentHP <= 0 || // 新增血量必须大于0的判断
       currentHP / maxHP > 0.3) {
         return null;
       }
@@ -1433,7 +1439,7 @@ function apply(ctx, config) {
           remove: ["冰霜回复"]
         }],
         messages: [
-          `❄️ ${targetBoss.name} 触发【冰霜回复】，自身回复40%最大生命值(+${selfHeal}HP)，主宰回复10%最大生命值(+${mainHeal}HP)`
+          `❄️ 【冰霜回复】生效，${targetBoss.name}回复40%最大生命值(+${selfHeal}HP)，${mainBoss.name}回复10%最大生命值(+${mainHeal}HP)`
         ]
       };
     }, "handleFrostRecovery"),
@@ -1452,24 +1458,25 @@ function apply(ctx, config) {
           tags: newtags
         });
         return {
-          messages: [`❄️ ${targetBoss.name} 触发【冷适应】，永久获得「惧热」标签并免疫寒冷伤害！`]
+          messages: [`❄️ 【冷适应】生效，${targetBoss.name}获得「惧热」标签`]
         };
       }
       return null;
     }, "handleColdAdaptation"),
-    // 新增冷适应免疫处理函数（模仿冰霜进化）
+    // 冷适应免疫处理
     handleColdAdaptationImmunity: /* @__PURE__ */ __name(function(targetBoss, weaponName) {
-      if (targetBoss.type === "主宰" && targetBoss.name === "莽兽" && targetBoss.skills.includes("冷适应") && targetBoss.Skillcountpoints >= 10 && weaponName === "零度之下") {
+      if (targetBoss.skills.includes("冷适应") && targetBoss.Skillcountpoints >= 10 && weaponName === "零度之下") {
         return {
           initialDamage: 0,
-          messages: [`❄️ ${targetBoss.name} 触发【冷适应】免疫寒冷伤害！`]
+          // 直接设置伤害为0
+          messages: [`❄️ 【冷适应】生效：免疫寒冷伤害`]
         };
       }
       return null;
     }, "handleColdAdaptationImmunity"),
     // 求生本能处理
     handleSurvivalInstinct: /* @__PURE__ */ __name(function(targetBoss, currentHP, maxHP) {
-      if (currentHP > 1) return null;
+      if (currentHP > 0) return null;
       let effect = null;
       if (targetBoss.skills.includes("求生本能I")) {
         effect = { heal: maxHP * 0.3, skill: "求生本能I" };
@@ -1479,28 +1486,21 @@ function apply(ctx, config) {
       if (!effect) return null;
       return {
         updatedHP: effect.heal,
-        messages: [`${targetBoss.name} 触发【${effect.skill}】，瞬间回复${effect.heal}生命值！`],
+        messages: [`【${effect.skill}】生效，${targetBoss.name}瞬间回复${effect.heal}生命值！`],
         skillUpdates: [{
           name: targetBoss.name,
           remove: [effect.skill]
         }]
       };
     }, "handleSurvivalInstinct"),
-    // 感染空间站处理
-    handleInfectedStation: /* @__PURE__ */ __name(async (ctx2, targetBoss, initialDamage, bossGroup) => {
-      if (targetBoss.name !== "空间站感染虫" || !targetBoss.skills.includes("感染空间站")) {
-        return null;
-      }
-      const sentryConfig = bossGroup.minions.find((m) => m.name === "空间站哨枪塔");
-      if (!sentryConfig) return null;
-      const [sentryGun] = await ctx2.database.get("ggcevo_boss", {
-        name: "空间站哨枪塔",
-        isActive: true
-      });
+    // 感染空间站处理（返回减伤系数）
+    handleInfectedStation: /* @__PURE__ */ __name(async (ctx2, targetBoss) => {
+      if (targetBoss.name !== "空间站感染虫" || !targetBoss.skills.includes("感染空间站")) return null;
+      const [sentryGun] = await ctx2.database.get("ggcevo_boss", { name: "空间站哨枪塔", isActive: true });
       if (sentryGun) {
-        const newDamage = Math.floor(initialDamage * 0.5);
         return {
-          initialDamage: newDamage,
+          damageMultiplier: -0.5,
+          // 50% 减伤
           messages: ["🛡️ 【感染空间站】生效：空间站哨枪塔存活，受到的伤害减少50%"]
         };
       }
@@ -1533,23 +1533,18 @@ function apply(ctx, config) {
     }, "handleMoldGrowth"),
     // 岗哨机枪处理
     handleSentryGun: /* @__PURE__ */ __name(async (ctx2, targetBoss, bossGroup) => {
-      if (targetBoss.name !== "空间站哨枪塔" || !targetBoss.skills.includes("岗哨机枪")) {
+      if (!targetBoss.skills.includes("岗哨机枪")) {
         return null;
       }
-      const newCount = (targetBoss.Skillcountpoints || 0) + 1;
-      await ctx2.database.set(
-        "ggcevo_boss",
-        { name: targetBoss.name },
-        { Skillcountpoints: newCount }
-      );
-      if (newCount >= 10) {
+      const currentCount = targetBoss.Skillcountpoints || 0;
+      const updates = [];
+      let messages = [];
+      if (currentCount === 10) {
         const getMaxHP = /* @__PURE__ */ __name((name2) => {
           if (name2 === "空间站感染虫") return bossGroup.main.maxHP;
           const minion = bossGroup.minions.find((m) => m.name === name2);
           return minion?.maxHP || 0;
         }, "getMaxHP");
-        const updates = [];
-        const messages = [];
         const [infectionBug] = await ctx2.database.get("ggcevo_boss", {
           name: "空间站感染虫",
           isActive: true
@@ -1564,7 +1559,7 @@ function apply(ctx, config) {
               { HP: Math.min(infectionBug.HP + heal, maxHP) }
             )
           );
-          messages.push(`主宰回复${heal}HP`);
+          messages.push(`空间站感染虫回复${heal}HP`);
         }
         const [mechaBug] = await ctx2.database.get("ggcevo_boss", {
           name: "机械感染虫",
@@ -1591,150 +1586,193 @@ function apply(ctx, config) {
         );
         await Promise.all(updates);
         return {
-          messages: ["🔫 【岗哨机枪】触发：" + messages.join("，")]
+          messages: ["🔫 【岗哨机枪】生效：" + messages.join("，")]
+        };
+      }
+      const newCount = currentCount + 1;
+      await ctx2.database.set(
+        "ggcevo_boss",
+        { name: targetBoss.name },
+        { Skillcountpoints: newCount }
+      );
+      if (newCount === 10) {
+        return {
+          messages: ["🔫 【岗哨机枪】达到10层！下次攻击将清空层数并治疗所有存活的异形"]
         };
       }
       return null;
     }, "handleSentryGun"),
-    // 结构装甲处理
-    handleStructuralArmor: /* @__PURE__ */ __name((targetBoss, initialDamage, weaponData) => {
-      if (targetBoss.name !== "空间站哨枪塔" || !targetBoss.skills.includes("结构装甲")) {
-        return null;
-      }
+    // 结构装甲处理（返回减伤系数）
+    handleStructuralArmor: /* @__PURE__ */ __name((targetBoss, weaponData) => {
+      if (!targetBoss.skills.includes("结构装甲")) return null;
       let reduction = 0.2;
       let msg = "常规武器减伤20%";
       if (weaponData.type === "热能武器") {
         reduction = 0.4;
         msg = "热能武器减伤40%";
       }
-      const newDamage = Math.floor(initialDamage * (1 - reduction));
       return {
-        initialDamage: newDamage,
+        damageMultiplier: -reduction,
+        // 返回减伤系数
         messages: [`🛡️ 【结构装甲】生效：${msg}`]
       };
     }, "handleStructuralArmor"),
-    // 处理吸血相关效果（加法减伤 + 独立增伤）
-    handleBloodEffects: /* @__PURE__ */ __name(function(targetBoss, initialDamage, currentHP, maxHP) {
-      if (!targetBoss.skills.includes("吸血唾液")) {
-        return null;
-      }
-      let messages = [];
-      let newDamage = initialDamage;
+    // 吸血效果处理（返回综合系数）
+    handleBloodEffects: /* @__PURE__ */ __name(function(targetBoss, currentHP, maxHP) {
+      if (!targetBoss.skills.includes("吸血唾液") || !targetBoss.skills.includes("嗜血狂暴") || !targetBoss.skills.includes("吐血")) return null;
       const bloodStacks = targetBoss.Skillcountpoints || 0;
-      let totalReduction = 0;
+      let damageMultiplier = 0;
+      const messages = [];
       if (targetBoss.skills.includes("吸血唾液")) {
-        totalReduction += bloodStacks * 0.05;
-        if (bloodStacks > 0) {
-          messages.push(`🩸 【吸血唾液】技能生效：受到的伤害-${bloodStacks * 5}%`);
-        }
+        const reduction = bloodStacks * 0.05;
+        damageMultiplier -= reduction;
+        messages.push(`🩸 【吸血唾液】生效：受到的伤害-${bloodStacks * 5}%`);
       }
       if (targetBoss.skills.includes("嗜血狂暴") && currentHP / maxHP < 0.5) {
-        totalReduction += 0.2;
-        messages.push(`🔥 【嗜血狂暴】技能生效：血量低于50%，进入狂暴状态，受到的伤害-20%`);
-      }
-      if (totalReduction > 0) {
-        newDamage = Math.floor(initialDamage * (1 - totalReduction));
+        damageMultiplier -= 0.2;
+        messages.push(`🔥 【嗜血狂暴】生效：血量低于50%，进入狂暴状态，受到的伤害-20%`);
       }
       if (targetBoss.skills.includes("吐血") && bloodStacks < 1) {
-        newDamage = Math.floor(newDamage * 1.1);
-        messages.push(`💔 【吐血】技能生效：无“吸血”层数，受到的伤害+10%`);
+        damageMultiplier += 0.1;
+        messages.push(`💔 【吐血】生效：无“吸血”层数，受到的伤害+10%`);
       }
-      return newDamage !== initialDamage ? { initialDamage: newDamage, messages } : null;
+      return { damageMultiplier, messages };
     }, "handleBloodEffects"),
     handleBloodCount: /* @__PURE__ */ __name(async function(ctx2, targetBoss, currentHP, maxHP) {
-      if (!targetBoss.skills.includes("吸血唾液")) {
+      if (!targetBoss.skills.includes("吸血唾液") || !targetBoss.skills.includes("进食") || !targetBoss.skills.includes("嗜血狂暴")) {
         return null;
       }
       let messages = [];
       let updatedHP = currentHP;
+      let newStacks;
       const oldStacks = targetBoss.Skillcountpoints || 0;
       if (oldStacks >= 10 && targetBoss.skills.includes("进食")) {
         const heal = Math.floor(maxHP * 0.2);
         updatedHP = Math.min(currentHP + heal, maxHP);
         await ctx2.database.set("ggcevo_boss", { name: targetBoss.name }, { Skillcountpoints: 0 });
-        messages.push(`🍽️ 【进食】技能生效：自身回复20%最大生命值(+${heal}HP)，“吸血”层数清零`);
+        messages.push(`🍽️ 【进食】生效：${targetBoss.name}回复20%最大生命值(+${heal}HP)，“吸血”层数清零`);
         return { updatedHP, messages };
       }
-      let newStacks = oldStacks + 1;
+      if (targetBoss.skills.includes("吸血唾液")) {
+        newStacks = oldStacks + 1;
+        messages.push(`🩸 【吸血唾液】生效：获得1层“吸血”`);
+      }
       if (targetBoss.skills.includes("嗜血狂暴") && currentHP / maxHP < 0.5) {
         newStacks += 1;
-        messages.push(`🔥 【嗜血狂暴】技能生效：额外叠加1层“吸血”`);
+        messages.push(`🔥 【嗜血狂暴】生效：额外获得1层“吸血”`);
       }
       newStacks = Math.min(newStacks, 10);
       if (oldStacks < 10 && newStacks >= 10) {
-        messages.push(`🩸 吸血层数达到${newStacks}，下次攻击将触发【进食】！`);
+        messages.push(`🩸 “吸血”层数达到${newStacks}，下次受到攻击将触发【进食】`);
       }
       await ctx2.database.set("ggcevo_boss", { name: targetBoss.name }, { Skillcountpoints: newStacks });
       return { updatedHP, messages };
     }, "handleBloodCount"),
-    // 伽马枪辐射层数处理（攻击后触发）
-    handleGammaRadiation: /* @__PURE__ */ __name(async (ctx2, targetBoss, weaponName) => {
-      if (weaponName !== "伽马枪") return null;
+    // 修改后的伽马枪辐射处理
+    handleGammaRadiation: /* @__PURE__ */ __name(async (ctx2, targetBoss, weaponData) => {
+      if (weaponData.name !== "伽马枪" || targetBoss.tags.includes("机械") || !targetBoss.tags.includes("生物")) {
+        return null;
+      }
       const messages = [];
-      const isNewRadiation = !targetBoss.skills.includes("辐射");
-      const newSkills = isNewRadiation ? [...targetBoss.skills, "辐射"] : targetBoss.skills;
-      const newVulnerability = isNewRadiation ? 1 : Math.min(targetBoss.Vulnerability + 1, 100);
+      const hasRadiation = targetBoss.skills.includes("辐射");
+      const currentLayers = targetBoss.Vulnerability || 0;
+      const newSkills = hasRadiation ? targetBoss.skills : [...targetBoss.skills, "辐射"];
+      const newLayers = hasRadiation ? Math.min(currentLayers + 1, 100) : 1;
       let layerMsg;
-      if (isNewRadiation) {
-        layerMsg = `☢️ 获得【辐射】效果`;
+      0;
+      if (!hasRadiation) {
+        layerMsg = `☢️ ${targetBoss.name} 获得【辐射】效果`;
+      } else if (newLayers === currentLayers) {
+        layerMsg = `☢️ 辐射层数已达上限(100层)`;
       } else {
-        if (newVulnerability === targetBoss.Vulnerability) {
-          layerMsg = `☢️ 辐射层数已达上限(100层)`;
-        } else {
-          const addedLayers = newVulnerability - targetBoss.Vulnerability;
-          layerMsg = `☢️ 辐射层数+${addedLayers}`;
-        }
+        layerMsg = `☢️ 辐射层数叠加至${newLayers}`;
       }
-      await ctx2.database.set("ggcevo_boss", { name: targetBoss.name }, {
-        skills: newSkills,
-        Vulnerability: newVulnerability
-      });
-      messages.push(`${targetBoss.name} ${layerMsg}`);
+      await ctx2.database.set(
+        "ggcevo_boss",
+        { name: targetBoss.name },
+        {
+          skills: Array.from(new Set(newSkills)),
+          // 显式类型断言
+          Vulnerability: newLayers
+        }
+      );
+      messages.push(layerMsg);
       return { messages };
     }, "handleGammaRadiation"),
-    // 修正后的辐射伤害计算函数
-    calculateRadiationDamage: /* @__PURE__ */ __name((targetBoss, baseDamage) => {
-      if (!targetBoss.skills.includes("辐射")) {
-        return {
-          damage: baseDamage,
-          messages: []
-        };
-      }
+    // 伽马枪辐射计算（返回增伤系数）
+    calculateRadiationDamage: /* @__PURE__ */ __name((targetBoss) => {
+      if (!targetBoss.skills.includes("辐射")) return null;
       const radiationLayers = targetBoss.Vulnerability || 0;
-      const damageMultiplier = 1 + radiationLayers * 0.01;
-      const amplifiedDamage = Math.floor(baseDamage * damageMultiplier);
       return {
-        damage: amplifiedDamage,
-        messages: radiationLayers > 0 ? [
-          `☢️ 【辐射】效果触发：当前${radiationLayers}层辐射，受到的伤害+${radiationLayers}%`
-        ] : []
+        damageMultiplier: radiationLayers * 0.01,
+        // 每层1%增伤
+        messages: radiationLayers > 0 ? [`☢️ 【辐射】生效：当前${radiationLayers}层辐射，受到的伤害+${radiationLayers}%`] : []
       };
     }, "calculateRadiationDamage"),
-    // 统一处理被动技能（关键修复部分）
-    handlePassives: /* @__PURE__ */ __name(async function(ctx2, targetBoss, initialDamage, currentHP, maxHP, weaponName, weaponData, baseDamage, activeBosses, bossGroup) {
+    // 统一处理被动技能
+    handlePassives: /* @__PURE__ */ __name(async function(ctx2, targetBoss, initialDamage, currentHP, maxHP, weaponName, weaponData, activeBosses, bossGroup) {
       let messages = [];
       let skillUpdates = [];
+      let totalMultiplier = 0;
+      const frostEvoResult = this.handleFrostEvolution(targetBoss, weaponName, initialDamage, maxHP);
+      if (frostEvoResult) {
+        return {
+          currentHP: frostEvoResult.updatedHP,
+          messages: frostEvoResult.messages,
+          skillUpdates,
+          initialDamage: 0
+        };
+      }
+      const coldImmunityResult = this.handleColdAdaptationImmunity(targetBoss, weaponName);
+      if (coldImmunityResult) {
+        return {
+          currentHP,
+          messages: coldImmunityResult.messages,
+          skillUpdates,
+          initialDamage: 0
+        };
+      }
       if (currentHP <= 0 && !targetBoss.skills.includes("求生本能I") && !targetBoss.skills.includes("求生本能II")) {
         return { currentHP, messages: [], skillUpdates: [], initialDamage };
       }
-      const radiationCalc = this.calculateRadiationDamage(targetBoss, initialDamage);
-      if (radiationCalc.messages.length > 0) {
-        messages.push(...radiationCalc.messages);
-        initialDamage = radiationCalc.damage;
+      targetBoss.skills.forEach((skill) => {
+        const config2 = passiveConfig[skill];
+        if (config2 && config2.effect !== void 0 && config2.effect !== 0) {
+          totalMultiplier += config2.effect;
+          const effectPercent = Math.round(config2.effect * 100);
+          messages.push(`📚 【${skill}】生效，受到的伤害${config2.effect > 0 ? "+" : ""}${effectPercent}%`);
+        }
+      });
+      const infectionResult = await this.handleInfectedStation(ctx2, targetBoss);
+      if (infectionResult) {
+        totalMultiplier += infectionResult.damageMultiplier;
+        messages.push(...infectionResult.messages);
       }
-      const bloodEffectResult = this.handleBloodEffects(targetBoss, initialDamage, currentHP, maxHP);
-      if (bloodEffectResult) {
-        initialDamage = bloodEffectResult.initialDamage;
-        messages.push(...bloodEffectResult.messages);
+      const armorResult = this.handleStructuralArmor(targetBoss, weaponData);
+      if (armorResult) {
+        totalMultiplier += armorResult.damageMultiplier;
+        messages.push(...armorResult.messages);
       }
-      const frostEvoResult = this.handleFrostEvolution(targetBoss, weaponName, baseDamage, currentHP, maxHP);
-      if (frostEvoResult) {
-        initialDamage = frostEvoResult.initialDamage;
-        currentHP = frostEvoResult.updatedHP;
-        messages.push(...frostEvoResult.messages);
-        return { currentHP, messages, skillUpdates, initialDamage };
+      const bloodEffect = this.handleBloodEffects(targetBoss, currentHP, maxHP);
+      if (bloodEffect) {
+        totalMultiplier += bloodEffect.damageMultiplier;
+        messages.push(...bloodEffect.messages);
+      }
+      const radiationCalc = this.calculateRadiationDamage(targetBoss);
+      if (radiationCalc) {
+        totalMultiplier += radiationCalc.damageMultiplier;
+        messages.push(...radiationCalc.messages);
+      }
+      const originalMultiplier = totalMultiplier;
+      totalMultiplier = Math.max(totalMultiplier, -0.99);
+      if (originalMultiplier < -0.99) {
+        messages.push(`⚠️ 减伤效果已达上限(99%)`);
       }
-      const frostSurroundResult = await this.handleFrostSurround(ctx2, targetBoss, currentHP, maxHP, bossGroup);
+      let finalDamage = initialDamage * (1 + totalMultiplier);
+      finalDamage = Math.floor(finalDamage);
+      finalDamage = Math.max(finalDamage, 1);
+      currentHP = targetBoss.HP - finalDamage;
+      const frostSurroundResult = await this.handleFrostSurround(ctx2, targetBoss, currentHP, maxHP);
       if (frostSurroundResult) {
         currentHP = frostSurroundResult.updatedHP;
         messages.push(...frostSurroundResult.messages);
@@ -1746,53 +1784,44 @@ function apply(ctx, config) {
         messages.push(...frostRecoveryResult.messages);
         skillUpdates.push(...frostRecoveryResult.skillUpdates);
       }
+      const moldResult = await this.handleMoldGrowth(ctx2, targetBoss, bossGroup);
+      if (moldResult) {
+        messages.push(...moldResult.messages);
+      }
+      const survivalResult = this.handleSurvivalInstinct(targetBoss, currentHP, maxHP);
+      if (survivalResult) {
+        currentHP = survivalResult.updatedHP;
+        messages.push(...survivalResult.messages);
+        skillUpdates.push(...survivalResult.skillUpdates);
+      }
       const coldAdaptResult = await this.handleColdAdaptation(ctx2, targetBoss, weaponName);
       if (coldAdaptResult) {
         messages.push(...coldAdaptResult.messages);
       }
-      const coldImmunityResult = this.handleColdAdaptationImmunity(targetBoss, weaponName);
-      if (coldImmunityResult) {
-        initialDamage = coldImmunityResult.initialDamage;
-        currentHP = targetBoss.HP;
-        messages.push(...coldImmunityResult.messages);
-        return { currentHP, messages, skillUpdates, initialDamage };
-      }
       const bloodCountResult = await this.handleBloodCount(ctx2, targetBoss, currentHP, maxHP);
       if (bloodCountResult) {
         currentHP = bloodCountResult.updatedHP;
         messages.push(...bloodCountResult.messages);
       }
-      const infectionResult = await this.handleInfectedStation(ctx2, targetBoss, initialDamage, bossGroup);
-      if (infectionResult) {
-        initialDamage = infectionResult.initialDamage;
-        messages.push(...infectionResult.messages);
-      }
-      const armorResult = this.handleStructuralArmor(targetBoss, initialDamage, weaponData);
-      if (armorResult) {
-        initialDamage = armorResult.initialDamage;
-        messages.push(...armorResult.messages);
-      }
       const sentryResult = await this.handleSentryGun(ctx2, targetBoss, bossGroup);
       if (sentryResult) {
         messages.push(...sentryResult.messages);
       }
-      const moldResult = await this.handleMoldGrowth(ctx2, targetBoss, bossGroup);
-      if (moldResult) {
-        messages.push(...moldResult.messages);
-      }
-      if (weaponName === "伽马枪" && targetBoss.tags.includes("生物") && !targetBoss.tags.includes("机械")) {
-        const radiationResult = await this.handleGammaRadiation(ctx2, targetBoss, weaponName);
-        if (radiationResult) {
-          messages.push(...radiationResult.messages);
-        }
-      }
-      const survivalResult = this.handleSurvivalInstinct(targetBoss, currentHP, maxHP);
-      if (survivalResult) {
-        currentHP = survivalResult.updatedHP;
-        messages.push(...survivalResult.messages);
-        skillUpdates.push(...survivalResult.skillUpdates);
+      const gammaRadResult = await this.handleGammaRadiation(
+        ctx2,
+        targetBoss,
+        weaponData
+        // 传入武器数据对象
+      );
+      if (gammaRadResult) {
+        messages.push(...gammaRadResult.messages);
       }
-      return { currentHP, messages, skillUpdates, initialDamage };
+      return {
+        currentHP,
+        messages,
+        skillUpdates,
+        initialDamage: finalDamage
+      };
     }, "handlePassives"),
     // 应用技能更新到数据库
     applySkillUpdates: /* @__PURE__ */ __name(async (ctx2, skillUpdates) => {
@@ -2347,6 +2376,23 @@ function apply(ctx, config) {
     ].join("\n");
   }
   __name(generateUpgradePriceList, "generateUpgradePriceList");
+  const weaponConfigById = {};
+  for (const key in weaponConfig) {
+    weaponConfigById[weaponConfig[key].id] = weaponConfig[key];
+  }
+  async function calculateTotalPower(handle, baseRank) {
+    const weapons = await ctx.database.get("ggcevo_equipment", { handle });
+    let total = baseRank;
+    for (const { weaponId, level, installedMods } of weapons) {
+      const weapon = weaponConfigById[weaponId];
+      if (!weapon) continue;
+      total += weapon.damage * 100;
+      total += level * 1e3;
+      total += (installedMods?.length || 0) * 2e3;
+    }
+    return total;
+  }
+  __name(calculateTotalPower, "calculateTotalPower");
   ctx.command("ggcevo/抽奖").action(async (argv) => {
     const session = argv.session;
     let winCount = 0;
@@ -3795,7 +3841,7 @@ ${achievementList.join("\n")}`;
   ctx.command("ggcevo/pk [user]", "发起玩家对战").alias("挑战").action(async (argv, user) => {
     try {
       const session = argv.session;
-      if (!user) return "缺少参数，请输入“pk @指定pk玩家”。";
+      if (!user) return "请输入“pk @指定pk玩家”。";
       const [profile] = await ctx.database.get("sc2arcade_player", { userId: session.userId });
       if (!profile) return "🔒 需要先绑定游戏句柄。";
       const handle = `${profile.regionId}-S2-${profile.realmId}-${profile.profileId}`;
@@ -3818,6 +3864,8 @@ ${achievementList.join("\n")}`;
       ]);
       const initiatorRank = initiatorData[0]?.rank || 0;
       const targetRank = targetData[0]?.rank || 0;
+      const initiatorPower = await calculateTotalPower(initiatorHandle, initiatorRank);
+      const targetPower = await calculateTotalPower(targetHandle, targetRank);
       const initiatorRankname = initiatorData[0]?.name || session.username;
       const targetRankname = targetData[0]?.name || (targetUsername.name || targetUsername.user.name);
       let initiatorPK = {
@@ -3895,9 +3943,9 @@ ${achievementList.join("\n")}`;
       const targetGold = targetSign[0]?.totalRewards || 0;
       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);
+      const powerDiff = initiatorPower - targetPower;
+      let winRate = 50 + powerDiff / 20 * 0.01;
+      winRate = Math.min(Math.max(winRate, 5), 95);
       const isWin = Math.random() * 100 < winRate;
       const stealPercentage = getRandomInt(1, 5);
       const goldTransfer = Math.floor(
@@ -3965,13 +4013,13 @@ ${achievementList.join("\n")}`;
       });
       const result = [
         `⚔️【对战结果】${isWin ? "胜利" : "失败"}`,
-        `🏅 挑战者：${initiatorRankname}(积分 ${initiatorRank})`,
-        `🛡️ 应战者：${targetRankname}(积分 ${targetRank})`,
+        `🏅 挑战者：${initiatorRankname}(战斗力 ${initiatorRank})`,
+        `🛡️ 应战者：${targetRankname}(战斗力 ${targetRank})`,
         `📊  胜率预测：${winRate.toFixed(1)}%`,
         `🎰 金币变动：${stealPercentage}%`
       ];
       isWin ? result.push(`💰 您从对方的口袋里抢夺了${goldTransfer}枚金币`) : result.push(`💸 您从口袋里拿出了${goldTransfer}枚金币上交给对方`);
-      initiatorCareer?.group === "辛迪加海盗" ? result.push(`🔴 海盗阵营奖励：获得1红晶`) : "";
+      initiatorCareer?.group === "辛迪加海盗" ? result.push(`🔴 海盗阵营奖励：获得1枚红晶`) : "";
       result.push(`📅 剩余挑战次数：${config.dailyPKLimit - (initiatorPK.todayCount + 1)}`);
       return result.join("\n");
     } catch (error) {
@@ -4105,7 +4153,7 @@ ${Object.keys(typeStats).join("、")}`;
     });
     return [
       `🏪 咕咕武器库 - ${type} 🏪`,
-      "使用“购买 武器名称”命令进行购买",
+      "使用“购买 武器名称”指令进行购买",
       discountRate > 0 && `🔧 当前购买折扣：${discountRate}% (武器系统 Lv${techLevel})`,
       "====================",
       ...items,
@@ -4146,7 +4194,7 @@ ${validTypes.join("、")}`;
     ].join("\n"));
     return [
       `💣 爆破装备库 - ${type} 💣`,
-      "使用“购买 物品名称”命令进行购买",
+      "使用“购买 物品名称”指令进行购买",
       "====================",
       ...items,
       items.length === 0 ? "⚠️ 该分类下暂无可用物品" : ""
@@ -4300,7 +4348,7 @@ ${validTypes.join("、")}`;
       ].join("\n");
     }));
     return [
-      "🛡️ 您当前拥有的武器",
+      `🛡️ ${handle}当前拥有的武器`,
       '使用"装备 武器名称"来装备武器',
       "⚡表示当前装备武器",
       "──────────────",
@@ -4481,6 +4529,11 @@ ${validTypes.join("、")}`;
   ctx.command("ggcevo/攻击 <bossName>").usage("请输入要攻击的异形名称(例如：攻击 异齿猛兽 或 攻击 寒冰王蛇)").action(async (argv, bossName) => {
     const session = argv.session;
     let broadcastMessage = null;
+    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 getActiveBossNames = /* @__PURE__ */ __name(async () => {
       const activeBosses2 = await ctx.database.get("ggcevo_boss", { isActive: true });
       return activeBosses2.map((b) => b.name).join("，");
@@ -4499,11 +4552,6 @@ ${validTypes.join("、")}`;
       return `当前没有找到名为 ${bossName} 的可攻击目标。
 请攻击当前存活的异形：${activeNames || "无"}。`;
     }
-    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 config2 = ctx.config;
     const unlimitedBossAttack = config2.unlimitedBossAttack;
     if (!unlimitedBossAttack) {
@@ -4526,17 +4574,17 @@ ${validTypes.join("、")}`;
     if (!weaponData.isantiair && targetBoss.groupId === 5) {
       return "您装备的武器无法攻击空中目标！";
     }
-    const { damage: baseDamage, hasCrit, effectMessage } = await calculateTotalDamage(ctx, session, equippedWeapon, targetBoss);
     const activeBosses = await ctx.database.get("ggcevo_boss", { isActive: true });
-    if (!activeBosses.length) return "当前没有存活的异形，请等待1小时后刷新。";
+    if (!activeBosses.length) return "当前没有存活的异形，请等待下一轮刷新。";
     const bossGroup = bossPool.find(
       (g) => g.main.name === targetBoss.name || g.minions.some((m) => m.name === targetBoss.name)
     );
     if (!bossGroup) return "无法获取异形组配置。";
     const maxHP = targetBoss.type === "主宰" ? bossGroup.main.maxHP : bossGroup.minions.find((m) => m.name === targetBoss.name)?.maxHP || 0;
-    let initialDamage = Math.min(baseDamage, targetBoss.HP);
+    const { damage, hasCrit, effectMessage } = await calculateTotalDamage(ctx, session, equippedWeapon, targetBoss);
+    let initialDamage = Math.min(damage, targetBoss.HP);
     let currentHP = targetBoss.HP - initialDamage;
-    let healMessages = [];
+    let passiveMessages = [];
     const passiveResult = await PassiveHandler.handlePassives(
       ctx,
       targetBoss,
@@ -4545,13 +4593,12 @@ ${validTypes.join("、")}`;
       maxHP,
       weaponName,
       weaponData,
-      baseDamage,
       activeBosses,
       bossGroup
     );
     currentHP = passiveResult.currentHP;
     initialDamage = passiveResult.initialDamage;
-    healMessages.push(...passiveResult.messages);
+    passiveMessages.push(...passiveResult.messages);
     if (passiveResult.skillUpdates.length > 0) {
       await PassiveHandler.applySkillUpdates(ctx, passiveResult.skillUpdates);
     }
@@ -4619,7 +4666,7 @@ ${validTypes.join("、")}`;
             await ctx.database.set("ggcevo_boss", { name: mainBoss.name }, {
               skills: [...mainBoss.skills, "孤立无援"]
             });
-            broadcastMessages.push("💥 机械感染虫被消灭，空间站感染虫进入【孤立无援】状态，受到的伤害+20%！");
+            broadcastMessages.push("💥 机械感染虫已阵亡，空间站感染虫进入【孤立无援】状态，受到的伤害+20%！");
           }
         } else {
           remainingMinions = await ctx.database.get("ggcevo_boss", {
@@ -4637,7 +4684,7 @@ ${validTypes.join("、")}`;
               await ctx.database.set("ggcevo_boss", { name: mainBoss.name }, {
                 skills: [...mainBoss.skills, "孤立无援"]
               });
-              broadcastMessages.push("💥 所有子代已阵亡，主宰进入【孤立无援】状态，受到的伤害+20%！");
+              broadcastMessages.push(`💥 所有子代已阵亡，${mainBoss.name}进入【孤立无援】状态，受到的伤害+20%！`);
             }
           }
         }
@@ -4669,7 +4716,7 @@ ${validTypes.join("、")}`;
         handle,
         redcrystal: (careerData?.redcrystal || 0) + 1
       }], ["handle"]);
-      redcrystalMessage = "🔴 清洁工职业加成：获得1个红晶！";
+      redcrystalMessage = "🔴 清洁工职业加成：获得1枚红晶";
     }
     const finalReward = Math.round(initialDamage * careerMultiplier);
     const [existingSign] = await ctx.database.get("ggcevo_sign", { handle });
@@ -4681,12 +4728,15 @@ ${validTypes.join("、")}`;
     const resultMessage = [
       `🔥 ${session.username} 使用武器 ${weaponName} 对 ${targetBoss.name} 发起攻击！`,
       ...effectMessage.length > 0 ? [
-        `触发效果：
-${effectMessage.join("\n")}`
+        `⚡ 攻击效果：
+${effectMessage.map((m) => `▸ ${m}`).join("\n")}`
+      ] : [],
+      // === 新增被动效果提示区域 ===
+      ...passiveMessages.length > 0 ? [
+        `🛡️ 被动效果：
+${passiveMessages.map((m) => `▸ ${m}`).join("\n")}`
       ] : [],
-      ...healMessages,
       `造成伤害：${initialDamage}${hasCrit ? "(✨ 暴击)" : ""}`,
-      // 修改金币显示行
       `获得金币：${finalReward}${careerMessage}`,
       redcrystalMessage,
       `目标剩余HP：${Math.max(currentHP, 0)}/${maxHP}`,
@@ -4699,12 +4749,11 @@ ${effectMessage.join("\n")}`
       await ctx.broadcast(groupId, finalBroadcast);
     }
   });
-  ctx.command("ggcevo/攻击假人").usage("测试当前装备武器的伤害，可添加标签和被动\n用法：攻击假人 [--标签 标签1 标签2] [--被动 被动1 被动2]").option("tags", "-t <tags:string> 添加BOSS标签(逗号分隔)").option("passives", "-p <passives:string> 添加BOSS被动(逗号分隔)").action(async (argv) => {
+  ctx.command("ggcevo/攻击假人").option("tags", "-t <tags:string> 添加BOSS标签(逗号分隔)").action(async (argv) => {
     const session = argv.session;
     const { options } = argv;
     const parseList = /* @__PURE__ */ __name((str) => str ? str.split(",").map((s) => s.trim()).filter(Boolean) : [], "parseList");
     const tags = parseList(options.tags);
-    const passives = parseList(options.passives);
     const [profile] = await ctx.database.get("sc2arcade_player", { userId: session.userId });
     if (!profile) return "🔒 需要先绑定游戏句柄。";
     const handle = `${profile.regionId}-S2-${profile.realmId}-${profile.profileId}`;
@@ -4720,8 +4769,6 @@ ${effectMessage.join("\n")}`
       HP: Infinity,
       type: "主宰",
       groupId: 0,
-      skills: passives || [],
-      // 从选项获取被动
       tags: tags || []
       // 从选项获取标签
     };
@@ -4733,21 +4780,22 @@ ${effectMessage.join("\n")}`
       {
         isTest: true,
         // 标记为测试模式
-        customTags: tags,
-        customPassives: passives
+        customTags: tags
       }
     );
     const weaponConfigEntry = Object.entries(weaponConfig).find(([_, c]) => c.id === equippedWeapon.weaponId);
     const [weaponName] = weaponConfigEntry;
     return [
-      `🎯 测试攻击 ${dummyBoss.name}`,
+      `🎯 攻击 ${dummyBoss.name}`,
       `💥 使用武器：${weaponName}`,
       options.tags?.length && `🏷️ 模拟标签：${tags.join(", ")}`,
-      options.passives?.length && `🛡️ 模拟被动：${passives.join(", ")}`,
-      `📊 理论伤害值：${damage}`,
-      hasCrit ? "✨ 触发暴击" : "",
-      ...effectMessage,
-      "⚠️ 注意：假人默认无属性，标签和被动需手动添加"
+      ...effectMessage.length ? [
+        "⚡ 攻击效果：",
+        ...effectMessage.map((m) => `▸ ${m}`)
+        // 这里添加符号
+      ] : [],
+      `📊 理论伤害值：${damage}${hasCrit ? " (✨ 触发暴击)" : ""}`,
+      "💡 提示：使用 -t 重甲,生物…… 添加测试标签"
     ].filter((line) => line).join("\n");
   });
   ctx.command("ggcevo/伤害榜 [page]", "查看当前主宰伤害排名").usage("输入 伤害榜 [页码] 查看对应页的排行榜，每页10条").action(async (_, page) => {
@@ -5182,9 +5230,9 @@ ${effectMessage.join("\n")}`
           infoCard.push("", "〓 科技研发 〓", ...activeTechs);
         }
       }
-      const promptMessage = careerData.group === "辛迪加海盗" ? "💡 提示：红晶可通过主动PK获得(无论胜负)" : "💡 提示：使用「转职」命令可变更职业";
+      const promptMessage = careerData.group === "辛迪加海盗" ? "💡 提示：红晶可通过主动PK获得(无论胜负)" : "💡 提示：使用「转职」指令可变更职业";
       return [
-        "〓 职业档案 〓",
+        `〓 ${handle}的职业档案 〓`,
         ...infoCard,
         "〓═════════〓\n" + promptMessage
         // 提示信息放在分隔线下方

package/package.json

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