koishi-plugin-ggcevo-game 1.4.15 → 1.4.17

package/lib/boss/attackhandling.d.ts

@@ -30,13 +30,14 @@ export declare function handleDeathTargets(ctx: Context, deadTargets: any[], kil
     bossBroadcast: string[];
     cleanerBroadcast: string[];
 }>;
-export declare function calculateRewards(ctx: Context, handle: string, username: string, totalDamage: number): Promise<{
+export declare function calculateRewards(ctx: Context, handle: string, totalDamage: number): Promise<{
     finalReward: number;
     careerMessage: string;
     redcrystalMessage: string;
+    techMessage: string;
 }>;
 export declare function updateSignRecord(ctx: Context, handle: string, reward: number): Promise<void>;
-export declare function buildResultMessage(session: any, weaponName: string, targetBoss: any, primaryResult: any, scatterResult: any, totalDamage: number, finalReward: number, maxHP: number, careerMessage: string, redcrystalMessage: string): string;
+export declare function buildResultMessage(session: any, weaponName: string, targetBoss: any, primaryResult: any, scatterResult: any, finalReward: number, maxHP: number, careerMessage: string, techMessage: string, redcrystalMessage: string): string;
 export declare function handleBroadcasts(ctx: Context, groupIds: string[], scatterBroadcast: string | string[] | null, bossEventBroadcast: string[] | string | null, cleanerRewardBroadcast: string[] | null, isPrimaryAttack: boolean): Promise<void>;
 export declare function applyScatterResults(ctx: Context, session: any, equippedWeapon: any, targetBoss: any, scatterResult: any): Promise<string[]>;
 export declare function updateBossDamageRecord(ctx: Context, handle: string, playerName: string, bossGroupId: number, damageAmount: number): Promise<void>;

package/lib/boss/passivehandler.d.ts

@@ -69,7 +69,7 @@ export declare const PassiveHandler: {
     }>;
     calculateRadiationDamage: (targetBoss: any) => {
         damageMultiplier: number;
-        messages: string[];
+        messages: any[];
     };
     handleColdEffect: (ctx: Context, targetBoss: any, weaponName: string) => Promise<{
         messages: string[];
@@ -77,7 +77,7 @@ export declare const PassiveHandler: {
     }>;
     calculateColdDamage: (targetBoss: any) => {
         damageMultiplier: number;
-        messages: string[];
+        messages: any[];
     };
     handleConductorTagChange: (ctx: Context, targetBoss: any, currentHP: number, maxHP: number) => Promise<{
         messages: string[];
@@ -151,7 +151,7 @@ export declare const PassiveHandler: {
         damageMultiplier: number;
         messages: string[];
     };
-    handleHunterAlien: (ctx: Context, targetBoss: any, weaponName: string) => Promise<{
+    handleHunterAlien: (targetBoss: any, weaponName: string, activeBosses: any[]) => Promise<{
         immune: boolean;
         messages: string[];
         damageMultiplier?: undefined;
@@ -181,7 +181,7 @@ export declare const PassiveHandler: {
     handlePulseDisruptor: (ctx: Context, targetBoss: any, weaponName: string) => Promise<{
         messages: string[];
     }>;
-    handlePassives: (ctx: Context, handle: string, targetBoss: any, initialDamage: number, currentHP: number, maxHP: number, weaponName: string, weaponData: any, activeBosses: any[], bossGroup: any) => Promise<{
+    handlePassives: (ctx: Context, handle: string, targetBoss: any, initialDamage: number, currentHP: number, maxHP: number, weaponName: string, weaponData: any, bossGroup: any) => Promise<{
         currentHP: any;
         messages: any;
         skillUpdates: any[];

package/lib/index.js

@@ -580,10 +580,10 @@ var spaceStationCrewConfig = [
   },
   {
     professionName: "舰长",
-    effect: "pk胜利将获得对面的红晶，可以使用红晶升级联盟空间站科技",
-    requirements: "pk总次数达10次",
-    Jobtransfer: false,
-    costcoins: 3e3
+    effect: "完成任务奖励+50%",
+    requirements: "累计完成4次及以上任务",
+    Jobtransfer: true,
+    costcoins: 2e3
   },
   {
     professionName: "机械化专家",
@@ -731,6 +731,18 @@ async function checkTransferRequirements(ctx, handle, profession) {
         success: totalDamage >= 100,
         message: `需要当期伤害榜累计造成100及以上伤害(当前${totalDamage})`
       };
+    // +++ 新增舰长检查 +++
+    case "舰长": {
+      const taskRecords = await ctx.database.get("ggcevo_task", { handle });
+      const totalCompletions = taskRecords.reduce(
+        (sum, task) => sum + (task.Completions || 0),
+        0
+      );
+      return {
+        success: totalCompletions >= 4,
+        message: totalCompletions >= 4 ? "" : `需要累计完成4次及以上任务(当前${totalCompletions}次)`
+      };
+    }
     case "情报副官":
       const techs = await ctx.database.get("ggcevo_tech", { handle });
       const hasValidTech = techs.some((t) => t.level >= 3);
@@ -973,19 +985,19 @@ var Spacestationtechnology = [
         level: 3,
         cost: 2250,
         description: "升级空间站关键系统，完成任务奖励+15%",
-        careerBonus: "完成任务奖励+30%"
+        careerBonus: "完成任务奖励+30%，移除签到7日以下奖励区间"
       },
       {
         level: 4,
         cost: 2950,
         description: "升级空间站关键系统，完成任务奖励+20%",
-        careerBonus: "完成任务奖励+40%，移除签到7日以下奖励区间"
+        careerBonus: "完成任务奖励+40%，移除签到14日以下奖励区间"
       },
       {
         level: 5,
         cost: 3550,
         description: "升级空间站关键系统，完成任务奖励+25%",
-        careerBonus: "完成任务奖励+50%，移除签到14日以下奖励区间"
+        careerBonus: "完成任务奖励+50%，移除签到21日以下奖励区间"
       }
     ]
   }
@@ -997,8 +1009,8 @@ var Tasklist = {
     id: 1,
     type: "可重复任务",
     description: "利用【伽马枪】武器对异形目标造成辐射伤害",
-    target: 2,
-    price: 100,
+    target: 1,
+    price: 50,
     redCrystalCost: 0,
     condition: "使用伽马枪攻击异形并成功使辐射层数+1"
   },
@@ -1006,8 +1018,8 @@ var Tasklist = {
     id: 2,
     type: "可重复任务",
     description: "利用【零度之下】武器对异形目标造成寒冷伤害",
-    target: 2,
-    price: 100,
+    target: 1,
+    price: 50,
     redCrystalCost: 0,
     condition: "使用零度之下攻击异形并成功使寒冷层数+1"
   },
@@ -1953,7 +1965,7 @@ async function applyItemEffect(ctx, session, handle, itemConfig2, target) {
     }
     return {
       success: false,
-      message: `${itemName} 效果开发中，无法使用。`
+      message: `${itemName} 无法使用。`
     };
   } catch (error) {
     console.error("物品效果处理失败:", error);
@@ -2029,11 +2041,11 @@ async function handleTechUpgrade(ctx, handle, target) {
   let discountInfo = [];
   if (discountApplied) {
     discountInfo = [
-      "折扣明细：",
+      "💰 折扣明细：",
       ...discountDetails.map((detail) => `▸ ${detail}`)
     ];
   }
-  const costInfo = discountApplied ? `💰 花费金币：${actualCost} (原价${originalCost})` : `💰 花费金币：${actualCost}`;
+  const costInfo = discountApplied ? `💸 花费金币：${actualCost} (原价${originalCost})` : `💸 花费金币：${actualCost}`;
   let permissionMessage = [];
   if (permissionGrantInfo) {
     const [permissionRecord] = await ctx.database.get("ggcevo_purchasepermissions", { handle });
@@ -2087,7 +2099,7 @@ async function handleWeaponUpgrade(ctx, handle, target) {
     if (weaponDiscount > 0) {
       totalDiscount += weaponDiscount;
       discountDetails.push(
-        `⚙️ 武器系统科技Lv${techLevel}：${weaponDiscount}%折扣`
+        `⚙️ 武器系统Lv.${techLevel}：${weaponDiscount}%折扣`
       );
     }
   }
@@ -2129,8 +2141,8 @@ async function handleWeaponUpgrade(ctx, handle, target) {
   const damage = (weaponData.damage * (1 + 0.1 * newLevel)).toFixed(1);
   let msg = `${target} 升级成功！Lv.${newLevel}`;
   const priceInfo = totalDiscount > 0 ? `
-💸 消耗：${actualCost}金币 (原价${baseCost}金币)` : `
-💸 消耗：${actualCost}金币`;
+💸 花费：${actualCost}金币 (原价${baseCost}金币)` : `
+💸 花费：${actualCost}金币`;
   msg += priceInfo;
   if (discountDetails.length > 0) {
     msg += `
@@ -2218,13 +2230,13 @@ ${priceInfo}`);
     discountNotice.push("💰 当前折扣：");
   }
   if (isGunslinger) {
-    discountNotice.push(`🔫 枪手职业：10%升级武器折扣`);
+    discountNotice.push(`▸ 🔫 枪手职业：10%折扣`);
   }
   if (isAlliance && hasTechDiscount) {
-    discountNotice.push(`⚙️ 武器系统科技Lv${techLevel}：${techDiscountRate}%折扣`);
+    discountNotice.push(`▸ ⚙️ 武器系统Lv.${techLevel}：${techDiscountRate}%折扣`);
   }
   if (hasFoxDiscount) {
-    discountNotice.push(`🦊 灵狐升运祈愿：20%折扣`);
+    discountNotice.push(`▸ 🦊 灵狐升运祈愿：20%折扣`);
   }
   if (!hasTechDiscount && !hasFoxDiscount && !hasGunslingerDiscount) {
     if (isAlliance) {
@@ -2236,11 +2248,11 @@ ${priceInfo}`);
     }
   }
   if (isGunslinger) {
-    discountNotice.push("🔝 枪手职业：武器等级上限提升至7级");
+    discountNotice.push("▸ 🔝 枪手职业：武器等级上限提升至7级");
   }
   return [
     "⚡ 武器升级价格表 ⚡",
-    `武器等级上限: ${maxLevel}级（${isGunslinger ? "枪手职业" : "普通玩家"})`,
+    `武器等级上限: ${maxLevel}级${isGunslinger ? " (枪手职业)" : ""}`,
     "使用「升级 武器名称」对武器进行等级升级",
     ...discountNotice,
     "====================",
@@ -2579,7 +2591,7 @@ var PassiveHandler = {
     await ctx.database.set("ggcevo_boss", { name: targetBoss.name }, { Skillcountpoints: newStacks });
     return { updatedHP, messages };
   }, "handleBloodCount"),
-  // 修改后的伽马枪辐射处理（上限10层，每层5%）
+  // 修改后的伽马枪辐射处理（无限叠层，每层2.5%增伤，有效上限20层）
   handleGammaRadiation: /* @__PURE__ */ __name(async (ctx, targetBoss, weaponName) => {
     if (weaponName !== "伽马枪" || targetBoss.tags.includes("机械") || !targetBoss.tags.includes("生物")) {
       return null;
@@ -2587,40 +2599,40 @@ var PassiveHandler = {
     const messages = [];
     let radiationApplied = false;
     const currentLayers = targetBoss.Vulnerability || 0;
-    const maxLayers = 10;
-    const newLayers = Math.min(currentLayers + 1, maxLayers);
+    const newLayers = currentLayers + 1;
     await ctx.database.set(
       "ggcevo_boss",
       { name: targetBoss.name },
       { Vulnerability: newLayers }
     );
-    if (newLayers === currentLayers) {
-      messages.push(`☢️ 【辐射】效果达到上限(10层)`);
-    } else {
-      const layerIncrease = newLayers - currentLayers;
-      messages.push(`☢️ ${targetBoss.name}获得${layerIncrease}层"辐射"(当前${newLayers}层)`);
-      radiationApplied = true;
-    }
+    messages.push(`☢️ ${targetBoss.name}获得1层"辐射"(当前${newLayers}层)`);
+    radiationApplied = true;
     return {
       messages,
       radiationApplied
     };
   }, "handleGammaRadiation"),
-  // 修改后的辐射伤害计算（每层5%增伤）
+  // 修改后的辐射伤害计算（每层2.5%增伤，上限20层）
   calculateRadiationDamage: /* @__PURE__ */ __name((targetBoss) => {
     const radiationLayers = targetBoss.Vulnerability || 0;
-    if (radiationLayers > 0) {
-      return {
-        damageMultiplier: radiationLayers * 0.05,
-        // 每层5%增伤
-        messages: [
-          `☢️ 【辐射】生效：当前${radiationLayers}层辐射，受到的伤害+${radiationLayers * 5}%`
-        ]
-      };
+    if (radiationLayers < 1) return null;
+    const effectiveLayers = Math.min(radiationLayers, 20);
+    const damageIncrease = effectiveLayers * 2.5;
+    const maxIncrease = 50;
+    const messages = [];
+    let statusMsg = `☢️ 【辐射】生效：当前${radiationLayers}层辐射`;
+    statusMsg += `，受到的伤害+${damageIncrease}%`;
+    if (damageIncrease >= maxIncrease) {
+      statusMsg += `(达到上限)`;
     }
-    return null;
+    messages.push(statusMsg);
+    return {
+      damageMultiplier: effectiveLayers * 0.025,
+      // 每层2.5%增伤
+      messages
+    };
   }, "calculateRadiationDamage"),
-  // 新增寒冷层数处理函数（类似辐射处理）
+  // 修改后的寒冷处理（无限叠层，每层2.5%增伤，有效上限20层）
   handleColdEffect: /* @__PURE__ */ __name(async (ctx, targetBoss, weaponName) => {
     if (weaponName !== "零度之下") {
       return null;
@@ -2628,36 +2640,38 @@ var PassiveHandler = {
     const messages = [];
     let freezing = false;
     const currentFreezing = targetBoss.freezing || 0;
-    const newFreezing = Math.min(currentFreezing + 1, 10);
+    const newFreezing = currentFreezing + 1;
     await ctx.database.set(
       "ggcevo_boss",
       { name: targetBoss.name },
       { freezing: newFreezing }
     );
-    if (newFreezing === currentFreezing) {
-      messages.push(`❄️ 【寒冷】效果达到上限(10层)`);
-    } else {
-      messages.push(`❄️ ${targetBoss.name} 获得1层"寒冷"(当前${newFreezing}层)`);
-      freezing = true;
-    }
+    messages.push(`❄️ ${targetBoss.name} 获得1层"寒冷"(当前${newFreezing}层)`);
+    freezing = true;
     return {
       messages,
       freezing
     };
   }, "handleColdEffect"),
-  // 寒冷伤害计算（返回增伤系数）
+  // 修改后的寒冷伤害计算（每层2.5%增伤，上限20层）
   calculateColdDamage: /* @__PURE__ */ __name((targetBoss) => {
     const freezingLayers = targetBoss.freezing || 0;
-    if (freezingLayers > 0) {
-      return {
-        damageMultiplier: freezingLayers * 0.05,
-        // 每层5%增伤
-        messages: [
-          `❄️ 【寒冷】生效：当前${freezingLayers}层，受到的伤害+${freezingLayers * 5}%`
-        ]
-      };
+    if (freezingLayers < 1) return null;
+    const effectiveLayers = Math.min(freezingLayers, 20);
+    const damageIncrease = effectiveLayers * 2.5;
+    const maxIncrease = 50;
+    const messages = [];
+    let statusMsg = `❄️ 【寒冷】生效：当前${freezingLayers}层`;
+    statusMsg += `，受到的伤害+${damageIncrease}%`;
+    if (damageIncrease >= maxIncrease) {
+      statusMsg += `(达到上限)`;
     }
-    return null;
+    messages.push(statusMsg);
+    return {
+      damageMultiplier: effectiveLayers * 0.025,
+      // 每层2.5%增伤
+      messages
+    };
   }, "calculateColdDamage"),
   // === 电能相关被动处理 ===
   // 处理导体标签变化（血量低时护盾->重甲）
@@ -3118,7 +3132,7 @@ var PassiveHandler = {
     };
   }, "handleHellfireBomb"),
   // 猎手异形处理（Hunter Alien）
-  handleHunterAlien: /* @__PURE__ */ __name(async function(ctx, targetBoss, weaponName) {
+  handleHunterAlien: /* @__PURE__ */ __name(async function(targetBoss, weaponName, activeBosses) {
     if (!targetBoss.skills.includes("猎手异形")) return null;
     if (weaponName === "焚烧枪" || weaponName === "零度之下") {
       return {
@@ -3126,7 +3140,6 @@ var PassiveHandler = {
         messages: [`🛡️ 【猎手异形】生效：免疫${weaponName === "焚烧枪" ? "火焰" : "寒冷"}伤害`]
       };
     }
-    const activeBosses = await ctx.database.get("ggcevo_boss", { isActive: true });
     const otherAlive = activeBosses.some(
       (boss) => boss.groupId === targetBoss.groupId && boss.name !== targetBoss.name && boss.HP > 0
     );
@@ -3144,7 +3157,7 @@ var PassiveHandler = {
     if (currentHP / maxHP < 0.5) {
       return {
         damageMultiplier: -0.5,
-        messages: [`😠 【狂暴】生效：血量低于50%，受到的伤害-50%`]
+        messages: [`🔥 【狂暴】生效：血量低于50%，受到的伤害-50%`]
       };
     }
     return null;
@@ -3279,7 +3292,7 @@ var PassiveHandler = {
     };
   }, "handlePulseDisruptor"),
   // 修改后的伤害处理函数
-  handlePassives: /* @__PURE__ */ __name(async function(ctx, handle, targetBoss, initialDamage, currentHP, maxHP, weaponName, weaponData, activeBosses, bossGroup) {
+  handlePassives: /* @__PURE__ */ __name(async function(ctx, handle, targetBoss, initialDamage, currentHP, maxHP, weaponName, weaponData, bossGroup) {
     let messages = [];
     let skillUpdates = [];
     let buffMultiplier = 0;
@@ -3287,6 +3300,7 @@ var PassiveHandler = {
     let radiationApplied = false;
     let freezing = false;
     let bileStacks = 0;
+    const activeBosses = await ctx.database.get("ggcevo_boss", { isActive: true });
     const solarFlareResult = await this.handleSolarFlare(ctx, targetBoss, weaponName);
     if (solarFlareResult.immune) {
       return {
@@ -3351,7 +3365,7 @@ var PassiveHandler = {
         initialDamage: 0
       };
     }
-    const hunterImmune = await this.handleHunterAlien(ctx, targetBoss, weaponName);
+    const hunterImmune = await this.handleHunterAlien(targetBoss, weaponName, activeBosses);
     if (hunterImmune?.immune) {
       return {
         currentHP: targetBoss.HP,
@@ -3679,7 +3693,7 @@ async function getCleanerRewardBroadcast(ctx, boss, killerHandle, killerName) {
         redcrystal: (cleaner.redcrystal || 0) + rewardAmount
       }], ["handle"]);
     }
-    const rewardMessage = `🧹 全体清洁工因清理 ${bossName} 获得 ${baseReward} 红晶${killerBonus ? ` (致命一击双倍奖励 ${killerName})` : ""}`;
+    const rewardMessage = `🧹 全体清洁工因清理 ${bossName} 获得 ${baseReward} 红晶${killerBonus ? ` (致命一击双倍奖励者：${killerName})` : ""}`;
     return [rewardMessage];
   } catch (error) {
     ctx.logger("ggcevo").warn("清洁工奖励发放失败", error);
@@ -3821,7 +3835,6 @@ async function handlePrimaryAttack(ctx, session, config, handle, equippedWeapon,
     maxHP,
     weaponName,
     weaponData,
-    activeBosses,
     bossGroup
   );
   const currentHP = passiveResult.currentHP;
@@ -3876,7 +3889,6 @@ async function handleScatterAttack(ctx, session, config, handle, equippedWeapon,
       getBossMaxHP(secondaryTarget.name),
       weaponName,
       weaponData,
-      secondaryTargets,
       bossGroup
     );
     const actualDamage = Math.min(passiveResult.initialDamage, secondaryTarget.HP);
@@ -4001,7 +4013,7 @@ async function handleDeathTargets(ctx, deadTargets, killerName, killerHandle) {
   };
 }
 __name(handleDeathTargets, "handleDeathTargets");
-async function calculateRewards(ctx, handle, username, totalDamage) {
+async function calculateRewards(ctx, handle, totalDamage) {
   const SECURITY_BONUS_MAPPING = {
     base: [5, 10, 15, 20, 25],
     career: [10, 20, 30, 40, 50]
@@ -4013,11 +4025,13 @@ async function calculateRewards(ctx, handle, username, totalDamage) {
     techId: 4
   });
   let techBonusPercent = 0;
+  let techMessage = "";
   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];
+    techMessage = isEligibleForCareerBonus ? `⚙️ 安防系统Lv.${securityTech.level}：+${SECURITY_BONUS_MAPPING.career[techLevel]}%金币` : `⚙️ 安防系统Lv.${securityTech.level}：+${SECURITY_BONUS_MAPPING.base[techLevel]}%金币`;
   }
   let careerMultiplier = 0;
   let careerMessage = "";
@@ -4042,7 +4056,9 @@ async function calculateRewards(ctx, handle, username, totalDamage) {
   return {
     finalReward,
     careerMessage,
-    redcrystalMessage
+    redcrystalMessage,
+    techMessage
+    // 新增：独立返回科技奖励信息
   };
 }
 __name(calculateRewards, "calculateRewards");
@@ -4054,7 +4070,7 @@ async function updateSignRecord(ctx, handle, reward) {
   }], ["handle"]);
 }
 __name(updateSignRecord, "updateSignRecord");
-function buildResultMessage(session, weaponName, targetBoss, primaryResult, scatterResult, totalDamage, finalReward, maxHP, careerMessage, redcrystalMessage) {
+function buildResultMessage(session, weaponName, targetBoss, primaryResult, scatterResult, finalReward, maxHP, careerMessage, techMessage, redcrystalMessage) {
   const messages = [
     `🔥 ${session.username} 使用武器 ${weaponName} 对 ${targetBoss.name} 发起攻击！`,
     ...primaryResult.effectMessage.length > 0 ? [
@@ -4078,10 +4094,16 @@ ${scatterResult.scatterEffectMessages.map((m) => `▸ ${m}`).join("\n")}`,
       ] : []
     );
   }
+  const bonusMessages = [
+    careerMessage ? `▸ ${careerMessage}` : "",
+    techMessage ? `▸ ${techMessage}` : "",
+    redcrystalMessage ? `▸ ${redcrystalMessage}` : ""
+  ].filter((msg) => msg);
   messages.push(
     `获得金币：${finalReward}`,
-    careerMessage,
-    redcrystalMessage,
+    `⚡ 加成效果：`,
+    ...bonusMessages,
+    // 使用展开运算符添加所有加▸的奖励消息
     `目标剩余HP：${Math.max(primaryResult.currentHP, 0)}/${maxHP}`,
     primaryResult.isDefeated ? `🎉 恭喜，已成功击败 ${targetBoss.name}！` : ""
   );
@@ -4728,7 +4750,6 @@ ${itemDetails.join("\n")}`;
       }
       const messages = [];
       let totalBonus = 0;
-      let basePoints;
       let tickets = 3;
       if (monthlyDays === 7) {
         tickets = 4;
@@ -4742,19 +4763,24 @@ ${itemDetails.join("\n")}`;
       const [systemFirmwareTech] = await ctx.database.get("ggcevo_tech", { handle, techId: 5 }).catch(() => [{ level: 0 }]);
       const systemFirmwareLevel = Math.min(systemFirmwareTech?.level || 0, 5);
       const [careerData] = await ctx.database.get("ggcevo_careers", { handle });
-      const shouldApplyBonus = careerData?.group === "人类联盟" && ["舰长", "情报副官"].includes(careerData.career) && systemFirmwareLevel >= 4;
-      if (shouldApplyBonus) {
-        if (systemFirmwareLevel === 4) {
-          if (monthlyDays < 14) basePoints = getRandomInt(40, 60);
-          else if (monthlyDays < 21) basePoints = getRandomInt(60, 80);
-          else if (monthlyDays < 28) basePoints = getRandomInt(80, 100);
+      const shouldApplyFirmwareEffect = careerData?.group === "人类联盟" && ["舰长", "情报副官"].includes(careerData.career) && systemFirmwareLevel >= 3;
+      let basePoints;
+      if (shouldApplyFirmwareEffect) {
+        if (systemFirmwareLevel >= 5) {
+          if (monthlyDays < 28) basePoints = getRandomInt(80, 100);
           else basePoints = getRandomInt(100, 200);
-          messages.push(`🛰️ 关键系统固件科技Lv4：移除签到7日以下奖励区间`);
-        } else if (systemFirmwareLevel === 5) {
+          messages.push(`🛰️ 关键系统固件Lv.5：移除签到21日以下奖励区间`);
+        } else if (systemFirmwareLevel >= 4) {
           if (monthlyDays < 21) basePoints = getRandomInt(60, 80);
           else if (monthlyDays < 28) basePoints = getRandomInt(80, 100);
           else basePoints = getRandomInt(100, 200);
-          messages.push(`🛰️ 关键系统固件科技Lv5：移除签到14日以下奖励区间`);
+          messages.push(`🛰️ 关键系统固件Lv.4：移除签到14日以下奖励区间`);
+        } else if (systemFirmwareLevel >= 3) {
+          if (monthlyDays < 14) basePoints = getRandomInt(40, 60);
+          else if (monthlyDays < 21) basePoints = getRandomInt(60, 80);
+          else if (monthlyDays < 28) basePoints = getRandomInt(80, 100);
+          else basePoints = getRandomInt(100, 200);
+          messages.push(`🛰️ 关键系统固件Lv.3：移除签到7日以下奖励区间`);
         }
       } else {
         if (monthlyDays < 7) basePoints = getRandomInt(20, 40);
@@ -4780,7 +4806,7 @@ ${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 === "深空矿工") {
@@ -5987,9 +6013,6 @@ ${items.join("、")}
         `📊 胜率预测：${winRate.toFixed(1)}%`,
         `🎰 金币变动：${stealPercentage}%`
       ];
-      if (targetCareer.group === "人类联盟" && isWin) {
-        result.push(`🛡️ 人类联盟：应战者PK失败时仅损失1%的金币`);
-      }
       if (computerExpertProtection) {
         result.push(`💻 计算机专家职业：应战者PK失败时不损失金币`);
       } else if (isWin) {
@@ -5997,17 +6020,21 @@ ${items.join("、")}
       } else {
         result.push(`💸 您从口袋里拿出了${goldTransfer}枚金币上交给对方`);
       }
+      result.push(`⚡ 加成效果：`);
+      if (targetCareer.group === "人类联盟" && isWin) {
+        result.push(`▸ 🛡️ 人类联盟：应战者PK失败时仅损失1%的金币`);
+      }
       if (mp3Effect) {
-        result.push(`💿 MP3播放器生效：挑战者PK失败时上交的金币减少50%`);
+        result.push(`▸ 💿 MP3播放器生效：挑战者PK失败时上交的金币减少50%`);
       }
       if (hornEffect) {
-        result.push(`📯 气喇叭生效：辛迪加海盗总部为您发放了额外${extraGold}金币奖励！`);
+        result.push(`▸ 📯 气喇叭生效：辛迪加海盗总部为您发放了额外${extraGold}金币奖励！`);
       }
       if (initiatorCareer?.group === "辛迪加海盗") {
-        result.push(`🔴 辛迪加海盗阵营：+1枚红晶`);
+        result.push(`▸ 🔴 辛迪加海盗阵营：+1枚红晶`);
       }
       if (isWin && initiatorCareer?.career === "辛迪加财务经理") {
-        result.push(`🎖️ 辛迪加财务经理职业：+1枚红晶`);
+        result.push(`▸ 🎖️ 辛迪加财务经理职业：+1枚红晶`);
       }
       result.push(`📅 剩余挑战次数：${config.dailyPKLimit - (initiatorPK.todayCount + 1)}`);
       return result.join("\n");
@@ -6059,7 +6086,7 @@ ${items.join("、")}
     if (careerData?.career === "武器中士") {
       const weaponSpecialistDiscount = 20;
       totalDiscount += weaponSpecialistDiscount;
-      discountDetails.push(`🎖️ 武器中士职业：${weaponSpecialistDiscount}%折扣`);
+      discountDetails.push(`▸ 🎖️ 武器中士职业：${weaponSpecialistDiscount}%折扣`);
     }
     const activeWish = await ctx.database.get("ggcevo_Wish_Record", {
       handle,
@@ -6071,7 +6098,7 @@ ${items.join("、")}
     if (activeWish) {
       const grasshopperDiscount = 20;
       totalDiscount += grasshopperDiscount;
-      discountDetails.push(`🦗 蚱蜢优购祈愿：${grasshopperDiscount}%折扣`);
+      discountDetails.push(`▸ 🦗 蚱蜢优购祈愿：${grasshopperDiscount}%折扣`);
     }
     totalDiscount = Math.min(totalDiscount, 100);
     const categoryStats = Object.values(weaponConfig).filter((weapon) => weapon.price !== 0).reduce((stats, weapon) => {
@@ -6082,7 +6109,7 @@ ${items.join("、")}
       return [
         "🏪 咕咕武器库分类 🏪",
         '使用 "武器库 分类名称" 查看详细列表',
-        totalDiscount > 0 && `💰 当前折扣：
+        totalDiscount > 0 && `💰 折扣明细：
 ${discountDetails.length ? `${discountDetails.join("\n")}` : ""}`,
         "====================",
         ...Object.entries(categoryStats).map(([catName, count]) => `▸ ${catName} (${count}种)`),
@@ -6117,7 +6144,7 @@ ${Object.keys(categoryStats).join("、")}`;
       ].filter(Boolean).join("\n");
     });
     const permissionNotice = isLegendaryCategory ? '⚠️ 注意：购买传奇武器需要"传奇武器购买权限"' : null;
-    const discountInfo = totalDiscount > 0 && !isLegendaryCategory ? `💰 当前折扣：
+    const discountInfo = totalDiscount > 0 && !isLegendaryCategory ? `💰 折扣明细：
 ${discountDetails.length ? `${discountDetails.join("\n")}` : ""}` : null;
     return [
       `🏪 咕咕武器库 - ${category} 🏪`,
@@ -6233,13 +6260,13 @@ ${validTypes.join("、")}`;
         if (activeWish) {
           const wishDiscount = 20;
           totalDiscount += wishDiscount;
-          discountDetails.push(`🦗 蚱蜢优购祈愿：${wishDiscount}%折扣`);
+          discountDetails.push(`▸ 🦗 蚱蜢优购祈愿：${wishDiscount}%折扣`);
         }
       }
       if (isWeapon && careerData?.career === "武器中士") {
         const specialistDiscount = 20;
         totalDiscount += specialistDiscount;
-        discountDetails.push(`🎖️ 武器中士职业：${specialistDiscount}%折扣`);
+        discountDetails.push(`▸ 🎖️ 武器中士职业：${specialistDiscount}%折扣`);
       }
       totalDiscount = Math.min(totalDiscount, 100);
     }
@@ -6315,7 +6342,7 @@ ${validTypes.join("、")}`;
 扣除 1 次传奇武器购买权限，剩余次数：${permissions?.legendarypermissions || 0}`;
     } else if (discountDetails.length > 0) {
       message += `(原价${config2.price} 金币)
-折扣明细：
+💰 折扣明细：
 ▸ ${discountDetails.join("\n▸ ")}`;
     } else {
       message += ` (原价${config2.price} 金币)`;
@@ -6484,8 +6511,8 @@ ${validTypes.join("、")}`;
         `✅ ${weapon} 成功安装 ${mod}！`,
         `花费金币：${actualCost}${discountRate > 0 ? ` (原价${modInfo.cost})` : ""}`,
         discountRate > 0 && [
-          "折扣明细：",
-          `⚙️ 武器升级平台科技Lv${techLevel}：${discountRate}%`
+          "💰 折扣明细：",
+          `▸ ⚙️ 武器升级平台Lv.${techLevel}：${discountRate}%折扣`
         ].join("\n"),
         `改装槽：${equipment.installedMods.length + 1}/${equipment.modificationSlots}`
       ].filter(Boolean).join("\n");
@@ -6523,7 +6550,7 @@ ${validTypes.join("、")}`;
           "使用「改装 武器名称 模块名称」安装",
           "※ 每个武器只能安装一个专属模块",
           exclusiveDiscountRate > 0 && `💰 当前专属模块折扣：
-⚙️ 武器升级平台科技Lv${techLevel}：${exclusiveDiscountRate}%`,
+▸ ⚙️ 武器升级平台Lv.${techLevel}：${exclusiveDiscountRate}%折扣`,
           "====================",
           exclusiveMods.length ? exclusiveMods.join("\n") : "该武器暂无专属模块"
         ].filter(Boolean).join("\n");
@@ -6534,7 +6561,7 @@ ${validTypes.join("、")}`;
           "使用「改装 武器名称 模块名称」安装通用模块",
           "使用「改装 武器名称」查询武器专属模块",
           universalDiscountRate > 0 && `💰 当前通用模块折扣：
-⚙️ 武器升级平台科技Lv${techLevel}：${universalDiscountRate}%`,
+▸ ⚙️ 武器升级平台Lv.${techLevel}：${universalDiscountRate}%折扣`,
           "====================",
           universalMods.join("\n")
         ].filter(Boolean).join("\n");
@@ -6553,9 +6580,9 @@ ${validTypes.join("、")}`;
     const existingEntries = await ctx.database.get("ggcevo_blacklist", { handle });
     if (existingEntries.length > 0) return "⛔ 您已被列入黑名单。";
     const weaponId = weaponConfig[weapon]?.id;
-    if (!weaponId) return "❌ 请输入“拆卸 武器名称 模块名称”\n注意：专属模块返还50%金币，通用模块返还80%金币";
+    if (!weaponId) return "❌ 请输入“拆卸 武器名称 模块名称”\n注意：通用模块返还80%金币，专属模块返还50%金币";
     const modInfo = modConfig[mod];
-    if (!modInfo) return "❌ 请输入“拆卸 武器名称 模块名称”\n注意：专属模块返还50%金币，通用模块返还80%金币";
+    if (!modInfo) return "❌ 请输入“拆卸 武器名称 模块名称”\n注意：通用模块返还80%金币，专属模块返还50%金币";
     const refundRate = modInfo.isExclusive ? 0.5 : 0.8;
     const refundType = modInfo.isExclusive ? "专属模块返还50%" : "通用模块返还80%";
     const [equipment] = await ctx.database.get("ggcevo_equipment", {
@@ -6651,7 +6678,8 @@ ${validTypes.join("、")}`;
       allDeadTargets.push(targetBoss);
     }
     let scatterResult = null;
-    const isScatterAttack = equippedWeapon.installedMods?.includes("光束曲射晶片") && weaponName === "碎骨步枪" || weaponName === "中子步枪";
+    const hasOtherBosses = activeBosses.some((b) => b.name !== targetBoss.name);
+    const isScatterAttack = (equippedWeapon.installedMods?.includes("光束曲射晶片") && weaponName === "碎骨步枪" || weaponName === "中子步枪") && hasOtherBosses;
     if (isScatterAttack) {
       scatterResult = await handleScatterAttack(
         ctx,
@@ -6682,10 +6710,9 @@ ${validTypes.join("、")}`;
     const deathResults = await handleDeathTargets(ctx, allDeadTargets, session.username, handle);
     bossEventBroadcast = deathResults.bossBroadcast;
     cleanerRewardBroadcast = deathResults.cleanerBroadcast;
-    const { finalReward, careerMessage, redcrystalMessage } = await calculateRewards(
+    const { finalReward, careerMessage, redcrystalMessage, techMessage } = await calculateRewards(
       ctx,
       handle,
-      session.username,
       totalDamage
     );
     await updateSignRecord(ctx, handle, finalReward);
@@ -6713,10 +6740,10 @@ ${validTypes.join("、")}`;
       targetBoss,
       primaryAttackResult,
       scatterResult,
-      totalDamage,
       finalReward,
       maxHP,
       careerMessage,
+      techMessage,
       redcrystalMessage
     );
     await session.send(resultMessage);
@@ -7288,16 +7315,16 @@ ${validTypes.join("、")}`;
     if (!category) {
       const discountLines = [];
       if (isComputerExpert) {
-        discountLines.push("💻 计算机专家职业：设备工具类物品50%折扣");
+        discountLines.push("▸ 💻 计算机专家职业：设备工具类物品50%折扣");
       }
       if (isSaboteur) {
-        discountLines.push("💣 破坏者职业：爆破物类物品50%折扣");
+        discountLines.push("▸ 💣 破坏者职业：爆破物类物品50%折扣");
       }
       return [
         "🏴 辛迪加黑市 🏴",
         '使用 "黑市 分类名称" 查看详细信息',
         discountLines.length ? [
-          "💰 当前折扣：",
+          "💰 折扣明细：",
           ...discountLines
         ].join("\n") : "",
         "====================",
@@ -7375,13 +7402,13 @@ ${validTypes.join("、")}`;
     let discountInfo = [];
     if (isSaboteur && normalizedCategory === "爆破物") {
       discountInfo = [
-        "💰 当前折扣：",
-        "💣 破坏者职业：爆破物类物品50%折扣"
+        "💰 折扣明细：",
+        "▸ 💣 破坏者职业：爆破物类物品50%折扣"
       ];
     } else if (isComputerExpert && normalizedCategory === "设备工具") {
       discountInfo = [
-        "💰 当前折扣：",
-        "💻 计算机专家职业：设备工具类物品50%折扣"
+        "💰 折扣明细：",
+        "▸ 💻 计算机专家职业：设备工具类物品50%折扣"
       ];
     }
     return [
@@ -7502,7 +7529,7 @@ ${validTypes.join("、")}`;
         return [
           `✅ 成功订购【${item}】！`,
           ...priceInfo,
-          discountLines.length ? `折扣明细：
+          discountLines.length ? `💰 折扣明细：
 ▸ ${discountLines.join("\n▸ ")}` : "",
           `装备状态：${equippedStatus}`,
           '输入 "武器仓库" 管理武器'
@@ -7515,7 +7542,7 @@ ${validTypes.join("、")}`;
         return [
           `✅ 成功订购【${item}】x1！`,
           ...priceInfo,
-          discountLines.length ? `折扣明细：
+          discountLines.length ? `💰 折扣明细：
 ▸ ${discountLines.join("\n▸ ")}` : "",
           `当前库存：${currentStock}件`,
           '输入 "仓库" 查看所有物品'
@@ -7602,7 +7629,7 @@ ${validTypes.join("、")}`;
       return [
         `✅ 成功使用 ${itemNameConfirmed}`,
         `剩余数量：${newQuantity}`,
-        `效果触发：${effectResult.message}`
+        `触发效果：${effectResult.message}`
       ].join("\n");
     } catch (error) {
       ctx.logger("GGCEVO").error(error);
@@ -7627,8 +7654,8 @@ ${validTypes.join("、")}`;
         "🛰️ 空间站科技系统 🛰️",
         '使用 "科技 科技名称" 查看详细信息',
         isIntelligenceOfficer ? [
-          "💰 当前折扣：",
-          "🎖️ 情报副官职业：10%"
+          "💰 折扣明细：",
+          "▸ 🎖️ 情报副官职业：10%折扣"
         ].join("\n") : "",
         "====================",
         ...techList,
@@ -7655,8 +7682,8 @@ ${Spacestationtechnology.map((t) => t.techname).join("、")}`;
     let discountInfo = [];
     if (isIntelligenceOfficer) {
       discountInfo = [
-        "💰 当前折扣：",
-        "🎖️ 情报副官职业：10%"
+        "💰 折扣明细：",
+        "▸ 🎖️ 情报副官职业：10%折扣"
       ];
     }
     return [
@@ -7762,7 +7789,8 @@ ${Spacestationtechnology.map((t) => t.techname).join("、")}`;
     }
     reportLines.push(rewardLine);
     if (tech.level >= 3) {
-      reportLines.push(`⚙️ 采掘系统科技Lv.${tech.level}(矿骡)：+${multiplier * 100}%金币`);
+      reportLines.push(`⚡ 加成效果：`);
+      reportLines.push(`▸ ⚙️ 采掘系统Lv.${tech.level}(矿骡)：+${multiplier * 100}%金币`);
     }
     reportLines.push(`🏆 历史总挖矿收益：${record.totalMined + total}金币`);
     reportLines.push("💡 已自动开始下一轮挖矿");
@@ -7843,7 +7871,7 @@ ${Spacestationtechnology.map((t) => t.techname).join("、")}`;
         handle,
         taskId: taskConfig.id
       });
-      if (!taskData) return `⚠️ 您尚未开始"${taskName}"任务`;
+      if (!taskData) return `⚠️ ⚠️ 任务进度不足！无法完成"${taskName}"任务`;
       if (taskData.progress < taskConfig.target) {
         return `⚠️ 任务进度不足！当前进度：${taskData.progress}/${taskConfig.target}`;
       }
@@ -7854,16 +7882,17 @@ ${Spacestationtechnology.map((t) => t.techname).join("、")}`;
       const techLevel = Math.min(systemFirmwareTech?.level || 0, 5);
       let baseReward = taskConfig.price;
       let actualReward = baseReward;
-      let bonusMessage = "";
       let bonusPercent = 0;
       if (techLevel > 0) {
         const normalBonus = [0, 5, 10, 15, 20, 25][techLevel];
-        const careerBonus = careerData?.group === "人类联盟" && ["舰长", "情报副官"].includes(careerData.career) ? [0, 10, 20, 30, 40, 50][techLevel] : 0;
+        const careerBonus = careerData?.group === "人类联盟" && ["舰长", "情报副官"].includes(careerData?.career) ? [0, 10, 20, 30, 40, 50][techLevel] : 0;
         bonusPercent = Math.max(normalBonus, careerBonus);
-        if (bonusPercent > 0) {
-          actualReward = Math.round(baseReward * (1 + bonusPercent / 100));
-          bonusMessage = `(含科技加成 +${bonusPercent}%)`;
-        }
+      }
+      if (careerData?.group === "人类联盟" && careerData.career === "舰长") {
+        bonusPercent += 50;
+      }
+      if (bonusPercent > 0) {
+        actualReward = Math.round(baseReward * (1 + bonusPercent / 100));
       }
       await ctx.database.set("ggcevo_task", {
         handle,
@@ -7879,9 +7908,13 @@ ${Spacestationtechnology.map((t) => t.techname).join("、")}`;
       }], ["handle"]);
       const [updatedSignData] = await ctx.database.get("ggcevo_sign", { handle });
       const response = [
-        `🎉 恭喜您成功完成【${taskName}】任务！`,
-        `任务奖励：${actualReward}金币（基础值：${baseReward}金币）`
+        `🎉 恭喜您成功完成【${taskName}】任务！`
       ];
+      if (bonusPercent > 0) {
+        response.push(`任务奖励：${actualReward}金币 (基础值：${baseReward}金币)`);
+      } else {
+        response.push(`任务奖励：${actualReward}金币`);
+      }
       if (bonusPercent > 0) {
         let bonusType = "";
         if (careerData?.group === "人类联盟" && ["舰长", "情报副官"].includes(careerData.career)) {
@@ -7889,7 +7922,8 @@ ${Spacestationtechnology.map((t) => t.techname).join("、")}`;
         } else {
           bonusType = "(普通加成)";
         }
-        response.push(`⚙️ 关键系统固件科技Lv.${techLevel}：+${bonusPercent}%金币`);
+        response.push(`⚡ 加成效果：`);
+        response.push(`▸ ⚙️ 关键系统固件Lv.${techLevel}：+${bonusPercent}%金币`);
       }
       response.push(
         `累计完成次数：${newCompletions}次`,

package/package.json

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