npm - koishi-plugin-ggcevo-game - Versions diffs - 1.3.22 → 1.3.24 - Mend

koishi-plugin-ggcevo-game 1.3.22 → 1.3.24

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (3) hide show

package/lib/index.js CHANGED Viewed

@@ -41,8 +41,8 @@ var Config = import_koishi.Schema.intersect([
   }).description("赛季配置"),
   // 核心功能开关组
   import_koishi.Schema.object({
-    signrequire: import_koishi.Schema.boolean().description("游戏对局签到要求").default(true),
-    autorank: import_koishi.Schema.boolean().description("自动同步天梯数据").default(true)
+    signrequire: import_koishi.Schema.boolean().description("游戏对局签到要求").default(false),
+    autorank: import_koishi.Schema.boolean().description("自动同步天梯数据").default(false)
   }).description("功能开关"),
   // 对战系统配置组
   import_koishi.Schema.object({
@@ -184,13 +184,6 @@ function apply(ctx, config) {
   }, {
     primary: "handle"
   });
-  ctx.model.extend("ggcevo_achievements", {
-    handle: "string",
-    achievementname: "string",
-    gaintime: "timestamp"
-  }, {
-    primary: ["handle", "achievementname"]
-  });
   ctx.model.extend("ggcevo_pk", {
     handle: "string",
     name: "string",
@@ -520,11 +513,11 @@ function apply(ctx, config) {
       },
       {
         name: "精灵双倍",
-        effect: "下一次击败首领时可获得双倍金币和咕咕币奖励"
+        effect: "下一次击败首领时可获得双倍的金币和咕咕币奖励"
       },
       {
         name: "喵喵财源",
-        effect: "签到金币和咕咕币奖励翻倍"
+        effect: "签到获得双倍的金币和咕咕币"
       },
       {
         name: "暴击韵律",
@@ -1671,35 +1664,36 @@ function apply(ctx, config) {
       return { updatedHP, messages };
     }, "handleBloodCount"),
     // 修改后的伽马枪辐射处理
-    handleGammaRadiation: /* @__PURE__ */ __name(async (ctx2, targetBoss, weaponData) => {
-      if (weaponData.name !== "伽马枪" || targetBoss.tags.includes("机械") || !targetBoss.tags.includes("生物")) {
+    handleGammaRadiation: /* @__PURE__ */ __name(async (ctx2, targetBoss, weaponName) => {
+      if (weaponName !== "伽马枪" || targetBoss.tags.includes("机械") || !targetBoss.tags.includes("生物")) {
         return null;
       }
       const messages = [];
       const hasRadiation = targetBoss.skills.includes("辐射");
       const currentLayers = targetBoss.Vulnerability || 0;
-      const newSkills = hasRadiation ? targetBoss.skills : [...targetBoss.skills, "辐射"];
+      const skillUpdates = [];
       const newLayers = hasRadiation ? Math.min(currentLayers + 1, 100) : 1;
       let layerMsg;
-      0;
       if (!hasRadiation) {
         layerMsg = `☢️ ${targetBoss.name} 获得【辐射】效果`;
+        skillUpdates.push({
+          name: targetBoss.name,
+          add: ["辐射"]
+        });
       } else if (newLayers === currentLayers) {
         layerMsg = `☢️ 辐射层数已达上限(100层)`;
       } else {
-        layerMsg = `☢️ 辐射层数叠加至${newLayers}`;
+        layerMsg = `☢️ 辐射层数+1`;
       }
       await ctx2.database.set(
         "ggcevo_boss",
         { name: targetBoss.name },
         {
-          skills: Array.from(new Set(newSkills)),
-          // 显式类型断言
           Vulnerability: newLayers
         }
       );
       messages.push(layerMsg);
-      return { messages };
+      return { messages, skillUpdates };
     }, "handleGammaRadiation"),
     // 伽马枪辐射计算（返回增伤系数）
     calculateRadiationDamage: /* @__PURE__ */ __name((targetBoss) => {
@@ -1809,14 +1803,10 @@ function apply(ctx, config) {
       if (sentryResult) {
         messages.push(...sentryResult.messages);
       }
-      const gammaRadResult = await this.handleGammaRadiation(
-        ctx2,
-        targetBoss,
-        weaponData
-        // 传入武器数据对象
-      );
+      const gammaRadResult = await this.handleGammaRadiation(ctx2, targetBoss, weaponName);
       if (gammaRadResult) {
         messages.push(...gammaRadResult.messages);
+        skillUpdates.push(...gammaRadResult.skillUpdates);
       }
       return {
         currentHP,
@@ -1825,40 +1815,71 @@ function apply(ctx, config) {
         initialDamage: finalDamage
       };
     }, "handlePassives"),
-    // 应用技能更新到数据库
+    // 应用技能更新到数据库（优化合并同名boss的更新）
     applySkillUpdates: /* @__PURE__ */ __name(async (ctx2, skillUpdates) => {
-      const updates = skillUpdates.map(async (update) => {
-        const boss = await ctx2.database.get("ggcevo_boss", { name: update.name });
-        const originalSkills = boss[0]?.skills || [];
-        const newSkills = [
-          ...originalSkills.filter((s) => !update.remove?.includes(s)),
-          ...update.add || []
-        ];
+      const mergedUpdates = skillUpdates.reduce((acc, update) => {
+        const existing = acc.find((u) => u.name === update.name);
+        if (existing) {
+          if (update.remove) {
+            existing.remove = [.../* @__PURE__ */ new Set([...existing.remove, ...update.remove])];
+          }
+          if (update.add) {
+            existing.add = [.../* @__PURE__ */ new Set([...existing.add, ...update.add])];
+          }
+        } else {
+          acc.push({
+            name: update.name,
+            remove: [...new Set(update.remove || [])],
+            add: [...new Set(update.add || [])]
+          });
+        }
+        return acc;
+      }, []);
+      const updates = mergedUpdates.map(async (update) => {
+        const [boss] = await ctx2.database.get("ggcevo_boss", { name: update.name });
+        if (!boss) return;
+        let newSkills = [...boss.skills];
+        if (update.remove?.length) {
+          newSkills = newSkills.filter((s) => !update.remove.includes(s));
+        }
+        if (update.add?.length) {
+          newSkills = [...newSkills, ...update.add];
+          newSkills = [...new Set(newSkills)];
+        }
         return ctx2.database.set(
           "ggcevo_boss",
           { name: update.name },
-          { skills: [...new Set(newSkills)] }
-          // 去重
+          { skills: newSkills }
         );
       });
       await Promise.all(updates);
     }, "applySkillUpdates")
   };
-  async function handleBossDefeatRewards(ctx2, targetBoss, session) {
+  async function handleBossDefeatRewards(ctx2, targetBoss) {
     const damageRecords = await ctx2.database.select("ggcevo_boss_damage").where({
       bossGroupId: targetBoss.groupId,
       totalDamage: { $gt: 0 }
     }).orderBy("totalDamage", "desc").execute();
     const rewardMessages = [];
     const rewardMap = /* @__PURE__ */ new Map();
-    const updatePromises = [];
     const handles = damageRecords.map((r) => r.handle);
-    const pirateCleaners = await ctx2.database.get("ggcevo_careers", {
-      handle: { $in: handles },
-      group: "辛迪加海盗",
-      career: "清洁工"
-    });
+    const [pirateCleaners, doubleWishRecords] = await Promise.all([
+      ctx2.database.get("ggcevo_careers", {
+        handle: { $in: handles },
+        group: "辛迪加海盗",
+        career: "清洁工"
+      }),
+      // 获取双倍祈愿信息
+      ctx2.database.get("ggcevo_Wish_Record", {
+        handle: { $in: handles },
+        wishname: "精灵双倍",
+        startTime: { $lte: /* @__PURE__ */ new Date() },
+        endTime: { $gte: /* @__PURE__ */ new Date() },
+        isused: false
+      })
+    ]);
     const cleanerHandles = new Set(pirateCleaners.map((c) => c.handle));
+    const doubleWishHandles = new Set(doubleWishRecords.map((r) => r.handle));
     if (damageRecords.length > 0) {
       const top20 = damageRecords.slice(0, 20);
       top20.forEach((record, index) => {
@@ -1882,6 +1903,10 @@ function apply(ctx, config) {
             gold = 1e3;
             break;
         }
+        if (doubleWishHandles.has(record.handle)) {
+          guguCoins *= 2;
+          gold *= 2;
+        }
         let redCrystal = 0;
         if (cleanerHandles.has(record.handle)) {
           switch (true) {
@@ -1917,18 +1942,22 @@ function apply(ctx, config) {
       const others = damageRecords.slice(20);
       if (others.length > 0) {
         others.forEach((record) => {
+          let guguCoins = 3;
+          let gold = 200;
+          if (doubleWishHandles.has(record.handle)) {
+            guguCoins *= 2;
+            gold *= 2;
+          }
           const baseReward = {
-            guguCoins: 3,
-            gold: 200,
+            guguCoins,
+            gold,
             redCrystal: cleanerHandles.has(record.handle) ? 3 : 0,
             playerName: record.playerName
           };
           rewardMap.set(record.handle, baseReward);
         });
-        rewardMessages.push(`其他参与者各获得: 3 咕咕币 + 200 金币` + (cleanerHandles.size > 0 ? " (清洁工额外+3红晶)" : ""));
+        rewardMessages.push(`其他参与者各获得: 3 咕咕币 + 200 金币` + (cleanerHandles.size > 0 ? " (清洁工额外+3红晶)" : "") + (doubleWishHandles.size > 0 ? " (精灵双倍祈愿玩家奖励翻倍)" : ""));
       }
-      const doubleRewardPlayers = await handleDoubleRewards(ctx2, damageRecords, rewardMap);
-      await applyDoubleRewards(ctx2, doubleRewardPlayers, rewardMap, rewardMessages);
       await ctx2.database.withTransaction(async () => {
         for (const [handle, reward] of rewardMap) {
           const [signData] = await ctx2.database.get("ggcevo_sign", { handle });
@@ -1958,58 +1987,6 @@ function apply(ctx, config) {
     return { rewardMessages };
   }
   __name(handleBossDefeatRewards, "handleBossDefeatRewards");
-  async function handleDoubleRewards(ctx2, damageRecords, rewardMap) {
-    const doubleRewardPlayers = /* @__PURE__ */ new Map();
-    for (const record of damageRecords) {
-      const [elfEffect] = await ctx2.database.get("ggcevo_Wish_Record", {
-        handle: record.handle,
-        wishname: "精灵双倍",
-        isused: false,
-        startTime: { $lte: /* @__PURE__ */ new Date() },
-        endTime: { $gte: /* @__PURE__ */ new Date() }
-      });
-      if (elfEffect) {
-        doubleRewardPlayers.set(record.handle, {
-          effect: elfEffect,
-          originalReward: {
-            guguCoins: rewardMap.get(record.handle)?.guguCoins || 0,
-            gold: rewardMap.get(record.handle)?.gold || 0
-          }
-        });
-      }
-    }
-    return doubleRewardPlayers;
-  }
-  __name(handleDoubleRewards, "handleDoubleRewards");
-  async function applyDoubleRewards(ctx2, doubleRewardPlayers, rewardMap, rewardMessages) {
-    if (doubleRewardPlayers.size > 0) {
-      await ctx2.database.withTransaction(async () => {
-        for (const [handle, data] of doubleRewardPlayers) {
-          const reward = rewardMap.get(handle);
-          reward.guguCoins = data.originalReward.guguCoins * 2;
-          reward.gold = data.originalReward.gold * 2;
-          await ctx2.database.set(
-            "ggcevo_Wish_Record",
-            { id: data.effect.id },
-            { isused: true }
-          );
-        }
-      });
-      rewardMessages.forEach((msg, index) => {
-        const match = msg.match(/(\d+\.) (.+?)  获得奖励/);
-        if (match) {
-          const playerName = match[2];
-          const targetHandle = [...rewardMap.keys()].find(
-            (key) => rewardMap.get(key).playerName === playerName
-          );
-          if (targetHandle && doubleRewardPlayers.has(targetHandle)) {
-            rewardMessages[index] = `${match[1]} ${playerName} 🧚 获得双倍奖励: ${rewardMap.get(targetHandle).guguCoins} 咕咕币 + ${rewardMap.get(targetHandle).gold} 金币(精灵双倍祈愿生效)`;
-          }
-        }
-      });
-    }
-  }
-  __name(applyDoubleRewards, "applyDoubleRewards");
   async function checkTransferRequirements(ctx2, handle, profession) {
     const [mainBoss] = await ctx2.database.get("ggcevo_boss", {
       type: "主宰",
@@ -2136,18 +2113,18 @@ function apply(ctx, config) {
             handle,
             totalRewards: (signRecords[0]?.totalRewards || 0) + damageValue
           }], ["handle"]);
-          const damageRecords = await ctx.database.get("ggcevo_boss_damage", { handle });
+          const [damageRecords] = await ctx.database.get("ggcevo_boss_damage", { handle });
           await ctx.database.upsert("ggcevo_boss_damage", [{
             handle,
             playerName: session.username,
-            totalDamage: (damageRecords[0]?.totalDamage || 0) + damageValue,
-            attackCount: damageRecords[0]?.attackCount || 0,
+            totalDamage: (damageRecords?.totalDamage || 0) + damageValue,
+            attackCount: damageRecords?.attackCount || 0,
             bossGroupId: 4
           }], ["handle"]);
         });
         return {
           success: true,
-          message: `成功引爆${itemName}，造成 ${damageValue} 点伤害，获得等额金币`
+          message: `成功引爆 ${itemName}，造成 ${damageValue} 点伤害，获得等额金币`
         };
       }
       if (itemConfig2.id === 2) {
@@ -2211,7 +2188,7 @@ function apply(ctx, config) {
     }
     const [signInfo] = await ctx.database.get("ggcevo_sign", { handle });
     if (signInfo?.totalRewards < actualCost) {
-      const originalHint = careerData.career === "情报副官" ? `（原价${levelData.cost}）` : "";
+      const originalHint = careerData.career === "情报副官" ? `(原价${levelData.cost})` : "";
       return `❌ 需要 ${actualCost} 金币${originalHint}，当前持有：${signInfo?.totalRewards || 0}`;
     }
     await ctx.database.withTransaction(async () => {
@@ -2224,9 +2201,11 @@ function apply(ctx, config) {
         level: nextLevel
       }], ["handle", "techId"]);
     });
-    const costHint = careerData.career === "情报副官" ? `${actualCost}（情报副官：已享8折优惠）` : actualCost;
+    const costLine = careerData.career === "情报副官" ? `💰 花费金币: ${actualCost}(原价${levelData.cost})` : `💰 花费金币: ${actualCost}`;
+    const discountHint = careerData.career === "情报副官" ? `📉 情报副官职业加成：20%折扣
+` : "";
     return `✅ ${tech.techname} 升级至 Lv.${nextLevel}
-💰 花费金币: ${costHint}
+${discountHint}${costLine}
 📝 ${levelData.description}
 💼 ${levelData.careerBonus}`;
   }
@@ -2237,36 +2216,42 @@ function apply(ctx, config) {
       handle,
       weaponId: weaponData.id
     });
-    if (!equipment) return "❌ 尚未获得该武器";
-    if (equipment.level >= 6) return "❌ 武器已达最高等级";
+    if (!equipment) return "❌ 您尚未获得该武器";
+    if (equipment.level >= 6) return "❌ 该武器已达最高等级";
     const BASE_COST = [1050, 1450, 1850, 2250, 2650, 3050];
     const baseCost = BASE_COST[equipment.level];
     const weaponTechConfig = Spacestationtechnology.find((t) => t.techId === 2);
     const [careerData] = await ctx.database.get("ggcevo_careers", { handle });
-    let discountedCost = baseCost;
-    let weaponDiscount = 0;
-    let techLevel;
-    let baseDiscount;
-    let careerDiscount;
+    let techLevel = 0;
+    let totalDiscount = 0;
+    const discountDetails = [];
     if (careerData?.group === "人类联盟") {
       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];
-      baseDiscount = techLevel > 0 ? BASE_DISCOUNTS[techLevel - 1] : 0;
-      careerDiscount = isCareerMatch && techLevel > 0 ? CAREER_DISCOUNTS[techLevel - 1] : 0;
-      weaponDiscount = Math.max(baseDiscount, careerDiscount) / 100;
-      discountedCost = baseCost * (1 - weaponDiscount);
+      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);
+      if (weaponDiscount > 0) {
+        totalDiscount += weaponDiscount;
+        discountDetails.push(
+          `武器系统 Lv${techLevel}${isCareerMatch ? "(科技职业加成)" : ""}：${weaponDiscount}%)`
+        );
+      }
     }
     const activeWish = await checkFoxBlessing(handle);
     if (activeWish) {
-      discountedCost *= 0.8;
+      totalDiscount += 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) {
-      return `❌ 需要 ${actualCost} 金币，当前持有：${signInfo?.totalRewards || 0}`;
+      return `❌ 需要 ${actualCost} 金币(原价${baseCost})，当前持有：${signInfo?.totalRewards || 0}`;
     }
     await ctx.database.withTransaction(async () => {
       await ctx.database.set("ggcevo_sign", { handle }, {
@@ -2291,20 +2276,14 @@ function apply(ctx, config) {
     const newLevel = equipment.level + 1;
     const damage = (weaponData.damage * (1 + 0.1 * newLevel)).toFixed(1);
     let msg = `${target} 升级成功！Lv.${newLevel}`;
-    const priceInfo = actualCost === baseCost ? `
-💸 消耗：${actualCost}金币` : `
-💸 消耗：${actualCost}金币 (原价${baseCost})`;
+    const priceInfo = totalDiscount > 0 ? `
+💸 消耗：${actualCost}金币 (原价${baseCost})` : `
+💸 消耗：${actualCost}金币`;
     msg += priceInfo;
-    let discountDetails = [];
-    if (weaponDiscount > 0) {
-      discountDetails.push(`${Math.round(weaponDiscount * 100)}% (武器系统 Lv${techLevel})`);
-    }
-    if (activeWish) {
-      discountDetails.push("20% (灵狐升运祈愿生效)");
-    }
     if (discountDetails.length > 0) {
       msg += `
-🔧 折扣：${discountDetails.join(" + ")}`;
+🔧 折扣：
+${discountDetails.join("\n▸ ")}`;
     }
     msg += `
 💥 伤害：${damage}`;
@@ -2343,14 +2322,11 @@ function apply(ctx, config) {
       const level = `${index}→${index + 1}`;
       let finalPrice = baseCost;
       if (hasTechDiscount || hasFoxDiscount) {
-        let discounted = baseCost;
-        if (hasTechDiscount) {
-          discounted *= 1 - techDiscountRate / 100;
-        }
-        if (hasFoxDiscount) {
-          discounted *= 0.8;
-        }
-        finalPrice = Math.floor(discounted);
+        let totalDiscount = 0;
+        if (hasTechDiscount) totalDiscount += techDiscountRate;
+        if (hasFoxDiscount) totalDiscount += foxDiscount;
+        totalDiscount = Math.min(totalDiscount, 100);
+        finalPrice = Math.floor(baseCost * (1 - totalDiscount / 100));
       }
       const showOriginal = finalPrice < baseCost;
       return [
@@ -2363,7 +2339,7 @@ function apply(ctx, config) {
       discountNotice.push(`🔧 武器系统 Lv${techLevel} (${techDiscountRate}% 折扣)`);
     }
     if (hasFoxDiscount) {
-      discountNotice.push("🦊 灵狐升运生效中 (20% 折扣)");
+      discountNotice.push("🦊 灵狐升运祈愿 (20% 折扣)");
     }
     if (!hasTechDiscount && !hasFoxDiscount) {
       discountNotice.push("💡 提示：加入人类联盟并升级武器系统可获得折扣");
@@ -2401,21 +2377,18 @@ function apply(ctx, config) {
     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) {
-      return "您还没有签到。";
-    }
-    const quantity = backpack.quantity;
+    const quantity = backpack?.quantity;
     if (quantity < 1) {
-      return "您的咕咕币不足。";
+      return "您背包中的咕咕币不足";
     }
     await ctx.database.upsert("ggcevo_backpack", [{
       handle,
@@ -2440,20 +2413,17 @@ function apply(ctx, config) {
     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) {
-      return "您还没有签到。";
-    }
-    if (backpack.quantity < 1) {
-      return "您的咕咕币不足。";
+    if (backpack?.quantity < 1) {
+      return "您背包中的咕咕币不足";
     }
     await ctx.database.upsert("ggcevo_backpack", [{
       handle,
@@ -2473,20 +2443,17 @@ function apply(ctx, config) {
     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) {
-      return "您还没有签到。";
-    }
-    if (backpack.quantity < 10) {
-      return "您的咕咕币不足。";
+    if (backpack?.quantity < 10) {
+      return "您背包中的咕咕币不足";
     }
     await ctx.database.upsert("ggcevo_backpack", [{
       handle,
@@ -2502,35 +2469,19 @@ function apply(ctx, config) {
     const [record] = await ctx.database.get("ggcevo_records", { handle });
     return [
       "十连抽结果：",
-      ...results.map((r) => r ? "⭐获得兑换券" : "❌未中奖"),
+      ...results.map((r) => r ? "🎉 获得兑换券" : "❌ 未中奖"),
       `保底进度：${record.pityCounter}/90`,
       ...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 "🔒 需要先绑定游戏句柄。";
-    }
-    const { regionId, realmId, profileId } = profile;
-    const handle = `${regionId}-S2-${realmId}-${profileId}`;
-    const [record] = await ctx.database.get("ggcevo_records", { handle });
-    return record ? [
-      `总抽数：${record.totalPulls}`,
-      `下次保底剩余：${90 - record.pityCounter}抽`,
-      `已保底次数：${record.fullPityCount}`,
-      ...record.hiddenawards ? [`抽中隐藏奖励次数：${record.hiddenawards}`] : []
-    ].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);
-    if (!validItems.length) return "你的背包空空如也。";
+    if (!validItems.length) return "您的背包空空如也。";
     const itemDetails = validItems.map((userItem) => {
       const entry = Object.entries(initDefaultItems).find(
         ([, item]) => item.id === userItem.itemId
@@ -2547,11 +2498,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) {
@@ -2569,7 +2520,7 @@ ${itemDetails.join("\n")}`;
       } else {
         latestTime = currentChinaTime;
       }
-      if (!latestTime) return "您还没有游玩过“咕咕虫-evolved”。";
+      if (!latestTime) return "请游玩过“咕咕虫-evolved”后签到。";
       const targetDateChina = new Date(latestTime);
       targetDateChina.setUTCDate(targetDateChina.getUTCDate() + 1);
       if (!isSameDate(latestTime, currentChinaTime) && !isSameDate(targetDateChina, currentChinaTime)) {
@@ -2592,15 +2543,10 @@ ${itemDetails.join("\n")}`;
           monthlyDays = record.monthlyDays + 1;
         }
       }
-      const [meowEffect] = await ctx.database.get("ggcevo_Wish_Record", {
-        handle,
-        wishname: "喵喵财源",
-        startTime: { $lte: now },
-        endTime: { $gte: now },
-        isused: false
-      });
+      const messages = [];
+      let totalBonus = 0;
+      let basePoints;
       let tickets = 3;
-      let points = getRandomInt(20, 40);
       if (monthlyDays === 7) {
         tickets = 4;
       } else if (monthlyDays === 14) {
@@ -2610,62 +2556,61 @@ ${itemDetails.join("\n")}`;
       } else if (monthlyDays === 28) {
         tickets = 7;
       }
-      if (monthlyDays >= 7 && monthlyDays < 14) {
-        points = getRandomInt(40, 60);
-      } else if (monthlyDays >= 14 && monthlyDays < 21) {
-        points = getRandomInt(60, 80);
-      } else if (monthlyDays >= 21 && monthlyDays < 28) {
-        points = getRandomInt(80, 100);
-      } else if (monthlyDays >= 28) {
-        points = getRandomInt(100, 200);
-      }
-      let redCrystal = 0;
-      let effectMessage = "";
-      let bonusMessage = "";
-      let careerCrystalMessage = "";
-      let cred17Message = "";
-      let allianceBonusMessage = "";
+      if (monthlyDays < 7) basePoints = getRandomInt(20, 40);
+      else 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);
       const [careerData] = await ctx.database.get("ggcevo_careers", { handle });
       if (careerData?.group === "人类联盟") {
-        const baseAllianceBonus = 0.2;
-        points = Math.round(points * (1 + baseAllianceBonus));
-        allianceBonusMessage = `
-🏛️ 人类联盟基础加成：金币+${baseAllianceBonus * 100}%`;
-        let miningBonus = 0;
-        let miningMessage = "";
-        const BASE_BONUS = [5, 10, 15, 20, 25];
-        const CAREER_BONUS = [10, 20, 30, 40, 50];
+        totalBonus += 0.2;
+        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);
         if (miningTechConfig) {
-          const [userMiningTech] = await ctx.database.get("ggcevo_tech", {
-            handle,
-            techId: 1
-          }).catch(() => [{ level: 0 }]);
-          const techLevel = Math.min(Math.max(userMiningTech?.level || 0, 0), 5);
-          const baseBonus = techLevel > 0 ? BASE_BONUS[techLevel - 1] : 0;
+          const BASE_BONUS = [5, 10, 15, 20, 25];
+          const baseTechBonus = techLevel > 0 ? BASE_BONUS[techLevel - 1] : 0;
           let careerTechBonus = 0;
-          if (careerData?.career && miningTechConfig.careerNames.includes(careerData.career)) {
+          if (careerData.career && miningTechConfig.careerNames.includes(careerData.career)) {
+            const CAREER_BONUS = [10, 20, 30, 40, 50];
             careerTechBonus = techLevel > 0 ? CAREER_BONUS[techLevel - 1] : 0;
           }
-          miningBonus = Math.max(baseBonus, careerTechBonus);
-          if (miningBonus > 0) {
-            miningMessage = `
-⚙️ 采掘系统 Lv${techLevel} 金币加成：+${miningBonus}%`;
+          const finalBonus = Math.max(baseTechBonus, careerTechBonus);
+          if (finalBonus > 0) {
+            totalBonus += finalBonus / 100;
+            messages.push(`⚙️ 采掘系统 Lv${techLevel} 加成：金币+${finalBonus}%`);
           }
         }
-        let minerBonus = 0;
-        let minerMessage = "";
-        if (careerData?.career === "深空矿工") {
-          minerBonus = 50;
-          minerMessage = `
-⛏️ 深空矿工职业加成：金币+50%`;
+        if (careerData.career === "深空矿工") {
+          totalBonus += 0.5;
+          messages.push("⛏️ 深空矿工职业加成：金币+50%");
         }
-        const totalBonus = miningBonus + minerBonus;
-        if (totalBonus > 0) {
-          points = Math.round(points * (1 + totalBonus / 100));
+      }
+      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;
+          totalBonus += credBonus;
+          messages.push(`💎 CRED-17生效：金币+50% 额外+${additional}%`);
         }
-        bonusMessage = miningMessage + minerMessage;
       }
+      const [meowEffect] = await ctx.database.get("ggcevo_Wish_Record", {
+        handle,
+        wishname: "喵喵财源",
+        startTime: { $lte: now },
+        endTime: { $gte: now },
+        isused: false
+      });
+      if (meowEffect) {
+        tickets *= 2;
+        totalBonus += 1;
+        messages.push("🐾 喵喵财源祈愿生效：咕咕币×2，金币+100%");
+      }
+      const finalPoints = Math.round(basePoints * (1 + totalBonus));
+      let redCrystal = 0;
       if (careerData?.group === "辛迪加海盗" && careerData.career === "辛迪加财务经理") {
         if (monthlyDays < 7) {
           redCrystal = 1;
@@ -2678,32 +2623,14 @@ ${itemDetails.join("\n")}`;
         } else {
           redCrystal = 5;
         }
-        careerCrystalMessage = `
-⚓ 辛迪加财务经理职业加成：获得 ${redCrystal} 红晶`;
-      }
-      if (careerData?.group === "辛迪加海盗") {
-        const [cred17Item] = await ctx.database.get("ggcevo_warehouse", { handle, itemId: 3 });
-        if (cred17Item?.quantity >= 1) {
-          const currentGold = record?.totalRewards || 0;
-          const additionalBonus = Math.min(Math.floor(currentGold / 100), 100);
-          const totalBonus = 0.5 + additionalBonus * 0.01;
-          points = Math.round(points * (1 + totalBonus));
-          cred17Message = `
-💎 CRED-17生效：签到奖励+50%，当前金币${currentGold}（+${additionalBonus}%），总计加成+${(totalBonus * 100).toFixed(0)}%`;
-        }
-      }
-      if (meowEffect) {
-        tickets *= 2;
-        points *= 2;
-        effectMessage = "\n🐾 喵喵财源祈愿生效，获得双倍奖励(金币和咕咕币)！";
+        messages.push(`⚓ 辛迪加财务经理职业加成：获得${redCrystal}枚红晶`);
       }
-      effectMessage += cred17Message;
       await ctx.database.withTransaction(async () => {
         await ctx.database.upsert("ggcevo_sign", [{
           handle,
           lastSign: now,
           monthlyDays,
-          totalRewards: (record?.totalRewards || 0) + points
+          totalRewards: (record?.totalRewards || 0) + finalPoints
         }]);
         await ctx.database.upsert("ggcevo_backpack", [{
           handle,
@@ -2717,9 +2644,15 @@ ${itemDetails.join("\n")}`;
           }], ["handle"]);
         }
       });
+      let effectMessage = "";
+      if (messages.length > 0) {
+        effectMessage = `
+⚡ 加成效果：
+▸ ${messages.join("\n▸ ")}`;
+      }
       return `签到成功！本月累计签到${monthlyDays}天，获得：
-💰 金币 x ${points}
-🪙 咕咕币 x ${tickets}` + (effectMessage || "") + allianceBonusMessage + (bonusMessage || "") + (careerCrystalMessage || "");
+💰 金币 x ${finalPoints}（基础值 ${basePoints}）
+🪙 咕咕币 x ${tickets}${effectMessage}`;
     } catch (error) {
       console.error("签到命令时发生错误:", error);
       return "服务器繁忙，请稍后尝试。";
@@ -2729,13 +2662,13 @@ ${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 "您还没有签到。";
+      if (!record) return "暂未查询到您的签到记录";
       const lastSignChina = convertUTCtoChinaTime(record.lastSign);
       const targetDateChina = new Date(lastSignChina);
       const nowChina = convertUTCtoChinaTime(/* @__PURE__ */ new Date());
@@ -2744,7 +2677,7 @@ ${itemDetails.join("\n")}`;
       const yesterday = new Date(targetDateChina).getUTCDate() - 1;
       if (targetDateChina.getUTCFullYear() !== currentYear || targetDateChina.getUTCMonth() !== currentMonth || // 必须当月
       record.monthlyDays > yesterday) {
-        return "暂时没有可补签的日期。";
+        return "暂时没有可补签的日期";
       }
       const costPoints = 100;
       if (record.totalRewards < costPoints) {
@@ -2781,46 +2714,16 @@ ${itemDetails.join("\n")}`;
       return "补签失败，请稍后重试。";
     }
   });
-  ctx.command("ggcevo/签到记录").action(async (argv) => {
-    const session = argv.session;
-    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}`;
-    const [record] = await ctx.database.get("ggcevo_sign", { handle });
-    if (!record) return "您还没有签到。";
-    const chinaTime = record.lastSign.toLocaleString("zh-CN", {
-      timeZone: "Asia/Shanghai",
-      year: "numeric",
-      month: "2-digit",
-      day: "2-digit",
-      hour: "2-digit",
-      minute: "2-digit",
-      second: "2-digit",
-      hour12: false
-    });
-    return [
-      `您的句柄：${handle}`,
-      `📅 最后签到时间：${chinaTime}`,
-      `🔥 累计签到：${record.monthlyDays}天`,
-      `💰 拥有金币：${record.totalRewards}枚金币`
-    ].join("\n");
-  });
   ctx.guild().command("ggcevo/每月津贴").action(async (argv) => {
     const session = argv.session;
     const [profile] = await ctx.database.get("sc2arcade_player", { userId: session.userId });
-    if (!profile) return "🔒 需要先绑定游戏句柄。";
+    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 `❌ 拒绝访问，您已被列入黑名单。`;
-    }
     const [backpack] = await ctx.database.get("ggcevo_backpack", { handle, itemId: 1 });
-    if (!backpack) return "您还没有签到。";
     const memberInfo = await session.event?.member?.roles;
     if (memberInfo?.includes("member")) {
-      return "❌ 拒绝访问，仅限管理员和群主领取每月津贴。";
+      return "❌ 仅限管理员和群主领取每月津贴";
     }
     const now = /* @__PURE__ */ new Date();
     const chinatime = convertUTCtoChinaTime(now);
@@ -2847,26 +2750,26 @@ ${itemDetails.join("\n")}`;
     await ctx.database.upsert("ggcevo_backpack", [{
       handle,
       itemId: 1,
-      quantity: (backpack.quantity || 0) + 50
+      quantity: (backpack?.quantity || 0) + 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 "🔒 需要先绑定游戏句柄";
+    const handle = `${profile.regionId}-S2-${profile.realmId}-${profile.profileId}`;
+    const existingEntries = await ctx.database.get("ggcevo_blacklist", { handle });
+    if (existingEntries.length > 0) return "⛔ 您已被列入黑名单";
     if (!name2) {
-      await session.send("请在30秒内输入活动名称");
+      await session.send("请在30秒内输入活动名称:");
       name2 = await session.prompt(3e4);
-      if (!name2) return "输入超时，请重新输入。";
+      if (!name2) return "已取消操作，请重新输入。";
     }
     const itemIdToName = {};
     for (const [name3, item] of Object.entries(initDefaultItems)) {
       itemIdToName[item.id] = name3;
     }
-    const [profile] = await ctx.database.get("sc2arcade_player", { userId: session.userId });
-    if (!profile) return "🔒 需要先绑定游戏句柄。";
-    const handle = `${profile.regionId}-S2-${profile.realmId}-${profile.profileId}`;
-    const existingEntries = await ctx.database.get("ggcevo_blacklist", { handle });
-    if (existingEntries.length > 0) return "❌ 拒绝访问，您已被列入黑名单。";
     const [activity] = await ctx.database.get("ggcevo_activity", {
       name: name2,
       status: "进行中"
@@ -2936,7 +2839,9 @@ ${itemDetails.join("\n")}`;
     });
     return `活动【${activityName}】创建成功！奖励内容：${itemName} x${quantity}。`;
   });
-  ctx.command("ggcevo/活动列表").action(async () => {
+  ctx.command("ggcevo/活动列表").action(async ({ session }) => {
+    const [profile] = await ctx.database.get("sc2arcade_player", { userId: session.userId });
+    if (!profile) return "🔒 需要先绑定游戏句柄";
     const activities = await ctx.database.get(
       "ggcevo_activity",
       { status: "进行中" },
@@ -2951,7 +2856,7 @@ ${itemDetails.join("\n")}`;
         `活动时间：${formatDate(a.startTime)} - ${formatDate(a.endTime)}`,
         `活动描述：${a.description}`,
         `活动奖励：${a.quantity} ${itemMap.get(a.itemId) || "未知物品"}`,
-        "━".repeat(20)
+        "━".repeat(14)
       ].join("\n")),
       "请输入「领取 活动名称」领取奖励"
     ].join("\n") : "当前没有进行中的活动。";
@@ -3100,7 +3005,9 @@ ${itemDetails.join("\n")}`;
       return "服务器繁忙，请稍后尝试。";
     }
   });
-  ctx.command("ggcevo/胜点榜 [page]").usage("输入 胜点榜 [页码] 查看对应页的排行榜，每页10条").action(async (_, page) => {
+  ctx.command("ggcevo/胜点榜 [page]").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;
     if (pageNum < 1) return "请输入有效的页码。";
     const offset = (pageNum - 1) * 10;
@@ -3109,7 +3016,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,
@@ -3264,7 +3171,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}`;
@@ -3292,7 +3199,7 @@ ${itemDetails.join("\n")}`;
     } else {
       const parsedUser = import_koishi.h.parse(player)[0];
       if (!parsedUser || parsedUser.type !== "at" || !parsedUser.attrs.id) {
-        return "请输入正确的格式。";
+        return "参数错误，请输入“排名 @玩家”";
       }
       const targetUserId = parsedUser.attrs.id;
       let targetUsername = parsedUser.attrs.name || targetUserId;
@@ -3328,7 +3235,7 @@ ${itemDetails.join("\n")}`;
   ctx.command("ggcevo/给予 <handle> <itemName:string> <amount:number>", "增加用户物品/金币", { authority: 3 }).action(async (_, handle, itemName, amount) => {
     try {
       if (!handle || !itemName || amount <= 0) {
-        return "参数格式错误，正确格式：给予 用户句柄 物品名称 数量";
+        return "参数格式错误，正确格式：给予 句柄 物品名称 数量";
       }
       const parsedAmount = Math.floor(amount);
       if (itemName === "金币") {
@@ -3373,19 +3280,19 @@ ${itemDetails.join("\n")}`;
       return "操作失败：" + (err instanceof Error ? err.message : "数据库异常");
     }
   });
-  ctx.command("ggcevo/违规记录 [user]", "违规记录查询").usage("输入 违规记录 [@用户] -p 页码 查看处罚记录，每页1条").option("p", "-p <page:number> 指定页码").action(async (argv) => {
+  ctx.command("ggcevo/违规记录 [user]", "违规记录查询").usage("输入 违规记录 [@玩家] -p 页码 查看处罚记录，每页1条").option("p", "-p <page:number> 指定页码").action(async (argv) => {
     const session = argv.session;
     const pageNum = argv.options.p ? argv.options.p : 1;
     const user = argv.args[0];
     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];
       if (!parsedUser || parsedUser.type !== "at" || !parsedUser.attrs.id) {
-        return "请输入正确的格式。";
+        return "参数错误，请输入“违规记录 @玩家”";
       }
       const targetUserId = parsedUser.attrs.id;
       let targetUsername = parsedUser.attrs.name || targetUserId;
@@ -3423,17 +3330,17 @@ ${itemDetails.join("\n")}`;
       "------------------------------",
       recordText,
       "------------------------------",
-      pageNum < totalPages ? `输入 违规记录 (@用户) -p ${pageNum + 1} 查看下一条` : "已是最后一页"
+      pageNum < totalPages ? `输入 违规记录 (@玩家) -p ${pageNum + 1} 查看下一条` : "已是最后一页"
     ].join("\n");
   });
   ctx.command("ggcevo/兑换", "兑换物品").action(async ({ session }) => {
     try {
       const [profile] = await ctx.database.get("sc2arcade_player", { userId: session.userId });
-      if (!profile) return "🔒 需要先绑定游戏句柄。";
+      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 = {};
@@ -3477,7 +3384,7 @@ ${items.join("、")}
       }
       await session.send(message);
       const name2 = await session.prompt(3e4);
-      if (!name2) return "输入超时，请重新输入。";
+      if (!name2) return "已取消操作，请重新输入。";
       const configname = itemConfig[name2];
       if (!configname) return "无效的物品名称，请重新输入。";
       const userRecords = await ctx.database.get("ggcevo_exchange", { handle, item: name2 });
@@ -3516,7 +3423,7 @@ ${items.join("、")}
       if (!coupon || coupon.quantity < cost) {
         const requireMsg = petItems.has(name2) ? `需要1个${configname.quality}级宠物扭蛋 或${configname.cost}张兑奖券` : `需要${configname.cost}张兑奖券`;
         return `${requireMsg}
-当前持有：${coupon?.quantity || 0}个${couponName}`;
+您当前持有：${coupon?.quantity || 0}个${couponName}`;
       }
       const isGlobal = configname.isLimited || config.ignoreGlobalLimit === false;
       await ctx.database.withTransaction(async () => {
@@ -3537,38 +3444,19 @@ ${items.join("、")}
           season: currentSeason
         });
       });
-      return `兑换成功！消耗${cost}个${couponName}获得【${name2}】`;
+      return `🎉 恭喜！您使用 ${cost} 个 ${couponName} 兑换了 【${name2}】`;
     } catch (error) {
       console.error("兑换失败:", error);
       return "兑换失败";
     }
   });
-  ctx.command("ggcevo/兑换记录").action(async ({ session }) => {
-    const [profile] = await ctx.database.get("sc2arcade_player", { userId: session.userId });
-    if (!profile) return "🔒 需要先绑定游戏句柄。";
-    const handle = `${profile.regionId}-S2-${profile.realmId}-${profile.profileId}`;
-    const exchanges = await ctx.database.get("ggcevo_exchange", { handle });
-    if (!exchanges.length) return "您暂无兑换记录";
-    const output = exchanges.map((e) => {
-      const date = new Date(e.date);
-      const cnTime = date.toLocaleString("zh-CN", {
-        timeZone: "Asia/Shanghai",
-        year: "numeric",
-        month: "2-digit",
-        day: "2-digit"
-      });
-      return `${e.type}: ${e.item} | 时间: ${cnTime}`;
-    }).join("\n");
-    return `${handle} 的兑换记录：
-${output}`;
-  });
   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);
@@ -3576,7 +3464,7 @@ ${output}`;
     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",
@@ -3588,23 +3476,23 @@ ${output}`;
       itemId: 3,
       quantity: (backpack?.quantity || 0) + 1
     }]);
-    return `兑换成功！消耗3张兑奖券获得1枚扭蛋币`;
+    return `🎉恭喜！您使用 3 张兑奖券兑换了 1 枚扭蛋币`;
   });
   ctx.command("ggcevo/扭蛋").action(async (argv) => {
     const session = argv.session;
     const [profile] = await ctx.database.get("sc2arcade_player", { userId: session.userId });
     if (!profile) {
-      return "🔒 需要先绑定游戏句柄。";
+      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(
@@ -3626,16 +3514,18 @@ ${output}`;
       itemId: itemData.id,
       quantity: currentQuantity + 1
     }]);
-    return `🎉 恭喜您获得：${itemName}`;
+    return `🎉 恭喜！您获得了 ${itemName}`;
   });
-  ctx.command("ggcevo/拉黑", "添加用户到黑名单").action(async (argv) => {
+  ctx.command("ggcevo/拉黑 [handle]", "添加用户到黑名单").action(async (argv, handle) => {
     const session = argv.session;
     if (!ctx.config.admins.includes(session.userId)) {
       return "⚠️ 没有操作权限。";
     }
-    await session.send("请在30秒内输入需要拉黑的句柄:\n(句柄格式为: [区域ID]-S2-[服务器ID]-[档案ID])");
-    const handle = await session.prompt(3e4);
-    if (!handle) return "输入超时，请重新输入。";
+    if (!handle) {
+      await session.send("请在30秒内输入需要拉黑的句柄:\n(句柄格式为: [区域ID]-S2-[服务器ID]-[档案ID])");
+      handle = await session.prompt(3e4);
+      if (!handle) return "已取消操作，请重新输入。";
+    }
     try {
       const handleRegex = /^([1235])-S2-([12])-(\d+)$/;
       if (!handleRegex.test(handle)) {
@@ -3649,20 +3539,22 @@ ${output}`;
         handle,
         createdAt: /* @__PURE__ */ new Date()
       });
-      return `✅ 用户${handle}已被列入黑名单。`;
+      return `✅ 操作成功，用户${handle}被列入黑名单。`;
     } catch (error) {
       console.error("黑名单操作失败:", error);
       return "操作失败，请稍后重试。错误详情已记录";
     }
   });
