koishi-plugin-ggcevo-game 1.4.39 → 1.4.41

package/lib/boss/BattleEffectProcessor.d.ts

@@ -80,14 +80,14 @@ export declare const BattleEffectProcessor: {
         nerfMultiplier: number;
         messages: string[];
     };
-    handleSurvivalInstinctI: (targetBoss: any) => {
+    handleSurvivalInstinctI: (targetBoss: any, damageAmount: number) => {
         messages: string[];
         targetUpdates: {
             name: string;
             updates: Partial<BattleStatistics>;
         } | null;
     } | null;
-    handleSurvivalInstinctII: (targetBoss: any) => {
+    handleSurvivalInstinctII: (targetBoss: any, damageAmount: number) => {
         messages: string[];
         targetUpdates: {
             name: string;
@@ -301,8 +301,7 @@ export declare const BattleEffectProcessor: {
             updates: Partial<BattleStatistics>;
         } | null;
     } | null;
-    /** 复苏处理（免疫死亡并回复） */
-    handleRevival: (targetBoss: any) => {
+    handleRevival: (targetBoss: any, damageAmount: number) => {
         messages: string[];
         targetUpdates: {
             name: string;

package/lib/database.d.ts

@@ -1,53 +1,53 @@
 declare module 'koishi' {
     interface Tables {
-        ggcevo_backpack: backpack;
-        ggcevo_sign: sign;
-        ggcevo_records: record;
-        ggcevo_welfare: welfare;
-        ggcevo_activity: Activity;
-        ggcevo_rank: rank;
-        ggcevo_Punishment: Punishment;
-        ggcevo_exchange: exchange;
-        ggcevo_adminbenefit: adminbenefit;
-        ggcevo_blacklist: blacklist;
-        ggcevo_pk: PKRecord;
-        ggcevo_pk_logs: PKLog;
-        ggcevo_equipment: equipment;
-        ggcevo_boss: Boss;
-        ggcevo_boss_damage: BossDamageRecord;
-        ggcevo_Wish_Record: WishRecord;
-        ggcevo_careers: careers;
-        ggcevo_warehouse: warehouse;
-        ggcevo_tech: tech;
-        ggcevo_Mining: Mining;
-        ggcevo_task: task;
-        ggcevo_purchasepermissions: purchasepermissions;
+        ggcevo_backpack: Backpack;
+        ggcevo_sign: SignRecord;
+        ggcevo_records: GachaRecord;
+        ggcevo_welfare: WelfareClaim;
+        ggcevo_activity: ActivityInfo;
+        ggcevo_rank: RankRecord;
+        ggcevo_punishment: PunishmentRecord;
+        ggcevo_exchange: ExchangeLog;
+        ggcevo_adminbenefit: AdminBenefit;
+        ggcevo_blacklist: Blacklist;
+        ggcevo_pk: PKProfile;
+        ggcevo_pk_logs: PKLogs;
+        ggcevo_weapons: WeaponInventory;
+        ggcevo_boss: BossInfo;
+        ggcevo_boss_damage: BossDamage;
+        ggcevo_wish: WishRecord;
+        ggcevo_careers: CareerInfo;
+        ggcevo_warehouse: Warehouse;
+        ggcevo_tech: TechProgress;
+        ggcevo_Mining: MiningRecord;
+        ggcevo_task: TaskProgress;
+        ggcevo_permissions: Permissions;
     }
 }
-export interface backpack {
+export interface Backpack {
     handle: string;
     itemId: number;
     quantity: number;
 }
-export interface sign {
+export interface SignRecord {
     handle: string;
     lastSign: Date;
     monthlyDays: number;
     totalRewards: number;
 }
-export interface record {
+export interface GachaRecord {
     handle: string;
     totalPulls: number;
     pityCounter: number;
     fullPityCount: number;
     hiddenawards: number;
 }
-export interface welfare {
+export interface WelfareClaim {
     handle: string;
     activity: number;
     lastdate: Date;
 }
-export interface Activity {
+export interface ActivityInfo {
     id: number;
     name: string;
     description: string;
@@ -58,7 +58,7 @@ export interface Activity {
     creator: string;
     status: '未开始' | '进行中' | '已结束';
 }
-export interface rank {
+export interface RankRecord {
     handle: string;
     name: string;
     rank: number;
@@ -67,7 +67,7 @@ export interface rank {
     rankseason: string;
     Blacklist: boolean;
 }
-export interface Punishment {
+export interface PunishmentRecord {
     id: number;
     name: string;
     handle: string;
@@ -78,7 +78,7 @@ export interface Punishment {
     date: string;
     comment?: string;
 }
-export interface exchange {
+export interface ExchangeLog {
     userId: string;
     handle: string;
     item: string;
@@ -87,17 +87,17 @@ export interface exchange {
     GlobalLimit: boolean;
     season: string;
 }
-export interface adminbenefit {
+export interface AdminBenefit {
     userId: string;
     handle: string;
     signmonth: number;
     lastSign: Date;
 }
-export interface blacklist {
+export interface Blacklist {
     handle: string;
     createdAt: Date;
 }
-export interface PKRecord {
+export interface PKProfile {
     handle: string;
     name: string;
     total: number;
@@ -107,13 +107,13 @@ export interface PKRecord {
     enable: boolean;
     lastToggle: Date;
 }
-export interface PKLog {
+export interface PKLogs {
     id: number;
     initiator_handle: string;
     target_handle: string;
     date: Date;
 }
-export interface equipment {
+export interface WeaponInventory {
     handle: string;
     weaponId: number;
     level: number;
@@ -121,7 +121,7 @@ export interface equipment {
     installedMods: string[];
     equipped: boolean;
 }
-export interface Boss {
+export interface BossInfo {
     name: string;
     groupId: number;
     type: string;
@@ -137,7 +137,7 @@ export interface Boss {
     isActive: boolean;
     respawnTime: Date;
 }
-export interface BossDamageRecord {
+export interface BossDamage {
     handle: string;
     playerName: string;
     totalDamage: number;
@@ -153,35 +153,35 @@ export interface WishRecord {
     endTime: Date;
     isused: boolean;
 }
-export interface careers {
+export interface CareerInfo {
     handle: string;
     group: string;
     career: string;
     redcrystal: number;
     date: Date;
 }
-export interface warehouse {
+export interface Warehouse {
     handle: string;
     itemId: number;
     quantity: number;
 }
-export interface tech {
+export interface TechProgress {
     handle: string;
     techId: number;
     level: number;
 }
-export interface Mining {
+export interface MiningRecord {
     handle: string;
     startTime: Date;
     totalMined: number;
 }
-export interface task {
+export interface TaskProgress {
     handle: string;
     taskId: number;
     progress: number;
     Completions: number;
 }
-export interface purchasepermissions {
+export interface Permissions {
     handle: string;
     legendarypermissions: number;
     explosiondoorauthority: number;

package/lib/index.js

@@ -697,7 +697,7 @@ async function checkTransferRequirements(ctx, handle, profession) {
   const damageRecords = await ctx.database.get("ggcevo_boss_damage", { handle });
   const totalAttack = damageRecords.reduce((sum, r) => sum + r.attackCount, 0);
   const totalDamage = damageRecords.reduce((sum, r) => sum + r.totalDamage, 0);
-  const weapons = await ctx.database.get("ggcevo_equipment", {
+  const weapons = await ctx.database.get("ggcevo_weapons", {
     handle,
     level: { $gte: 3 }
   });
@@ -1442,7 +1442,7 @@ var passiveConfig = {
   },
   "复苏": {
     type: "生存强化（生命/能量回复）",
-    description: "免疫致命伤害，回复50%最大生命与100%能量值，并获得「灵能构造炉」技能（生效后移除）"
+    description: "免疫致命伤害，回复60%最大生命与100%能量值，并获得「灵能构造炉」技能（生效后移除）"
   },
   "光影之刃": {
     type: "状态叠加（层数叠加）",
@@ -1576,7 +1576,7 @@ async function calculateTotalDamage(ctx, session, config, equippedWeapon, target
 }
 __name(calculateTotalDamage, "calculateTotalDamage");
 async function checkCritRhythm(ctx, handle) {
-  const [record] = await ctx.database.get("ggcevo_Wish_Record", {
+  const [record] = await ctx.database.get("ggcevo_wish", {
     handle,
     wishname: "暴击韵律",
     startTime: { $lte: /* @__PURE__ */ new Date() },
@@ -1680,7 +1680,7 @@ __name(calculateCareerAdditive, "calculateCareerAdditive");
 async function calculateWishAdditive(ctx, handle, weapon) {
   let value = 0;
   const messages = [];
-  const [sovereign] = await ctx.database.get("ggcevo_Wish_Record", {
+  const [sovereign] = await ctx.database.get("ggcevo_wish", {
     handle,
     wishname: "王权增幅",
     startTime: { $lte: /* @__PURE__ */ new Date() },
@@ -1690,7 +1690,7 @@ async function calculateWishAdditive(ctx, handle, weapon) {
     value += 0.1;
     messages.push("👑 王权增幅祈愿：攻击伤害+10%");
   }
-  const [lament] = await ctx.database.get("ggcevo_Wish_Record", {
+  const [lament] = await ctx.database.get("ggcevo_wish", {
     handle,
     wishname: "悲鸣之锋",
     startTime: { $lte: /* @__PURE__ */ new Date() },
@@ -1701,7 +1701,7 @@ async function calculateWishAdditive(ctx, handle, weapon) {
     value += levelBonus;
     messages.push(`🗡️ 悲鸣之锋祈愿：攻击伤害+${Math.round(levelBonus * 100)}%`);
   }
-  const [critRhythm] = await ctx.database.get("ggcevo_Wish_Record", {
+  const [critRhythm] = await ctx.database.get("ggcevo_wish", {
     handle,
     wishname: "暴击韵律",
     startTime: { $lte: /* @__PURE__ */ new Date() },
@@ -1930,7 +1930,7 @@ async function calculateTotalPower(ctx, config, handle) {
     else if (["警卫员下士", "警卫长", "武器中士"].includes(career)) total += 3500;
     else if (["能量武器专家", "枪手", "猩红杀手", "纵火狂"].includes(career)) total += 4e3;
   }
-  const weapons = await ctx.database.get("ggcevo_equipment", { handle });
+  const weapons = await ctx.database.get("ggcevo_weapons", { handle });
   for (const { weaponId, level, installedMods } of weapons) {
     const weapon = weaponConfigById[weaponId];
     if (!weapon) continue;
@@ -2123,9 +2123,9 @@ async function handleTechUpgrade(ctx, handle, target) {
       level: nextLevel
     }], ["handle", "techId"]);
     if (permissionGrantInfo) {
-      const [permissionRecord] = await ctx.database.get("ggcevo_purchasepermissions", { handle });
+      const [permissionRecord] = await ctx.database.get("ggcevo_permissions", { handle });
       const currentValue = permissionRecord?.[permissionGrantInfo.field] || 0;
-      await ctx.database.upsert("ggcevo_purchasepermissions", [{
+      await ctx.database.upsert("ggcevo_permissions", [{
         handle,
         [permissionGrantInfo.field]: currentValue + permissionGrantInfo.amount
       }], ["handle"]);
@@ -2141,7 +2141,7 @@ async function handleTechUpgrade(ctx, handle, target) {
   const costInfo = discountApplied ? `💸 花费金币：${actualCost} (原价${originalCost})` : `💸 花费金币：${actualCost}`;
   let permissionMessage = [];
   if (permissionGrantInfo) {
-    const [permissionRecord] = await ctx.database.get("ggcevo_purchasepermissions", { handle });
+    const [permissionRecord] = await ctx.database.get("ggcevo_permissions", { handle });
     const newValue = permissionRecord?.[permissionGrantInfo.field] || permissionGrantInfo.amount;
     permissionMessage.push(
       permissionGrantInfo.message
@@ -2161,7 +2161,7 @@ async function handleTechUpgrade(ctx, handle, target) {
 __name(handleTechUpgrade, "handleTechUpgrade");
 async function handleWeaponUpgrade(ctx, handle, target) {
   const weaponData = weaponConfig[target];
-  const [equipment] = await ctx.database.get("ggcevo_equipment", {
+  const [equipment] = await ctx.database.get("ggcevo_weapons", {
     handle,
     weaponId: weaponData.id
   });
@@ -2216,7 +2216,7 @@ async function handleWeaponUpgrade(ctx, handle, target) {
       totalRewards: signInfo.totalRewards - actualCost
     });
     await ctx.database.set(
-      "ggcevo_equipment",
+      "ggcevo_weapons",
       { handle, weaponId: weaponData.id },
       {
         level: newLevel,
@@ -2225,7 +2225,7 @@ async function handleWeaponUpgrade(ctx, handle, target) {
     );
     if (activeWish) {
       await ctx.database.set(
-        "ggcevo_Wish_Record",
+        "ggcevo_wish",
         { id: activeWish.id },
         { isused: true }
       );
@@ -2250,7 +2250,7 @@ async function handleWeaponUpgrade(ctx, handle, target) {
 }
 __name(handleWeaponUpgrade, "handleWeaponUpgrade");
 async function checkFoxBlessing(ctx, handle) {
-  return ctx.database.get("ggcevo_Wish_Record", {
+  return ctx.database.get("ggcevo_wish", {
     handle,
     wishname: "灵狐升运",
     startTime: { $lte: /* @__PURE__ */ new Date() },
@@ -2642,22 +2642,25 @@ var BattleEffectProcessor = {
     }
     return null;
   }, "handleStressShellII"),
-  handleSurvivalInstinctI: /* @__PURE__ */ __name(function(targetBoss) {
+  // 求生本能I (修改后)
+  handleSurvivalInstinctI: /* @__PURE__ */ __name(function(targetBoss, damageAmount) {
     const messages = [];
     if (!targetBoss.skills.includes("求生本能I")) {
       return null;
     }
     const targetMaxHP = getMaxHPByName(targetBoss.name);
-    const currentHP = targetBoss.HP;
-    if (currentHP !== 0) {
+    const isLethal = damageAmount >= targetBoss.HP;
+    if (!isLethal) {
       return null;
     }
     const selfHealAmount = Math.round(targetMaxHP * 0.3);
     const updates = {
       hpChange: selfHealAmount,
+      // 回复生命值
       skillsRemoved: ["求生本能I"]
+      // 移除技能
     };
-    messages.push(`❤️ 【求生本能I】触发：濒死时，回复${selfHealAmount}点生命值`);
+    messages.push(`❤️ 【求生本能I】触发：承受致命伤害时，回复${selfHealAmount}点生命值`);
     messages.push(`❤️ 【求生本能I】技能移除`);
     return {
       messages,
@@ -2667,14 +2670,15 @@ var BattleEffectProcessor = {
       }
     };
   }, "handleSurvivalInstinctI"),
-  handleSurvivalInstinctII: /* @__PURE__ */ __name(function(targetBoss) {
+  // 求生本能II (修改后)
+  handleSurvivalInstinctII: /* @__PURE__ */ __name(function(targetBoss, damageAmount) {
     const messages = [];
     if (!targetBoss.skills.includes("求生本能II")) {
       return null;
     }
     const targetMaxHP = getMaxHPByName(targetBoss.name);
-    const currentHP = targetBoss.HP;
-    if (currentHP !== 0) {
+    const isLethal = damageAmount >= targetBoss.HP;
+    if (!isLethal) {
       return null;
     }
     const selfHealAmount = Math.round(targetMaxHP * 0.5);
@@ -2684,7 +2688,7 @@ var BattleEffectProcessor = {
       skillsRemoved: ["求生本能II"]
       // 移除的技能
     };
-    messages.push(`❤️ 【求生本能II】触发：濒死时，回复${selfHealAmount}点生命值`);
+    messages.push(`❤️ 【求生本能II】触发：承受致命伤害时，回复${selfHealAmount}点生命值`);
     messages.push(`❤️ 【求生本能II】技能移除`);
     return {
       messages,
@@ -3549,24 +3553,25 @@ var BattleEffectProcessor = {
       }
     };
   }, "handleCosmicEnergy"),
-  /** 复苏处理（免疫死亡并回复） */
-  handleRevival: /* @__PURE__ */ __name(function(targetBoss) {
+  // 复苏 (修改后)
+  handleRevival: /* @__PURE__ */ __name(function(targetBoss, damageAmount) {
     const messages = [];
     if (!targetBoss.skills.includes("复苏")) {
       return null;
     }
-    if (targetBoss.HP !== 0) {
+    const isLethal = damageAmount >= targetBoss.HP;
+    if (!isLethal) {
       return null;
     }
     const maxHP = getMaxHPByName(targetBoss.name);
     const maxEnergy = getMaxEnergyByName(targetBoss.name);
-    const healAmount = Math.round(maxHP * 0.5);
+    const healAmount = Math.round(maxHP * 0.6);
     const energyGain = maxEnergy;
     const targetUpdates = {
       name: targetBoss.name,
       updates: {
         hpChange: healAmount,
-        // 回复50%最大生命值
+        // 回复60%最大生命值
         energyChange: energyGain,
         // 回复100%能量
         skillsRemoved: ["复苏"],
@@ -4088,14 +4093,11 @@ function applyPassiveEffects(targetBoss, activeBosses, weaponName, damage, ignor
     { effect: BattleEffectProcessor.handleFrostRegeneration, args: [targetBoss, activeBosses] },
     { effect: BattleEffectProcessor.handleFrostAura, args: [targetBoss, activeBosses] },
     { effect: BattleEffectProcessor.handleSentryGun, args: [targetBoss, activeBosses] },
-    { effect: BattleEffectProcessor.handleSurvivalInstinctI, args: [targetBoss] },
-    { effect: BattleEffectProcessor.handleSurvivalInstinctII, args: [targetBoss] },
     { effect: BattleEffectProcessor.handleMoldGrowth, args: [targetBoss, activeBosses] },
     { effect: BattleEffectProcessor.handleElectricShockwave, args: [targetBoss] },
     { effect: BattleEffectProcessor.handlePulse, args: [targetBoss, activeBosses] },
     { effect: BattleEffectProcessor.handleFeeding, args: [targetBoss] },
     { effect: BattleEffectProcessor.handleBurningBurrow, args: [targetBoss] },
-    { effect: BattleEffectProcessor.handleRevival, args: [targetBoss] },
     { effect: BattleEffectProcessor.handleCosmicEnergy, args: [targetBoss, damage] },
     { effect: BattleEffectProcessor.handleBombardmentGuide, args: [targetBoss] },
     { effect: BattleEffectProcessor.handleOverdriveShield, args: [targetBoss, activeBosses] }
@@ -4180,18 +4182,38 @@ function applyPassiveEffects(targetBoss, activeBosses, weaponName, damage, ignor
     layerReduced = layerReduceResult.reductionSuccess || false;
   }
   let finalDamage = damage;
+  const isLethal = finalDamage >= targetBoss.HP && finalDamage > 0;
   if (!immune) {
     let adjustedNerfMultiplier = totalNerfMultiplier * (1 - ignoreRate);
     const damageMultiplier = 1 + totalBuffMultiplier - adjustedNerfMultiplier;
     finalDamage = Math.max(1, Math.round(damage * damageMultiplier));
-    if (finalDamage > 0) {
-      updateStatsByName(targetBoss.name, {
-        hpChange: -finalDamage
-      });
-    }
   } else {
     finalDamage = 0;
   }
+  const survivalSkills = [
+    { func: BattleEffectProcessor.handleSurvivalInstinctI, name: "求生本能I" },
+    { func: BattleEffectProcessor.handleSurvivalInstinctII, name: "求生本能II" },
+    { func: BattleEffectProcessor.handleRevival, name: "复苏" }
+  ];
+  let revivalTriggered = false;
+  if (isLethal) {
+    for (const skill of survivalSkills) {
+      if (targetBoss.skills.includes(skill.name)) {
+        const result = skill.func(targetBoss, finalDamage);
+        if (result) {
+          updateStatsByName(result.targetUpdates.name, result.targetUpdates.updates);
+          messages.push(...result.messages);
+          revivalTriggered = true;
+          break;
+        }
+      }
+    }
+  }
+  if (!revivalTriggered && !immune && finalDamage > 0) {
+    updateStatsByName(targetBoss.name, {
+      hpChange: -finalDamage
+    });
+  }
   return {
     finalDamage,
     messages,
@@ -4241,7 +4263,7 @@ async function handleBossDefeatRewards(ctx, targetBoss) {
     return { rewardMessages };
   }
   const handles = damageRecords.map((r) => r.handle);
-  const doubleWishRecords = await ctx.database.get("ggcevo_Wish_Record", {
+  const doubleWishRecords = await ctx.database.get("ggcevo_wish", {
     handle: { $in: handles },
     wishname: "精灵双倍",
     startTime: { $lte: /* @__PURE__ */ new Date() },
@@ -4344,7 +4366,7 @@ async function handleBossDefeatRewards(ctx, targetBoss) {
       }], ["handle", "itemId"]);
     }
     if (doubleWishIds.length > 0) {
-      await ctx.database.set("ggcevo_Wish_Record", { id: { $in: doubleWishIds } }, {
+      await ctx.database.set("ggcevo_wish", { id: { $in: doubleWishIds } }, {
         isused: true
         // 将使用过的双倍祈愿标记为已使用
       });
@@ -4701,7 +4723,7 @@ async function handleIgnoreReductionEffects(ctx, handle, weaponName, targetBoss)
   const handlePiercingMod = /* @__PURE__ */ __name(async () => {
     const weaponConfigData = weaponConfig[weaponName];
     if (!weaponConfigData) return;
-    const [equippedWeapon] = await ctx.database.get("ggcevo_equipment", {
+    const [equippedWeapon] = await ctx.database.get("ggcevo_weapons", {
       weaponId: weaponConfigData.id,
       handle,
       equipped: true
@@ -4839,7 +4861,7 @@ function apply(ctx, config) {
   }, {
     primary: "handle"
   });
-  ctx.model.extend("ggcevo_Punishment", {
+  ctx.model.extend("ggcevo_punishment", {
     id: "unsigned",
     // 自增序号
     name: "string",
@@ -4916,7 +4938,7 @@ function apply(ctx, config) {
     primary: "id",
     autoInc: true
   });
-  ctx.model.extend("ggcevo_equipment", {
+  ctx.model.extend("ggcevo_weapons", {
     handle: "string",
     weaponId: "unsigned",
     level: "unsigned",
@@ -4954,7 +4976,7 @@ function apply(ctx, config) {
   }, {
     primary: "handle"
   });
-  ctx.model.extend("ggcevo_Wish_Record", {
+  ctx.model.extend("ggcevo_wish", {
     id: "unsigned",
     handle: "string",
     wishname: "string",
@@ -5003,7 +5025,7 @@ function apply(ctx, config) {
   }, {
     primary: ["handle", "taskId"]
   });
-  ctx.model.extend("ggcevo_purchasepermissions", {
+  ctx.model.extend("ggcevo_permissions", {
     handle: "string",
     legendarypermissions: "unsigned",
     explosiondoorauthority: "unsigned"
@@ -5134,7 +5156,7 @@ function apply(ctx, config) {
           // 保留名称用于后续展示
         }))
       );
-      const punishmentRecords = await ctx.database.select("ggcevo_Punishment").where({
+      const punishmentRecords = await ctx.database.select("ggcevo_punishment").where({
         $and: [
           { handle: { $in: allPlayers.map((p) => p.handle) } },
           { id: { $gte: 1889 } },
@@ -5303,7 +5325,7 @@ function apply(ctx, config) {
       const [itemName, itemData] = entry;
       return itemData.description ? `${itemName} x ${userItem.quantity}：${itemData.description}` : `${itemName} x ${userItem.quantity}`;
     });
-    return `【${handle}的背包】
+    return `【${session.username}的背包】
 ${itemDetails.join("\n")}`;
   });
   ctx.command("ggcevo/签到").action(async (argv) => {
@@ -5409,7 +5431,7 @@ ${itemDetails.join("\n")}`;
           messages.push(`💎 CRED-17生效：+${totalBonusPercent}%金币`);
         }
       }
-      const [meowEffect] = await ctx.database.get("ggcevo_Wish_Record", {
+      const [meowEffect] = await ctx.database.get("ggcevo_wish", {
         handle,
         wishname: "喵喵财源",
         startTime: { $lte: now },
@@ -6006,8 +6028,8 @@ ${ticketMessage}${effectMessage}`;
       handle = `${regionId}-S2-${realmId}-${profileId}`;
     }
     if (pageNum < 1) return "请输入有效的页码。";
-    const totalPages = await ctx.database.select("ggcevo_Punishment").where({ handle }).execute((row) => import_koishi.$.count(row.id));
-    const records = await ctx.database.select("ggcevo_Punishment").where({ handle }).orderBy("id", "desc").limit(1).offset(pageNum - 1).execute();
+    const totalPages = await ctx.database.select("ggcevo_punishment").where({ handle }).execute((row) => import_koishi.$.count(row.id));
+    const records = await ctx.database.select("ggcevo_punishment").where({ handle }).orderBy("id", "desc").limit(1).offset(pageNum - 1).execute();
     if (!records.length) {
       return pageNum === 1 ? `【${handle}】暂无违规记录` : `【${handle}】第 ${pageNum} 条记录不存在`;
     }
@@ -6683,7 +6705,7 @@ ${items.join("、")}
     if (careerData?.career === "武器中士") {
       discountDetails.push(`▸ 🎖️ 武器中士职业：50%折扣`);
     }
-    const activeWish = await ctx.database.get("ggcevo_Wish_Record", {
+    const activeWish = await ctx.database.get("ggcevo_wish", {
       handle,
       wishname: "蚱蜢优购",
       startTime: { $lte: /* @__PURE__ */ new Date() },
@@ -6815,14 +6837,14 @@ ${validTypes.join("、")}`;
     const isWeapon = ["能量武器", "热能武器", "实弹武器", "传奇武器"].includes(config2.category);
     const isLegendaryWeapon = config2.category === "传奇武器";
     if (isWeapon) {
-      const existingWeapon = await ctx.database.get("ggcevo_equipment", {
+      const existingWeapon = await ctx.database.get("ggcevo_weapons", {
         handle,
         weaponId: config2.id
       });
       if (existingWeapon.length > 0) return `❌ 您已经拥有${item}，无法重复购买`;
     }
     if (isLegendaryWeapon) {
-      const [permissions] = await ctx.database.get("ggcevo_purchasepermissions", { handle });
+      const [permissions] = await ctx.database.get("ggcevo_permissions", { handle });
       if (!permissions || permissions.legendarypermissions <= 0) {
         return '❌ 购买传奇武器需要"传奇武器购买权限"，您当前没有购买权限。';
       }
@@ -6850,7 +6872,7 @@ ${validTypes.join("、")}`;
       discountDetails.push(`🎖️ 武器中士职业：${specialistDiscount}%折扣`);
     }
     if (!isLegendaryWeapon && isWeapon) {
-      activeWish = await ctx.database.get("ggcevo_Wish_Record", {
+      activeWish = await ctx.database.get("ggcevo_wish", {
         handle,
         wishname: "蚱蜢优购",
         startTime: { $lte: /* @__PURE__ */ new Date() },
@@ -6882,32 +6904,32 @@ ${validTypes.join("、")}`;
         totalRewards: signInfo.totalRewards - actualPrice
       });
       if (activeWish) {
-        await ctx.database.set("ggcevo_Wish_Record", { id: activeWish.id }, {
+        await ctx.database.set("ggcevo_wish", { id: activeWish.id }, {
           isused: true
         });
       }
       if (isLegendaryWeapon) {
-        const [permissionRecord] = await ctx.database.get("ggcevo_purchasepermissions", { handle });
+        const [permissionRecord] = await ctx.database.get("ggcevo_permissions", { handle });
         if (!permissionRecord || permissionRecord.legendarypermissions <= 0) {
           throw new Error("传奇武器购买权限不足");
         }
         const remaining = permissionRecord.legendarypermissions - 1;
-        await ctx.database.set("ggcevo_purchasepermissions", { handle }, {
+        await ctx.database.set("ggcevo_permissions", { handle }, {
           legendarypermissions: remaining
         });
       }
       if (isWeapon) {
-        await ctx.database.upsert("ggcevo_equipment", [{
+        await ctx.database.upsert("ggcevo_weapons", [{
           handle,
           weaponId: config2.id,
           level: 0,
           modificationSlots: 1,
           equipped: false
         }], ["handle", "weaponId"]);
-        const equippedCount = await ctx.database.select("ggcevo_equipment").where({ handle, equipped: true }).execute((row) => import_koishi.$.count(row.weaponId));
+        const equippedCount = await ctx.database.select("ggcevo_weapons").where({ handle, equipped: true }).execute((row) => import_koishi.$.count(row.weaponId));
         if (equippedCount === 0) {
           await ctx.database.set(
-            "ggcevo_equipment",
+            "ggcevo_weapons",
             { handle, weaponId: config2.id },
             { equipped: true }
           );
@@ -6936,7 +6958,7 @@ ${validTypes.join("、")}`;
       message += `花费 ${actualPrice} 金币`;
     }
     if (isLegendaryWeapon) {
-      const [permissions] = await ctx.database.get("ggcevo_purchasepermissions", { handle });
+      const [permissions] = await ctx.database.get("ggcevo_permissions", { handle });
       message += `
 扣除 1 次传奇武器购买权限，剩余次数：${permissions?.legendarypermissions || 0}`;
     }
@@ -6956,7 +6978,7 @@ ${validTypes.join("、")}`;
     const [profile] = await ctx.database.get("sc2arcade_player", { userId: session.userId });
     if (!profile) return "🔒 需要先绑定游戏句柄。";
     const handle = `${profile.regionId}-S2-${profile.realmId}-${profile.profileId}`;
-    const weapons = await ctx.database.get("ggcevo_equipment", {
+    const weapons = await ctx.database.get("ggcevo_weapons", {
       handle
     });
     const weaponDetails = await Promise.all(weapons.map(async (w) => {
@@ -6974,7 +6996,7 @@ ${validTypes.join("、")}`;
       ].join("\n");
     }));
     return [
-      `🛡️ ${handle}的武器仓库`,
+      `🛡️ ${session.username}的武器列表`,
       '使用"装备 武器名称"来装备武器',
       "⚡表示当前装备武器",
       "──────────────",
@@ -6995,14 +7017,14 @@ ${validTypes.join("、")}`;
     if (!weapon) return "请输入“装备 武器名称”来装备一把你拥有的武器。";
     if (!weaponConfig[weapon]) return "武器名称错误，请输入“装备 武器名称”来装备一把你拥有的武器。";
     const config2 = weaponConfig[weapon];
-    const [owned] = await ctx.database.get("ggcevo_equipment", {
+    const [owned] = await ctx.database.get("ggcevo_weapons", {
       handle,
       weaponId: config2.id
     });
     if (!owned) return "您尚未获得该武器。";
     await ctx.database.withTransaction(async () => {
       await ctx.database.set(
-        "ggcevo_equipment",
+        "ggcevo_weapons",
         {
           handle,
           weaponId: { $ne: config2.id }
@@ -7010,7 +7032,7 @@ ${validTypes.join("、")}`;
         },
         { equipped: false }
       );
-      await ctx.database.upsert("ggcevo_equipment", [{
+      await ctx.database.upsert("ggcevo_weapons", [{
         handle,
         weaponId: config2.id,
         equipped: true
@@ -7054,7 +7076,7 @@ ${validTypes.join("、")}`;
         return `❌ 无效武器名称。可选武器：${validWeapons.join("、")}`;
       }
       const weaponId = weaponConfig[weapon].id;
-      const [equipment] = await ctx.database.get("ggcevo_equipment", {
+      const [equipment] = await ctx.database.get("ggcevo_weapons", {
         handle,
         weaponId
         // 使用已验证的weaponId
@@ -7097,7 +7119,7 @@ ${validTypes.join("、")}`;
         return `改装需要 ${actualCost} 金币，当前持有：${signInfo?.totalRewards || 0}`;
       }
       await ctx.database.set(
-        "ggcevo_equipment",
+        "ggcevo_weapons",
         { handle, weaponId: weaponConfig[weapon].id },
         { installedMods: [...equipment.installedMods, mod] }
       );
@@ -7182,7 +7204,7 @@ ${validTypes.join("、")}`;
     if (!modInfo) return "❌ 请输入“拆卸 武器名称 模块名称”\n注意：通用模块返还80%金币，专属模块返还50%金币";
     const refundRate = modInfo.isExclusive ? 0.5 : 0.8;
     const refundType = modInfo.isExclusive ? "专属模块返还50%" : "通用模块返还80%";
-    const [equipment] = await ctx.database.get("ggcevo_equipment", {
+    const [equipment] = await ctx.database.get("ggcevo_weapons", {
       handle,
       weaponId
     });
@@ -7193,7 +7215,7 @@ ${validTypes.join("、")}`;
     const refund = Math.floor(modInfo.cost * refundRate);
     const newMods = equipment.installedMods.filter((m) => m !== mod);
     await ctx.database.set(
-      "ggcevo_equipment",
+      "ggcevo_weapons",
       { handle, weaponId },
       { installedMods: newMods }
     );
@@ -7243,7 +7265,7 @@ ${validTypes.join("、")}`;
         }
       }
     }
-    const [equippedWeapon] = await ctx.database.get("ggcevo_equipment", { handle, equipped: true });
+    const [equippedWeapon] = await ctx.database.get("ggcevo_weapons", { handle, equipped: true });
     if (!equippedWeapon) return '请先输入"装备 武器名称"后再攻击。';
     const weaponConfigEntry = Object.entries(weaponConfig).find(([_, c]) => c.id === equippedWeapon.weaponId);
     const [weaponName, weaponData] = weaponConfigEntry;
@@ -7355,7 +7377,7 @@ ${validTypes.join("、")}`;
     const handle = `${profile.regionId}-S2-${profile.realmId}-${profile.profileId}`;
     const existingEntries = await ctx.database.get("ggcevo_blacklist", { handle });
     if (existingEntries.length > 0) return "⛔ 您已被列入黑名单。";
-    const [equippedWeapon] = await ctx.database.get("ggcevo_equipment", {
+    const [equippedWeapon] = await ctx.database.get("ggcevo_weapons", {
       handle,
       equipped: true
     });
@@ -7544,7 +7566,7 @@ ${validTypes.join("、")}`;
     const [sign] = await ctx.database.get("ggcevo_sign", { handle });
     if (!sign || sign.totalRewards < 50) return "需要50金币进行祈愿，您的金币不足。";
     const now = /* @__PURE__ */ new Date();
-    const [latestWish] = await ctx.database.get("ggcevo_Wish_Record", { handle }, {
+    const [latestWish] = await ctx.database.get("ggcevo_wish", { handle }, {
       sort: { endTime: "desc" },
       limit: 1
     });
@@ -7592,7 +7614,7 @@ ${validTypes.join("、")}`;
     await ctx.database.set("ggcevo_sign", { handle }, { totalRewards: newGold });
     const startTime = /* @__PURE__ */ new Date();
     const endTime = new Date(startTime.getTime() + 7 * 24 * 60 * 60 * 1e3);
-    await ctx.database.create("ggcevo_Wish_Record", {
+    await ctx.database.create("ggcevo_wish", {
       handle,
       wishname: effect.name,
       startTime,
@@ -8060,7 +8082,7 @@ ${validTypes.join("、")}`;
       return `❌ 红晶不足！需要：${finalCost}${discountMessage} 当前拥有红晶：${careerData.redcrystal}`;
     }
     if (isWeapon) {
-      const existing = await ctx.database.get("ggcevo_equipment", {
+      const existing = await ctx.database.get("ggcevo_weapons", {
         handle,
         weaponId: itemConfig2.id
       });
@@ -8072,7 +8094,7 @@ ${validTypes.join("、")}`;
         redcrystal: careerData.redcrystal - finalCost
       });
       if (isWeapon) {
-        await ctx.database.create("ggcevo_equipment", {
+        await ctx.database.create("ggcevo_weapons", {
           handle,
           weaponId: itemConfig2.id,
           level: 0,
@@ -8080,10 +8102,10 @@ ${validTypes.join("、")}`;
           installedMods: [],
           equipped: false
         });
-        const equippedCount = await ctx.database.select("ggcevo_equipment").where({ handle, equipped: true }).execute((row) => import_koishi.$.count(row.weaponId));
+        const equippedCount = await ctx.database.select("ggcevo_weapons").where({ handle, equipped: true }).execute((row) => import_koishi.$.count(row.weaponId));
         if (equippedCount === 0) {
           await ctx.database.set(
-            "ggcevo_equipment",
+            "ggcevo_weapons",
             { handle, weaponId: itemConfig2.id },
             { equipped: true }
           );
@@ -8151,7 +8173,7 @@ ${validTypes.join("、")}`;
     ]);
     const totalRewards = signData[0]?.totalRewards || 0;
     const redcrystal = careerData[0]?.redcrystal || 0;
-    const message = [`【${handle}的仓库】`];
+    const message = [`【${session.username}的仓库】`];
     message.push(`💰 金币：${totalRewards}`);
     if (careerData[0]?.group === "辛迪加海盗") {
       message.push(`🔴 红晶：${redcrystal}`);

package/lib/utils.d.ts

@@ -10,7 +10,7 @@ export declare function isSameHalfDay(a: Date, b: Date): boolean;
 export declare function convertUTCtoChinaTime(input: Date | string | number): Date;
 export declare function formatDate(d: Date): string;
 export declare function createHpBar(current: number, max: number): string;
-export declare function activateNextBossGroup(ctx: Context, currentBossId?: number | null): Promise<import("./database").Boss>;
+export declare function activateNextBossGroup(ctx: Context, currentBossId?: number | null): Promise<import("./database").BossInfo>;
 export declare function calculateTotalPower(ctx: Context, config: Config, handle: string): Promise<number>;
 export declare function applyItemEffect(ctx: Context, session: any, handle: string, itemConfig: any, target?: string): Promise<{
     success: boolean;

package/package.json

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