koishi-plugin-ggcevo-game 1.3.61 → 1.3.63

package/lib/index.js

@@ -491,7 +491,7 @@ function apply(ctx, config) {
       description: "一个小型辛迪加机器人，可以破坏电子银行账户",
       price: 0,
       redCrystalCost: 60,
-      effects: "此物品存放于仓库自动生效(阵营必须为辛迪加海盗)。每日签到金币奖励+50%，每拥有100金币，增加1%(至多增加100%)"
+      effects: "此物品存放于仓库自动生效(阵营必须为辛迪加海盗)。每日签到金币奖励+50%，每有一名人类联盟玩家额外增加1%(至多额外增加50%)"
     },
     "脉冲手雷": {
       id: 4,
@@ -526,7 +526,7 @@ function apply(ctx, config) {
     // 新增专属模块
     "裂甲核心": {
       cost: 750,
-      effect: "伤害+40%，对重甲目标改为造成120%伤害",
+      effect: "伤害+40%，对重甲目标改为造成150%伤害",
       exclusiveTo: "高斯步枪",
       // 指定专属武器
       isExclusive: true
@@ -680,7 +680,7 @@ function apply(ctx, config) {
     },
     "嗜血狂暴": {
       effect: 0,
-      description: "血量低于50%时，每次受到攻击将会额外获得一层“吸血”，并且受到的伤害-20%"
+      description: "血量低于50%时，进入狂暴状态，每次受到攻击将会额外获得一层“吸血”，并且受到的伤害-20%"
     },
     "吐血": {
       effect: 0,
@@ -721,6 +721,30 @@ function apply(ctx, config) {
     "能量黑洞": {
       effect: 0,
       description: "存在“能量黑洞”，受到的伤害-10%; 每拥有一层“寒冷”，受到的伤害+5%"
+    },
+    "火焰异形": {
+      effect: 0,
+      description: "免疫火焰伤害，受到火焰伤害时会回复生命值"
+    },
+    "庞兽狂暴": {
+      effect: 0,
+      description: "血量低于50%后，进入狂暴状态，受到的伤害-50%"
+    },
+    "灼烧粘液": {
+      effect: 0,
+      description: "受到伤害后，会获得一层“胆汁”; 若存在“胆汁”层数下受到火焰攻击，将立刻引爆并使受到的伤害+100%，同时层数清零"
+    },
+    "腐蚀胆汁": {
+      effect: 0,
+      description: "当“胆汁”达到5层时，发射灼热强酸爆蛋并清空层数，治愈所有存活的异形500点血量"
+    },
+    "火焰吐息": {
+      effect: 0,
+      description: "当“胆汁”达到10层时，发射灼热强酸爆蛋并清空层数，治愈所有存活的异形20%最大生命值"
+    },
+    "太阳耀斑": {
+      effect: 0,
+      description: "当所有子代阵亡后，自身移除“惧寒”标签和“孤立无援”并免疫寒冷伤害"
     }
   };
   const defineBoss = /* @__PURE__ */ __name((config2) => config2, "defineBoss");
@@ -874,6 +898,27 @@ function apply(ctx, config) {
           passive: asPassives(["弱化形态", "电能导体", "能量虹吸", "能量黑洞"])
         }
       ]
+    }),
+    defineBoss({
+      main: {
+        id: 7,
+        name: "烈焰庞兽",
+        type: "主宰",
+        maxHP: 2e4,
+        energy: 0,
+        tags: asBossTags(["重甲", "生物", "惧寒", "重型", "异形"]),
+        passive: asPassives(["火焰异形", "庞兽狂暴", "灼烧粘液", "火焰吐息", "太阳耀斑"])
+      },
+      minions: [
+        {
+          name: "火焰甲虫",
+          type: "子代",
+          maxHP: 5e3,
+          energy: 0,
+          tags: asBossTags(["重甲", "生物", "惧寒", "异形"]),
+          passive: asPassives(["弱化形态", "火焰异形", "灼烧粘液", "腐蚀胆汁"])
+        }
+      ]
     })
   ];
   const spaceStationCrewConfig = [
@@ -900,7 +945,7 @@ function apply(ctx, config) {
     },
     {
       professionName: "武器中士",
-      effect: "攻击伤害+15%",
+      effect: "攻击伤害+15%; 购买武器(非传奇)享有20%的折扣",
       requirements: "当期伤害榜累计造成100及以上伤害",
       Jobtransfer: true,
       costcoins: 2e3
@@ -914,7 +959,7 @@ function apply(ctx, config) {
     },
     {
       professionName: "情报副官",
-      effect: "升级空间站科技花费的金币是原价的80%",
+      effect: "升级空间站科技享有20%的折扣",
       requirements: "至少一个空间站科技等级≥3级",
       Jobtransfer: true,
       costcoins: 3e3
@@ -1259,7 +1304,7 @@ function apply(ctx, config) {
   __name(checkCritRhythm, "checkCritRhythm");
   async function calculateTagMultiplier(weaponData, tags, equippedWeapon) {
     const MOD_EFFECTS = [
-      { mod: "裂甲核心", tag: "重甲", value: 1.2 },
+      { mod: "裂甲核心", tag: "重甲", value: 1.5 },
       { mod: "助燃核心", tag: "惧热", value: 3 },
       { mod: "助燃核心", tag: "生物", value: 2 }
     ];
@@ -1315,28 +1360,28 @@ function apply(ctx, config) {
     let message = "";
     if (careerData?.career === "警卫长") {
       value += 0.05;
-      message = "⚔️ 职业加成：警卫长(攻击伤害+5%)";
+      message = "⚔️ 警卫长：攻击伤害+5%";
     }
     if (careerData?.career === "武器中士") {
       value += 0.15;
-      message = "⚔️ 职业加成：武器中士(攻击伤害+15%)";
+      message = "⚔️ 武器中士：攻击伤害+15%";
     }
     if (careerData?.career === "能量武器专家") {
       if (weaponType === "能量武器") {
         value += 0.2;
-        message = "⚔️ 职业加成：能量武器专家(能量武器伤害+20%)";
+        message = "⚔️ 能量武器专家：能量武器攻击伤害+20%";
       }
     }
     if (careerData?.career === "纵火狂") {
       if (weaponType === "热能武器") {
         value += 0.2;
-        message = "⚔️ 职业加成：纵火狂(热能武器伤害+20%)";
+        message = "⚔️ 纵火狂：热能武器攻击伤害+20%";
       }
     }
     if (careerData?.career === "猩红杀手") {
       if (weaponId === 7) {
         value += 0.15;
-        message = "⚔️ 职业加成：猩红杀手(侦察步枪伤害+15%)";
+        message = "⚔️ 猩红杀手：侦察步枪攻击伤害+15%";
       }
     }
     return { value, message };
@@ -1353,7 +1398,7 @@ function apply(ctx, config) {
     });
     if (sovereign) {
       value += 0.05;
-      messages.push("👑 王权增幅(攻击伤害+5%)");
+      messages.push("👑 王权增幅：攻击伤害+5%");
     }
     const [lament] = await ctx2.database.get("ggcevo_Wish_Record", {
       handle,
@@ -1364,7 +1409,7 @@ function apply(ctx, config) {
     if (lament) {
       const levelBonus = 0.1 * (weapon.level + 1);
       value += levelBonus;
-      messages.push(`🗡️ 悲鸣之锋(攻击伤害+${Math.round(levelBonus * 100)}%)`);
+      messages.push(`🗡️ 悲鸣之锋：攻击伤害+${Math.round(levelBonus * 100)}%`);
     }
     const [critRhythm] = await ctx2.database.get("ggcevo_Wish_Record", {
       handle,
@@ -1373,7 +1418,7 @@ function apply(ctx, config) {
       endTime: { $gte: /* @__PURE__ */ new Date() }
     });
     if (critRhythm) {
-      messages.push("🎵 暴击韵律(攻击暴击率+20%)");
+      messages.push("🎵 暴击韵律：攻击暴击率+20%");
     }
     return {
       value,
@@ -1582,7 +1627,7 @@ function apply(ctx, config) {
           updatedHP: Math.min(targetBoss.HP + healAmount, maxHP),
           initialDamage: 0,
           // 直接设置伤害为0
-          messages: [`❄️ 【冰霜进化】生效：免疫冰霜伤害，${targetBoss.name}回复 ${healAmount} 生命值`]
+          messages: [`❄️ 【冰霜进化】生效：免疫寒冷伤害，${targetBoss.name}回复${healAmount}生命值`]
         };
       }
       return null;
@@ -1695,7 +1740,7 @@ function apply(ctx, config) {
       if (!effect) return null;
       return {
         updatedHP: effect.heal,
-        messages: [`【${effect.skill}】生效，${targetBoss.name}瞬间回复${effect.heal}生命值！`],
+        messages: [`【${effect.skill}】生效，${targetBoss.name}濒死时瞬间回复${effect.heal}生命值`],
         skillUpdates: [{
           name: targetBoss.name,
           remove: [effect.skill]
@@ -1710,7 +1755,7 @@ function apply(ctx, config) {
         return {
           damageMultiplier: -0.5,
           // 50% 减伤
-          messages: ["🛡️ 【感染空间站】生效：空间站哨枪塔存活，受到的伤害减少50%"]
+          messages: ["🛡️ 【感染空间站】生效：空间站哨枪塔存活时，受到的伤害-50%"]
         };
       }
       return null;
@@ -1815,10 +1860,10 @@ function apply(ctx, config) {
     handleStructuralArmor: /* @__PURE__ */ __name((targetBoss, weaponData) => {
       if (!targetBoss.skills.includes("结构装甲")) return null;
       let reduction = 0.2;
-      let msg = "常规武器减伤20%";
+      let msg = "受到常规武器伤害-20%";
       if (weaponData.type === "热能武器") {
         reduction = 0.4;
-        msg = "热能武器减伤40%";
+        msg = "受到热能武器伤害-40%";
       }
       return {
         damageMultiplier: -reduction,
@@ -1841,7 +1886,7 @@ function apply(ctx, config) {
       }
       if (targetBoss.skills.includes("嗜血狂暴") && currentHP / maxHP < 0.5) {
         damageMultiplier -= 0.2;
-        messages.push(`🔥 【嗜血狂暴】生效：血量低于50%，进入狂暴状态，受到的伤害-20%`);
+        messages.push(`🔥 【嗜血狂暴】生效：进入狂暴状态，受到的伤害-20%`);
       }
       if (targetBoss.skills.includes("吐血") && bloodStacks < 1) {
         damageMultiplier += 0.2;
@@ -1874,7 +1919,7 @@ function apply(ctx, config) {
       }
       newStacks = Math.min(newStacks, 20);
       if (oldStacks < 20 && newStacks >= 20) {
-        messages.push(`🩸 “吸血”层数达到${newStacks}，下次受到攻击将触发【进食】`);
+        messages.push(`🩸 “吸血”达到${newStacks}层，下次受到攻击将触发【进食】`);
       }
       await ctx2.database.set("ggcevo_boss", { name: targetBoss.name }, { Skillcountpoints: newStacks });
       return { updatedHP, messages };
@@ -2063,7 +2108,7 @@ function apply(ctx, config) {
         return {
           immune: true,
           messages: [
-            `🛡️ 【电能立场】生效：成功免疫伤害！`
+            `🛡️ 【电能立场】生效：免疫非寒冷伤害！`
           ]
         };
       }
@@ -2120,7 +2165,7 @@ function apply(ctx, config) {
           await Promise.all(updates);
           return {
             messages: [
-              `❤️ 【脉冲】生效：治疗全体异形！`,
+              `❤️ 【脉冲】生效：治疗全体异形`,
               ...healMessages
             ]
           };
@@ -2142,7 +2187,7 @@ function apply(ctx, config) {
           { name: targetBoss.name },
           { energy: newEnergy }
         );
-        messages.push(`⚡ 【弧焊枪】触发特效：消耗目标${energyDrain}点能量`);
+        messages.push(`⚡ 【弧焊枪】触发特效：消耗目标200点能量`);
       } else {
         return null;
       }
@@ -2169,6 +2214,184 @@ function apply(ctx, config) {
         return null;
       }
     }, "handleParticlePhaseEffect"),
+    // 火焰异形处理（免疫火焰伤害）
+    handleFlameCreature: /* @__PURE__ */ __name(function(targetBoss, weaponName, damage, maxHP) {
+      if (targetBoss.skills.includes("火焰异形") && weaponName === "焚烧枪") {
+        const healAmount = damage;
+        return {
+          updatedHP: Math.min(targetBoss.HP + healAmount, maxHP),
+          initialDamage: 0,
+          messages: [`🔥 【火焰异形】生效：免疫火焰伤害，${targetBoss.name}回复${healAmount}生命值`]
+        };
+      }
+      return null;
+    }, "handleFlameCreature"),
+    // 庞兽狂暴处理（每次攻击时检测血量）
+    handleTitanRage: /* @__PURE__ */ __name(function(targetBoss, currentHP, maxHP) {
+      if (!targetBoss.skills.includes("庞兽狂暴")) return null;
+      const hpPercent = currentHP / maxHP;
+      const isBelowThreshold = hpPercent < 0.5;
+      if (isBelowThreshold) {
+        return {
+          damageMultiplier: -0.5,
+          messages: [`🔥 【庞兽狂暴】生效：进入狂暴状态，受到的伤害-50%`]
+        };
+      }
+      return null;
+    }, "handleTitanRage"),
+    // 胆汁效果处理（返回伤害调整系数）
+    handleBileEffects: /* @__PURE__ */ __name(function(targetBoss, weaponName, initialDamage) {
+      if (!targetBoss.skills.includes("灼烧粘液")) return null;
+      const bileLayers = targetBoss.Skillcountpoints || 0;
+      const messages = [];
+      let currentDamage = initialDamage;
+      if (weaponName === "焚烧枪" && bileLayers > 0) {
+        currentDamage *= 2;
+        messages.push(`🔥 【灼烧粘液】引爆：已有${bileLayers}层胆汁，本次伤害+100%`);
+        return {
+          messages,
+          clearBile: true,
+          currentDamage
+        };
+      }
+      return null;
+    }, "handleBileEffects"),
+    // 胆汁叠层和效果触发处理
+    handleBileCount: /* @__PURE__ */ __name(async function(ctx2, targetBoss, weaponName, bossGroup) {
+      if (!targetBoss.skills.includes("灼烧粘液")) return null;
+      const maxBile = targetBoss.type === "主宰" ? 10 : 5;
+      const messages = [];
+      const updates = [];
+      const currentBile = targetBoss.Skillcountpoints || 0;
+      if (currentBile >= 5 && targetBoss.skills.includes("腐蚀胆汁")) {
+        await this.triggerCorrosiveBile(ctx2, targetBoss, bossGroup);
+        updates.push(
+          ctx2.database.set(
+            "ggcevo_boss",
+            { name: targetBoss.name },
+            { Skillcountpoints: 0 }
+          )
+        );
+        messages.push(`💚 【腐蚀胆汁】触发：胆汁达到5层，治愈所有存活的异形500点血量`);
+      } else if (currentBile >= 10 && targetBoss.skills.includes("火焰吐息")) {
+        await this.triggerFlamingBreath(ctx2, targetBoss, bossGroup);
+        updates.push(
+          ctx2.database.set(
+            "ggcevo_boss",
+            { name: targetBoss.name },
+            { Skillcountpoints: 0 }
+          )
+        );
+        messages.push(`🔥 【火焰吐息】触发：胆汁达到10层，治愈所有存活的异形20%最大生命值`);
+      }
+      if (updates.length > 0) {
+        await Promise.all(updates);
+        return { messages };
+      }
+      if (weaponName !== "焚烧枪" && currentBile < maxBile) {
+        const newBile = currentBile + 1;
+        updates.push(
+          ctx2.database.set(
+            "ggcevo_boss",
+            { name: targetBoss.name },
+            { Skillcountpoints: newBile }
+          )
+        );
+        messages.push(`🟢 【灼烧粘液】生效：获得1层胆汁（当前${newBile}/${maxBile}层）`);
+        if (newBile === 5 && targetBoss.skills.includes("腐蚀胆汁")) {
+          messages.push(`💚 层数达到5层，下次受到攻击将触发【腐蚀胆汁】效果`);
+        } else if (newBile === 10 && targetBoss.skills.includes("火焰吐息")) {
+          messages.push(`🔥 层数达到10层，下次受到攻击将触发【火焰吐息】效果`);
+        }
+      }
+      if (updates.length > 0) {
+        await Promise.all(updates);
+      }
+      return { messages };
+    }, "handleBileCount"),
+    // 触发腐蚀胆汁效果
+    triggerCorrosiveBile: /* @__PURE__ */ __name(async function(ctx2, targetBoss, bossGroup) {
+      const updates = [];
+      const activeMembers = await ctx2.database.get("ggcevo_boss", {
+        groupId: targetBoss.groupId,
+        isActive: true
+      });
+      for (const member of activeMembers) {
+        const memberConfig = this.getMemberConfig(member.name, bossGroup);
+        if (!memberConfig) continue;
+        const maxHP = memberConfig.maxHP;
+        const healAmount = 500;
+        const newHP = Math.min(member.HP + healAmount, maxHP);
+        updates.push(
+          ctx2.database.set(
+            "ggcevo_boss",
+            { name: member.name },
+            { HP: newHP }
+          )
+        );
+      }
+      if (updates.length > 0) {
+        await Promise.all(updates);
+      }
+    }, "triggerCorrosiveBile"),
+    // 触发火焰吐息效果
+    triggerFlamingBreath: /* @__PURE__ */ __name(async function(ctx2, targetBoss, bossGroup) {
+      const updates = [];
+      const activeMembers = await ctx2.database.get("ggcevo_boss", {
+        groupId: targetBoss.groupId,
+        isActive: true
+      });
+      for (const member of activeMembers) {
+        const memberConfig = this.getMemberConfig(member.name, bossGroup);
+        if (!memberConfig) continue;
+        const maxHP = memberConfig.maxHP;
+        const healAmount = Math.floor(maxHP * 0.2);
+        const newHP = Math.min(member.HP + healAmount, maxHP);
+        updates.push(
+          ctx2.database.set(
+            "ggcevo_boss",
+            { name: member.name },
+            { HP: newHP }
+          )
+        );
+      }
+      if (updates.length > 0) {
+        await Promise.all(updates);
+      }
+    }, "triggerFlamingBreath"),
+    // 太阳耀斑处理（每次受到攻击时检测）
+    handleSolarFlare: /* @__PURE__ */ __name(async function(ctx2, targetBoss, weaponName, activeBosses) {
+      if (!targetBoss.skills.includes("太阳耀斑")) return null;
+      const minionDead = activeBosses.every(
+        (boss) => boss.groupId === targetBoss.groupId && boss.type === "子代" && (!boss.isActive || boss.HP <= 0)
+      );
+      if (!minionDead) return null;
+      const messages = [];
+      let immuneCold = false;
+      if (targetBoss.tags.includes("惧寒")) {
+        const newTags = targetBoss.tags.filter((tag) => tag !== "惧寒");
+        await ctx2.database.set(
+          "ggcevo_boss",
+          { name: targetBoss.name },
+          { tags: newTags }
+        );
+        messages.push(`☀️ 【太阳耀斑】降临：所有子代阵亡，${targetBoss.name}移除「惧寒」标签`);
+      }
+      if (targetBoss.skills.includes("孤立无援")) {
+        const newSkills = targetBoss.skills.filter((skill) => skill !== "孤立无援");
+        await ctx2.database.set(
+          "ggcevo_boss",
+          { name: targetBoss.name },
+          { skills: newSkills }
+        );
+        messages.push(`${targetBoss.name}移除【孤立无援】效果`);
+      }
+      if (weaponName === "零度之下" && !targetBoss.tags.includes("惧寒")) {
+        immuneCold = true;
+        messages.push(`☀️ 【太阳耀斑】生效：免疫寒冷伤害`);
+      }
+      return { immuneCold, messages };
+    }, "handleSolarFlare"),
     // 统一处理被动技能
     handlePassives: /* @__PURE__ */ __name(async function(ctx2, targetBoss, initialDamage, currentHP, maxHP, weaponName, weaponData, activeBosses, bossGroup) {
       let messages = [];
@@ -2206,6 +2429,31 @@ function apply(ctx, config) {
           };
         }
       }
+      const solarFlareResult = await this.handleSolarFlare(ctx2, targetBoss, weaponName, activeBosses);
+      if (solarFlareResult?.immuneCold && weaponName === "零度之下") {
+        messages.push(...solarFlareResult.messages);
+        return {
+          currentHP,
+          messages,
+          initialDamage: 0
+        };
+      }
+      const bileDetonationResult = await this.handleBileEffects(targetBoss, weaponName, initialDamage);
+      if (bileDetonationResult) {
+        messages.push(...bileDetonationResult.messages);
+        initialDamage = bileDetonationResult.currentDamage;
+        if (bileDetonationResult.clearBile) {
+          targetBoss.Skillcountpoints = 0;
+        }
+      }
+      const flameResult = this.handleFlameCreature(targetBoss, weaponName, initialDamage, maxHP);
+      if (flameResult) {
+        return {
+          currentHP: flameResult.updatedHP,
+          messages: flameResult.messages,
+          initialDamage: 0
+        };
+      }
       targetBoss.skills.forEach((skill) => {
         const config2 = passiveConfig[skill];
         if (config2 && config2.effect !== void 0 && config2.effect !== 0) {
@@ -2244,6 +2492,11 @@ function apply(ctx, config) {
         totalMultiplier += blackholeResult.damageMultiplier;
         messages.push(...blackholeResult.messages);
       }
+      const titanRageResult = this.handleTitanRage(targetBoss, currentHP, maxHP);
+      if (titanRageResult) {
+        totalMultiplier += titanRageResult.damageMultiplier;
+        messages.push(...titanRageResult.messages);
+      }
       const radiationCalc = this.calculateRadiationDamage(targetBoss);
       if (radiationCalc) {
         totalMultiplier += radiationCalc.damageMultiplier;
@@ -2311,6 +2564,13 @@ function apply(ctx, config) {
         currentHP = bloodCountResult.updatedHP;
         messages.push(...bloodCountResult.messages);
       }
+      const bileCountResult = await this.handleBileCount(ctx2, targetBoss, weaponName, bossGroup);
+      if (bileCountResult) {
+        messages.push(...bileCountResult.messages);
+        if (bileCountResult.newBile !== void 0) {
+          targetBoss.Skillcountpoints = bileCountResult.newBile;
+        }
+      }
       const sentryResult = await this.handleSentryGun(ctx2, targetBoss, bossGroup);
       if (sentryResult) {
         messages.push(...sentryResult.messages);
@@ -2521,6 +2781,7 @@ function apply(ctx, config) {
       });
       if (!allCleaners.length) return [];
       let killerBonus = false;
+      let killerBonusMessage = "";
       for (const cleaner of allCleaners) {
         let rewardAmount = baseReward;
         if (cleaner.handle === killerHandle) {
@@ -2532,13 +2793,8 @@ function apply(ctx, config) {
           redcrystal: (cleaner.redcrystal || 0) + rewardAmount
         }], ["handle"]);
       }
-      const rewardMessages = [
-        `🧹 全体清洁工因清理 ${bossName} 尸体获得 ${baseReward} 红晶！`
-      ];
-      if (killerBonus) {
-        rewardMessages.push(`🎖️ ${killerName}(致命一击)获得双倍红晶奖励！`);
-      }
-      return rewardMessages;
+      const rewardMessage = `🧹 全体清洁工因清理 ${bossName} 获得 ${baseReward} 红晶${killerBonus ? ` (致命一击奖励 ${killerName})` : ""}`;
+      return [rewardMessage];
     } catch (error) {
       ctx2.logger("ggcevo").warn("清洁工奖励发放失败", error);
       return [];
@@ -2550,6 +2806,10 @@ function apply(ctx, config) {
     const extraDamages = [];
     const actuallyDead = [];
     let scatterBroadcast = null;
+    const allCleanerRewards = [];
+    let masterDeathEvent = null;
+    const otherBroadcastMessages = [];
+    const processedGroups = /* @__PURE__ */ new Set();
     const secondaryTargets = activeBosses.filter(
       (boss) => boss.name !== targetBoss.name
     );
@@ -2571,7 +2831,6 @@ function apply(ctx, config) {
     scatterEffectMessages.push(scatterMsg);
     const baseDamage = weaponData.damage * (1 + 0.1 * equippedWeapon.level);
     const secondaryDamage = Math.round(baseDamage * scatterRatio);
-    const cleanerRewards = [];
     for (const secondaryTarget of secondaryTargets) {
       const secondaryMaxHP = getBossMaxHP(secondaryTarget.name);
       let currentDamage = secondaryDamage;
@@ -2631,24 +2890,17 @@ function apply(ctx, config) {
               redcrystal: (cleaner.redcrystal || 0) + rewardAmount
             }], ["handle"]);
           }
-          let rewardMsg = `🧹 全体清洁工因清理 ${bossName} 尸体获得 ${baseReward} 红晶！`;
+          let rewardMsg = `🧹 全体清洁工因清理 ${bossName} 获得 ${baseReward} 红晶`;
           if (killerBonus) {
-            rewardMsg += `
-🎖️ ${playerName}(致命一击)获得双倍红晶奖励！`;
-          }
-          if (!scatterBroadcast) {
-            scatterBroadcast = [];
-          }
-          if (Array.isArray(scatterBroadcast)) {
-            scatterBroadcast.push(rewardMsg);
-          } else {
-            scatterBroadcast = [rewardMsg];
+            rewardMsg += ` (致命一击奖励 ${playerName})`;
           }
+          allCleanerRewards.push(rewardMsg);
         }
+        const groupId = secondaryTarget.groupId;
         if (secondaryTarget.type === "子代") {
           if (secondaryTarget.name === "机械感染虫") {
             const [mainBoss] = await ctx2.database.get("ggcevo_boss", {
-              groupId: secondaryTarget.groupId,
+              groupId,
               type: "主宰",
               isActive: true
             });
@@ -2656,24 +2908,18 @@ function apply(ctx, config) {
               await ctx2.database.set("ggcevo_boss", { name: mainBoss.name }, {
                 skills: [...mainBoss.skills, "孤立无援"]
               });
-              const isolationMsg = "💥 机械感染虫已阵亡，空间站感染虫进入【孤立无援】状态，受到的伤害+20%！";
-              if (!scatterBroadcast) {
-                scatterBroadcast = isolationMsg;
-              } else if (Array.isArray(scatterBroadcast)) {
-                scatterBroadcast.push(isolationMsg);
-              } else {
-                scatterBroadcast = [scatterBroadcast, isolationMsg];
-              }
+              otherBroadcastMessages.push("💥 机械感染虫已阵亡，空间站感染虫进入【孤立无援】状态，受到的伤害+20%！");
             }
           } else {
             const remainingMinions = await ctx2.database.get("ggcevo_boss", {
-              groupId: secondaryTarget.groupId,
+              groupId,
               type: "子代",
               isActive: true
             });
-            if (remainingMinions.length === 0) {
+            if (remainingMinions.length === 0 && !processedGroups.has(groupId)) {
+              processedGroups.add(groupId);
               const [mainBoss] = await ctx2.database.get("ggcevo_boss", {
-                groupId: secondaryTarget.groupId,
+                groupId,
                 type: "主宰",
                 isActive: true
               });
@@ -2681,21 +2927,14 @@ function apply(ctx, config) {
                 await ctx2.database.set("ggcevo_boss", { name: mainBoss.name }, {
                   skills: [...mainBoss.skills, "孤立无援"]
                 });
-                const isolationMsg = `💥 所有子代已阵亡，${mainBoss.name}进入【孤立无援】状态，受到的伤害+20%！`;
-                if (!scatterBroadcast) {
-                  scatterBroadcast = isolationMsg;
-                } else if (Array.isArray(scatterBroadcast)) {
-                  scatterBroadcast.push(isolationMsg);
-                } else {
-                  scatterBroadcast = [scatterBroadcast, isolationMsg];
-                }
+                otherBroadcastMessages.push(`💥 所有子代已阵亡，${mainBoss.name}进入【孤立无援】状态，受到的伤害+20%！`);
               }
             }
           }
         } else if (secondaryTarget.type === "主宰") {
           await ctx2.database.set(
             "ggcevo_boss",
-            { groupId: secondaryTarget.groupId },
+            { groupId },
             { isActive: false, HP: 0 }
           );
           const respawnTime = /* @__PURE__ */ new Date();
@@ -2707,25 +2946,39 @@ function apply(ctx, config) {
           );
           const { rewardMessages } = await handleBossDefeatRewards(ctx2, secondaryTarget);
           await ctx2.database.remove("ggcevo_boss_damage", {
-            bossGroupId: secondaryTarget.groupId
+            bossGroupId: groupId
           });
-          const defeatMsg = [
-            `🎯 主宰 ${secondaryTarget.name} 已被 ${session.username} 的散射伤害击败！`,
-            `所有子代已消失，下一个主宰将在1小时后重生`,
-            "",
-            "🏆 伤害排行榜奖励：",
-            ...rewardMessages
-          ];
-          if (!scatterBroadcast) {
-            scatterBroadcast = defeatMsg;
-          } else if (Array.isArray(scatterBroadcast)) {
-            scatterBroadcast.push(...defeatMsg);
-          } else {
-            scatterBroadcast = [scatterBroadcast, ...defeatMsg];
-          }
+          masterDeathEvent = {
+            name: secondaryTarget.name,
+            rewards: [
+              `🎯 主宰 ${secondaryTarget.name} 已被 ${session.username} 的散射伤害击败！`,
+              `所有子代已消失，下一个主宰将在1小时后重生`,
+              "",
+              "🏆 伤害排行榜奖励：",
+              ...rewardMessages
+            ]
+          };
         }
       }
     }
+    if (allCleanerRewards.length > 0) {
+      const combinedRewards = `✨ 散射攻击击败奖励
+${allCleanerRewards.join("\n")}`;
+      otherBroadcastMessages.push(combinedRewards);
+    }
+    if (masterDeathEvent) {
+      scatterBroadcast = [
+        ...masterDeathEvent.rewards
+      ];
+      if (otherBroadcastMessages.length > 0) {
+        scatterBroadcast.push("", ...otherBroadcastMessages);
+      }
+    } else if (otherBroadcastMessages.length > 0) {
+      scatterBroadcast = otherBroadcastMessages;
+    }
+    if (Array.isArray(scatterBroadcast) && scatterBroadcast.length === 1) {
+      scatterBroadcast = scatterBroadcast[0];
+    }
     return { scatterEffectMessages, extraDamages, actuallyDead, scatterBroadcast };
   }
   __name(handleSecondaryTargets, "handleSecondaryTargets");
@@ -2877,7 +3130,7 @@ function apply(ctx, config) {
         });
         return {
           success: true,
-          message: `成功引爆 ${itemName}，造成 ${damageValue} 点伤害，获得等额金币`
+          message: `成功引爆${itemName}，对空间站哨枪塔造成${damageValue}点伤害，获得等额金币。`
         };
       }
       if (itemConfig2.id === 2) {
@@ -2891,7 +3144,7 @@ function apply(ctx, config) {
         });
         if (!targetboss || targetboss?.Skillcountpoints === 0 || targetboss?.tags.includes("建筑") || targetboss?.tags.includes("重型")) return {
           success: false,
-          message: "您无法对目标使用。(目标已死亡/目标的技能计数为0/目标拥有“建筑”或“重型”标签)"
+          message: "您无法对目标使用(目标已死亡/目标的技能计数为0/目标拥有“建筑”或“重型”标签)。"
         };
         await ctx.database.set(
           "ggcevo_boss",
@@ -2900,7 +3153,7 @@ function apply(ctx, config) {
         );
         return {
           success: true,
-          message: `成功使用 ${itemName}，已重置 ${target} 的技能计数`
+          message: `成功使用${itemName}，已重置${target}的技能计数。`
         };
       }
       if (itemConfig2.id === 3 || itemConfig2.id === 5) {
@@ -2920,7 +3173,7 @@ function apply(ctx, config) {
         });
         if (!targetboss || targetboss?.energy === 0) return {
           success: false,
-          message: "您无法对目标使用。(目标的能量为0)"
+          message: "您无法对目标使用(目标的能量为0)。"
         };
         await ctx.database.set(
           "ggcevo_boss",
@@ -2930,18 +3183,18 @@ function apply(ctx, config) {
         );
         return {
           success: true,
-          message: `成功使用 ${itemName}，消耗 ${target} 500点能量`
+          message: `成功使用${itemName}，消耗${target}500点能量。`
         };
       }
       return {
         success: false,
-        message: `${itemName} 效果开发中，无法使用`
+        message: `${itemName} 效果开发中，无法使用。`
       };
     } catch (error) {
       console.error("物品效果处理失败:", error);
       return {
         success: false,
-        message: "⚠️ 物品效果处理异常，已回滚操作"
+        message: "⚠️ 物品效果处理异常，已回滚操作。"
       };
     }
   }
@@ -2959,14 +3212,19 @@ function apply(ctx, config) {
     if (currentLevel >= tech.maxLevel) return `❌ ${tech.techname}已达最高等级`;
     const nextLevel = currentLevel + 1;
     const levelData = tech.levels.find((l) => l.level === nextLevel);
-    let actualCost = levelData.cost;
+    let originalCost = levelData.cost;
+    let actualCost = originalCost;
+    let discountApplied = false;
+    let discountDetails = [];
     if (careerData.career === "情报副官") {
-      actualCost = Math.floor(actualCost * 0.8);
+      discountApplied = true;
+      actualCost = Math.floor(originalCost * 0.8);
+      discountDetails.push("🎖️ 情报副官：20%折扣");
     }
     const [signInfo] = await ctx.database.get("ggcevo_sign", { handle });
     if (signInfo?.totalRewards < actualCost) {
-      const originalHint = careerData.career === "情报副官" ? `(原价${levelData.cost})` : "";
-      return `❌ 需要 ${actualCost} 金币${originalHint}，当前持有：${signInfo?.totalRewards || 0}`;
+      const priceHint = discountApplied ? ` (原价${originalCost}金币)` : "";
+      return `❌ 金币不足！需要${actualCost}金币${priceHint}，您当前拥有：${signInfo?.totalRewards || 0}金币`;
     }
     await ctx.database.withTransaction(async () => {
       await ctx.database.set("ggcevo_sign", { handle }, {
@@ -2978,13 +3236,22 @@ function apply(ctx, config) {
         level: nextLevel
       }], ["handle", "techId"]);
     });
-    const costLine = careerData.career === "情报副官" ? `💰 花费金币: ${actualCost}(原价${levelData.cost})` : `💰 花费金币: ${actualCost}`;
-    const discountHint = careerData.career === "情报副官" ? `📉 情报副官职业加成：20%折扣
-` : "";
-    return `✅ ${tech.techname} 升级至 Lv.${nextLevel}
-${discountHint}${costLine}
-📝 ${levelData.description}
-💼 ${levelData.careerBonus}`;
+    let discountInfo = [];
+    if (discountApplied) {
+      discountInfo = [
+        "折扣明细：",
+        ...discountDetails.map((detail) => `▸ ${detail}`)
+      ];
+    }
+    const costInfo = discountApplied ? `💰 花费金币：${actualCost} (原价${originalCost})` : `💰 花费金币：${actualCost}`;
+    return [
+      `✅ ${tech.techname} 升级至 Lv.${nextLevel}`,
+      costInfo,
+      ...discountInfo,
+      // 插入折扣明细
+      `📝 ${levelData.description}`,
+      `💼 ${levelData.careerBonus}`
+    ].filter(Boolean).join("\n");
   }
   __name(handleTechUpgrade, "handleTechUpgrade");
   async function handleWeaponUpgrade(handle, target) {
@@ -3014,22 +3281,22 @@ ${discountHint}${costLine}
       if (weaponDiscount > 0) {
         totalDiscount += weaponDiscount;
         discountDetails.push(
-          `武器系统 Lv${techLevel}${isCareerMatch ? "(科技职业加成)" : ""}：${weaponDiscount}%)`
+          `⚙️ 武器系统 Lv${techLevel}：${weaponDiscount}%折扣`
         );
       }
     }
     const activeWish = await checkFoxBlessing(handle);
     if (activeWish) {
       totalDiscount += 20;
-      discountDetails.push("灵狐升运祈愿生效：20%");
+      discountDetails.push("🦊 灵狐升运：20%折扣");
     }
     totalDiscount = Math.min(totalDiscount, 100);
     const discountedCost = baseCost * (100 - totalDiscount) / 100;
     const actualCost = Math.floor(discountedCost);
     const [signInfo] = await ctx.database.get("ggcevo_sign", { handle });
     if (signInfo?.totalRewards < actualCost) {
-      const priceInfo2 = totalDiscount > 0 ? `需要 ${actualCost} 金币(原价${baseCost})` : `需要 ${actualCost} 金币`;
-      return `❌ ${priceInfo2}，当前持有：${signInfo?.totalRewards || 0}`;
+      const priceInfo2 = totalDiscount > 0 ? `需要${actualCost}金币(原价${baseCost}金币)` : `需要${actualCost}金币`;
+      return `❌ ${priceInfo2}，您当前拥有：${signInfo?.totalRewards || 0}金币`;
     }
     await ctx.database.withTransaction(async () => {
       await ctx.database.set("ggcevo_sign", { handle }, {
@@ -3055,18 +3322,18 @@ ${discountHint}${costLine}
     const damage = (weaponData.damage * (1 + 0.1 * newLevel)).toFixed(1);
     let msg = `${target} 升级成功！Lv.${newLevel}`;
     const priceInfo = totalDiscount > 0 ? `
-💸 消耗：${actualCost}金币 (原价${baseCost})` : `
+💸 消耗：${actualCost}金币 (原价${baseCost}金币)` : `
 💸 消耗：${actualCost}金币`;
     msg += priceInfo;
     if (discountDetails.length > 0) {
       msg += `
-🔧 折扣：
+💰 折扣明细：
 ${discountDetails.join("\n▸ ")}`;
     }
     msg += `
 💥 伤害：${damage}`;
     msg += `
-🔩 改装槽：${Math.floor(newLevel / 3) + 1}个`;
+🔧 改装槽：${Math.floor(newLevel / 3) + 1}个`;
     return msg;
   }
   __name(handleWeaponUpgrade, "handleWeaponUpgrade");
@@ -3109,26 +3376,30 @@ ${discountDetails.join("\n▸ ")}`;
       const showOriginal = finalPrice < baseCost;
       return [
         `等级 ${level.padEnd(5)}`,
-        `▸ 价格: ${finalPrice.toString().padStart(4)}${showOriginal ? ` (原价 ${baseCost})` : ""}`
+        `▸ 价格: ${finalPrice.toString().padStart(4)}${showOriginal ? ` (原价${baseCost})` : ""}`
       ].join("\n");
     });
     const discountNotice = [];
+    if (hasTechDiscount || hasFoxDiscount) {
+      discountNotice.push("💰 当前折扣：");
+    }
     if (hasTechDiscount) {
-      discountNotice.push(`🔧 武器系统 Lv${techLevel} (${techDiscountRate}% 折扣)`);
+      discountNotice.push(`⚙️ 武器系统 Lv${techLevel}：${techDiscountRate}%折扣`);
     }
     if (hasFoxDiscount) {
-      discountNotice.push("🦊 灵狐升运祈愿 (20% 折扣)");
+      discountNotice.push(`🦊 灵狐升运：20%折扣`);
     }
     if (!hasTechDiscount && !hasFoxDiscount) {
       discountNotice.push("💡 提示：加入人类联盟并升级武器系统可获得折扣");
     }
     return [
       "⚡ 武器升级价格表 ⚡",
+      "使用「升级 武器名称」对武器进行等级升级",
       ...discountNotice,
+      // 现在折扣信息前有标题
       "====================",
       ...priceDetails,
-      "====================",
-      "使用「升级 武器名称」进行具体升级"
+      "===================="
     ].join("\n");
   }
   __name(generateUpgradePriceList, "generateUpgradePriceList");
@@ -3193,18 +3464,18 @@ ${discountDetails.join("\n▸ ")}`;
     let hiddenWinCount = 0;
     const [profile] = await ctx.database.get("sc2arcade_player", { userId: session.userId });
     if (!profile) {
-      return "🔒 需要先绑定游戏句柄";
+      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 });
     const quantity = backpack?.quantity;
     if (quantity < 1) {
-      return "您背包中的咕咕币不足";
+      return "您背包内的咕咕币不足。";
     }
     await ctx.database.upsert("ggcevo_backpack", [{
       handle,
@@ -3219,27 +3490,27 @@ ${discountDetails.join("\n▸ ")}`;
     }
     const [record] = await ctx.database.get("ggcevo_records", { handle });
     return [
-      `🎰 您使用了 ${quantity} 枚咕咕币`,
-      winCount > 0 ? `🎉 其中获得 ${winCount} 张兑换券！` : "💔 本次未获得任何兑换券",
+      `🎰 您使用了${quantity}枚咕咕币`,
+      winCount > 0 ? `🎉 其中获得${winCount}张兑换券！` : "💔 本次未获得任何兑换券",
       `📊 当前保底进度：${record.pityCounter}/90`,
-      ...hiddenWinCount > 0 ? [`🎉 恭喜你抽中隐藏奖励，额外获得 ${hiddenWinCount} 张兑换券和 ${hiddenWinCount} 枚扭蛋币！`] : []
+      ...hiddenWinCount > 0 ? [`🎉 恭喜你抽中隐藏奖励，额外获得${hiddenWinCount}张兑换券和${hiddenWinCount}枚扭蛋币！`] : []
     ].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 "🔒 需要先绑定游戏句柄";
+      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?.quantity < 1) {
-      return "您背包中的咕咕币不足";
+      return "您背包内的咕咕币不足。";
     }
     await ctx.database.upsert("ggcevo_backpack", [{
       handle,
@@ -3251,7 +3522,7 @@ ${discountDetails.join("\n▸ ")}`;
     const [record] = await ctx.database.get("ggcevo_records", { handle });
     return [
       `${result ? "🎉 获得兑换券！" : "❌ 未中奖"} 保底进度：${record.pityCounter}/90`,
-      ...HiddenAward2 ? [`🎉 恭喜你抽中隐藏奖励，额外获得 1 张兑换券和 1 枚扭蛋币！`] : []
+      ...HiddenAward2 ? [`🎉 恭喜你抽中隐藏奖励，额外获得1张兑换券和1枚扭蛋币！`] : []
     ].join("\n");
   });
   ctx.command("ggcevo/十连抽").action(async (argv) => {
@@ -3259,17 +3530,17 @@ ${discountDetails.join("\n▸ ")}`;
     let hiddenWinCount = 0;
     const [profile] = await ctx.database.get("sc2arcade_player", { userId: session.userId });
     if (!profile) {
-      return "🔒 需要先绑定游戏句柄";
+      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?.quantity < 10) {
-      return "您背包中的咕咕币不足";
+      return "您背包内的咕咕币不足。";
     }
     await ctx.database.upsert("ggcevo_backpack", [{
       handle,
@@ -3287,13 +3558,13 @@ ${discountDetails.join("\n▸ ")}`;
       "十连抽结果：",
       ...results.map((r) => r ? "🎉 获得兑换券" : "❌ 未中奖"),
       `保底进度：${record.pityCounter}/90`,
-      ...hiddenWinCount > 0 ? [`🎉 恭喜你抽中隐藏奖励，额外获得 ${hiddenWinCount} 张兑换券和 ${hiddenWinCount} 枚扭蛋币！`] : []
+      ...hiddenWinCount > 0 ? [`🎉 恭喜你抽中隐藏奖励，额外获得${hiddenWinCount}张兑换券和${hiddenWinCount}枚扭蛋币！`] : []
     ].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 "🔒 需要先绑定游戏句柄";
+    if (!profile) return "🔒 需要先绑定游戏句柄。";
     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);
@@ -3314,11 +3585,11 @@ ${itemDetails.join("\n")}`;
       const session = argv.session;
       let latestTime;
       const [profile] = await ctx.database.get("sc2arcade_player", { userId: session.userId });
-      if (!profile) return "🔒 需要先绑定游戏句柄";
+      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) {
@@ -3380,7 +3651,7 @@ ${itemDetails.join("\n")}`;
       const [careerData] = await ctx.database.get("ggcevo_careers", { handle });
       if (careerData?.group === "人类联盟") {
         totalBonus += 0.2;
-        messages.push("🏛️ 人类联盟阵营加成：金币+20%");
+        messages.push("🏛️ 人类联盟：+20%金币");
         const [userMiningTech] = await ctx.database.get("ggcevo_tech", { handle, techId: 1 }).catch(() => [{ level: 0 }]);
         const techLevel = Math.min(userMiningTech?.level || 0, 5);
         const miningTechConfig = Spacestationtechnology.find((t) => t.techId === 1);
@@ -3395,22 +3666,22 @@ ${itemDetails.join("\n")}`;
           const finalBonus = Math.max(baseTechBonus, careerTechBonus);
           if (finalBonus > 0) {
             totalBonus += finalBonus / 100;
-            messages.push(`⚙️ 采掘系统 Lv${techLevel} 加成：金币+${finalBonus}%`);
+            messages.push(`⚙️ 采掘系统 Lv${techLevel}：+${finalBonus}%金币`);
           }
         }
         if (careerData.career === "深空矿工") {
           totalBonus += 0.5;
-          messages.push("⛏️ 深空矿工职业加成：金币+50%");
+          messages.push("🎖️ 深空矿工：+50%金币");
         }
       }
       if (careerData?.group === "辛迪加海盗") {
         const [cred17Item] = await ctx.database.get("ggcevo_warehouse", { handle, itemId: 3 });
         if (cred17Item?.quantity >= 1) {
-          const currentGold = record?.totalRewards || 0;
-          const additional = Math.min(Math.floor(currentGold / 100), 100);
-          const credBonus = 0.5 + additional / 100;
+          const humanPlayersCount = await ctx.database.select("ggcevo_careers").where({ group: "人类联盟" }).execute((row) => import_koishi.$.count(row.handle));
+          const additionalBonus = Math.min(humanPlayersCount, 50);
+          const credBonus = 0.5 + additionalBonus / 100;
           totalBonus += credBonus;
-          messages.push(`💎 CRED-17生效：金币+50% 额外+${additional}%`);
+          messages.push(`💎 CRED-17：+50%金币 (${additionalBonus}名人类联盟玩家，额外+${additionalBonus}%金币)`);
         }
       }
       const [meowEffect] = await ctx.database.get("ggcevo_Wish_Record", {
@@ -3423,7 +3694,7 @@ ${itemDetails.join("\n")}`;
       if (meowEffect) {
         tickets *= 2;
         totalBonus += 1;
-        messages.push("🐾 喵喵财源祈愿生效：咕咕币×2，金币+100%");
+        messages.push("🐾 喵喵财源：咕咕币+100%，金币+100%");
       }
       const finalPoints = Math.round(basePoints * (1 + totalBonus));
       let redCrystal = 0;
@@ -3439,7 +3710,7 @@ ${itemDetails.join("\n")}`;
         } else {
           redCrystal = 5;
         }
-        messages.push(`⚓ 辛迪加财务经理职业加成：获得${redCrystal}枚红晶`);
+        messages.push(`🎖️ 辛迪加财务经理：+${redCrystal}枚红晶`);
       }
       await ctx.database.withTransaction(async () => {
         await ctx.database.upsert("ggcevo_sign", [{
@@ -3476,11 +3747,11 @@ ${itemDetails.join("\n")}`;
     try {
       const session = argv.session;
       const [profile] = await ctx.database.get("sc2arcade_player", { userId: session.userId });
-      if (!profile) return "🔒 需要先绑定游戏句柄";
+      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 "暂未查询到您的签到记录";
       const lastSignChina = convertUTCtoChinaTime(record.lastSign);
@@ -3495,7 +3766,7 @@ ${itemDetails.join("\n")}`;
       }
       const costPoints = 100;
       if (record.totalRewards < costPoints) {
-        return `补签需要消耗${costPoints}枚金币，您的金币不足。`;
+        return `补签需要消耗${costPoints}枚金币，您当前拥有：${record.totalRewards}枚金币`;
       }
       const newMonthlyDays = record.monthlyDays + 1;
       let tickets = 3, points = 0;
@@ -3521,7 +3792,7 @@ ${itemDetails.join("\n")}`;
       await ctx.database.set("ggcevo_backpack", { handle, itemId: 1 }, {
         quantity: (backpack?.quantity || 0) + tickets
       });
-      const rewardsMessage = points > 0 ? `获得${points}枚金币和${tickets}枚咕咕币` : `获得${tickets}枚咕咕币`;
+      const rewardsMessage = points > 0 ? `获得${points}枚金币和${tickets}枚咕咕币。` : `获得${tickets}枚咕咕币。`;
       return `补签成功！本月累计签到${newMonthlyDays}天，消耗${costPoints}枚金币，${rewardsMessage}`;
     } catch (error) {
       console.error("补签错误:", error);
@@ -3531,13 +3802,13 @@ ${itemDetails.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 "🔒 需要先绑定游戏句柄";
+    if (!profile) return "🔒 需要先绑定游戏句柄。";
     const { regionId, realmId, profileId } = profile;
     const handle = `${regionId}-S2-${realmId}-${profileId}`;
     const [backpack] = await ctx.database.get("ggcevo_backpack", { handle, itemId: 1 });
     const memberInfo = await session.event?.member?.roles;
     if (memberInfo?.includes("member")) {
-      return "❌ 仅限管理员和群主领取每月津贴";
+      return "❌ 仅限管理员和群主领取每月津贴。";
     }
     const now = /* @__PURE__ */ new Date();
     const chinatime = convertUTCtoChinaTime(now);
@@ -3551,7 +3822,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", [{
@@ -3566,15 +3837,15 @@ ${itemDetails.join("\n")}`;
       itemId: 1,
       quantity: (backpack?.quantity || 0) + 50
     }]);
-    return `[管理专属] 成功领取本月津贴，获得了50枚咕咕币！`;
+    return `[管理专属] 您成功领取本月津贴，获得了50枚咕咕币！`;
   });
   ctx.command("ggcevo/领取 [name]").action(async (argv, name2) => {
     const session = argv.session;
     const [profile] = await ctx.database.get("sc2arcade_player", { userId: session.userId });
-    if (!profile) return "🔒 需要先绑定游戏句柄";
+    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 "⛔ 您已被列入黑名单。";
     if (!name2) {
       await session.send("请在30秒内输入活动名称:");
       name2 = await session.prompt(3e4);
@@ -3655,7 +3926,7 @@ ${itemDetails.join("\n")}`;
   });
   ctx.command("ggcevo/活动列表").action(async ({ session }) => {
     const [profile] = await ctx.database.get("sc2arcade_player", { userId: session.userId });
-    if (!profile) return "🔒 需要先绑定游戏句柄";
+    if (!profile) return "🔒 需要先绑定游戏句柄。";
     const activities = await ctx.database.get(
       "ggcevo_activity",
       { status: "进行中" },
@@ -3821,7 +4092,7 @@ ${itemDetails.join("\n")}`;
   });
   ctx.command("ggcevo/胜点榜 [page]").usage("输入 胜点榜 [页码] 查看对应页的排行榜，每页10条").action(async ({ session }, page) => {
     const [profile] = await ctx.database.get("sc2arcade_player", { userId: session.userId });
-    if (!profile) return "🔒 需要先绑定游戏句柄";
+    if (!profile) return "🔒 需要先绑定游戏句柄。";
     const pageNum = parseInt(page) || 1;
     if (pageNum < 1) return "请输入有效的页码。";
     const offset = (pageNum - 1) * 10;
@@ -3830,7 +4101,7 @@ ${itemDetails.join("\n")}`;
       ctx.database.select("ggcevo_rank").where({ Blacklist: false, rankseason: config.rankseason }).execute((row) => import_koishi.$.count(row.handle))
     ]);
     const totalPages = Math.ceil(total / 10);
-    if (pageNum > totalPages) return `查询失败，最多有 ${totalPages} 页`;
+    if (pageNum > totalPages) return `查询失败，最多有${totalPages}页`;
     const processedRecords = await Promise.all(
       records.map(async (item) => ({
         ...item,
@@ -3993,7 +4264,7 @@ ${itemDetails.join("\n")}`;
     if (!player) {
       const [profile] = await ctx.database.get("sc2arcade_player", { userId: session.userId });
       if (!profile) {
-        return "🔒 需要先绑定游戏句柄";
+        return "🔒 需要先绑定游戏句柄。";
       }
       const { regionId, realmId, profileId } = profile;
       const handle = `${regionId}-S2-${realmId}-${profileId}`;
@@ -4009,7 +4280,7 @@ ${itemDetails.join("\n")}`;
       ) + 1;
       const isSafe = await checkSensitiveWord(user.name);
       const displayName = isSafe ? user.name : (user.name[0] || "") + "***";
-      return `🎮 咕咕胜点榜排名信息 🎮
+      return `🎮 咕咕排名信息 🎮
 ------------------------------
 昵称：${displayName}
 句柄：${user.handle}
@@ -4043,7 +4314,7 @@ ${itemDetails.join("\n")}`;
       ) + 1;
       const isSafe = await checkSensitiveWord(user.name);
       const displayName = isSafe ? user.name : (user.name[0] || "") + "***";
-      return `🎮 咕咕胜点榜排名信息 🎮
+      return `🎮 咕咕排名信息 🎮
 ------------------------------
 昵称：${displayName}
 句柄：${user.handle}
@@ -4069,7 +4340,7 @@ ${itemDetails.join("\n")}`;
           lastSign: signData?.lastSign || /* @__PURE__ */ new Date(0),
           monthlyDays: signData?.monthlyDays || 0
         }]);
-        return `成功为 ${handle} 添加 ${parsedAmount} 金币！当前总数：${newTotal}`;
+        return `✅ 成功为 ${handle} 添加 ${parsedAmount} 金币！用户当前总数：${newTotal}`;
       } else if (itemName === "红晶") {
         const [careerData] = await ctx.database.get("ggcevo_careers", { handle });
         const currentRed = careerData?.redcrystal || 0;
@@ -4081,7 +4352,7 @@ ${itemDetails.join("\n")}`;
           career: careerData?.career || "",
           date: careerData?.date || /* @__PURE__ */ new Date()
         }]);
-        return `成功为 ${handle} 添加 ${parsedAmount} 红晶！当前总数：${newRed}`;
+        return `✅ 成功为 ${handle} 添加 ${parsedAmount} 红晶！用户当前总数：${newRed}`;
       } else {
         const validItems = Object.keys(initDefaultItems);
         if (!validItems.includes(itemName)) {
@@ -4095,7 +4366,7 @@ ${itemDetails.join("\n")}`;
           itemId,
           quantity: newQuantity
         }], ["handle", "itemId"]);
-        return `成功为 ${handle} 添加 ${parsedAmount} 个${itemName}！当前总数：${newQuantity}`;
+        return `✅ 成功为 ${handle} 添加 ${parsedAmount} 个${itemName}！用户当前总数：${newQuantity}`;
       }
     } catch (err) {
       console.error("[给予命令错误]", err);
@@ -4109,7 +4380,7 @@ ${itemDetails.join("\n")}`;
     let handle;
     if (!user) {
       const [profile] = await ctx.database.get("sc2arcade_player", { userId: session.userId });
-      if (!profile) return "🔒 需要先绑定游戏句柄";
+      if (!profile) return "🔒 需要先绑定游戏句柄。";
       handle = `${profile.regionId}-S2-${profile.realmId}-${profile.profileId}`;
     } else {
       const parsedUser = import_koishi.h.parse(user)[0];
@@ -4158,11 +4429,11 @@ ${itemDetails.join("\n")}`;
   ctx.command("ggcevo/兑换", "兑换物品").action(async ({ session }) => {
     try {
       const [profile] = await ctx.database.get("sc2arcade_player", { userId: session.userId });
-      if (!profile) return "🔒 需要先绑定游戏句柄";
+      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 = {};
@@ -4243,7 +4514,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}`;
       }
@@ -4266,7 +4537,7 @@ ${items.join("、")}
           season: currentSeason
         });
       });
-      return `🎉 恭喜！您使用 ${cost} 个 ${couponName} 兑换了 【${name2}】`;
+      return `🎉 恭喜！您使用${cost}个${couponName}兑换了【${name2}】`;
     } catch (error) {
       console.error("兑换失败:", error);
       return "兑换失败";
@@ -4274,11 +4545,11 @@ ${items.join("、")}
   });
   ctx.command("ggcevo/兑换扭蛋币").action(async ({ session }) => {
     const [profile] = await ctx.database.get("sc2arcade_player", { userId: session.userId });
-    if (!profile) return "🔒 需要先绑定游戏句柄";
+    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 `⛔ 您已被列入黑名单。`;
     }
     await session.send(`您确定要使用3张兑换券换取一枚扭蛋币吗？(请在30秒内回复“是”确认)`);
     const confirm = await session.prompt(3e4);
@@ -4286,7 +4557,7 @@ ${items.join("、")}
     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",
@@ -4298,23 +4569,23 @@ ${items.join("、")}
       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 "🔒 需要先绑定游戏句柄";
+      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) {
-      return `当前扭蛋币不足，您拥有：${backpack?.quantity || 0}枚`;
+      return `当前扭蛋币不足，您当前拥有：${backpack?.quantity || 0}枚扭蛋币`;
     }
     const awardName = PetCapsuleToy();
     const awardItem = Object.entries(initDefaultItems).find(
@@ -4336,7 +4607,7 @@ ${items.join("、")}
       itemId: itemData.id,
       quantity: currentQuantity + 1
     }]);
-    return `🎉 恭喜！您获得了 ${itemName}`;
+    return `🎉 恭喜！您获得了${itemName}`;
   });
   ctx.command("ggcevo/拉黑 [handle]", "添加用户到黑名单").action(async (argv, handle) => {
     const session = argv.session;
@@ -4401,7 +4672,7 @@ ${items.join("、")}
     const session = argv.session;
     const output = [];
     const [profile] = await ctx.database.get("sc2arcade_player", { userId: session.userId });
-    if (!profile) return "🔒 需要先绑定游戏句柄";
+    if (!profile) return "🔒 需要先绑定游戏句柄。";
     const { regionId, realmId, profileId } = profile;
     const handle = `${regionId}-S2-${realmId}-${profileId}`;
     output.push(`🎮 游戏句柄：${handle}
@@ -4459,7 +4730,7 @@ ${items.join("、")}
       lottery && "抽奖",
       exchanges.length && "兑换"
     ].filter(Boolean);
-    output.push(`📊 共查询到 ${existModules.length} 类信息`);
+    output.push(`📊 共查询到${existModules.length}类信息`);
     return output.join("\n");
   });
   const processedLobbies = /* @__PURE__ */ new Set();
@@ -4534,11 +4805,11 @@ ${items.join("、")}
     try {
       const session = argv.session;
       const [profile] = await ctx.database.get("sc2arcade_player", { userId: session.userId });
-      if (!profile) return "🔒 需要先绑定游戏句柄";
+      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 `⛔ 您已被列入黑名单。`;
       }
       if (!user) return "请输入“pk @玩家”。";
       const parsedUser = import_koishi.h.parse(user)[0];
@@ -4582,8 +4853,14 @@ ${items.join("、")}
         const now2 = /* @__PURE__ */ new Date();
         const timeDiff = now2.getTime() - joinDate.getTime();
         const diffInDays = Math.floor(timeDiff / (1e3 * 60 * 60 * 24));
-        if (diffInDays < 30) {
-          return `🛡️ 该玩家是人类联盟成员，尚在30天保护期内（剩余${30 - diffInDays}天），无法挑战`;
+        const [targetPKRecord] = await ctx.database.get("ggcevo_pk", {
+          handle: targetHandle
+        });
+        const isNewPlayer = !targetPKRecord;
+        const hasProtection = diffInDays < 30;
+        const isPKDisabled = targetPKRecord && !targetPKRecord.enable;
+        if ((isNewPlayer || isPKDisabled) && hasProtection) {
+          return `🛡️ 该玩家是人类联盟成员，当前处于30天保护期内（剩余${30 - diffInDays}天），无法PK`;
         }
       }
       let initiatorPK;
@@ -4777,23 +5054,23 @@ ${items.join("、")}
         `🎰 金币变动：${stealPercentage}%`
       ];
       if (targetCareer.group === "人类联盟" && isWin) {
-        result.push(`🛡️ 人类联盟保护：${targetRankname} 被动应战的PK失败时仅损失1%的金币`);
+        result.push(`🛡️ 人类联盟：应战者PK失败时仅损失1%的金币`);
       }
       if (computerExpertProtection) {
-        result.push(`💻 计算机专家职业加成：${targetRankname} 被动应战的PK失败时不损失金币`);
+        result.push(`💻 计算机专家：应战者PK失败时不损失金币`);
       } else if (isWin) {
         result.push(`💰 您从对方的口袋里抢夺了${goldTransfer}枚金币`);
       } else {
         result.push(`💸 您从口袋里拿出了${goldTransfer}枚金币上交给对方`);
       }
       if (mp3Effect) {
-        result.push(`💿 MP3播放器生效：${initiatorRankname} 主动发起的PK失败时上交的金币减少50%`);
+        result.push(`💿 MP3播放器：挑战者PK失败时上交的金币减少50%`);
       }
       if (initiatorCareer?.group === "辛迪加海盗") {
-        result.push(`🔴 辛迪加海盗阵营加成：${initiatorRankname} 获得1枚红晶`);
+        result.push(`🔴 辛迪加海盗：+1枚红晶`);
       }
       if (isWin && initiatorCareer?.career === "辛迪加财务经理") {
-        result.push(`💰 辛迪加财务经理职业加成：${initiatorRankname} 额外获得1枚红晶`);
+        result.push(`💰 辛迪加财务经理：+1枚红晶`);
       }
       result.push(`📅 剩余挑战次数：${config.dailyPKLimit - (initiatorPK.todayCount + 1)}`);
       return result.join("\n");
@@ -4804,7 +5081,7 @@ ${items.join("、")}
   });
   ctx.command("ggcevo/pk榜 [page]", "查看玩家PK排行榜").usage("输入 pk榜 [页码] 查看对应页的排行榜，每页10条").action(async ({ session }, page) => {
     const [profile] = await ctx.database.get("sc2arcade_player", { userId: session.userId });
-    if (!profile) return "🔒 需要先绑定游戏句柄";
+    if (!profile) return "🔒 需要先绑定游戏句柄。";
     const pageNum = parseInt(page) || 1;
     if (pageNum < 1) return "请输入有效的页码。";
     const offset = (pageNum - 1) * 10;
@@ -4841,13 +5118,28 @@ ${items.join("、")}
     const handle = `${profile.regionId}-S2-${profile.realmId}-${profile.profileId}`;
     const [techData] = await ctx.database.get("ggcevo_tech", { handle, techId: 2 }).catch(() => [{ level: 0 }]);
     const [careerData] = await ctx.database.get("ggcevo_careers", { handle });
-    const techLevel = techData?.level || 0;
-    const isCareerMatch = Spacestationtechnology.find((t) => t.techId === 2).careerNames.includes(careerData?.career);
-    const BASE_DISCOUNTS = [0, 0, 0, 0, 0];
-    const CAREER_DISCOUNTS = [0, 0, 10, 15, 20];
-    const baseDiscount = techLevel > 0 ? BASE_DISCOUNTS[techLevel - 1] : 0;
-    const careerDiscount = isCareerMatch ? CAREER_DISCOUNTS[techLevel - 1] : 0;
-    const techDiscount = Math.max(baseDiscount, careerDiscount);
+    const group = careerData?.group || "";
+    const discountDetails = [];
+    let techDiscount = 0;
+    if (group === "人类联盟") {
+      const techLevel = techData?.level || 0;
+      if (techLevel > 0) {
+        const isCareerMatch = Spacestationtechnology.find((t) => t.techId === 2).careerNames.includes(careerData?.career);
+        const BASE_DISCOUNTS = [0, 0, 0, 0, 0];
+        const CAREER_DISCOUNTS = [0, 0, 10, 15, 20];
+        const baseDiscount = techLevel > 0 ? BASE_DISCOUNTS[techLevel - 1] : 0;
+        const careerDiscount = isCareerMatch ? CAREER_DISCOUNTS[techLevel - 1] : 0;
+        techDiscount = Math.max(baseDiscount, careerDiscount);
+        if (techDiscount > 0) {
+          discountDetails.push(`⚙️ 武器系统 Lv${techLevel}：${techDiscount}%折扣`);
+        }
+      }
+    }
+    let weaponSpecialistDiscount = 0;
+    if (careerData?.career === "武器中士") {
+      weaponSpecialistDiscount = 20;
+      discountDetails.push(`🎖️ 武器中士：20%折扣`);
+    }
     const activeWish = await ctx.database.get("ggcevo_Wish_Record", {
       handle,
       wishname: "蚱蜢优购",
@@ -4855,16 +5147,12 @@ ${items.join("、")}
       endTime: { $gte: /* @__PURE__ */ new Date() },
       isused: false
     }).then((records) => records[0]);
-    const grasshopperDiscount = activeWish ? 20 : 0;
-    let totalDiscount = techDiscount + grasshopperDiscount;
-    totalDiscount = Math.min(totalDiscount, 100);
-    const discountDetails = [];
-    if (techDiscount > 0) {
-      discountDetails.push(`武器系统 Lv${techLevel}：${techDiscount}%`);
-    }
+    let grasshopperDiscount = activeWish ? 20 : 0;
     if (grasshopperDiscount > 0) {
-      discountDetails.push(`蚱蜢优购：${grasshopperDiscount}%`);
+      discountDetails.push(`🦗 蚱蜢优购：${grasshopperDiscount}%折扣`);
     }
+    let totalDiscount = techDiscount + weaponSpecialistDiscount + grasshopperDiscount;
+    totalDiscount = Math.min(totalDiscount, 100);
     const typeStats = Object.values(weaponConfig).filter((weapon) => weapon.price !== 0).reduce((stats, weapon) => {
       stats[weapon.type] = (stats[weapon.type] || 0) + 1;
       return stats;
@@ -4873,12 +5161,11 @@ ${items.join("、")}
       return [
         "🏪 咕咕武器库分类 🏪",
         '使用 "武器库 类型名称" 查看详细列表',
+        totalDiscount > 0 && `💰 当前折扣：
+${discountDetails.length ? `${discountDetails.join("\n")}` : ""}`,
         "====================",
         ...Object.entries(typeStats).map(([typeName, count]) => `▸ ${typeName} (${count}种)`),
-        "====================",
-        totalDiscount > 0 && `
-🔧 当前购买折扣：
-${discountDetails.length ? ` ${discountDetails.join(" \n ")}` : ""}`
+        "===================="
       ].filter(Boolean).join("\n");
     }
     if (!Object.keys(typeStats).includes(type)) {
@@ -4895,21 +5182,21 @@ ${Object.keys(typeStats).join("、")}`;
         `基础伤害：${config2.damage}`,
         `价格：${actualPrice}金币${totalDiscount > 0 ? ` (原价${config2.price})` : ""}`,
         specialEffect,
-        // 新增特殊效果显示
         "特性：",
         tagEffectsDesc,
-        `描述：${config2.description}`
+        `描述：${config2.description}`,
+        "------------------"
       ].filter(Boolean).join("\n");
     });
     return [
       `🏪 咕咕武器库 - ${type} 🏪`,
-      "使用“购买 武器名称”指令进行购买",
-      totalDiscount > 0 && `🔧 当前购买折扣：
-${discountDetails.length ? ` ${discountDetails.join(" \n ")}` : ""}`,
+      '使用"购买 武器名称"指令进行购买',
+      totalDiscount > 0 && `💰 当前折扣：
+${discountDetails.length ? `${discountDetails.join("\n")}` : ""}`,
       "====================",
       ...items,
       items.length === 0 ? "⚠️ 该分类下暂无可用武器" : ""
-    ].filter(Boolean).join("\n\n");
+    ].filter(Boolean).join("\n");
   });
   ctx.command("ggcevo/爆破库 [type]").usage("输入“爆破库”查看分类，或“爆破库 类型”查看详细物品").action(async ({ session }, type) => {
     const [profile] = await ctx.database.get("sc2arcade_player", { userId: session.userId });
@@ -4941,7 +5228,8 @@ ${validTypes.join("、")}`;
       `类型：${item.type}`,
       `价格：${item.price}金币`,
       `效果：${item.effects}`,
-      `描述：${item.description}`
+      `描述：${item.description}`,
+      "------------------"
     ].join("\n"));
     return [
       `💣 爆破装备库 - ${type} 💣`,
@@ -4949,14 +5237,14 @@ ${validTypes.join("、")}`;
       "====================",
       ...items,
       items.length === 0 ? "⚠️ 该分类下暂无可用物品" : ""
-    ].join("\n\n");
+    ].join("\n");
   });
   ctx.command("ggcevo/购买 <item>").action(async ({ session }, item) => {
     const [profile] = await ctx.database.get("sc2arcade_player", { userId: session.userId });
-    if (!profile) return "🔒 需要先绑定游戏句柄";
+    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 allItems = { ...weaponConfig, ...SyndicatedItems };
     if (!item) return "请输入“购买 物品名称”来购买所需物品。";
     const config2 = allItems[item];
@@ -5015,7 +5303,7 @@ ${validTypes.join("、")}`;
     if ((signInfo?.totalRewards || 0) < actualPrice) {
       let priceInfo = `需要 ${actualPrice} 金币`;
       if (discountDetails.length > 0) {
-        priceInfo += `(原价 ${config2.price})`;
+        priceInfo += `(原价${config2.price})`;
       }
       return `❌ 金币不足，${priceInfo}`;
     }
@@ -5062,7 +5350,7 @@ ${validTypes.join("、")}`;
 `;
     message += `花费 ${actualPrice} 金币`;
     if (discountDetails.length > 0) {
-      message += `(原价 ${config2.price} 金币)
+      message += `(原价${config2.price} 金币)
 折扣明细：
 ▸ ${discountDetails.join("\n▸ ")}`;
     }
@@ -5080,7 +5368,7 @@ ${validTypes.join("、")}`;
   });
   ctx.command("ggcevo/武器仓库").action(async ({ session }) => {
     const [profile] = await ctx.database.get("sc2arcade_player", { userId: session.userId });
-    if (!profile) return "🔒 需要先绑定游戏句柄";
+    if (!profile) return "🔒 需要先绑定游戏句柄。";
     const handle = `${profile.regionId}-S2-${profile.realmId}-${profile.profileId}`;
     const weapons = await ctx.database.get("ggcevo_equipment", {
       handle
@@ -5112,11 +5400,11 @@ ${validTypes.join("、")}`;
   });
   ctx.command("ggcevo/装备 <weapon>").action(async ({ session }, weapon) => {
     const [profile] = await ctx.database.get("sc2arcade_player", { userId: session.userId });
-    if (!profile) return "🔒 需要先绑定游戏句柄";
+    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 `⛔ 您已被列入黑名单。`;
     }
     if (!weapon) return "请输入“装备 武器名称”来装备一把你拥有的武器。";
     if (!weaponConfig[weapon]) return "武器名称错误，请输入“装备 武器名称”来装备一把你拥有的武器。";
@@ -5146,10 +5434,10 @@ ${validTypes.join("、")}`;
   });
   ctx.command("ggcevo/升级 <target>", "升级武器或科技").action(async ({ session }, target) => {
     const [profile] = await ctx.database.get("sc2arcade_player", { userId: session.userId });
-    if (!profile) return "🔒 需要先绑定游戏句柄";
+    if (!profile) return "🔒 需要先绑定游戏句柄。";
     const handle = `${profile.regionId}-S2-${profile.realmId}-${profile.profileId}`;
     if ((await ctx.database.get("ggcevo_blacklist", { handle })).length) {
-      return "⛔ 您已被列入黑名单";
+      return "⛔ 您已被列入黑名单。";
     }
     if (!target) {
       return generateUpgradePriceList(handle);
@@ -5167,10 +5455,10 @@ ${validTypes.join("、")}`;
   });
   ctx.command("ggcevo/改装 <weapon> [mod]", "安装武器模块").action(async ({ session }, weapon, mod) => {
     const [profile] = await ctx.database.get("sc2arcade_player", { userId: session.userId });
-    if (!profile) return "🔒 需要先绑定游戏句柄";
+    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 isValidWeapon = weapon && weaponConfig[weapon]?.id !== void 0;
     const processModInstallation = /* @__PURE__ */ __name(async () => {
       const modInfo = modConfig[mod];
@@ -5216,7 +5504,7 @@ ${validTypes.join("、")}`;
       const actualCost = Math.floor(modInfo.cost * (1 - discountRate / 100));
       const [signInfo] = await ctx.database.get("ggcevo_sign", { handle });
       if ((signInfo?.totalRewards || 0) < actualCost) {
-        return `需要 ${actualCost} 金币，当前持有：${signInfo?.totalRewards || 0}`;
+        return `改装需要 ${actualCost} 金币，当前持有：${signInfo?.totalRewards || 0}`;
       }
       await ctx.database.set(
         "ggcevo_equipment",
@@ -5226,13 +5514,15 @@ ${validTypes.join("、")}`;
       await ctx.database.set("ggcevo_sign", { handle }, {
         totalRewards: signInfo.totalRewards - actualCost
       });
-      const discountMsg = discountRate > 0 ? `武器升级平台 Lv${techLevel} 折扣：${discountRate}%` : "";
       return [
         `✅ ${weapon} 成功安装 ${mod}！`,
-        discountMsg,
-        `花费金币：${actualCost}${discountRate > 0 ? `(原价${modInfo.cost})` : ""}`,
+        `花费金币：${actualCost}${discountRate > 0 ? ` (原价${modInfo.cost})` : ""}`,
+        discountRate > 0 && [
+          "折扣明细：",
+          `⚙️ 武器升级平台 Lv${techLevel}：${discountRate}%`
+        ].join("\n"),
         `改装槽：${equipment.installedMods.length + 1}/${equipment.modificationSlots}`
-      ].join("\n");
+      ].filter(Boolean).join("\n");
     }, "processModInstallation");
     const showModList = /* @__PURE__ */ __name(async () => {
       const [techData] = await ctx.database.get("ggcevo_tech", { handle, techId: 3 }).catch(() => [{ level: 0 }]);
@@ -5252,8 +5542,8 @@ ${validTypes.join("、")}`;
         return [
           `【${name2}】${config2.isExclusive ? ` (专属:${config2.exclusiveTo})` : ""}`,
           `价格：${actualPrice}金币${discountRate > 0 ? ` (原价${config2.cost})` : ""}`,
-          `效果：${config2.effect.replace(/▸/g, "▸ ")}`,
-          config2.isExclusive ? "※ 每个武器只能安装一个专属模块" : ""
+          `效果：${config2.effect}`,
+          "------------------"
         ].filter(Boolean).join("\n");
       }, "formatMod");
       const baseUniversalDiscount = [5, 10][techLevel - 1] || 0;
@@ -5265,20 +5555,23 @@ ${validTypes.join("、")}`;
         return [
           `🛠️ ${weapon} 专属模块 🛠️`,
           "使用「改装 武器名称 模块名称」安装",
-          exclusiveDiscountRate > 0 && `🔧 当前专属模块折扣：${exclusiveDiscountRate}% (武器升级平台 Lv${techLevel})`,
+          "※ 每个武器只能安装一个专属模块",
+          exclusiveDiscountRate > 0 && `💰 当前专属模块折扣：
+⚙️ 武器升级平台 Lv${techLevel}：${exclusiveDiscountRate}%`,
           "====================",
-          exclusiveMods.length ? exclusiveMods.join("\n\n") : "该武器暂无专属模块"
-        ].filter(Boolean).join("\n\n");
+          exclusiveMods.length ? exclusiveMods.join("\n") : "该武器暂无专属模块"
+        ].filter(Boolean).join("\n");
       } else {
         const universalMods = Object.entries(modConfig).filter(([_, m]) => !m.isExclusive).map(([name2, cfg]) => formatMod(name2, cfg));
         return [
           "🛠️ 通用武器模块 🛠️",
           "使用「改装 武器名称 模块名称」安装通用模块",
-          "输入「改装 武器名称」查询武器的专属模块",
-          universalDiscountRate > 0 && `🔧 当前通用模块折扣：${universalDiscountRate}% (武器升级平台 Lv${techLevel})`,
+          "使用「改装 武器名称」查询武器专属模块",
+          universalDiscountRate > 0 && `💰 当前通用模块折扣：
+⚙️ 武器升级平台 Lv${techLevel}：${universalDiscountRate}%`,
           "====================",
-          universalMods.join("\n\n")
-        ].filter(Boolean).join("\n\n");
+          universalMods.join("\n")
+        ].filter(Boolean).join("\n");
       }
     }, "showModList");
     if (mod) {
@@ -5289,10 +5582,10 @@ ${validTypes.join("、")}`;
   });
   ctx.command("ggcevo/拆卸 <weapon> <mod>", "卸载武器模块，专属模块返还50%金币，通用模块返还80%金币").action(async ({ session }, weapon, mod) => {
     const [profile] = await ctx.database.get("sc2arcade_player", { userId: session.userId });
-    if (!profile) return "🔒 需要先绑定游戏句柄";
+    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 weaponId = weaponConfig[weapon]?.id;
     if (!weaponId) return "❌ 请输入“拆卸 武器名称 模块名称”\n注意：专属模块返还50%金币，通用模块返还80%金币";
     const modInfo = modConfig[mod];
@@ -5334,10 +5627,10 @@ ${validTypes.join("、")}`;
     let scatterBroadcast = null;
     let cleanerRewardBroadcast = null;
     const [profile] = await ctx.database.get("sc2arcade_player", { userId: session.userId });
-    if (!profile) return "🔒 需要先绑定游戏句柄";
+    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 getActiveBossNames = /* @__PURE__ */ __name(async () => {
       const activeBosses2 = await ctx.database.get("ggcevo_boss", { isActive: true });
       return activeBosses2.map((b) => b.name).join("，");
@@ -5500,12 +5793,14 @@ ${validTypes.join("、")}`;
           "🏆 伤害排行榜奖励：",
           ...rewardMessages
         ];
-        cleanerRewardBroadcast = await getCleanerRewardBroadcast(
-          ctx,
-          targetBoss,
-          handle,
-          session.username
-        );
+        if (!(equippedWeapon.installedMods?.includes("光束曲射晶片") && weaponName === "碎骨步枪") && !(weaponName === "中子步枪")) {
+          cleanerRewardBroadcast = await getCleanerRewardBroadcast(
+            ctx,
+            targetBoss,
+            handle,
+            session.username
+          );
+        }
       } else {
         await ctx.database.set(
           "ggcevo_boss",
@@ -5551,12 +5846,14 @@ ${validTypes.join("、")}`;
           }
         }
         bossEventBroadcast = broadcastMessages2;
-        cleanerRewardBroadcast = await getCleanerRewardBroadcast(
-          ctx,
-          targetBoss,
-          handle,
-          session.username
-        );
+        if (!(equippedWeapon.installedMods?.includes("光束曲射晶片") && weaponName === "碎骨步枪") && !(weaponName === "中子步枪")) {
+          cleanerRewardBroadcast = await getCleanerRewardBroadcast(
+            ctx,
+            targetBoss,
+            handle,
+            session.username
+          );
+        }
       }
     } else {
       await ctx.database.set(
@@ -5580,13 +5877,12 @@ ${validTypes.join("、")}`;
       techId: 4
     });
     let techBonusPercent = 0;
-    if (securityTech && securityTech.level >= 1) {
+    if (securityTech && securityTech.level >= 1 && careerData?.group === "人类联盟") {
       const techLevel = securityTech.level - 1;
       const securityConfig = Spacestationtechnology.find((t) => t.techId === 4);
       const isEligibleForCareerBonus = securityConfig?.careerNames.includes(career);
       techBonusPercent = isEligibleForCareerBonus ? SECURITY_BONUS_MAPPING.career[techLevel] : SECURITY_BONUS_MAPPING.base[techLevel];
     }
-    const techMessage = techBonusPercent ? ` + ${techBonusPercent}% (${securityTech.level}级安防系统${career ? ` + ${career}职业加成` : ""})` : "";
     let careerMultiplier = 0;
     let careerMessage = "";
     let redcrystalMessage = "";
@@ -5645,17 +5941,19 @@ ${scatterEffectMessages.map((m) => `▸ ${m}`).join("\n")}`
       isDefeated ? `🎉 恭喜，已成功击败 ${targetBoss.name}！` : ""
     ].filter((line) => line).join("\n");
     await session.send(resultMessage);
+    const isScatterAttack = equippedWeapon.installedMods?.includes("光束曲射晶片") && weaponName === "碎骨步枪" || weaponName === "中子步枪";
     const broadcastMessages = [];
     const groupId = [...config2.groupId];
     if (scatterBroadcast) {
       const scatterMsg = Array.isArray(scatterBroadcast) ? scatterBroadcast.join("\n") : scatterBroadcast;
-      broadcastMessages.push(scatterMsg);
+      broadcastMessages.push(`✨ 散射攻击结果
+${scatterMsg}`);
     }
     if (bossEventBroadcast) {
       const bossMsg = Array.isArray(bossEventBroadcast) ? bossEventBroadcast.join("\n") : bossEventBroadcast;
       broadcastMessages.push(bossMsg);
     }
-    if (cleanerRewardBroadcast && cleanerRewardBroadcast.length > 0) {
+    if (!isScatterAttack && cleanerRewardBroadcast && cleanerRewardBroadcast.length > 0) {
       broadcastMessages.push(cleanerRewardBroadcast.join("\n"));
     }
     if (broadcastMessages.length > 0) {
@@ -5668,10 +5966,10 @@ ${scatterEffectMessages.map((m) => `▸ ${m}`).join("\n")}`
     const parseList = /* @__PURE__ */ __name((str) => str ? str.split(",").map((s) => s.trim()).filter(Boolean) : [], "parseList");
     const tags = parseList(options.tags);
     const [profile] = await ctx.database.get("sc2arcade_player", { userId: session.userId });
-    if (!profile) return "🔒 需要先绑定游戏句柄";
+    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 [equippedWeapon] = await ctx.database.get("ggcevo_equipment", {
       handle,
       equipped: true
@@ -5751,7 +6049,7 @@ ${scatterEffectMessages.map((m) => `▸ ${m}`).join("\n")}`
     const mainBossHpBar = createHpBar(mainBoss.HP, bossGroup.main.maxHP);
     const result = [
       `🔴 主宰：${mainBoss.name}`,
-      `❤️ ${mainBossHpBar} (${mainBoss.HP}/${bossGroup.main.maxHP})`
+      `${mainBossHpBar} (${mainBoss.HP}/${bossGroup.main.maxHP})`
     ];
     if (bossGroup.main.energy > 0) {
       result.push(`⚡ 能量：${mainBoss.energy}/1000`);
@@ -5780,8 +6078,8 @@ ${scatterEffectMessages.map((m) => `▸ ${m}`).join("\n")}`
         const minionConfig = bossGroup.minions.find((m) => m.name === minion.name);
         const minionHpBar = createHpBar(minion.HP, minionConfig?.maxHP || 1e3);
         const minionInfo = [
-          `👤 ${minion.name}`,
-          `❤️ ${minionHpBar} (${minion.HP}/${minionConfig?.maxHP || "未知"})`
+          `❤️ ${minion.name}`,
+          `${minionHpBar} (${minion.HP}/${minionConfig?.maxHP || "未知"})`
         ];
         if (minionConfig && minionConfig.energy > 0) {
           minionInfo.push(`⚡ 能量：${minion.energy}/1000`);
@@ -5845,11 +6143,11 @@ ${scatterEffectMessages.map((m) => `▸ ${m}`).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 "🔒 需要先绑定游戏句柄";
+    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 [sign] = await ctx.database.get("ggcevo_sign", { handle });
     if (!sign || sign.totalRewards < 50) return "需要50金币进行祈愿，您的金币不足。";
     const now = /* @__PURE__ */ new Date();
@@ -5922,12 +6220,12 @@ ${scatterEffectMessages.map((m) => `▸ ${m}`).join("\n")}`
   });
   ctx.command("ggcevo/兑换金币", "使用兑换券兑换金币").action(async ({ session }) => {
     const [profile] = await ctx.database.get("sc2arcade_player", { userId: session.userId });
-    if (!profile) return "🔒 需要先绑定游戏句柄";
+    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 `⛔ 您已被列入黑名单。`;
     }
     await session.send(`请输入你要使用多少张兑换券来兑换金币？(请在30秒内回复数字，回复“0”为取消兑换)
 注意：1张兑换券=2000金币`);
@@ -5961,11 +6259,11 @@ ${scatterEffectMessages.map((m) => `▸ ${m}`).join("\n")}`
   });
   ctx.command("ggcevo/兑换红晶", "使用金币兑换红晶").action(async ({ session }) => {
     const [profile] = await ctx.database.get("sc2arcade_player", { userId: session.userId });
-    if (!profile) return "🔒 需要先绑定游戏句柄";
+    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 [careerData] = await ctx.database.get("ggcevo_careers", { handle });
     if (!careerData || careerData.group !== "辛迪加海盗") {
@@ -6001,12 +6299,12 @@ ${scatterEffectMessages.map((m) => `▸ ${m}`).join("\n")}`
   });
   ctx.command("ggcevo/加入 <faction>", "加入阵营").alias("加入阵营").action(async ({ session }, faction) => {
     const [profile] = await ctx.database.get("sc2arcade_player", { userId: session.userId });
-    if (!profile) return "🔒 需要先绑定游戏句柄";
+    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 validFactions = ["人类联盟", "辛迪加海盗"];
     if (!faction) return `请输入“加入 阵营名称”加入对应阵营
@@ -6067,11 +6365,11 @@ ${scatterEffectMessages.map((m) => `▸ ${m}`).join("\n")}`
   });
   ctx.command("ggcevo/转职 [profession]", "转职系统").action(async ({ session }, profession) => {
     const [profile] = await ctx.database.get("sc2arcade_player", { userId: session.userId });
-    if (!profile) return "🔒 需要先绑定游戏句柄";
+    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 [careerData] = await ctx.database.get("ggcevo_careers", { handle });
     if (!careerData) return "请先加入阵营后使用转职功能。";
@@ -6151,7 +6449,7 @@ ${scatterEffectMessages.map((m) => `▸ ${m}`).join("\n")}`
       const [profile] = await ctx.database.get("sc2arcade_player", {
         userId: session.userId
       });
-      if (!profile) return "🔒 需要先绑定游戏句柄";
+      if (!profile) return "🔒 需要先绑定游戏句柄。";
       const handle = `${profile.regionId}-S2-${profile.realmId}-${profile.profileId}`;
       const [careerData] = await ctx.database.get("ggcevo_careers", { handle });
       if (!careerData) return "您尚未加入任何阵营。";
@@ -6194,7 +6492,7 @@ ${scatterEffectMessages.map((m) => `▸ ${m}`).join("\n")}`
   });
   ctx.command("ggcevo/黑市 [type]", "辛迪加海盗专属黑市").usage("输入“黑市”查看类型，或“黑市 类型”查看详细").action(async ({ session }, type) => {
     const [profile] = await ctx.database.get("sc2arcade_player", { userId: session.userId });
-    if (!profile) return "🔒 需要先绑定游戏句柄";
+    if (!profile) return "🔒 需要先绑定游戏句柄。";
     const handle = `${profile.regionId}-S2-${profile.realmId}-${profile.profileId}`;
     const [careerData] = await ctx.database.get("ggcevo_careers", { handle });
     if (!careerData || careerData.group !== "辛迪加海盗") {
@@ -6210,13 +6508,16 @@ ${scatterEffectMessages.map((m) => `▸ ${m}`).join("\n")}`
     });
     if (!type) {
       return [
-        "🏴☠️ 辛迪加黑市 🏴☠️",
+        "🏴 辛迪加黑市 🏴",
         '使用 "黑市 类型名称" 查看详细信息',
+        // 添加计算机专家提示 - 优化为带emoji的分行显示
+        isComputerExpert ? [
+          "💰 当前折扣：",
+          "💻 计算机专家：设备工具类物品50%折扣"
+        ].join("\n") : "",
         "====================",
         ...Object.entries(typeStats).map(([typeName, count]) => `▸ ${typeName} (${count}种)`),
-        "====================",
-        // 添加计算机专家提示
-        isComputerExpert ? "💳 计算机专家可享受设备工具类物品50%折扣！" : ""
+        "===================="
       ].join("\n");
     }
     const normalizedType = Object.keys(typeStats).find((t) => t === type);
@@ -6239,7 +6540,7 @@ ${scatterEffectMessages.map((m) => `▸ ${m}`).join("\n")}`
         }
         infoBlocks.push(
           `描述：${config2.description}`,
-          "──────────────"
+          "------------------"
         );
         return infoBlocks.join("\n");
       }),
@@ -6263,26 +6564,33 @@ ${scatterEffectMessages.map((m) => `▸ ${m}`).join("\n")}`
         infoBlocks.push(
           `特殊效果：${item.effects}`,
           `描述：${item.description}`,
-          "──────────────"
+          "------------------"
         );
         return infoBlocks.join("\n");
       })
     ];
+    let discountInfo = [];
+    if (isComputerExpert && normalizedType === "设备工具") {
+      discountInfo = [
+        "💰 当前折扣：",
+        "💻 计算机专家：设备工具类物品50%折扣"
+      ];
+    }
     return [
       `🏴☠️ 辛迪加黑市 - ${normalizedType} 🏴☠️`,
-      "使用“订购 物品名称”进行购买(仅消耗红晶)",
-      // 计算机专家专属提示
-      isComputerExpert && normalizedType === "设备工具" ? "💳 计算机专家可享受50%折扣！" : "",
+      '使用"订购 物品名称"进行购买(仅消耗红晶)',
+      // 显示折扣信息（如果有）
+      ...discountInfo,
       "====================",
       ...items
-    ].filter(Boolean).join("\n\n");
+    ].filter(Boolean).join("\n");
   });
   ctx.command("ggcevo/订购 <item>").action(async ({ session }, item) => {
     const [profile] = await ctx.database.get("sc2arcade_player", { userId: session.userId });
-    if (!profile) return "🔒 需要先绑定游戏句柄";
+    if (!profile) return "🔒 需要先绑定游戏句柄。";
     const handle = `${profile.regionId}-S2-${profile.realmId}-${profile.profileId}`;
     if (await ctx.database.get("ggcevo_blacklist", { handle }).then((r) => r.length)) {
-      return "⛔ 您已被列入黑名单";
+      return "⛔ 您已被列入黑名单。";
     }
     const [careerData] = await ctx.database.get("ggcevo_careers", { handle });
     if (!careerData || careerData.group !== "辛迪加海盗") {
@@ -6347,44 +6655,50 @@ ${scatterEffectMessages.map((m) => `▸ ${m}`).join("\n")}`
         }], ["handle", "itemId"]);
       }
     });