-  ctx.command("ggcevo/标记", "标记用户到胜点榜黑名单").action(async (argv) => {
+  ctx.command("ggcevo/标记 [handle]", "标记用户到胜点榜黑名单").action(async (argv, handle) => {
     const session = argv.session;
     if (!ctx.config.admins.includes(session.userId)) {
       return "⚠️ 没有操作权限。";
     }
-    await session.send("请在30秒内输入需要标记的句柄:\n(句柄格式为: [区域ID]-S2-[服务器ID]-[档案ID])");
-    const handle = await session.prompt(3e4);
-    if (!handle) return "输入超时，请重新输入。";
+    if (!handle) {
+      await session.send("请在30秒内输入需要标记的句柄:\n(句柄格式为: [区域ID]-S2-[服务器ID]-[档案ID])");
+      handle = await session.prompt(3e4);
+      if (!handle) return "已取消操作，请重新输入。";
+    }
     try {
       const handleRegex = /^([1235])-S2-([12])-(\d+)$/;
       if (!handleRegex.test(handle)) {
@@ -3670,48 +3562,24 @@ ${output}`;
       }
       const existingEntries = await ctx.database.get("ggcevo_rank", { handle, Blacklist: true, rankseason: config.rankseason });
       if (existingEntries.length > 0) {
-        return `${handle}已被标记在咕咕胜点榜黑名单中。`;
+        return `${handle}已在当前赛季胜点榜上被标记。`;
       }
       await ctx.database.upsert("ggcevo_rank", [{
         handle,
         Blacklist: true,
         rankseason: config.rankseason
       }]);
-      return `✅ 用户${handle}已被标记在咕咕胜点榜黑名单。`;
+      return `✅ 操作成功，用户${handle}在当前赛季胜点榜上被标记。`;
     } catch (error) {
       console.error("黑名单操作失败:", error);
       return "操作失败，请稍后重试。错误详情已记录";
     }
   });
-  ctx.command("ggcevo/成就").action(async ({ session }) => {
-    const [profile] = await ctx.database.get("sc2arcade_player", { userId: session.userId });
-    if (!profile) {
-      return "🔒 需要先绑定游戏句柄。";
-    }
-    const { regionId, realmId, profileId } = profile;
-    const achievements = await ctx.database.get("ggcevo_achievements", {
-      handle: `${regionId}-S2-${realmId}-${profileId}`
-    });
-    if (!achievements.length) {
-      return "你还没有获得任何成就。";
-    }
-    const achievementList = achievements.map((achievement) => {
-      const date = new Date(achievement.gaintime);
-      return `${achievement.achievementname} (获得于 ${date.toLocaleDateString("zh-CN", {
-        timeZone: "Asia/Shanghai",
-        year: "numeric",
-        month: "2-digit",
-        day: "2-digit"
-      })})`;
-    });
-    return `${regionId}-S2-${realmId}-${profileId} 已获得的成就：
-${achievementList.join("\n")}`;
-  });
   ctx.command("ggcevo/个人信息").action(async (argv) => {
     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}
@@ -3738,10 +3606,10 @@ ${achievementList.join("\n")}`;
     if (lottery) {
       output.push(
         "🎉 抽奖统计：",
-        `总抽奖次数：${lottery.totalPulls}`,
+        `总计抽奖：${lottery.totalPulls} 次`,
         `距离保底剩余：${90 - lottery.pityCounter} 抽`,
-        `已达成保底：${lottery.fullPityCount} 次`,
-        ...lottery.hiddenawards ? [`隐藏奖励次数：${lottery.hiddenawards}`] : [],
+        `触发保底：${lottery.fullPityCount} 次`,
+        ...lottery.hiddenawards ? [`隐藏奖励：${lottery.hiddenawards} 次`] : [],
         "──────────────"
       );
     }
@@ -3843,16 +3711,16 @@ ${achievementList.join("\n")}`;
   ctx.command("ggcevo/pk [user]", "发起玩家对战").alias("挑战").action(async (argv, user) => {
     try {
       const session = argv.session;
-      if (!user) return "请输入“pk @指定pk玩家”。";
       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];
-      if (!parsedUser || parsedUser.type !== "at" || !parsedUser.attrs.id) return "参数格式错误，请输入“pk @指定pk玩家”。";
+      if (!parsedUser || parsedUser.type !== "at" || !parsedUser.attrs.id) return "参数格式错误，请输入“pk @玩家”。";
       const targetUserId = parsedUser.attrs.id;
       const targetUsername = await session.bot.getGuildMember(session.guildId, targetUserId);
       const [targetprofile] = await ctx.database.get("sc2arcade_player", { userId: targetUserId });
@@ -4021,7 +3889,7 @@ ${achievementList.join("\n")}`;
         `🎰 金币变动：${stealPercentage}%`
       ];
       isWin ? result.push(`💰 您从对方的口袋里抢夺了${goldTransfer}枚金币`) : result.push(`💸 您从口袋里拿出了${goldTransfer}枚金币上交给对方`);
-      initiatorCareer?.group === "辛迪加海盗" ? result.push(`🔴 海盗阵营奖励：获得1枚红晶`) : "";
+      initiatorCareer?.group === "辛迪加海盗" ? result.push(`🔴 辛迪加海盗阵营加成：获得1枚红晶`) : "";
       result.push(`📅 剩余挑战次数：${config.dailyPKLimit - (initiatorPK.todayCount + 1)}`);
       return result.join("\n");
     } catch (error) {
@@ -4029,7 +3897,9 @@ ${achievementList.join("\n")}`;
       return "对战功能暂时不可用，请稍后重试";
     }
   });
-  ctx.command("ggcevo/pk榜 [page]", "查看玩家PK排行榜").usage("输入 pk榜 [页码] 查看对应页的排行榜，每页10条").action(async (_, page) => {
+  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 "🔒 需要先绑定游戏句柄";
     const pageNum = parseInt(page) || 1;
     if (pageNum < 1) return "请输入有效的页码。";
     const offset = (pageNum - 1) * 10;
@@ -4040,7 +3910,7 @@ ${achievementList.join("\n")}`;
       ctx.database.select("ggcevo_pk").where({ enable: true }).execute((row) => import_koishi.$.count(row.handle))
     ]);
     const totalPages = Math.ceil(total / 10);
-    if (pageNum > totalPages) return `最多有 ${totalPages} 页`;
+    if (pageNum > totalPages) return `查询失败，最多有 ${totalPages} 页`;
     if (!records.length) return "暂无PK记录";
     const rankingText = records.map((record, index) => {
       const winRate = record.total > 0 ? `${(record.wins / record.total * 100).toFixed(1)}%` : "N/A";
@@ -4062,7 +3932,7 @@ ${achievementList.join("\n")}`;
   });
   ctx.command("ggcevo/切换pk", "切换玩家对战状态").alias("切换pk状态").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 [pkRecord] = await ctx.database.get("ggcevo_pk", { handle }) || [null];
     const currentState = pkRecord?.enable ?? true;
@@ -4082,12 +3952,12 @@ ${achievementList.join("\n")}`;
     const now = convertUTCtoChinaTime(/* @__PURE__ */ new Date());
     const lastToggleTime = convertUTCtoChinaTime(lastToggle);
     const diffDays = Math.floor((now.getTime() - lastToggleTime.getTime()) / (1e3 * 3600 * 24));
+    const [careers] = await ctx.database.get("ggcevo_careers", { handle });
+    if (careers?.group === "辛迪加海盗") return "您已经加入了辛迪加海盗阵营，无法切换PK状态！";
     if (diffDays < 3 && lastToggleTime.getTime() !== 0) {
       const remaining = 3 - diffDays;
       return `状态切换冷却中，${remaining}天后再试(下次可切换时间：${new Date(lastToggle.getTime() + 3 * 864e5).toLocaleDateString("zh-CN")})。`;
     }
-    const [careers] = await ctx.database.get("ggcevo_careers", { handle });
-    if (careers?.group === "辛迪加海盗") return "您已经加入了辛迪加海盗阵营，无法切换PK状态！";
     const action = currentState ? "关闭" : "开启";
     await session.send(`您当前的PK状态为【${currentState ? "开启" : "关闭"}】，确认要${action}吗？(请在30秒内回复“是”确认)`);
     const confirm = await session.prompt(3e4);
@@ -4120,7 +3990,24 @@ ${achievementList.join("\n")}`;
     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 discountRate = Math.max(baseDiscount, careerDiscount);
+    const techDiscount = Math.max(baseDiscount, careerDiscount);
+    const activeWish = await ctx.database.get("ggcevo_Wish_Record", {
+      handle,
+      wishname: "蚱蜢优购",
+      startTime: { $lte: /* @__PURE__ */ new Date() },
+      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}%`);
+    }
+    if (grasshopperDiscount > 0) {
+      discountDetails.push(`蚱蜢优购祈愿：${grasshopperDiscount}%`);
+    }
     const typeStats = Object.values(weaponConfig).filter((weapon) => weapon.price !== 0).reduce((stats, weapon) => {
       stats[weapon.type] = (stats[weapon.type] || 0) + 1;
       return stats;
@@ -4132,8 +4019,9 @@ ${achievementList.join("\n")}`;
         "====================",
         ...Object.entries(typeStats).map(([typeName, count]) => `▸ ${typeName} (${count}种)`),
         "====================",
-        discountRate > 0 && `
-🔧 当前购买折扣：${discountRate}% (武器系统 Lv${techLevel})`
+        totalDiscount > 0 && `
+🔧 当前购买折扣：
+${discountDetails.length ? ` ${discountDetails.join(" \n ")}` : ""}`
       ].filter(Boolean).join("\n");
     }
     if (!Object.keys(typeStats).includes(type)) {
@@ -4141,13 +4029,13 @@ ${achievementList.join("\n")}`;
 ${Object.keys(typeStats).join("、")}`;
     }
     const items = Object.entries(weaponConfig).filter(([_, config2]) => config2.type === type && config2.price !== 0).map(([name2, config2]) => {
-      const actualPrice = Math.floor(config2.price * (1 - discountRate / 100));
+      const actualPrice = Math.floor(config2.price * (100 - totalDiscount) / 100);
       const tagEffectsDesc = config2.tagEffects ? Object.entries(config2.tagEffects).map(([tag, multiplier]) => `▸ 对${tag}目标造成${(multiplier * 100).toFixed(0)}%伤害`).join("\n") : "▸ 无特殊加成效果";
       return [
         `【${name2}】`,
         `类型：${config2.type}`,
         `基础伤害：${config2.damage}`,
-        `价格：${actualPrice}金币${discountRate > 0 ? ` (原价${config2.price})` : ""}`,
+        `价格：${actualPrice}金币${totalDiscount > 0 ? ` (原价${config2.price})` : ""}`,
         "特性：",
         tagEffectsDesc,
         `描述：${config2.description}`
@@ -4156,7 +4044,8 @@ ${Object.keys(typeStats).join("、")}`;
     return [
       `🏪 咕咕武器库 - ${type} 🏪`,
       "使用“购买 武器名称”指令进行购买",
-      discountRate > 0 && `🔧 当前购买折扣：${discountRate}% (武器系统 Lv${techLevel})`,
+      totalDiscount > 0 && `🔧 当前购买折扣：
+${discountDetails.length ? ` ${discountDetails.join(" \n ")}` : ""}`,
       "====================",
       ...items,
       items.length === 0 ? "⚠️ 该分类下暂无可用武器" : ""
@@ -4204,10 +4093,10 @@ ${validTypes.join("、")}`;
   });
   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];
@@ -4224,8 +4113,8 @@ ${validTypes.join("、")}`;
     const [signInfo] = await ctx.database.get("ggcevo_sign", { handle });
     const [careerData] = await ctx.database.get("ggcevo_careers", { handle });
     const [weaponTech] = await ctx.database.get("ggcevo_tech", { handle, techId: 2 });
-    let discountDetails = [];
     let totalDiscount = 0;
+    let discountDetails = [];
     if (isWeapon && careerData?.group === "人类联盟") {
       const techDiscountTable = {
         3: [0, 10],
@@ -4240,7 +4129,7 @@ ${validTypes.join("、")}`;
         if (techDiscount > 0) {
           totalDiscount += techDiscount;
           discountDetails.push(
-            `武器系统 Lv${techLevel}${isQualifiedCareer ? "（职业加成）" : ""} ${techDiscount}%折扣`
+            `武器系统 Lv${techLevel}${isQualifiedCareer ? "（职业加成）" : ""}：${techDiscount}%折扣`
           );
         }
       }
@@ -4254,8 +4143,9 @@ ${validTypes.join("、")}`;
     }).then((records) => records[0]) : null;
     if (activeWish) {
       const wishDiscount = 20;
-      totalDiscount = 100 - (100 - totalDiscount) * (100 - wishDiscount) / 100;
-      discountDetails.push(`蚱蜢优购祈愿生效 ${wishDiscount}%折扣`);
+      totalDiscount += wishDiscount;
+      discountDetails.push(`蚱蜢优购祈愿生效：${wishDiscount}%折扣`);
+      totalDiscount = Math.min(totalDiscount, 100);
     }
     let actualPrice = config2.price;
     if (totalDiscount > 0) {
@@ -4265,7 +4155,7 @@ ${validTypes.join("、")}`;
     if ((signInfo?.totalRewards || 0) < actualPrice) {
       let priceInfo = `需要 ${actualPrice} 金币`;
       if (discountDetails.length > 0) {
-        priceInfo += `（原价 ${config2.price}，累计折扣 ${totalDiscount}%）`;
+        priceInfo += `(原价 ${config2.price})`;
       }
       return `❌ 金币不足，${priceInfo}`;
     }
@@ -4330,7 +4220,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
@@ -4350,7 +4240,7 @@ ${validTypes.join("、")}`;
       ].join("\n");
     }));
     return [
-      `🛡️ ${handle}当前拥有的武器`,
+      `🛡️ ${handle}拥有的武器`,
       '使用"装备 武器名称"来装备武器',
       "⚡表示当前装备武器",
       "──────────────",
@@ -4362,20 +4252,20 @@ ${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 (!weapon) return "请输入“装备 武器名称”来装备一把你拥有的武器。";
-    if (!weaponConfig[weapon]) return "请输入“装备 武器名称”来装备一把你拥有的武器。";
-    const config2 = weaponConfig[weapon];
+    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 "武器名称错误，请输入“装备 武器名称”来装备一把你拥有的武器。";
+    const config2 = weaponConfig[weapon];
     const [owned] = await ctx.database.get("ggcevo_equipment", {
       handle,
       weaponId: config2.id
     });
-    if (!owned) return "尚未获得该武器。";
+    if (!owned) return "您尚未获得该武器。";
     await ctx.database.withTransaction(async () => {
       await ctx.database.set(
         "ggcevo_equipment",
@@ -4396,10 +4286,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);
@@ -4417,10 +4307,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];
@@ -4429,7 +4319,7 @@ ${validTypes.join("、")}`;
         handle,
         weaponId: weaponConfig[weapon].id
       });
-      if (!equipment) return "尚未获得该武器。";
+      if (!equipment) return "您尚未获得该武器。";
       if (modInfo.isExclusive) {
         if (modInfo.exclusiveTo !== weapon) return `❌ 该模块只能安装在${modInfo.exclusiveTo}上。`;
         const hasExclusive = equipment.installedMods.some((m) => modConfig[m]?.isExclusive);
@@ -4472,7 +4362,7 @@ ${validTypes.join("、")}`;
       return [
         `✅ ${weapon} 成功安装 ${mod}！`,
         discountMsg,
-        `花费金币：${actualCost}`,
+        `花费金币：${actualCost}${discountRate > 0 ? `(原价${modInfo.cost})` : ""}`,
         `改装槽：${equipment.installedMods.length + 1}/${equipment.modificationSlots}`
       ].join("\n");
     }, "processModInstallation");
@@ -4532,10 +4422,10 @@ ${validTypes.join("、")}`;
     const session = argv.session;
     let broadcastMessage = 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("，");
@@ -4574,7 +4464,7 @@ ${validTypes.join("、")}`;
     const weaponConfigEntry = Object.entries(weaponConfig).find(([_, c]) => c.id === equippedWeapon.weaponId);
     const [weaponName, weaponData] = weaponConfigEntry;
     if (!weaponData.isantiair && targetBoss.groupId === 5) {
-      return "您装备的武器无法攻击空中目标！";
+      return "您当前装备的武器无法攻击空中目标！";
     }
     const activeBosses = await ctx.database.get("ggcevo_boss", { isActive: true });
     if (!activeBosses.length) return "当前没有存活的异形，请等待下一轮刷新。";
@@ -4635,7 +4525,7 @@ ${validTypes.join("、")}`;
           { name: targetBoss.name },
           { respawnTime }
         );
-        const { rewardMessages } = await handleBossDefeatRewards(ctx, targetBoss, session);
+        const { rewardMessages } = await handleBossDefeatRewards(ctx, targetBoss);
         await ctx.database.remove("ggcevo_boss_damage", {
           bossGroupId: targetBoss.groupId
         });
@@ -4757,10 +4647,10 @@ ${passiveMessages.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
@@ -4797,7 +4687,7 @@ ${passiveMessages.map((m) => `▸ ${m}`).join("\n")}`
         // 这里添加符号
       ] : [],
       `📊 理论伤害值：${damage}${hasCrit ? " (✨ 触发暴击)" : ""}`,
-      "💡 提示：使用 -t 重甲,生物…… 添加测试标签"
+      "💡 提示：使用 -t 重甲,生物……(标签之间用英文逗号分隔) 添加测试标签"
     ].filter((line) => line).join("\n");
   });
   ctx.command("ggcevo/伤害榜 [page]", "查看当前主宰伤害排名").usage("输入 伤害榜 [页码] 查看对应页的排行榜，每页10条").action(async (_, page) => {
@@ -4815,7 +4705,7 @@ ${passiveMessages.map((m) => `▸ ${m}`).join("\n")}`
       ctx.database.select("ggcevo_boss_damage").where({ bossGroupId: mainBoss.groupId }).execute((row) => import_koishi.$.count(row.handle))
     ]);
     const totalPages = Math.ceil(total / 10);
-    if (pageNum > totalPages) return `最多有 ${totalPages} 页`;
+    if (pageNum > totalPages) return `查询失败，最多有 ${totalPages} 页`;
     if (!records.length) return "暂无伤害记录";
     const rankingText = records.map(
       (record, index) => `${offset + index + 1}. ${record.playerName || "未知玩家"} | 总伤害: ${record.totalDamage} | 攻击次数: ${record.attackCount}`
@@ -4863,7 +4753,7 @@ ${passiveMessages.map((m) => `▸ ${m}`).join("\n")}`
     }
     return result.join("\n");
   });
