koishi-plugin-ggcevo-game 1.6.14 → 1.6.16

package/lib/index.js

@@ -36,6 +36,7 @@ var weaponConfig = {
     id: 1,
     type: "实弹武器",
     category: "实弹武器",
+    level: 1,
     damage: 13,
     armorDamageReduction: 1,
     // 每点护甲减伤1点伤害
@@ -53,6 +54,7 @@ var weaponConfig = {
     id: 2,
     type: "能量武器",
     category: "能量武器",
+    level: 1,
     damage: 23,
     armorDamageReduction: 0,
     description: "先进激光武器，远距离精准打击",
@@ -68,6 +70,7 @@ var weaponConfig = {
     id: 3,
     type: "热能武器",
     category: "热能武器",
+    level: 1,
     damage: 23,
     armorDamageReduction: 0.25,
     description: "基于热能的强大武器，烧烬一切",
@@ -85,6 +88,7 @@ var weaponConfig = {
     id: 4,
     type: "能量武器",
     category: "能量武器",
+    level: 2,
     damage: 28,
     armorDamageReduction: 0,
     description: "由激光步枪改良而来，高效的对重甲武器",
@@ -100,6 +104,7 @@ var weaponConfig = {
     id: 5,
     type: "实弹武器",
     category: "实弹武器",
+    level: 1,
     damage: 16,
     armorDamageReduction: 1,
     description: "一种改造后的采矿切割机，有效对抗重甲目标",
@@ -117,6 +122,7 @@ var weaponConfig = {
     id: 6,
     type: "实弹武器",
     category: "实弹武器",
+    level: 1,
     damage: 48,
     armorDamageReduction: 4,
     description: "近距离攻击武器，专为遭遇战设计使用",
@@ -132,6 +138,7 @@ var weaponConfig = {
     id: 7,
     type: "实弹武器",
     category: "实弹武器",
+    level: 2,
     damage: 60,
     armorDamageReduction: 3,
     description: "用于隐秘射击的最佳武器，但是无法穿透护甲",
@@ -145,6 +152,7 @@ var weaponConfig = {
     id: 8,
     type: "热能武器",
     category: "热能武器",
+    level: 2,
     damage: 25,
     armorDamageReduction: 1,
     description: "喷射稳定的液氮恒流，对长时间接触者造成致命的损伤",
@@ -162,6 +170,7 @@ var weaponConfig = {
     id: 9,
     type: "能量武器",
     category: "能量武器",
+    level: 2,
     damage: 24,
     armorDamageReduction: 0.5,
     description: "一种经过改造的电动工具，可对近距离的目标放出高压电",
@@ -178,6 +187,7 @@ var weaponConfig = {
     id: 10,
     type: "热能武器",
     category: "热能武器",
+    level: 2,
     damage: 27,
     armorDamageReduction: 0.75,
     description: "一种高度危险性的武器，设计用辐射照射并伤害敌人",
@@ -194,6 +204,7 @@ var weaponConfig = {
     id: 11,
     type: "能量武器",
     category: "能量武器",
+    level: 3,
     damage: 27,
     armorDamageReduction: 0,
     description: "激光步枪的变种，采用折射技术升级",
@@ -209,6 +220,7 @@ var weaponConfig = {
     id: 12,
     type: "能量武器",
     category: "能量武器",
+    level: 3,
     damage: 29,
     armorDamageReduction: 0.75,
     description: "面对护盾目标而开发的武器",
@@ -224,6 +236,7 @@ var weaponConfig = {
     id: 13,
     type: "实弹武器",
     category: "实弹武器",
+    level: 3,
     damage: 32,
     armorDamageReduction: 0.5,
     description: "这种强大的钻头是由那些想把矿工SCV上的大螺丝用作武器的人创造的",
@@ -241,6 +254,7 @@ var weaponConfig = {
     id: 14,
     type: "能量武器",
     category: "能量武器",
+    level: 3,
     damage: 36,
     armorDamageReduction: 1,
     description: "一种原型能量武器，能够发射强大的脉冲",
@@ -254,6 +268,7 @@ var weaponConfig = {
     id: 15,
     type: "热能武器",
     category: "热能武器",
+    level: 4,
     damage: 60,
     armorDamageReduction: 0.5,
     description: "发射非常坚固的专属榴弹，对具有坚固防御的目标几乎没有效果",
@@ -271,6 +286,7 @@ var weaponConfig = {
     id: 16,
     type: "能量武器",
     category: "能量武器",
+    level: 4,
     damage: 64,
     armorDamageReduction: 4,
     description: "用于解决高生命值目标的次时代武器，擅长对付护盾耗尽或没有护甲的敌人",
@@ -287,6 +303,7 @@ var weaponConfig = {
     id: 17,
     type: "能量武器",
     category: "能量武器",
+    level: 4,
     damage: 60,
     armorDamageReduction: 0,
     description: "一种实验性的超级武器，能造成巨大的伤害",
@@ -300,6 +317,7 @@ var weaponConfig = {
     id: 18,
     type: "实弹武器",
     category: "实弹武器",
+    level: 5,
     damage: 70,
     armorDamageReduction: 0.1,
     description: "二十一世纪的武器，经过修改以减少后坐力并提高远程精度",
@@ -315,6 +333,7 @@ var weaponConfig = {
     id: 19,
     type: "能量武器",
     category: "能量武器",
+    level: 5,
     damage: 35,
     armorDamageReduction: 1,
     description: "这是在一位高级灵能者的帮助下，解析灵能力量制作出的高科技武器",
@@ -332,6 +351,7 @@ var weaponConfig = {
     id: 101,
     type: "能量武器",
     category: "传奇武器",
+    level: 6,
     damage: 88,
     armorDamageReduction: 3,
     description: "一件传奇武器",
@@ -348,6 +368,7 @@ var weaponConfig = {
     id: 102,
     type: "能量武器",
     category: "传奇武器",
+    level: 6,
     damage: 80,
     armorDamageReduction: -1,
     description: "一件传奇武器",
@@ -363,6 +384,7 @@ var weaponConfig = {
     id: 103,
     type: "实弹武器",
     category: "传奇武器",
+    level: 6,
     damage: 90,
     armorDamageReduction: 0,
     description: "这是传说中的武器",
@@ -380,6 +402,7 @@ var weaponConfig = {
     id: 104,
     type: "实弹武器",
     category: "传奇武器",
+    level: 6,
     damage: 125,
     armorDamageReduction: -2,
     description: "一件传奇武器",
@@ -395,6 +418,7 @@ var weaponConfig = {
     id: 105,
     type: "能量武器",
     category: "传奇武器",
+    level: 6,
     damage: 100,
     armorDamageReduction: 0,
     description: "优雅而独特的武器",
@@ -408,6 +432,7 @@ var weaponConfig = {
     id: 106,
     type: "能量武器",
     category: "传奇武器",
+    level: 6,
     damage: 100,
     armorDamageReduction: 1,
     description: "一件传奇武器",
@@ -423,6 +448,7 @@ var weaponConfig = {
     id: 107,
     type: "能量武器",
     category: "传奇武器",
+    level: 6,
     damage: 80,
     armorDamageReduction: 0,
     description: "一件传奇武器",
@@ -438,6 +464,7 @@ var weaponConfig = {
     id: 108,
     type: "能量武器",
     category: "传奇武器",
+    level: 6,
     damage: 90,
     armorDamageReduction: 0,
     description: "一件传奇武器",
@@ -690,21 +717,21 @@ var spaceStationCrewConfig = [
   {
     professionName: "警卫员下士",
     effect: "攻击获得的金币+50%",
-    requirements: "当期伤害榜累计攻击4次及以上",
+    requirements: "当期伤害榜累计造成200及以上伤害",
     Jobtransfer: true,
-    costcoins: 2e3
+    costcoins: 3e3
   },
   {
     professionName: "警卫长",
-    effect: "攻击伤害+5%，攻击获得的金币+75%",
-    requirements: "当期伤害榜前二十名；职业为警卫员下士",
+    effect: "攻击伤害+5%，当有异形被击败时获得金币(击败者获得双倍金币)",
+    requirements: "当期伤害榜累计攻击4次及以上",
     Jobtransfer: true,
     costcoins: 3e3
   },
   {
     professionName: "武器中士",
-    effect: "攻击伤害+15%; 购买武器享有50%的折扣",
-    requirements: "当期伤害榜累计造成100及以上伤害",
+    effect: "攻击伤害+15%; 购买传奇武器不消耗权限次数（可消耗权限次数半价购买传奇武器）",
+    requirements: "至少拥有一把6级及以上等级的武器",
     Jobtransfer: true,
     costcoins: 3e3
   },
@@ -762,7 +789,7 @@ var syndicatePirateConfig = [
   {
     professionName: "清洁工",
     effect: "当有异形被击败时获得红晶(击败者获得双倍红晶); 每次攻击额外获得红晶",
-    requirements: "当期伤害榜前二十名",
+    requirements: "当期伤害榜累计攻击4次及以上",
     Jobtransfer: true,
     costredcrystal: 20
   },
@@ -803,10 +830,10 @@ var syndicatePirateConfig = [
   },
   {
     professionName: "指挥官",
-    effect: "使用红晶升级物品享有50%的折扣；购买光剑（传奇）享有50%的折扣",
-    requirements: "PK胜利20次及以上；非辛迪加炮灰新兵职业",
+    effect: "使用红晶升级物品享有50%的折扣；升级物品时有50%的概率获得双倍加成；购买光剑（传奇）享有50%的折扣",
+    requirements: "仓库中至少拥有一个升级5次及以上的物品",
     Jobtransfer: true,
-    costredcrystal: 40
+    costredcrystal: 30
   },
   {
     professionName: "装甲兵",
@@ -825,9 +852,9 @@ var syndicatePirateConfig = [
   {
     professionName: "征募官",
     effect: "购买DG-3电弧步枪（传奇）享有50%的折扣",
-    requirements: "",
-    Jobtransfer: false,
-    costredcrystal: 10
+    requirements: "PK胜利20次及以上",
+    Jobtransfer: true,
+    costredcrystal: 20
   },
   {
     professionName: "辛迪加炮灰新兵",
@@ -851,6 +878,7 @@ async function checkTransferRequirements(ctx, handle, profession) {
     handle,
     level: { $gte: 3 }
   });
+  let hasLevel6Weapon = false;
   switch (profession) {
     case "深空矿工":
       const [miningRecord] = await ctx.database.get("ggcevo_Mining", { handle });
@@ -868,30 +896,24 @@ async function checkTransferRequirements(ctx, handle, profession) {
         message: totalReturns >= 4 ? "" : `需要探索返回次数达到4次及以上(当前${totalReturns}次)`
       };
     }
-    case "警卫员下士":
+    case "警卫长":
       if (!mainBoss) return { success: false, message: "当前暂无伤害榜。" };
       return {
         success: totalAttack >= 4,
         message: `需要当期伤害榜累计攻击4次及以上(当前${totalAttack}次)`
       };
-    case "警卫长": {
-      if (careerData?.career !== "警卫员下士") {
-        return { success: false, message: "需要当前职业为警卫员下士" };
-      }
+    case "警卫员下士": {
       if (!mainBoss) return { success: false, message: "当前暂无伤害榜。" };
-      const top20 = await ctx.database.select("ggcevo_boss_damage").where({ bossGroupId: mainBoss.groupId }).orderBy("totalDamage", "desc").limit(20).execute();
-      const isInTop202 = top20.some((r) => r.handle === handle);
       return {
-        success: isInTop202,
-        message: isInTop202 ? "" : "需要当期伤害榜前二十名"
-        // 消息提示更新为前二十名
+        success: totalDamage >= 200,
+        message: `需要当期伤害榜累计造成200及以上伤害(当前${totalDamage})`
       };
     }
     case "武器中士":
-      if (!mainBoss) return { success: false, message: "当前暂无伤害榜。" };
+      hasLevel6Weapon = weapons.some((weapon) => weapon.level >= 6);
       return {
-        success: totalDamage >= 100,
-        message: `需要当期伤害榜累计造成100及以上伤害(当前${totalDamage})`
+        success: hasLevel6Weapon,
+        message: hasLevel6Weapon ? "" : "需要至少拥有一把6级及以上等级的武器"
       };
     // +++ 新增舰长检查 +++
     case "舰长": {
@@ -940,7 +962,7 @@ async function checkTransferRequirements(ctx, handle, profession) {
       }
       ;
     case "枪手":
-      const hasLevel6Weapon = weapons.some((weapon) => weapon.level >= 6);
+      hasLevel6Weapon = weapons.some((weapon) => weapon.level >= 6);
       return {
         success: hasLevel6Weapon,
         message: hasLevel6Weapon ? "" : "需要至少拥有一把6级及以上等级的武器"
@@ -967,14 +989,7 @@ async function checkTransferRequirements(ctx, handle, profession) {
         message: hasModifiedWeapon ? "" : "需要至少拥有一把改装了3个模块的武器"
       };
     }
-    // +++ 新增指挥官检查 +++
-    case "指挥官": {
-      if (careerData?.career === "辛迪加炮灰新兵") {
-        return {
-          success: false,
-          message: "非辛迪加炮灰新兵职业才能转职为指挥官"
-        };
-      }
+    case "征募官": {
       const [pkProfile] = await ctx.database.get("ggcevo_pk", { handle });
       if (!pkProfile) {
         return {
@@ -989,11 +1004,9 @@ async function checkTransferRequirements(ctx, handle, profession) {
     }
     case "清洁工":
       if (!mainBoss) return { success: false, message: "当前暂无伤害榜。" };
-      const cleanTop20 = await ctx.database.select("ggcevo_boss_damage").where({ bossGroupId: mainBoss.groupId }).orderBy("totalDamage", "desc").limit(20).execute();
-      const isInTop20 = cleanTop20.some((r) => r.handle === handle);
       return {
-        success: isInTop20,
-        message: "需要当期伤害榜前二十名"
+        success: totalAttack >= 4,
+        message: `需要当期伤害榜累计攻击4次及以上(当前${totalAttack}次)`
       };
     case "辛迪加财务经理":
       return {
@@ -1011,6 +1024,18 @@ async function checkTransferRequirements(ctx, handle, profession) {
         message: hasDeviceTool ? "" : "需要仓库中拥有一个从黑市订购的设备工具物品"
       };
     }
+    case "指挥官": {
+      const warehouseItems2 = await ctx.database.get("ggcevo_warehouse", {
+        handle
+      });
+      const hasUpgradedItem = warehouseItems2.some(
+        (item) => (item.upgrades || 0) >= 5
+      );
+      return {
+        success: hasUpgradedItem,
+        message: hasUpgradedItem ? "" : "需要仓库中至少拥有一个升级5次及以上的物品"
+      };
+    }
     default:
       return { success: false, message: "未知职业要求" };
   }
@@ -1068,32 +1093,32 @@ var Spacestationtechnology = [
       {
         level: 1,
         cost: 500,
-        description: "提升空间站武器等级，升级武器享有5%的折扣",
-        careerBonus: "升级武器额外享有5%的折扣"
+        description: "提升空间站武器等级，购买I类及以下武器享有25%的折扣",
+        careerBonus: "购买I类及以下武器额外享有25%的折扣"
       },
       {
         level: 2,
         cost: 1500,
-        description: "提升空间站武器等级，升级武器享有10%的折扣",
-        careerBonus: "升级武器额外享有10%的折扣"
+        description: "提升空间站武器等级，购买II类及以下武器享有25%的折扣",
+        careerBonus: "购买II类及以下武器额外享有25%的折扣"
       },
       {
         level: 3,
         cost: 2550,
-        description: "提升空间站武器等级，升级武器享有15%的折扣",
-        careerBonus: "升级武器额外享有15%的折扣"
+        description: "提升空间站武器等级，购买III类武器享有25%的折扣",
+        careerBonus: "购买III类及以下武器额外享有25%的折扣"
       },
       {
         level: 4,
         cost: 3950,
-        description: "提升空间站武器等级，升级武器享有20%的折扣",
-        careerBonus: "升级武器额外享有20%的折扣"
+        description: "提升空间站武器等级，购买IV类及以下武器享有25%的折扣",
+        careerBonus: "购买IV类及以下武器额外享有25%的折扣"
       },
       {
         level: 5,
         cost: 4650,
-        description: "提升空间站武器等级，升级武器享有25%的折扣; 解锁传奇武器购买权限1次",
-        careerBonus: "升级武器额外享有25%的折扣; 解锁全部传奇武器购买权限（仅限武器中士）"
+        description: "提升空间站武器等级，购买V类及以下武器享有25%的折扣; 获得传奇武器购买权限1次",
+        careerBonus: "购买V类及以下武器额外享有25%的折扣; 升级武器享有20%的折扣"
       }
     ]
   },
@@ -2607,7 +2632,7 @@ var BattleEffectProcessor = {
     if (!isFireDamage && currentStacks < maxStacks) {
       updates.skillStacksChanged = 1;
       const newStacks = currentStacks + 1;
-      messages.push(`🔥 【灼烧粘液】叠层：当前${newStacks}/20层`);
+      messages.push(`🔥 【灼烧粘液】生效：获得1层「灼烧粘液」`);
     }
     if (isFireDamage && currentStacks > 0) {
       const healAmount = currentStacks * 10;
@@ -2632,12 +2657,12 @@ var BattleEffectProcessor = {
     };
   }, "handleBurningSlime"),
   // 腐蚀胆汁 - 群体回复机制
-  handleCorrosiveBile: /* @__PURE__ */ __name(function(targetBoss, activeBosses) {
+  handleCorrosiveBile: /* @__PURE__ */ __name(function(targetBoss, activeBosses, isHighStackHeal = false) {
     const messages = [];
     const otherUpdates = [];
     let targetUpdates = null;
     const requiredStacks = 10;
-    if (!targetBoss.skills.includes("腐蚀胆汁")) {
+    if (!targetBoss.skills.includes("腐蚀胆汁") || isHighStackHeal) {
       return null;
     }
     const currentStacks = targetBoss.skillStacks || 0;
@@ -2811,7 +2836,7 @@ var BattleEffectProcessor = {
     nerfMultiplier = baseReduction + extraReduction;
     if (nerfMultiplier > 0) {
       const reductionPercent = Math.round(nerfMultiplier * 100);
-      const offspringMsg = hasLivingOffspring ? "（存在子代，额外加成）" : "";
+      const offspringMsg = hasLivingOffspring ? "" : "";
       messages.push(`💣 【炼狱爆弹】生效：当前${currentStacks}层「灼烧粘液」，受到的伤害-${reductionPercent}%${offspringMsg}`);
     }
     return { nerfMultiplier, messages };
@@ -4464,7 +4489,7 @@ function applyPassiveEffects(targetBoss, activeBosses, weaponName, damage, hasCr
     bileDetonationTrigger = burningSlimeResult.isHighStackHeal || false;
   }
   const bileEffects = [
-    { effect: BattleEffectProcessor.handleCorrosiveBile, args: [targetBoss, activeBosses] },
+    { effect: BattleEffectProcessor.handleCorrosiveBile, args: [targetBoss, activeBosses, bileDetonationTrigger] },
     { effect: BattleEffectProcessor.handleFlameBreath, args: [targetBoss, activeBosses] }
   ];
   for (const effectItem of bileEffects) {
@@ -5299,6 +5324,18 @@ var ggcevoUpdates = [
 - 提高“绝对零度”和“脉冲干扰”任务金币奖励，降低“破甲先锋”和“烈火燎原”任务金币奖励
 - 提高“自动采掘机器人”和“CRED-17”每次升级区间至5%-15%
     `.trim()
+  },
+  {
+    version: "1.6.15",
+    time: "2025-07-10",
+    content: `
+- 重制了人类阵营的“武器中士”和“警卫长”
+- 修改了辛迪加海盗阵营的“清洁工”转职要求
+- 开放了辛迪加海盗阵营的“征募管”（半成品）转职
+- 重制了人类联盟的科技“武器系统”
+- 指令“升级”拆分成“升级科技”和“升级武器”
+- 新增“竞猜”功能
+    `.trim()
   }
 ];
 function compareVersions(a, b) {
@@ -5783,8 +5820,8 @@ async function handleWeaponUpgrade(ctx, handle, target) {
     const [weaponTech] = await ctx.database.get("ggcevo_tech", { handle, techId: 2 }).catch(() => [{ level: 0 }]);
     techLevel = Math.min(Math.max(weaponTech?.level || 0, 0), 5);
     const isCareerMatch = weaponTechConfig?.careerNames.includes(careerData?.career);
-    const BASE_DISCOUNTS = [5, 10, 15, 20, 25];
-    const CAREER_DISCOUNTS = [10, 20, 30, 40, 50];
+    const BASE_DISCOUNTS = [0, 0, 0, 0, 0];
+    const CAREER_DISCOUNTS = [0, 0, 0, 0, 20];
     const baseDiscount = techLevel > 0 ? BASE_DISCOUNTS[techLevel - 1] : 0;
     const careerDiscount = isCareerMatch && techLevel > 0 ? CAREER_DISCOUNTS[techLevel - 1] : 0;
     const weaponDiscount = Math.max(baseDiscount, careerDiscount);
@@ -5872,8 +5909,8 @@ async function generateUpgradePriceList(ctx, handle) {
     const weaponTechConfig = Spacestationtechnology.find((t) => t.techId === 2);
     techLevel = Math.min(techData?.level || 0, 5);
     const isCareerMatch = weaponTechConfig?.careerNames.includes(careerData?.career);
-    const BASE_DISCOUNTS = [5, 10, 15, 20, 25];
-    const CAREER_DISCOUNTS = [10, 20, 30, 40, 50];
+    const BASE_DISCOUNTS = [0, 0, 0, 0, 0];
+    const CAREER_DISCOUNTS = [0, 0, 0, 0, 20];
     const baseDiscount = techLevel > 0 ? BASE_DISCOUNTS[techLevel - 1] : 0;
     const careerDiscount = isCareerMatch ? CAREER_DISCOUNTS[techLevel - 1] : 0;
     techDiscountRate = Math.max(baseDiscount, careerDiscount);
@@ -5947,7 +5984,7 @@ ${priceInfo}`);
   return [
     "⚡ 武器升级价格表 ⚡",
     `武器等级上限: ${maxLevel}级${isGunslinger ? " (枪手职业)" : ""}`,
-    "使用「升级 武器名称」对武器进行等级升级",
+    "使用「升级武器 武器名称」对武器进行等级升级",
     ...discountNotice,
     "====================",
     ...priceDetails,
@@ -6002,6 +6039,16 @@ var legendaryDiscounts = {
   "外星电浆": ["装甲兵"],
   "核聚变重炮": ["破坏者"]
 };
+var GUESSING_ITEMS = [
+  {
+    id: 1,
+    description: "猜测下一个复活主宰的名字",
+    odds: 3,
+    status: "open"
+  }
+  // 可以继续添加更多竞猜项目
+  // { id: 2, description: '其他竞猜项目', odds: 2.5, status: 'closed' },
+];
 
 // src/boss/damagecalculation.ts
 async function calculateTotalDamage(ctx, session, config, equippedWeapon, targetBoss, careerData) {
@@ -6248,30 +6295,65 @@ __name(calculateRankAdditive, "calculateRankAdditive");
 async function getCleanerRewardBroadcast(ctx, boss, killerHandle, killerName) {
   const bossType = boss.type;
   const bossName = boss.name;
-  let baseReward = 0;
+  const broadcastMessages = [];
+  let cleanerBaseReward = 0;
   if (["巢穴雷兽", "巢穴战士", "巢穴甲虫"].includes(bossName)) {
-    baseReward = 2;
+    cleanerBaseReward = 2;
   } else {
-    baseReward = bossType === "主宰" ? 10 : 5;
+    cleanerBaseReward = bossType === "主宰" ? 10 : 5;
   }
   const allCleaners = await ctx.database.get("ggcevo_careers", {
     career: "清洁工"
   });
-  if (!allCleaners.length) return [];
-  let killerBonus = false;
-  for (const cleaner of allCleaners) {
-    let rewardAmount = baseReward;
-    if (cleaner.handle === killerHandle) {
-      rewardAmount *= 2;
-      killerBonus = true;
+  let cleanerKillerBonus = false;
+  if (allCleaners.length > 0) {
+    for (const cleaner of allCleaners) {
+      let rewardAmount = cleanerBaseReward;
+      if (cleaner.handle === killerHandle) {
+        rewardAmount *= 2;
+        cleanerKillerBonus = true;
+      }
+      await ctx.database.upsert("ggcevo_careers", [{
+        handle: cleaner.handle,
+        redcrystal: (cleaner.redcrystal || 0) + rewardAmount
+      }], ["handle"]);
     }
-    await ctx.database.upsert("ggcevo_careers", [{
-      handle: cleaner.handle,
-      redcrystal: (cleaner.redcrystal || 0) + rewardAmount
-    }], ["handle"]);
+    const cleanerMessage = `🧹 清洁工职业因清理 ${bossName} 尸体，获得 ${cleanerBaseReward} 红晶${cleanerKillerBonus ? ` (击败者 ${killerName} 获得双倍奖励)` : ""}`;
+    broadcastMessages.push(cleanerMessage);
   }
-  const rewardMessage = `🧹 清洁工职业因清理 ${bossName} 获得 ${baseReward} 红晶${killerBonus ? ` (击杀者 ${killerName} 获得双倍)` : ""}`;
-  return [rewardMessage];
+  let guardBaseReward = 0;
+  if (["巢穴雷兽", "巢穴战士", "巢穴甲虫"].includes(bossName)) {
+    guardBaseReward = 200;
+  } else {
+    guardBaseReward = bossType === "主宰" ? 1e3 : 500;
+  }
+  const allGuards = await ctx.database.get("ggcevo_careers", {
+    career: "警卫长"
+  });
+  if (allGuards.length > 0) {
+    const guardHandles = allGuards.map((g) => g.handle);
+    const signRecords = await ctx.database.get("ggcevo_sign", {
+      handle: { $in: guardHandles }
+    });
+    const signMap = new Map(signRecords.map((record) => [record.handle, record]));
+    let guardKillerBonus = false;
+    for (const guard of allGuards) {
+      let rewardAmount = guardBaseReward;
+      if (guard.handle === killerHandle) {
+        rewardAmount *= 2;
+        guardKillerBonus = true;
+      }
+      const currentSignRecord = signMap.get(guard.handle);
+      const currentTotal = currentSignRecord?.totalRewards || 0;
+      await ctx.database.upsert("ggcevo_sign", [{
+        handle: guard.handle,
+        totalRewards: currentTotal + rewardAmount
+      }], ["handle"]);
+    }
+    const guardMessage = `👮 警卫长职业因 ${bossName} 阵亡，获得 ${guardBaseReward} 金币${guardKillerBonus ? ` (击败者 ${killerName} 获得双倍奖励)` : ""}`;
+    broadcastMessages.push(guardMessage);
+  }
+  return broadcastMessages;
 }
 __name(getCleanerRewardBroadcast, "getCleanerRewardBroadcast");
 async function handleBossDefeatRewards(ctx, targetBoss) {
@@ -6571,7 +6653,6 @@ async function handleDeathTargets(ctx, deadTargets, killerName, killerHandle) {
       const now = /* @__PURE__ */ new Date();
       let nextRespawn = /* @__PURE__ */ new Date();
       const hours = now.getHours();
-      console.log(`当前小时：${hours}`);
       if (hours < 12) {
         nextRespawn.setHours(12, 0, 0, 0);
       } else {
@@ -6638,8 +6719,6 @@ async function calculateRewards(ctx, handle, totalDamage) {
     careerMultiplier = 50;
     careerMessage = "🛡️ 警卫员下士职业：+50%金币";
   } else if (career === "警卫长") {
-    careerMultiplier = 75;
-    careerMessage = "🛡️ 警卫长职业：+75%金币";
   }
   const totalBonusPercent = careerMultiplier + techBonusPercent;
   const totalBonusFactor = 1 + totalBonusPercent / 100;
@@ -7245,7 +7324,8 @@ function apply(ctx, config) {
     handle: "string",
     itemId: "unsigned",
     quantity: "unsigned",
-    bonus: "unsigned"
+    bonus: "unsigned",
+    upgrades: "unsigned"
   }, {
     primary: ["handle", "itemId"]
   });
@@ -7306,18 +7386,36 @@ function apply(ctx, config) {
   }, {
     primary: "handle"
   });
+  ctx.model.extend("ggcevo_global_stats", {
+    groupId: "string",
+    updatedAt: "timestamp",
+    rankdate: "timestamp"
+  }, {
+    primary: "groupId"
+  });
+  ctx.model.extend("ggcevo_guess", {
+    handle: "string",
+    name: "string",
+    itemId: "unsigned",
+    guessContent: "string",
+    amount: "unsigned",
+    wins: "unsigned",
+    createdAt: "timestamp"
+  }, {
+    primary: ["handle", "itemId"]
+  });
   ctx.setInterval(async () => {
     const totalBosses = await ctx.database.select("ggcevo_boss").execute((row) => import_koishi.$.count(row.name));
-    const groupId = [...config.groupId];
+    const groupIds = [...config.groupId];
     if (totalBosses === 0) {
       const firstBoss = await activateNextBossGroup(ctx);
-      await ctx.broadcast(groupId, `🔄 咕咕之战系统已初始化，首个主宰【${firstBoss.name}】已登场！`);
+      await ctx.broadcast(groupIds, `🔄 咕咕之战系统已初始化，首个主宰【${firstBoss.name}】已登场！`);
       return;
     }
     const now = /* @__PURE__ */ new Date();
     const expiredGroups = await ctx.database.select("ggcevo_boss").where({
-      type: "主宰",
-      respawnTime: { $lte: now },
+      respawnTime: { $gt: now },
+      // 修改为大于当前时间
       isActive: false
     }).execute();
     for (const group of expiredGroups) {
@@ -7326,10 +7424,48 @@ function apply(ctx, config) {
       await ctx.database.remove("ggcevo_boss", {});
       await ctx.database.set("ggcevo_weapons", {}, { comboCount: 0 });
       const newBossGroup = await activateNextBossGroup(ctx, currentGroupId);
-      await ctx.broadcast(
-        groupId,
-        `🔄 新的主宰【${newBossGroup.name}】组已刷新，快去挑战吧！`
-      );
+      const nextBossName = newBossGroup.name;
+      const guessingRecords = await ctx.database.get("ggcevo_guess", {
+        itemId: 1
+      });
+      if (guessingRecords.length > 0) {
+        const winners = guessingRecords.filter(
+          (r) => r.guessContent === nextBossName
+        );
+        const winMessages = [];
+        for (const winner of winners) {
+          const prize = Math.floor(winner.amount * 3);
+          const [signInfo] = await ctx.database.get("ggcevo_sign", {
+            handle: winner.handle
+          });
+          if (signInfo) {
+            await ctx.database.set("ggcevo_sign", { handle: winner.handle }, {
+              totalRewards: signInfo.totalRewards + prize
+            });
+            winMessages.push(`${winner.name}: 获得${prize}金币`);
+          }
+        }
+        await ctx.database.set("ggcevo_guess", {
+          itemId: 1
+        }, {
+          guessContent: "",
+          // 清空竞猜内容
+          amount: 0
+          // 重置竞猜金额
+        });
+        ctx.logger("ggcevo").info(`竞猜结算: ${winners.length}位玩家猜中新主宰【${nextBossName}】`);
+        const broadcastMsg = [
+          `🔄 新的主宰【${nextBossName}】已刷新！`,
+          ...winMessages.length > 0 ? [
+            `🎉 猜中新主宰的玩家:`,
+            ...winMessages
+            // 直接显示玩家名称和对应金额
+          ] : []
+        ].join("\n");
+        await ctx.broadcast(groupIds, broadcastMsg);
+      } else {
+        await ctx.broadcast(groupIds, `🔄 新的主宰【${nextBossName}】已刷新！`);
+      }
     }
   }, 60 * 1e3);
   ctx.setInterval(async () => {
@@ -7355,8 +7491,8 @@ function apply(ctx, config) {
   ctx.setInterval(async () => {
     if (config.autorank) {
       try {
-        const ggcmap = await ctx.database.get("sc2arcade_map", { regionId: 3, mapId: 165561 });
-        const lastdate = ggcmap[0].lastdate;
+        const ggcmap = await ctx.database.get("ggcevo_global_stats", {});
+        const lastdate = ggcmap[0].updatedAt;
         let currentMaxDate = new Date(lastdate);
         let nextCursor = null;
         let shouldContinue = true;
@@ -7405,8 +7541,8 @@ function apply(ctx, config) {
         } while (nextCursor && shouldContinue);
         if (pageMaxDate > currentMaxDate) {
           currentMaxDate = pageMaxDate;
-          await ctx.database.set("sc2arcade_map", { regionId: 3, mapId: 165561 }, {
-            lastdate: new Date(currentMaxDate.toISOString())
+          await ctx.database.set("ggcevo_global_stats", {}, {
+            updatedAt: new Date(currentMaxDate.toISOString())
           });
         }
       } catch (err) {
@@ -7960,8 +8096,8 @@ ${ticketMessage}${effectMessage}`;
   });
   ctx.command("ggcevo/胜点榜数据同步", { authority: 3 }).action(async () => {
     try {
-      const ggcmap = await ctx.database.get("sc2arcade_map", { regionId: 3, mapId: 165561 });
-      const lastdate = ggcmap[0].lastdate;
+      const ggcmap = await ctx.database.get("ggcevo_global_stats", {});
+      const lastdate = ggcmap[0].updatedAt;
       let currentMaxDate = new Date(lastdate);
       let nextCursor = null;
       let shouldContinue = true;
@@ -8010,8 +8146,8 @@ ${ticketMessage}${effectMessage}`;
       } while (nextCursor && shouldContinue);
       if (pageMaxDate > currentMaxDate) {
         currentMaxDate = pageMaxDate;
-        await ctx.database.set("sc2arcade_map", { regionId: 3, mapId: 165561 }, {
-          lastdate: new Date(currentMaxDate.toISOString())
+        await ctx.database.set("ggcevo_global_stats", {}, {
+          updatedAt: new Date(currentMaxDate.toISOString())
         });
       }
       return "✅ 胜点榜数据同步成功！";
@@ -8020,7 +8156,7 @@ ${ticketMessage}${effectMessage}`;
       return "服务器繁忙，请稍后尝试。";
     }
   });
-  ctx.command("ggcevo/胜点榜 [page]").usage("输入 胜点榜 [页码] 查看对应页的排行榜，每页10条").action(async ({ session }, page) => {
+  ctx.command("ggcevo/胜点榜 [page]").alias("排行榜").usage("输入 胜点榜 [页码] 查看对应页的排行榜，每页10条").action(async ({ session }, page) => {
     const [profile] = await ctx.database.get("sc2arcade_player", { userId: session.userId });
     if (!profile) return "🔒 需要先绑定游戏句柄。";
     const pageNum = parseInt(page) || 1;
@@ -8038,8 +8174,8 @@ ${ticketMessage}${effectMessage}`;
         displayName: await checkSensitiveWord(ctx, item.name) ? item.name : (item.name[0] || "") + "***"
       }))
     );
-    const ggcmap = await ctx.database.get("sc2arcade_map", { regionId: 3, mapId: 165561 });
-    const lastdate = ggcmap[0].lastdate;
+    const ggcmap = await ctx.database.get("ggcevo_global_stats", {});
+    const lastdate = ggcmap[0].updatedAt;
     const rankingText = processedRecords.map(
       (item, index) => `${offset + index + 1}. ${item.displayName} | 积分: ${item.rank} | 胜率: ${item.matches === 0 ? "0.00%" : (item.wins / item.matches * 100).toFixed(2) + "%"}`
     ).join("\n");
@@ -8213,6 +8349,14 @@ ${ticketMessage}${effectMessage}`;
 `;
     report += `- 参与玩家：${otherPlayers.length}人`;
     await session.send(report);
+    if (session.guildId) {
+      await ctx.database.upsert("ggcevo_global_stats", [{
+        groupId: session.guildId,
+        // 使用当前群组ID作为主键
+        rankdate: /* @__PURE__ */ new Date()
+        // 当前时间
+      }], ["groupId"]);
+    }
     return `${currentSeason}赛季结算数据已更新！`;
     function getRewardByRank(rank) {
       const rewards = [
@@ -9050,9 +9194,30 @@ ${protectionList}
     if (!profile) return "⚠️ 需要先绑定游戏句柄";
     const handle = `${profile.regionId}-S2-${profile.realmId}-${profile.profileId}`;
     const [careerData] = await ctx.database.get("ggcevo_careers", { handle });
+    const playerCareer = careerData?.career || "";
+    const playerGroup = careerData?.group || "";
+    const [weaponTech] = await ctx.database.get("ggcevo_tech", { handle, techId: 2 });
+    const techLevel = weaponTech?.level || 0;
+    const [legendaryPerm] = await ctx.database.get("ggcevo_permissions", { handle });
+    const legendaryPermission = legendaryPerm?.legendarypermissions || 0;
+    const techConfigData = Spacestationtechnology.find((tech) => tech.techId === 2);
     const discountDetails = [];
-    if (careerData?.career === "武器中士") {
-      discountDetails.push(`▸ 🎖️ 武器中士职业：50%折扣`);
+    const romanLevels = {
+      1: "I",
+      2: "II",
+      3: "III",
+      4: "IV",
+      5: "V"
+    };
+    if (playerGroup === "人类联盟" && techLevel > 0 && techConfigData) {
+      const isCareer = techConfigData.careerNames.includes(playerCareer);
+      const totalDiscount = isCareer ? 50 : 25;
+      const applicableLevels = [];
+      for (let level = 1; level <= techLevel; level++) {
+        applicableLevels.push(romanLevels[level]);
+      }
+      const levelRange = applicableLevels.join("、");
+      discountDetails.push(`▸ 🔧 武器系统Lv${techLevel}: ${totalDiscount}%折扣 (适用${levelRange}类武器)`);
     }
     const activeWish = await ctx.database.get("ggcevo_wish", {
       handle,
@@ -9069,12 +9234,11 @@ ${protectionList}
       return stats;
     }, {});
     if (!category) {
+      const discountInfo = discountDetails.length > 0 ? [`💰 当前折扣信息：`, ...discountDetails, "===================="] : [];
       return [
         "🏪 咕咕武器库分类 🏪",
         '使用 "武器库 分类名称" 查看详细列表',
-        discountDetails.length > 0 && `💰 折扣明细：
-${discountDetails.join("\n")}`,
-        "====================",
+        ...discountInfo,
         ...Object.entries(categoryStats).map(([catName, count]) => `▸ ${catName} (${count}种)`),
         "===================="
       ].filter(Boolean).join("\n");
@@ -9083,15 +9247,42 @@ ${discountDetails.join("\n")}`,
       return `无效武器分类，可用分类：
 ${Object.keys(categoryStats).join("、")}`;
     }
-    const displayDiscounts = category === "传奇武器" ? discountDetails.filter((d) => !d.includes("蚱蜢优购")) : discountDetails;
-    const items = Object.entries(weaponConfig).filter(([_, config2]) => config2.category === category && config2.price !== 0).map(([name2, config2]) => {
+    let displayDiscounts = [];
+    if (category === "传奇武器" && playerCareer === "武器中士" && legendaryPermission > 0) {
+      displayDiscounts.push("▸ 🎖️ 武器中士职业：50%折扣");
+    } else {
+      displayDiscounts = [...discountDetails];
+    }
+    const getWeaponDiscount = /* @__PURE__ */ __name((configLevel) => {
+      const BASE_DISCOUNT = 25;
+      const CAREER_DISCOUNT = 25;
+      const GRASSHOPPER_DISCOUNT = 20;
+      const LEGENDARY_WEAPON_MASTER_DISCOUNT = 50;
       let applicableDiscount = 0;
-      if (careerData?.career === "武器中士") {
-        applicableDiscount += 50;
-      }
-      if (config2.category !== "传奇武器" && activeWish) {
-        applicableDiscount += 20;
+      const discountSources = [];
+      if (category === "传奇武器") {
+        if (playerCareer === "武器中士" && legendaryPermission > 0) {
+          applicableDiscount += LEGENDARY_WEAPON_MASTER_DISCOUNT;
+          discountSources.push(`武器中士${LEGENDARY_WEAPON_MASTER_DISCOUNT}%`);
+        }
+      } else {
+        if (playerGroup === "人类联盟" && techLevel > 0 && configLevel <= techLevel) {
+          applicableDiscount += BASE_DISCOUNT;
+          discountSources.push(`科技${BASE_DISCOUNT}%`);
+        }
+        if (playerGroup === "人类联盟" && techConfigData?.careerNames.includes(playerCareer) && techLevel > 0 && configLevel <= techLevel) {
+          applicableDiscount += CAREER_DISCOUNT;
+          discountSources.push(`职业${CAREER_DISCOUNT}%`);
+        }
+        if (activeWish) {
+          applicableDiscount += GRASSHOPPER_DISCOUNT;
+          discountSources.push(`蚱蜢${GRASSHOPPER_DISCOUNT}%`);
+        }
       }
+      return { applicableDiscount, discountSources };
+    }, "getWeaponDiscount");
+    const items = Object.entries(weaponConfig).filter(([_, config2]) => config2.category === category && config2.price !== 0).map(([name2, config2]) => {
+      const { applicableDiscount, discountSources } = getWeaponDiscount(config2.level);
       let priceDisplay = `${config2.price}金币`;
       if (applicableDiscount > 0) {
         const discountedPrice = Math.floor(config2.price * (100 - applicableDiscount) / 100);
@@ -9110,7 +9301,7 @@ ${Object.keys(categoryStats).join("、")}`;
           return `护甲减伤：${config2.armorDamageReduction}（每点护甲增加${Math.abs(config2.armorDamageReduction)}点伤害）`;
         }
       })();
-      return [
+      const weaponInfo = [
         `【${name2}】`,
         `武器类型：${config2.type}`,
         `基础伤害：${config2.damage}`,
@@ -9121,14 +9312,20 @@ ${Object.keys(categoryStats).join("、")}`;
         tagEffectsDesc,
         `描述：${config2.description}`,
         "------------------"
-      ].filter(Boolean).join("\n");
+      ];
+      if (category !== "传奇武器") {
+        weaponInfo.splice(1, 0, `武器等级：${romanLevels[config2.level]}`);
+      }
+      return weaponInfo.filter(Boolean).join("\n");
     });
     const permissionNotice = category === "传奇武器" ? "⚠️ 购买传奇武器要求：人类联盟阵营+武器系统5级+传奇武器购买权限" : null;
+    const techUpgradeNotice = playerGroup === "人类联盟" && techLevel === 0 && category !== "传奇武器" ? "⚠️ 提示：提升武器系统等级可获得额外折扣" : "";
     return [
       `🏪 咕咕武器库 - ${category} 🏪`,
       '使用"购买 武器名称"指令进行购买',
-      displayDiscounts.length > 0 ? `💰 折扣明细：
+      displayDiscounts.length > 0 ? `💰 折扣信息：
 ${displayDiscounts.join("\n")}` : "",
+      techUpgradeNotice,
       permissionNotice,
       "====================",
       ...items,
@@ -9202,35 +9399,52 @@ ${validTypes.join("、")}`;
       });
       if (existingWeapon.length > 0) return `❌ 您已经拥有${item}，无法重复购买`;
     }
+    const [signInfo] = await ctx.database.get("ggcevo_sign", { handle });
+    const [careerData] = await ctx.database.get("ggcevo_careers", { handle });
+    const playerGroup = careerData?.group || "";
+    const playerCareer = careerData?.career || "";
+    let legendaryPermission = 0;
+    let hasLegendaryPermission = false;
     if (isLegendaryWeapon) {
-      const [careerData2] = await ctx.database.get("ggcevo_careers", { handle });
-      const [weaponTech] = await ctx.database.get("ggcevo_tech", { handle, techId: 2 });
-      const weaponSystemLevel = weaponTech?.level || 0;
-      if (!careerData2 || careerData2.group !== "人类联盟") {
+      const [permissionRecord] = await ctx.database.get("ggcevo_permissions", { handle });
+      legendaryPermission = permissionRecord?.legendarypermissions || 0;
+      hasLegendaryPermission = legendaryPermission > 0;
+      if (playerGroup !== "人类联盟") {
         return '❌ 购买传奇武器需要在"人类联盟"阵营。';
       }
+      const [weaponTech2] = await ctx.database.get("ggcevo_tech", { handle, techId: 2 });
+      const weaponSystemLevel = weaponTech2?.level || 0;
       if (weaponSystemLevel < 5) {
         return `❌ 购买传奇武器需要将武器系统升级到5级(当前等级：${weaponSystemLevel})。`;
       }
-      const isWeaponSpecialist = careerData2?.career === "武器中士";
-      if (!isWeaponSpecialist) {
-        const [permissions] = await ctx.database.get("ggcevo_permissions", { handle });
-        if (!permissions || permissions.legendarypermissions <= 0) {
-          return '❌ 购买传奇武器需要"传奇武器购买权限"，您当前没有购买权限。';
-        }
+      if (playerCareer !== "武器中士" && !hasLegendaryPermission) {
+        return '❌ 购买传奇武器需要"传奇武器购买权限"，您当前没有购买权限。';
       }
     }
-    const [signInfo] = await ctx.database.get("ggcevo_sign", { handle });
-    const [careerData] = await ctx.database.get("ggcevo_careers", { handle });
     let totalDiscount = 0;
     let discountDetails = [];
     let activeWish = null;
-    if (isWeapon && careerData?.career === "武器中士") {
-      const specialistDiscount = 50;
-      totalDiscount += specialistDiscount;
-      discountDetails.push(`🎖️ 武器中士职业：${specialistDiscount}%折扣`);
+    const romanLevels = {
+      1: "I",
+      2: "II",
+      3: "III",
+      4: "IV",
+      5: "V"
+    };
+    const [weaponTech] = await ctx.database.get("ggcevo_tech", { handle, techId: 2 });
+    const techLevel = weaponTech?.level || 0;
+    const techConfigData = Spacestationtechnology.find((tech) => tech.techId === 2);
+    if (!isLegendaryWeapon && playerGroup === "人类联盟" && techLevel > 0 && techConfigData) {
+      if (config2.level && config2.level <= techLevel) {
+        const isCareerBonus = techConfigData.careerNames.includes(playerCareer);
+        totalDiscount += 25;
+        discountDetails.push(`▸ 🔧 武器系统Lv${techLevel}: ${isCareerBonus ? "50%" : "25%"}折扣 (适用${romanLevels[config2.level]}类武器)`);
+        if (isCareerBonus) {
+          totalDiscount += 25;
+        }
+      }
     }
-    if (!isLegendaryWeapon && isWeapon) {
+    if (!isLegendaryWeapon) {
       activeWish = await ctx.database.get("ggcevo_wish", {
         handle,
         wishname: "蚱蜢优购",
@@ -9239,9 +9453,20 @@ ${validTypes.join("、")}`;
         isused: false
       }).then((records) => records[0] || null);
       if (activeWish) {
-        const wishDiscount = 20;
-        totalDiscount += wishDiscount;
-        discountDetails.push(`🦗 蚱蜢优购祈愿：${wishDiscount}%折扣`);
+        totalDiscount += 20;
+        discountDetails.push(`▸ 🦗 蚱蜢优购祈愿：20%折扣`);
+      }
+    }
+    let willConsumePermission = false;
+    if (isLegendaryWeapon) {
+      if (playerCareer === "武器中士" && hasLegendaryPermission) {
+        totalDiscount = 50;
+        discountDetails = [`▸ 🎖️ 武器中士职业：半价购买(消耗1次权限)`];
+        willConsumePermission = true;
+      } else if (playerCareer === "武器中士") {
+        discountDetails.push(`▸ 🎖️ 武器中士职业：原价购买`);
+      } else {
+        willConsumePermission = true;
       }
     }
     totalDiscount = Math.min(totalDiscount, 100);
@@ -9267,7 +9492,7 @@ ${validTypes.join("、")}`;
           isused: true
         });
       }
-      if (isLegendaryWeapon && careerData?.career !== "武器中士") {
+      if (willConsumePermission) {
         const [permissionRecord] = await ctx.database.get("ggcevo_permissions", { handle });
         if (!permissionRecord || permissionRecord.legendarypermissions <= 0) {
           throw new Error("传奇武器购买权限不足");
@@ -9276,6 +9501,7 @@ ${validTypes.join("、")}`;
         await ctx.database.set("ggcevo_permissions", { handle }, {
           legendarypermissions: remaining
         });
+        legendaryPermission = remaining;
       }
       if (isWeapon) {
         await ctx.database.upsert("ggcevo_weapons", [{
@@ -9314,18 +9540,17 @@ ${validTypes.join("、")}`;
       message += `花费 ${actualPrice} 金币 (原价${config2.price} 金币)`;
       message += `
 💰 折扣明细：
-▸ ${discountDetails.join("\n▸ ")}`;
+${discountDetails.join("\n")}`;
     } else {
       message += `花费 ${actualPrice} 金币`;
     }
     if (isLegendaryWeapon) {
-      if (careerData?.career !== "武器中士") {
-        const [permissions] = await ctx.database.get("ggcevo_permissions", { handle });
+      if (willConsumePermission) {
         message += `
-扣除 1 次传奇武器购买权限，剩余次数：${permissions?.legendarypermissions || 0}`;
-      } else {
+扣除 1 次传奇武器购买权限，剩余次数：${legendaryPermission}`;
+      } else if (playerCareer === "武器中士" && !hasLegendaryPermission) {
         message += `
-【武器中士特权】本次购买未消耗传奇武器权限`;
+【武器中士特权】本次按原价购买，未消耗权限次数`;
       }
     }
     if (isWeapon) {
@@ -9410,7 +9635,24 @@ ${validTypes.join("、")}`;
     });
     return `您已成功装备武器 ${weapon}！`;
   });
-  ctx.command("ggcevo/升级 <target>", "升级武器或科技").action(async ({ session }, target) => {
+  ctx.command("ggcevo/升级科技 <target>", "升级空间站科技").action(async ({ session }, target) => {
+    const [profile] = await ctx.database.get("sc2arcade_player", { userId: session.userId });
+    if (!profile) return "🔒 需要先绑定游戏句柄。";
+    const handle = `${profile.regionId}-S2-${profile.realmId}-${profile.profileId}`;
+    if ((await ctx.database.get("ggcevo_blacklist", { handle })).length) {
+      return "⛔ 您已被列入黑名单。";
+    }
+    if (!target) {
+      return "请输入“升级科技 科技名称”来升级科技";
+    }
+    const tech = Spacestationtechnology.find((t) => t.techname === target);
+    if (!tech) {
+      const validTech = Spacestationtechnology.map((t) => t.techname).join("、");
+      return `❌ 无效科技名称。可用科技: ${validTech}`;
+    }
+    return handleTechUpgrade(ctx, handle, target);
+  });
+  ctx.command("ggcevo/升级武器 <target>", "升级武器装备").alias("升级").action(async ({ session }, target) => {
     const [profile] = await ctx.database.get("sc2arcade_player", { userId: session.userId });
     if (!profile) return "🔒 需要先绑定游戏句柄。";
     const handle = `${profile.regionId}-S2-${profile.realmId}-${profile.profileId}`;
@@ -9420,18 +9662,13 @@ ${validTypes.join("、")}`;
     if (!target) {
       return generateUpgradePriceList(ctx, handle);
     }
-    const isTech = Spacestationtechnology.some(
-      (t) => t.techname === target || t.techname == target
-    );
-    const isWeapon = Object.keys(weaponConfig).includes(target);
-    if (isTech) {
-      return handleTechUpgrade(ctx, handle, target);
-    } else if (isWeapon) {
-      return handleWeaponUpgrade(ctx, handle, target);
+    if (!Object.keys(weaponConfig).includes(target)) {
+      const validWeapons = Object.keys(weaponConfig).join("、");
+      return `❌ 无效武器名称。可用武器: ${validWeapons}`;
     }
-    return `❌ 未找到 "${target}" 对应的武器或科技(科技仅限人类联盟阵营升级)`;
+    return handleWeaponUpgrade(ctx, handle, target);
   });
-  ctx.command("ggcevo/改装 <weapon> [mod]", "安装武器模块").alias("改造").action(async ({ session }, weapon, mod) => {
+  ctx.command("ggcevo/改装武器 <weapon> [mod]", "安装武器模块").alias("改装").action(async ({ session }, weapon, mod) => {
     const [profile] = await ctx.database.get("sc2arcade_player", { userId: session.userId });
     if (!profile) return "🔒 需要先绑定游戏句柄。";
     const handle = `${profile.regionId}-S2-${profile.realmId}-${profile.profileId}`;
@@ -9553,7 +9790,7 @@ ${validTypes.join("、")}`;
         const armorMessage = isArmoredPirate ? "🔰 装甲兵职业：\n▸ 武器改装槽+1" : "";
         return [
           `🛠️ ${weapon} 专属模块 🛠️`,
-          "使用「改装 武器名称 模块名称」安装",
+          "使用「改装武器 武器名称 模块名称」安装",
           "※ 每个武器只能安装一个专属模块",
           armorMessage,
           // 新增装甲兵提示
@@ -9567,8 +9804,8 @@ ${validTypes.join("、")}`;
         const armorMessage = isArmoredPirate ? "🔰 装甲兵职业：\n▸ 武器改装槽+1" : "";
         return [
           "🛠️ 通用武器模块 🛠️",
-          "使用「改装 武器名称 模块名称」安装通用模块",
-          "※ 使用「改装 武器名称」查询武器专属模块",
+          "使用「改装武器 武器名称 模块名称」安装通用模块",
+          "※ 使用「改装武器 武器名称」查询武器专属模块",
           armorMessage,
           // 新增装甲兵提示
           universalDiscountRate > 0 && `💰 当前通用模块折扣：`,
@@ -9816,6 +10053,8 @@ ${validTypes.join("、")}`;
     if (!name2) {
       name2 = "测试假人";
     }
+    const parsedUser = import_koishi.h.parse(name2)[0];
+    if (parsedUser && parsedUser.type === "at") return "无法指定群友为假人。";
     let hp = 1e4;
     if (typeof options.hp === "number") {
       hp = Math.max(1, Math.min(options.hp, 1e4));
@@ -11763,25 +12002,6 @@ ${Spacestationtechnology.map((t) => t.techname).join("、")}`;
   for (const [name2, data] of Object.entries(spaceship)) {
     shipIdToName[data.id] = name2;
   }
-  ctx.command("ggcevo/飞船").action(async ({ session }) => {
-    const shipList = Object.keys(spaceship).map((name2) => {
-      const ship = spaceship[name2];
-      return [
-        `【${name2}】`,
-        `- 价格: ${ship.price}金币`,
-        `- 挖矿加成: +${ship.miningbonus}%金币`,
-        `- 探索加成: +${ship.explorebonus}%金币`,
-        `- 特殊效果: ${ship.effect || "无"}`
-      ].join("\n");
-    });
-    return [
-      "🚀 可购买的飞船列表：",
-      ...shipList.map((ship) => `▸ ${ship}`),
-      "\n🛒 购买指令：购买飞船 [飞船名称]",
-      "例如：购买飞船 TX-12S隐形巡洋舰",
-      '\n💡 提示：购买飞船后使用"飞船信息"查看您的飞船'
-    ].join("\n");
-  });
   ctx.command("ggcevo/飞船信息").action(async ({ session }) => {
     const [profile] = await ctx.database.get("sc2arcade_player", { userId: session.userId });
     if (!profile) return "🔒 需要先绑定游戏句柄。";
@@ -11812,6 +12032,9 @@ ${Spacestationtechnology.map((t) => t.techname).join("、")}`;
     const [profile] = await ctx.database.get("sc2arcade_player", { userId: session.userId });
     if (!profile) return "🔒 需要先绑定游戏句柄。";
     const handle = `${profile.regionId}-S2-${profile.realmId}-${profile.profileId}`;
+    if ((await ctx.database.get("ggcevo_blacklist", { handle })).length) {
+      return "⛔ 您已被列入黑名单。";
+    }
     const [signRecord] = await ctx.database.get("ggcevo_sign", { handle });
     if (!signRecord) return "⛔ 请先进行至少一次签到获得金币后购买飞船";
     const coins = signRecord.totalRewards;
@@ -11831,7 +12054,7 @@ ${Spacestationtechnology.map((t) => t.techname).join("、")}`;
         ...shipList.map((ship2) => `▸ ${ship2}`),
         "\n使用格式：购买飞船 [飞船名称]",
         "示例：购买飞船 TX-12S隐形巡洋舰",
-        `💡 当前金币余额：${coins}`
+        `💡 提示：购买飞船后使用"飞船信息"查看您的飞船`
       ].join("\n");
     }
     const ship = spaceship[shipName];
@@ -11880,6 +12103,9 @@ ${Spacestationtechnology.map((t) => t.techname).join("、")}`;
     const [profile] = await ctx.database.get("sc2arcade_player", { userId: session.userId });
     if (!profile) return "🔒 需要先绑定游戏句柄。";
     const handle = `${profile.regionId}-S2-${profile.realmId}-${profile.profileId}`;
+    if ((await ctx.database.get("ggcevo_blacklist", { handle })).length) {
+      return "⛔ 您已被列入黑名单。";
+    }
     const [career] = await ctx.database.get("ggcevo_careers", { handle });
     if (!career) return "🚫 未查询到您的阵营信息";
     if (career.group !== "辛迪加海盗") {
@@ -11910,24 +12136,23 @@ ${Spacestationtechnology.map((t) => t.techname).join("、")}`;
       if (upgradableItems.length === 0) {
         return "🚫 当前没有可升级的物品";
       }
-      const discountNotice2 = [];
+      const discountNotice = [];
       if (isCommander) {
-        discountNotice2.push(
-          "💰 折扣明细：",
-          "▸ 🎖️ 指挥官职业：50%折扣"
+        discountNotice.push(
+          "💰 指挥官职业效果：",
+          "▸ 🎖️ 升级费用：50%折扣",
+          "▸ ⚡ 升级加成：50%概率触发双倍提升"
         );
       }
       const msgLines = [
         "💎 可升级物品列表",
-        ...discountNotice2,
+        ...discountNotice,
         "====================",
-        // 修改这里: 在物品信息中增加升级区间显示
         ...upgradableItems.map((item) => {
           return [
             `▸ ${item.name}：`,
             `  当前升级加成: ${item.currentBonus}% / ${item.maxBonus}%`,
             `  每次升级提升: ${item.upgradeRange}`,
-            // 新增行
             `  升级消耗: ${item.cost} 红晶 ${item.discount}`
           ].join("\n");
         }),
@@ -11952,39 +12177,155 @@ ${Spacestationtechnology.map((t) => t.techname).join("、")}`;
       return `🚫 【${itemName}】已达到最大升级上限(${upgradeConfig.maxBonus}%)`;
     }
     let upgradeCost = upgradeConfig.upgradeCostBase;
-    let discountNotice = "";
     if (isCommander) {
       upgradeCost = Math.floor(upgradeCost * 0.5);
-      discountNotice = `
-✨ 指挥官职业生效！实际消耗: ${upgradeCost} (原价：${upgradeConfig.upgradeCostBase})`;
     }
     if (career.redcrystal < upgradeCost) {
       return `🚫 红晶不足！升级需要${upgradeCost}红晶，您当前有${career.redcrystal}红晶`;
     }
-    const upgradeValue = Math.floor(
+    const baseUpgradeValue = Math.floor(
       Math.random() * (upgradeConfig.maxUpgrade - upgradeConfig.minUpgrade + 1)
     ) + upgradeConfig.minUpgrade;
-    const actualUpgrade = Math.min(
-      upgradeValue,
-      upgradeConfig.maxBonus - warehouseItem.bonus
-    );
+    let actualUpgrade = baseUpgradeValue;
+    let doubleEffect = false;
+    if (isCommander && Math.random() < 0.5) {
+      actualUpgrade *= 2;
+      doubleEffect = true;
+      actualUpgrade = Math.min(
+        actualUpgrade,
+        upgradeConfig.maxBonus - warehouseItem.bonus
+      );
+    } else {
+      actualUpgrade = Math.min(
+        actualUpgrade,
+        upgradeConfig.maxBonus - warehouseItem.bonus
+      );
+    }
     const newRedCrystal = career.redcrystal - upgradeCost;
     await ctx.database.upsert("ggcevo_careers", [{
       handle,
       redcrystal: newRedCrystal
     }], ["handle"]);
+    const totalBonus = warehouseItem.bonus + actualUpgrade;
     await ctx.database.upsert("ggcevo_warehouse", [{
       handle,
       itemId: itemConfig2.id,
-      bonus: warehouseItem.bonus + actualUpgrade
+      bonus: totalBonus,
+      upgrades: warehouseItem.upgrades + 1
     }], ["handle", "itemId"]);
-    const totalBonus = warehouseItem.bonus + actualUpgrade;
-    return `✅ 【${itemName}】升级成功！${discountNotice}
-- 消耗红晶: ${upgradeCost}
-- 本次提升: ${actualUpgrade}%
+    return `✅ 【${itemName}】升级成功！
+- 消耗红晶: ${upgradeCost} (基础值: ${upgradeConfig.upgradeCostBase} 红晶)
+- 本次提升: ${actualUpgrade}%${doubleEffect ? ` (基础值:${baseUpgradeValue}%)` : ""}
 - 当前加成: ${totalBonus}%
 - 剩余红晶: ${newRedCrystal}`;
   });
+  ctx.guild().command("ggcevo/init", "初始化群组全局配置", { authority: 3 }).option("reset", "-r 重置已存在配置").action(async ({ session, options }) => {
+    const groupId = session.guildId;
+    const now = /* @__PURE__ */ new Date();
+    const existing = await ctx.database.get("ggcevo_global_stats", { groupId });
+    if (existing.length > 0 && !options.reset) {
+      return "配置已存在！如需重置请使用 -r 选项";
+    }
+    await ctx.database.upsert("ggcevo_global_stats", [{
+      groupId,
+      updatedAt: now,
+      rankdate: now
+    }]);
+    return `群组 ${groupId} 配置已${existing.length ? "重置" : "初始化"}
+排名更新时间: ${now.toLocaleString()}
+胜点榜基准日: ${now.toLocaleDateString()}`;
+  });
+  ctx.command("ggcevo/竞猜 [itemId] [amount] [guess]", "参与竞猜游戏").usage('输入"竞猜"查看可竞猜项目，"竞猜 项目ID 金额 内容"进行竞猜').example("竞猜 1 500 寒冰王蛇").action(async ({ session }, itemId, amount, guess) => {
+    const [profile] = await ctx.database.get("sc2arcade_player", { userId: session.userId });
+    if (!profile) return "🔒 需要先绑定游戏句柄";
+    const { regionId, realmId, profileId } = profile;
+    const handle = `${regionId}-S2-${realmId}-${profileId}`;
+    if ((await ctx.database.get("ggcevo_blacklist", { handle })).length) {
+      return "⛔ 您已被列入黑名单。";
+    }
+    const [signInfo] = await ctx.database.get("ggcevo_sign", { handle });
+    if (!signInfo) return "⚠️ 账号数据异常，请重试";
+    const userCoins = signInfo.totalRewards;
+    const username = session.username;
+    const availableItems = GUESSING_ITEMS.filter((item) => item.status === "open");
+    if (!itemId) {
+      return [
+        "🎯 可参与竞猜项目 🎯",
+        '使用"竞猜 项目ID 金额 内容"下注',
+        "====================",
+        ...availableItems.map(
+          (item) => `▸ [ID：${item.id}] ${item.description} (赔率: ${item.odds}x)`
+        ),
+        "===================="
+      ].join("\n");
+    }
+    const parsedItemId = parseInt(itemId);
+    if (isNaN(parsedItemId)) return "⚠️ 项目ID必须是数字";
+    const targetItem = availableItems.find((item) => item.id === parsedItemId);
+    if (!targetItem) return "⚠️ 无效的项目ID或项目不可用";
+    if (!amount && !guess) {
+      const [userBet] = await ctx.database.get("ggcevo_guess", {
+        handle,
+        itemId: parsedItemId
+      });
+      const wins = userBet?.wins || 0;
+      const betInfo = userBet && userBet.amount > 0 ? `已下注: ${userBet.amount}金币 (内容:${userBet.guessContent})` : "尚未下注";
+      return [
+        `📋 项目详情 [ID:${parsedItemId}]`,
+        `描述: ${targetItem.description}`,
+        `赔率: ${targetItem.odds}x`,
+        `猜中次数: ${wins} 次`,
+        `您的状态: ${betInfo}`
+      ].join("\n");
+    }
+    if (!amount) return "⚠️ 请输入下注金额";
+    if (!guess) return "⚠️ 请填写竞猜内容";
+    const [existingBet] = await ctx.database.get("ggcevo_guess", {
+      handle,
+      itemId: parsedItemId,
+      amount: { $gt: 0 }
+      // 只查找金额大于0的未结算记录
+    });
+    if (existingBet) {
+      return `⛔ 您已参与该项目竞猜，禁止重复下注
+当前下注内容: ${existingBet.guessContent}
+当前下注金额: ${existingBet.amount}金币`;
+    }
+    const betAmount = parseInt(amount);
+    if (isNaN(betAmount) || betAmount < 1) return "⚠️ 请输入有效金额";
+    if (betAmount > userCoins) return `⚠️ 金币不足，当前账户只有 ${userCoins} 金币`;
+    const validBossNames = bossPool.map((pool) => pool.main.name);
+    if (!validBossNames.includes(guess)) {
+      return `⚠️ 无效的主宰名字，可用选项：
+${validBossNames.join("、")}`;
+    }
+    const recordData = {
+      handle,
+      name: username,
+      itemId: parsedItemId,
+      guessContent: guess,
+      amount: betAmount,
+      createdAt: /* @__PURE__ */ new Date()
+    };
+    try {
+      await ctx.database.upsert("ggcevo_guess", [recordData]);
+      await ctx.database.set("ggcevo_sign", { handle }, {
+        totalRewards: userCoins - betAmount
+      });
+      return [
+        "✅ 竞猜成功！",
+        `项目ID: ${parsedItemId}`,
+        `项目描述: ${targetItem.description}`,
+        `竞猜内容: "${guess}"`,
+        `投入金额: ${betAmount} 金币`,
+        `如猜中将获得: ${Math.floor(betAmount * targetItem.odds)} 金币`,
+        "⏳ 每个项目只能下注一次"
+      ].join("\n");
+    } catch (e) {
+      ctx.logger("ggcevo").error(e);
+      return "⚠️ 竞猜提交失败，请重试";
+    }
+  });
   ctx.command("ggcevo/签到奖励").action(({}) => {
     return `
 签到咕咕币奖励：
@@ -12139,7 +12480,7 @@ PK同玩家限战：1次/日
 📌 重要说明：
 1. 结算后自动发放所有奖励
 2. 勋章可通过背包查看
-3. 每个赛季持续45天
+3. 每个赛季持续60天（即2个月）
 `.trim();
   });
 }