-    let discountInfo = "";
-    if (discountApplied) {
-      discountInfo = `
-💳 计算机专家职业加成：设备工具类物品50%折扣`;
-    }
-    if (isWeapon) {
-      const equippedStatus = await ctx.database.get("ggcevo_equipment", {
-        handle,
-        weaponId: itemConfig2.id
-      }).then((r) => r[0]?.equipped ? "已自动装备武器" : "需手动装备武器");
-      return [
-        `✅ 成功订购【${item}】！`,
-        `消耗红晶：${finalCost}${discountInfo}`,
-        `装备状态：${equippedStatus}`,
-        '输入 "武器仓库" 管理武器'
-      ].join("\n");
-    } else {
-      const currentStock = await ctx.database.get("ggcevo_warehouse", {
-        handle,
-        itemId: itemConfig2.id
-      }).then((r) => r[0]?.quantity || 1);
-      let priceInfo = `消耗红晶：${finalCost}`;
-      if (isComputerExpertDiscount) {
-        priceInfo += `(原价${originalPrice})`;
+    const buildResponse = /* @__PURE__ */ __name(async () => {
+      const discountLines = [];
+      if (discountApplied) {
+        discountLines.push("💻 计算机专家：设备工具类物品50%折扣");
       }
-      priceInfo += discountInfo;
-      return [
-        `✅ 成功订购【${item}】x1！`,
-        priceInfo,
-        `当前库存：${currentStock}件`,
-        '输入 "仓库" 查看所有物品'
-      ].join("\n");
-    }
+      const priceInfo = [
+        `消耗红晶：${finalCost}${discountApplied ? ` (原价${originalPrice})` : ""}`
+      ];
+      if (discountApplied) {
+        priceInfo.push("折扣明细：");
+        priceInfo.push(...discountLines);
+      }
+      if (isWeapon) {
+        const equippedStatus = await ctx.database.get("ggcevo_equipment", {
+          handle,
+          weaponId: itemConfig2.id
+        }).then((r) => r[0]?.equipped ? "已自动装备武器" : "需手动装备武器");
+        return [
+          `✅ 成功订购【${item}】！`,
+          ...priceInfo,
+          // 价格和折扣信息显示在一起
+          `装备状态：${equippedStatus}`,
+          '输入 "武器仓库" 管理武器'
+        ].filter(Boolean).join("\n");
+      } else {
+        const currentStock = await ctx.database.get("ggcevo_warehouse", {
+          handle,
+          itemId: itemConfig2.id
+        }).then((r) => r[0]?.quantity || 1);
+        return [
+          `✅ 成功订购【${item}】x1！`,
+          ...priceInfo,
+          // 价格和折扣信息显示在一起
+          `当前库存：${currentStock}件`,
+          '输入 "仓库" 查看所有物品'
+        ].filter(Boolean).join("\n");
+      }
+    }, "buildResponse");
+    return await buildResponse();
   });
   ctx.command("ggcevo/仓库").action(async (argv) => {
     const session = argv.session;
     const [profile] = await ctx.database.get("sc2arcade_player", { userId: session.userId });
-    if (!profile) return "🔒 需要先绑定游戏句柄";
+    if (!profile) return "🔒 需要先绑定游戏句柄。";
     const handle = `${profile.regionId}-S2-${profile.realmId}-${profile.profileId}`;
     const [items, signData, careerData] = await Promise.all([
       ctx.database.get("ggcevo_warehouse", { handle }),
@@ -6428,10 +6742,10 @@ ${scatterEffectMessages.map((m) => `▸ ${m}`).join("\n")}`
   ctx.command("ggcevo/使用 [itemName] [target]").action(async (argv, itemName, target) => {
     const session = argv.session;
     const [profile] = await ctx.database.get("sc2arcade_player", { userId: session.userId });
-    if (!profile) return "🔒 需要先绑定游戏句柄";
+    if (!profile) return "🔒 需要先绑定游戏句柄。";
     const handle = `${profile.regionId}-S2-${profile.realmId}-${profile.profileId}`;
     if (await ctx.database.get("ggcevo_blacklist", { handle }).then((r) => r.length)) {
-      return "⛔ 您已被列入黑名单";
+      return "⛔ 您已被列入黑名单。";
     }
     try {
       if (!itemName) return "请输入“使用 物品名称 (可选目标)”使用仓库中的物品。";
@@ -6458,9 +6772,8 @@ ${scatterEffectMessages.map((m) => `▸ ${m}`).join("\n")}`
       );
       return [
         `✅ 成功使用 ${itemNameConfirmed}`,
-        `├ 剩余数量：${newQuantity}`,
-        `└ 效果触发：${effectResult.message}`,
-        "─".repeat(14)
+        `剩余数量：${newQuantity}`,
+        `效果触发：${effectResult.message}`
       ].join("\n");
     } catch (error) {
       ctx.logger("GGCEVO").error(error);
@@ -6469,7 +6782,7 @@ ${scatterEffectMessages.map((m) => `▸ ${m}`).join("\n")}`
   });
   ctx.command("ggcevo/科技 [techName]", "查看空间站科技信息").usage("输入“科技”查看列表，或“科技 科技名称”查看详细信息").action(async ({ session }, techName) => {
     const [profile] = await ctx.database.get("sc2arcade_player", { userId: session.userId });
-    if (!profile) return "🔒 需要先绑定游戏句柄";
+    if (!profile) return "🔒 需要先绑定游戏句柄。";
     const handle = `${profile.regionId}-S2-${profile.realmId}-${profile.profileId}`;
     const [careerData] = await ctx.database.get("ggcevo_careers", { handle });
     if (!careerData || careerData.group !== "人类联盟") {
@@ -6484,11 +6797,13 @@ ${scatterEffectMessages.map((m) => `▸ ${m}`).join("\n")}`
       return [
         "🛰️ 空间站科技系统 🛰️",
         '使用 "科技 科技名称" 查看详细信息',
+        isIntelligenceOfficer ? [
+          "💰 当前折扣：",
+          "🎖️ 情报副官：20%"
+        ].join("\n") : "",
         "====================",
         ...techList,
-        "====================",
-        isIntelligenceOfficer && "※ 情报副官享受20%升级折扣"
-        // 新增折扣提示
+        "===================="
       ].filter(Boolean).join("\n");
     }
     const tech = Spacestationtechnology.find(
@@ -6509,22 +6824,29 @@ ${Spacestationtechnology.map((t) => t.techname).join("、")}`;
         "------------------"
       ].join("\n");
     });
+    let discountInfo = [];
+    if (isIntelligenceOfficer) {
+      discountInfo = [
+        "💰 当前折扣：",
+        "🎖️ 情报副官：20%"
+      ];
+    }
     return [
       `🛠️ ${tech.techname} 科技详情 🛠️`,
       `最大可升级等级：${romanNumerals[tech.maxLevel]}`,
       '使用 "升级 科技名称" 进行升级',
+      ...discountInfo,
+      // 插入折扣信息
       "====================",
-      ...techDetails,
-      isIntelligenceOfficer && "※ 情报副官享受20%升级折扣"
-      // 新增折扣提示
+      ...techDetails
     ].filter(Boolean).join("\n");
   });
   ctx.command("ggcevo/挖矿").action(async ({ session }) => {
     const [profile] = await ctx.database.get("sc2arcade_player", { userId: session.userId });
-    if (!profile) return "🔒 需要先绑定游戏句柄";
+    if (!profile) return "🔒 需要先绑定游戏句柄。";
     const handle = `${profile.regionId}-S2-${profile.realmId}-${profile.profileId}`;
     if (await ctx.database.get("ggcevo_blacklist", { handle }).then((r) => r.length)) {
-      return "⛔ 您已被列入黑名单";
+      return "⛔ 您已被列入黑名单。";
     }
     const [career] = await ctx.database.get("ggcevo_careers", { handle });
     if (!career || career.group !== "人类联盟") {
@@ -6631,7 +6953,8 @@ ${Spacestationtechnology.map((t) => t.techname).join("、")}`;
           `类型: ${task2.type}`,
           `目标: ${task2.target}次`,
           `奖励: ${task2.price}金币`,
-          `进度: ${completionStatus}`
+          `进度: ${completionStatus}`,
+          "------------------"
         ].join("\n"));
       }
       return [
@@ -6640,7 +6963,7 @@ ${Spacestationtechnology.map((t) => t.techname).join("、")}`;
         "====================",
         ...taskList,
         "===================="
-      ].join("\n\n");
+      ].join("\n");
     }
     const task = Object.entries(Tasklist).find(
       ([taskName]) => taskName === name2
@@ -6661,10 +6984,10 @@ ${Spacestationtechnology.map((t) => t.techname).join("、")}`;
       `任务奖励: ${task.price}金币`,
       `当前进度: ${progress}/${task.target}`,
       `累计完成: ${completions}次`,
-      "-------------------",
+      "------------------",
       "任务描述:",
       task.description,
-      "-------------------",
+      "------------------",
       "完成条件:",
       task.condition,
       "====================",
@@ -6676,7 +6999,7 @@ ${Spacestationtechnology.map((t) => t.techname).join("、")}`;
     if (!profile) return "⚠️ 需要先绑定游戏句柄";
     const handle = `${profile.regionId}-S2-${profile.realmId}-${profile.profileId}`;
     if (await ctx.database.get("ggcevo_blacklist", { handle }).then((r) => r.length)) {
-      return "⛔ 您已被列入黑名单";
+      return "⛔ 您已被列入黑名单。";
     }
     const taskEntry = Object.entries(Tasklist).find(
       ([taskName2]) => taskName2.includes(name2)