-  ctx.command("ggcevo/初始化异形 <groupid:number>", "初始化指定主宰组", { authority: 3 }).action(async (_, groupid) => {
+  ctx.command("ggcevo/初始化异形 <groupid:number>", "初始化指定主宰组", { authority: 3 }).alias("初始化yx").action(async (_, groupid) => {
     if (!groupid) groupid = 1;
     const bossConfig = bossPool.find((g) => g.main.id === groupid);
     if (!bossConfig) {
@@ -4897,11 +4787,11 @@ ${passiveMessages.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();
@@ -4972,19 +4862,19 @@ ${passiveMessages.map((m) => `▸ ${m}`).join("\n")}`
     return `✨ 祈愿成功！花费50枚金币获得【${effect.name}】效果：${effect.effect}
 ⏳ 效果持续至 ${formattedEndTime}`;
   });
-  ctx.command("兑换金币", "使用兑换券兑换金币").action(async ({ session }) => {
+  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金币`);
     const exchangeInput = await session.prompt(3e4);
-    if (!exchangeInput) return "输入超时，请重新输入。";
+    if (!exchangeInput) return "已取消操作，请重新输入。";
     const exchangeCount = parseInt(exchangeInput, 10);
     if (isNaN(exchangeCount)) return "请输入有效的数字！";
     if (exchangeCount < 0) return "兑换数量不能为负数！";
@@ -5011,13 +4901,13 @@ ${passiveMessages.map((m) => `▸ ${m}`).join("\n")}`
     });
     return `成功使用${exchangeCount}张兑换券，获得${goldAmount}枚金币！`;
   });
-  ctx.command("兑换红晶", "使用金币兑换红晶").action(async ({ session }) => {
+  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 !== "辛迪加海盗") {
@@ -5026,7 +4916,7 @@ ${passiveMessages.map((m) => `▸ ${m}`).join("\n")}`
     await session.send(`请输入你想要兑换多少红晶？(请在30秒内回复数字，回复“0”为取消兑换)
 注意：每块红晶需要950金币。`);
     const exchangeInput = await session.prompt(3e4);
-    if (!exchangeInput) return "输入超时，请重新输入。";
+    if (!exchangeInput) return "已取消操作，请重新输入。";
     const exchangeCount = parseInt(exchangeInput, 10);
     if (isNaN(exchangeCount)) return "请输入有效的数字！";
     if (exchangeCount < 0) return "兑换数量不能为负数！";
@@ -5053,12 +4943,12 @@ ${passiveMessages.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 `请输入“加入 阵营名称”加入对应阵营
@@ -5094,7 +4984,7 @@ ${passiveMessages.map((m) => `▸ ${m}`).join("\n")}`
       } else if (faction === "辛迪加海盗") {
         const [pkData] = await ctx.database.get("ggcevo_pk", { handle });
         if (userCoins < 2e3) {
-          return `加入辛迪加海盗需要2000金币并且永久开启PK功能，你当前拥有${userCoins}金币`;
+          return `加入辛迪加海盗需要缴纳2000金币并且永久开启PK功能，你当前拥有${userCoins}金币`;
         }
         if (pkData && !pkData?.enable) {
           return "当前PK功能未开启，无法加入辛迪加海盗。";
@@ -5122,11 +5012,11 @@ ${passiveMessages.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 "请先加入阵营后使用转职功能。";
@@ -5174,7 +5064,7 @@ ${passiveMessages.map((m) => `▸ ${m}`).join("\n")}`
     try {
       if (careerData.group === "人类联盟") {
         if (userCoins < targetProfession.costcoins) {
-          return `转职需要 ${targetProfession.costcoins} 金币，当前拥有 ${userCoins} 金币`;
+          return `转职需要 ${targetProfession.costcoins} 金币，您当前拥有 ${userCoins}`;
         }
         await ctx.database.upsert("ggcevo_sign", [{
           handle,
@@ -5182,7 +5072,7 @@ ${passiveMessages.map((m) => `▸ ${m}`).join("\n")}`
         }], ["handle"]);
       } else if (careerData.group === "辛迪加海盗") {
         if (userRedCrystal < (targetProfession.costredcrystal || 0)) {
-          return `需要红晶 ${targetProfession.costredcrystal}，当前 ${userRedCrystal}`;
+          return `需要红晶 ${targetProfession.costredcrystal}，您当前拥有 ${userRedCrystal}`;
         }
         await Promise.all([
           ctx.database.upsert("ggcevo_careers", [{
@@ -5207,7 +5097,7 @@ ${passiveMessages.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 "您尚未加入任何阵营。";
@@ -5246,7 +5136,7 @@ ${passiveMessages.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 !== "辛迪加海盗") {
@@ -5308,23 +5198,23 @@ ${passiveMessages.map((m) => `▸ ${m}`).join("\n")}`
     ];
     return [
       `🏴☠️ 辛迪加黑市 - ${normalizedType} 🏴☠️`,
-      "使用“订购 物品名称”进行购买（仅消耗红晶）",
+      "使用“订购 物品名称”进行购买(仅消耗红晶)",
       "====================",
       ...items
     ].join("\n\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 !== "辛迪加海盗") {
       return "🚫 该功能需要【辛迪加海盗】阵营权限";
     }
-    if (!item) return "请输入“订购 物品名称”来向辛迪加订购物品。";
+    if (!item) return "请输入“订购 物品名称”向辛迪加总部订购物品。";
     const isWeapon = Object.prototype.hasOwnProperty.call(weaponConfig, item);
     const isSyndicatedItem = Object.prototype.hasOwnProperty.call(SyndicatedItems, item);
     if (!isWeapon && !isSyndicatedItem) return "❌ 无效物品名称";
@@ -5401,7 +5291,7 @@ ${passiveMessages.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 handle = `${profile.regionId}-S2-${profile.realmId}-${profile.profileId}`;
     const [items, signData, careerData] = await Promise.all([
       ctx.database.get("ggcevo_warehouse", { handle }),
@@ -5434,7 +5324,7 @@ ${passiveMessages.map((m) => `▸ ${m}`).join("\n")}`
             // 从warehouse表读取实际数量
             `特效：${itemData.effects}`,
             `描述：${itemData.description}`,
-            "―――――――――――――――"
+            "――――――――――――――"
           ].join("\n");
         }).join("\n\n")
       );
@@ -5444,12 +5334,13 @@ ${passiveMessages.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 "⛔ 您已被列入黑名单";
     }
     try {
+      if (!itemName) return "请输入“使用 物品名称 (可选目标)”使用仓库中的物品。";
       const warehouseItems = await ctx.database.get("ggcevo_warehouse", { handle });
       const targetItem = warehouseItems.find((item) => {
         const entry = Object.entries(SyndicatedItems).find(
@@ -5484,13 +5375,14 @@ ${passiveMessages.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 !== "人类联盟") {
       return "🚫 该功能需要【人类联盟】阵营权限";
     }
     const romanNumerals = { 1: "I", 2: "II", 3: "III", 4: "IV", 5: "V" };
+    const isIntelligenceOfficer = careerData?.career === "情报副官";
     if (!techName) {
       const techList = Spacestationtechnology.map(
         (tech2) => `▸ ${tech2.techname} (最大等级 ${romanNumerals[tech2.maxLevel]})`
@@ -5500,8 +5392,10 @@ ${passiveMessages.map((m) => `▸ ${m}`).join("\n")}`
         '使用 "科技 科技名称" 查看详细信息',
         "====================",
         ...techList,
-        "===================="
-      ].join("\n");
+        "====================",
+        isIntelligenceOfficer && "※ 情报副官享受20%升级折扣"
+        // 新增折扣提示
+      ].filter(Boolean).join("\n");
     }
     const tech = Spacestationtechnology.find(
       (t) => t.techname === techName
@@ -5509,9 +5403,13 @@ ${passiveMessages.map((m) => `▸ ${m}`).join("\n")}`
     if (!tech) return `❌ 无效科技名称，可用科技：
 ${Spacestationtechnology.map((t) => t.techname).join("、")}`;
     const techDetails = tech.levels.map((level) => {
+      const originalCost = level.cost;
+      const discountedCost = isIntelligenceOfficer ? Math.floor(originalCost * 0.8) : originalCost;
+      const costDesc = isIntelligenceOfficer ? `▸ 升级花费：${discountedCost}金币 (原价${originalCost})` : `▸ 升级花费：${originalCost}金币`;
       return [
         `✦ 等级 ${romanNumerals[level.level]}`,
-        `▸ 升级花费：${level.cost}金币`,
+        costDesc,
+        // 修改后的价格显示
         `▸ 基础效果：${level.description}`,
         `💼 ${level.careerBonus}`,
         "------------------"
@@ -5523,16 +5421,14 @@ ${Spacestationtechnology.map((t) => t.techname).join("、")}`;
       '使用 "升级 科技名称" 进行升级',
       "====================",
       ...techDetails,
-      "===================="
-    ].join("\n");
+      "====================",
+      isIntelligenceOfficer && "※ 情报副官享受20%升级折扣"
+      // 新增折扣提示
+    ].filter(Boolean).join("\n");
   });
   ctx.command("ggcevo/挖矿").action(async ({ session }) => {
-    const convertUTCtoChinaTime2 = /* @__PURE__ */ __name((utcDate) => {
-      const chinaOffset = 8 * 60 * 60 * 1e3;
-      return new Date(utcDate.getTime() + chinaOffset);
-    }, "convertUTCtoChinaTime");
     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 "⛔ 您已被列入黑名单";
@@ -5557,8 +5453,8 @@ ${Spacestationtechnology.map((t) => t.techname).join("、")}`;
       return "⛏️ 挖矿作业已开始，至少1小时后可收获。";
     }
     const nowtime = /* @__PURE__ */ new Date();
-    const chinaStart = convertUTCtoChinaTime2(record.startTime);
-    const chinaNow = convertUTCtoChinaTime2(nowtime);
+    const chinaStart = convertUTCtoChinaTime(record.startTime);
+    const chinaNow = convertUTCtoChinaTime(nowtime);
     const duration = Math.floor(
       (chinaNow.getTime() - chinaStart.getTime()) / 1e3 / 60
     );
@@ -5569,7 +5465,7 @@ ${Spacestationtechnology.map((t) => t.techname).join("、")}`;
         `🕒 开始时间：${record.startTime.toLocaleString("zh-CN", { hour12: false })}`,
         `⏱️ 当前时间：${nowtime.toLocaleString("zh-CN", { hour12: false })}`,
         `⏳ 还需等待：${remaining}分钟`,
-        `💡 提示：达到1小时可随时收获并自动开始下一轮`
+        `💡 提示：挖矿1小时后可随时收获并自动开始下一轮`
       ].join("\n");
     }
     const halfHours = Math.floor(duration / 30);
@@ -5607,11 +5503,8 @@ ${Spacestationtechnology.map((t) => t.techname).join("、")}`;
       `🕒 开始时间：${record.startTime.toLocaleString("zh-CN", { hour12: false })}`,
       `⏱️ 结束时间：${nowtime.toLocaleString("zh-CN", { hour12: false })}`,
       `⏳ 持续时间：${formatTime(duration)}`,
-      ...tech.level >= 4 ? (
-        // 仅当科技等级≥3时显示加成信息
-        [`🔧 科技加成（Lv.${tech.level}）：+${multiplier * 100}%`]
-      ) : [],
       `💰 实际获得：${total}金币`,
+      ...tech.level >= 4 ? [`🔧 挖矿系统 Lv.${tech.level}：金币+${multiplier * 100}%`] : [],
       "💡 已自动开始下一轮挖矿"
     ].join("\n");
   });