koishi-plugin-ggcevo-game 1.2.70 → 1.2.72

package/lib/index.d.ts

@@ -3,7 +3,6 @@ import 'koishi-plugin-sc2arcade-search';
 export declare const name = "ggcevo-game";
 export interface Config {
     proxyAgent: string;
-    ggcqun: string;
     rankseason: string;
     signrequire: boolean;
     autorank: boolean;
@@ -41,6 +40,7 @@ declare module 'koishi' {
         ggcevo_Wish_Record: WishRecord;
         ggcevo_careers: careers;
         ggcevo_warehouse: warehouse;
+        ggcevo_tech: tech;
     }
 }
 export interface backpack {
@@ -184,4 +184,9 @@ export interface warehouse {
     itemId: number;
     quantity: number;
 }
+export interface tech {
+    handle: string;
+    techId: number;
+    level: number;
+}
 export declare function apply(ctx: Context, config: Config): void;

package/lib/index.js

@@ -32,8 +32,7 @@ var name = "ggcevo-game";
 var Config = import_koishi.Schema.intersect([
   // 基础配置组
   import_koishi.Schema.object({
-    proxyAgent: import_koishi.Schema.string().description("代理服务器地址"),
-    ggcqun: import_koishi.Schema.string().description("绑定咕咕虫evo的群组ID").required()
+    proxyAgent: import_koishi.Schema.string().description("代理服务器地址")
   }).description("基础设置"),
   // 赛季与兑换配置组
   import_koishi.Schema.object({
@@ -54,7 +53,7 @@ var Config = import_koishi.Schema.intersect([
   }).description("对战限制"),
   // 通知系统配置组
   import_koishi.Schema.object({
-    groupId: import_koishi.Schema.array(import_koishi.Schema.string()).description("黑名单通知群组").default([]),
+    groupId: import_koishi.Schema.array(import_koishi.Schema.string()).description("广播通知群组").default([]),
     checkInterval: import_koishi.Schema.number().description("大厅监控检查间隔(秒)").default(60)
   }).description("通知设置").collapse(),
   // 权限管理组
@@ -278,21 +277,13 @@ function apply(ctx, config) {
   }, {
     primary: ["handle", "itemId"]
   });
-  const SyndicatedItems = {
-    "E-2能量炸弹": {
-      id: 1e3,
-      type: "爆破物",
-      description: "一种小型的机械装置，用于吸收空间站能量并进行爆破",
-      redCrystalCost: 30,
-      effects: "当主宰为“空间站感染虫”时才能使用，对“空间站哨枪塔”造成其当前血量值的伤害(获得等同于伤害值的金币)",
-      // 确保结构兼容性
-      price: 0,
-      damage: 0,
-      // 若需要可补充伤害值
-      tagEffects: {}
-      // 若无属性加成则留空
-    }
-  };
+  ctx.model.extend("ggcevo_tech", {
+    handle: "string",
+    techId: "unsigned",
+    level: "unsigned"
+  }, {
+    primary: ["handle", "techId"]
+  });
   const weaponConfig = {
     // 武器配置
     "高斯步枪": {
@@ -305,8 +296,7 @@ function apply(ctx, config) {
       tagEffects: {
         "轻甲": 1.5
         // 对轻甲目标造成150%伤害
-      },
-      effects: ""
+      }
     },
     "激光步枪": {
       id: 2,
@@ -319,8 +309,7 @@ function apply(ctx, config) {
         "重甲": 1.5,
         // 对重甲目标造成150%伤害
         "护盾": 0.5
-      },
-      effects: ""
+      }
     },
     "焚烧枪": {
       id: 3,
@@ -333,8 +322,7 @@ function apply(ctx, config) {
         "惧热": 2,
         "生物": 1.5,
         "护盾": 0.5
-      },
-      effects: ""
+      }
     },
     "碎骨步枪": {
       id: 4,
@@ -347,8 +335,7 @@ function apply(ctx, config) {
         "重甲": 2,
         "机械": 0.5,
         "护盾": 0.2
-      },
-      effects: ""
+      }
     },
     "等离子切割机": {
       id: 5,
@@ -361,8 +348,7 @@ function apply(ctx, config) {
         "重甲": 1.5,
         "建筑": 1.5,
         "机械": 1.2
-      },
-      effects: ""
+      }
     },
     "突击霰弹枪": {
       id: 6,
@@ -374,8 +360,7 @@ function apply(ctx, config) {
       tagEffects: {
         "轻甲": 1.5,
         "重甲": 0.8
-      },
-      effects: ""
+      }
     },
     "侦查步枪": {
       id: 7,
@@ -388,8 +373,7 @@ function apply(ctx, config) {
         "护盾": 0.5,
         "轻甲": 0.5,
         "重甲": 0.2
-      },
-      effects: ""
+      }
     },
     "零度之下": {
       id: 8,
@@ -401,8 +385,7 @@ function apply(ctx, config) {
       tagEffects: {
         "惧寒": 2,
         "灵能": 1.5
-      },
-      effects: ""
+      }
     },
     "弧焊枪": {
       id: 9,
@@ -414,10 +397,18 @@ function apply(ctx, config) {
       tagEffects: {
         "建筑": 2,
         "机械": 1.5
-      },
-      effects: ""
-    },
-    ...SyndicatedItems
+      }
+    }
+  };
+  const SyndicatedItems = {
+    "E-2能量炸弹": {
+      id: 1,
+      type: "爆破物",
+      description: "一种小型的机械装置，用于吸收空间站能量并进行爆破",
+      price: 0,
+      redCrystalCost: 30,
+      effects: "当主宰为“空间站感染虫”时才能使用，对“空间站哨枪塔”造成其当前血量值的伤害(获得等同于伤害值的金币)"
+    }
   };
   const modConfig = {
     "动能增幅": {
@@ -502,6 +493,8 @@ function apply(ctx, config) {
       }
     ]
   };
+  const asBossTags = /* @__PURE__ */ __name((arr) => arr, "asBossTags");
+  const asPassives = /* @__PURE__ */ __name((arr) => arr, "asPassives");
   const passiveConfig = {
     "弱化形态": {
       effect: 0.1,
@@ -572,107 +565,98 @@ function apply(ctx, config) {
       description: "拥有结构装甲，受到的伤害-20%; 若伤害来源于热能武器，则受到的伤害-40%"
     }
   };
+  const defineBoss = /* @__PURE__ */ __name((config2) => config2, "defineBoss");
   const bossPool = [
-    {
+    defineBoss({
       main: {
         id: 1,
         name: "异齿猛兽-首领",
         type: "主宰",
-        maxHP: 12e3,
-        tags: ["重甲", "生物", "异形"],
-        passive: ["异形甲壳"]
-        // 明确类型
+        maxHP: 15e3,
+        tags: asBossTags(["重甲", "生物", "异形"]),
+        passive: asPassives(["异形甲壳"])
       },
       minions: [
         {
           name: "异齿猛兽",
           type: "子代",
-          maxHP: 4e3,
-          tags: ["重甲", "生物", "异形"],
-          passive: ["弱化形态", "异形甲壳"]
-          // 明确类型
+          maxHP: 7500,
+          tags: asBossTags(["重甲", "生物", "异形"]),
+          passive: asPassives(["弱化形态", "异形甲壳"])
         }
       ]
-    },
-    {
+    }),
+    defineBoss({
       main: {
         id: 2,
         name: "寒冰王蛇",
         type: "主宰",
         maxHP: 1e4,
-        tags: ["重甲", "惧热", "生物", "异形"],
-        passive: ["冰霜环绕", "冰霜进化"]
-        // 明确类型
+        tags: asBossTags(["重甲", "惧热", "生物", "异形"]),
+        passive: asPassives(["冰霜环绕", "冰霜进化"])
       },
       minions: [
         {
           name: "冰蛇",
           type: "子代",
           maxHP: 3e3,
-          tags: ["惧热", "生物", "异形"],
-          passive: ["弱化形态", "冰霜回复", "冰霜进化"]
-          // 明确类型
+          tags: asBossTags(["惧热", "生物", "异形"]),
+          passive: asPassives(["弱化形态", "冰霜回复", "冰霜进化"])
         }
       ]
-    },
-    {
+    }),
+    defineBoss({
       main: {
         id: 3,
         name: "莽兽",
         type: "主宰",
         maxHP: 1e4,
-        tags: ["重甲", "生物", "异形"],
-        passive: ["应激甲壳II", "求生本能II", "冷适应"]
-        // 明确类型
+        tags: asBossTags(["重甲", "生物", "异形"]),
+        passive: asPassives(["应激甲壳II", "求生本能II", "冷适应"])
       },
       minions: [
         {
           name: "狂暴畸变体",
           type: "子代",
           maxHP: 3e3,
-          tags: ["重甲", "生物", "异形"],
-          passive: ["弱化形态", "应激甲壳I", "求生本能I", "冷适应"]
-          // 明确类型
+          tags: asBossTags(["重甲", "生物", "异形"]),
+          passive: asPassives(["弱化形态", "应激甲壳I", "求生本能I", "冷适应"])
         },
         {
           name: "剧毒畸变体",
           type: "子代",
           maxHP: 3e3,
-          tags: ["重甲", "生物", "异形"],
-          passive: ["弱化形态", "应激甲壳I", "求生本能I", "冷适应"]
-          // 明确类型
+          tags: asBossTags(["重甲", "生物", "异形"]),
+          passive: asPassives(["弱化形态", "应激甲壳I", "求生本能I", "冷适应"])
         }
       ]
-    },
-    {
+    }),
+    defineBoss({
       main: {
         id: 4,
         name: "空间站感染虫",
         type: "主宰",
         maxHP: 1e4,
-        tags: ["重甲", "生物", "机械", "异形"],
-        passive: ["感染空间站", "病毒云", "霉菌滋生"]
-        // 明确类型
+        tags: asBossTags(["重甲", "生物", "机械", "异形"]),
+        passive: asPassives(["感染空间站", "病毒云", "霉菌滋生"])
       },
       minions: [
         {
           name: "机械感染虫",
           type: "子代",
           maxHP: 3e3,
-          tags: ["重甲", "生物", "机械", "异形"],
-          passive: ["弱化形态", "病毒云", "霉菌滋生"]
-          // 明确类型
+          tags: asBossTags(["重甲", "生物", "机械", "异形"]),
+          passive: asPassives(["弱化形态", "病毒云", "霉菌滋生"])
         },
         {
           name: "空间站哨枪塔",
           type: "子代",
           maxHP: 5e3,
-          tags: ["重甲", "机械", "建筑"],
-          passive: ["岗哨机枪", "结构装甲"]
-          // 明确类型
+          tags: asBossTags(["重甲", "机械", "建筑"]),
+          passive: asPassives(["岗哨机枪", "结构装甲"])
         }
       ]
-    }
+    })
   ];
   const spaceStationCrewConfig = [
     {
@@ -750,7 +734,7 @@ function apply(ctx, config) {
     {
       professionName: "能量武器专家",
       effect: "能量武器攻击伤害+20%，解锁MK-4激光步枪(传奇)购买权限",
-      requirements: "拥有一把武器等级为3级以上的能量武器",
+      requirements: "拥有一把3级及以上等级的能量武器",
       Jobtransfer: true,
       costcoins: 0,
       costredcrystal: 20
@@ -781,9 +765,9 @@ function apply(ctx, config) {
     },
     {
       professionName: "纵火狂",
-      effect: "热能武器攻击伤害+15%",
-      requirements: "",
-      Jobtransfer: false,
+      effect: "热能武器攻击伤害+20%，解锁龙息散弹枪(传奇)购买权限",
+      requirements: "拥有一把3级及以上等级的热能武器",
+      Jobtransfer: true,
       costcoins: 0,
       costredcrystal: 20
     },
@@ -844,6 +828,82 @@ function apply(ctx, config) {
       costredcrystal: 0
     }
   ];
+  const Spacestationtechnology = [
+    {
+      techId: 1,
+      techname: "采掘系统",
+      maxLevel: 5,
+      levels: [
+        {
+          level: 1,
+          cost: 500,
+          description: "提高挖矿效率，每日签到奖励+5%",
+          careerBonus: "深空矿工/情报副官: 每日签到奖励+10%"
+        },
+        {
+          level: 2,
+          cost: 1750,
+          description: "提高挖矿效率，每日签到奖励+10%",
+          careerBonus: "深空矿工/情报副官: 每日签到奖励+20%，解锁专属“挖矿”指令"
+        },
+        {
+          level: 3,
+          cost: 2950,
+          description: "提高挖矿效率，每日签到奖励+15%",
+          careerBonus: "深空矿工/情报副官: 每日签到奖励+30%，解锁专属“挖矿”指令"
+        },
+        {
+          level: 4,
+          cost: 4250,
+          description: "提高挖矿效率，每日签到奖励+20%",
+          careerBonus: "深空矿工/情报副官: 每日签到奖励+40%，解锁专属“挖矿”指令，并且挖矿效率提高25%"
+        },
+        {
+          level: 5,
+          cost: 5375,
+          description: "提高挖矿效率，每日签到奖励+25%",
+          careerBonus: "深空矿工/情报副官: 每日签到奖励+50%，解锁专属“挖矿”指令，并且挖矿效率提高50%"
+        }
+      ]
+    },
+    {
+      techId: 2,
+      techname: "武器系统",
+      maxLevel: 5,
+      levels: [
+        {
+          level: 1,
+          cost: 500,
+          description: "提升空间站武器等级，升级/改装武器享有5%的折扣",
+          careerBonus: "武器中士/情报副官: 升级/改装武器享有10%的折扣"
+        },
+        {
+          level: 2,
+          cost: 1500,
+          description: "提升空间站武器等级，升级/改装武器享有10%的折扣",
+          careerBonus: "武器中士/情报副官: 升级/改装武器享有20%的折扣，购买武器享有10%的折扣(非传奇)"
+        },
+        {
+          level: 3,
+          cost: 2550,
+          description: "提升空间站武器等级，升级/改装武器享有15%的折扣",
+          careerBonus: "武器中士/情报副官: 升级/改装武器享有30%的折扣，购买武器享有15%的折扣(非传奇)"
+        },
+        {
+          level: 4,
+          cost: 3950,
+          description: "提升空间站武器等级，升级/改装武器享有20%的折扣",
+          careerBonus: "武器中士/情报副官: 在升级/改装武器享有40%的折扣，购买武器享有20%的折扣(非传奇)"
+        },
+        {
+          level: 5,
+          cost: 4650,
+          description: "提升空间站武器等级，升级/改装武器享有25%的折扣，可以以原价购买传奇武器(仅限一把)",
+          careerBonus: "武器中士/情报副官: 升级/改装武器享有50%的折扣，购买武器享有25%的折扣(非传奇)，可以以80%的价格购买传奇武器(仅限一把)"
+        }
+      ]
+    }
+  ];
   function calculateModifiers(equippedWeapon, weaponName, hasCritRhythm) {
     let totalModAdd = 0;
     let hasCrit = false;
@@ -924,6 +984,14 @@ function apply(ctx, config) {
         message = "⚠️ 能量武器专家：未装备能量武器，加成未生效";
       }
     }
+    if (faction === "辛迪加海盗" && career === "纵火狂") {
+      if (weaponType === "热能武器") {
+        multiplier *= 1.2;
+        message = "⚡ 职业加成：纵火狂(热能武器伤害+20%)";
+      } else {
+        message = "⚠️ 纵火狂：未装备热能武器，加成未生效";
+      }
+    }
     return {
       damage: currentDamage * multiplier,
       message: message || void 0
@@ -1692,6 +1760,10 @@ function apply(ctx, config) {
     const damageRecords = await ctx2.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 ctx2.database.get("ggcevo_equipment", {
+      handle,
+      level: { $gte: 3 }
+    });
     switch (profession) {
       case "深空矿工":
         return {
@@ -1726,17 +1798,22 @@ function apply(ctx, config) {
           message: `需要累计造成300伤害（当前${totalDamage}）`
         };
       case "能量武器专家":
-        const weapons = await ctx2.database.get("ggcevo_equipment", {
-          handle,
-          level: { $gte: 3 }
-        });
         const hasEnergyWeapon = weapons.some((weapon) => {
           const weaponConfigEntry = Object.values(weaponConfig).find((c) => c.id === weapon.weaponId);
           return weaponConfigEntry?.type === "能量武器";
         });
         return {
           success: hasEnergyWeapon,
-          message: `需要拥有一把等级6以上的能量武器`
+          message: `需要拥有一把3级及以上等级的能量武器`
+        };
+      case "纵火狂":
+        const hasthermalWeapon = weapons.some((weapon) => {
+          const weaponConfigEntry = Object.values(weaponConfig).find((c) => c.id === weapon.weaponId);
+          return weaponConfigEntry?.type === "热能武器";
+        });
+        return {
+          success: hasthermalWeapon,
+          message: `需要拥有一把3级及以上等级的热能武器`
         };
       case "清洁工":
         if (!mainBoss) return { success: false, message: "当前暂无伤害榜。" };
@@ -1758,33 +1835,50 @@ function apply(ctx, config) {
     }
   }
   __name(checkTransferRequirements, "checkTransferRequirements");
-  async function applyItemEffect(session, handle, itemId) {
-    const itemConfig2 = Object.values(weaponConfig).find((v) => v.id === itemId);
-    if (!itemConfig2) return "该物品未配置效果";
-    if (itemId === 1e3) {
-      const [SentryTower] = await ctx.database.get("ggcevo_boss", { name: "空间站哨枪塔", isActive: true });
-      const [record] = await ctx.database.get("ggcevo_sign", { handle });
-      const [existingRecord] = await ctx.database.get("ggcevo_boss_damage", { handle });
-      await ctx.database.set(
-        "ggcevo_boss",
-        { name: "空间站哨枪塔" },
-        {
-          isActive: false,
-          HP: 0
-        }
-      );
-      await ctx.database.upsert("ggcevo_boss_damage", [{
-        handle,
-        playerName: session.username,
-        totalDamage: (existingRecord?.totalDamage || 0) + SentryTower.HP,
-        // 改为实际伤害
-        attackCount: existingRecord?.attackCount || 0
-      }], ["handle"]);
-      await ctx.database.upsert("ggcevo_sign", [{
-        handle,
-        totalRewards: (record?.totalRewards || 0) + SentryTower.HP
-      }], ["handle"]);
-      return `您使用了E-2能量炸弹，直接摧毁了“空间站哨枪塔”并且获得了${SentryTower.HP}金币。`;
+  async function applyItemEffect(session, handle, itemConfig2) {
+    const itemName = Object.entries(SyndicatedItems).find(
+      ([_, item]) => item.id === itemConfig2.id
+    )?.[0] || "未知物品";
+    try {
+      if (itemConfig2.id === 1) {
+        const [SentryTower] = await ctx.database.get("ggcevo_boss", {
+          name: "空间站哨枪塔",
+          isActive: true
+        });
+        const damageValue = SentryTower.HP;
+        await ctx.database.set(
+          "ggcevo_boss",
+          { name: "空间站哨枪塔" },
+          {
+            isActive: false,
+            HP: 0
+          }
+        );
+        await ctx.database.withTransaction(async () => {
+          const signRecords = await ctx.database.get("ggcevo_sign", { handle });
+          const currentRewards = signRecords[0]?.totalRewards || 0;
+          await ctx.database.upsert("ggcevo_sign", [{
+            handle,
+            totalRewards: currentRewards + damageValue
+          }], ["handle"]);
+          const damageRecords = await ctx.database.get("ggcevo_boss_damage", { handle });
+          const currentDamage = damageRecords[0]?.totalDamage || 0;
+          const currentCount = damageRecords[0]?.attackCount || 0;
+          await ctx.database.upsert("ggcevo_boss_damage", [{
+            handle,
+            playerName: session.username,
+            totalDamage: currentDamage + damageValue,
+            attackCount: currentCount,
+            // 保持原攻击次数
+            bossGroupId: 4
+          }], ["handle"]);
+        });
+        return `成功引爆${itemName}，造成 ${damageValue} 点伤害，获得等额金币`;
+      }
+      return `${itemName} 效果已生效（开发中）`;
+    } catch (error) {
+      console.error("物品效果处理失败:", error);
+      return "⚠️ 物品效果处理异常，已回滚操作";
     }
   }
   __name(applyItemEffect, "applyItemEffect");
@@ -2322,7 +2416,7 @@ ${itemDetails.join("\n")}`;
   ctx.setInterval(async () => {
     if (config.autorank) {
       try {
-        const ggcmap = await ctx.database.get("sc2arcade_map", { guildId: config.ggcqun });
+        const ggcmap = await ctx.database.get("sc2arcade_map", { regionId: 3, mapId: 165561 });
         const lastdate = ggcmap[0].lastdate;
         let currentMaxDate = new Date(lastdate);
         let nextCursor = null;
@@ -2372,7 +2466,7 @@ ${itemDetails.join("\n")}`;
         } while (nextCursor && shouldContinue);
         if (pageMaxDate > currentMaxDate) {
           currentMaxDate = pageMaxDate;
-          await ctx.database.set("sc2arcade_map", { guildId: config.ggcqun }, {
+          await ctx.database.set("sc2arcade_map", { regionId: 3, mapId: 165561 }, {
             lastdate: new Date(currentMaxDate.toISOString())
           });
         }
@@ -2383,7 +2477,7 @@ ${itemDetails.join("\n")}`;
   }, 60 * 60 * 1e3);
   ctx.command("ggcevo/胜点榜数据同步", { authority: 3 }).action(async () => {
     try {
-      const ggcmap = await ctx.database.get("sc2arcade_map", { guildId: config.ggcqun });
+      const ggcmap = await ctx.database.get("sc2arcade_map", { regionId: 3, mapId: 165561 });
       const lastdate = ggcmap[0].lastdate;
       let currentMaxDate = new Date(lastdate);
       let nextCursor = null;
@@ -2433,7 +2527,7 @@ ${itemDetails.join("\n")}`;
       } while (nextCursor && shouldContinue);
       if (pageMaxDate > currentMaxDate) {
         currentMaxDate = pageMaxDate;
-        await ctx.database.set("sc2arcade_map", { guildId: config.ggcqun }, {
+        await ctx.database.set("sc2arcade_map", { regionId: 3, mapId: 165561 }, {
           lastdate: new Date(currentMaxDate.toISOString())
         });
       }
@@ -2459,7 +2553,7 @@ ${itemDetails.join("\n")}`;
         displayName: await checkSensitiveWord(item.name) ? item.name : (item.name[0] || "") + "***"
       }))
     );
-    const ggcmap = await ctx.database.get("sc2arcade_map", { guildId: config.ggcqun });
+    const ggcmap = await ctx.database.get("sc2arcade_map", { regionId: 3, mapId: 165561 });
     const lastdate = ggcmap[0].lastdate;
     const rankingText = processedRecords.map(
       (item, index) => `${offset + index + 1}. ${item.displayName} | 积分: ${item.rank} | 胜率: ${item.matches === 0 ? "0.00%" : (item.wins / item.matches * 100).toFixed(2) + "%"}`
@@ -3196,7 +3290,7 @@ ${achievementList.join("\n")}`;
       const parsedUser = import_koishi.h.parse(user)[0];
       if (!parsedUser || parsedUser.type !== "at" || !parsedUser.attrs.id) return "参数格式错误，请输入“pk @指定pk玩家”。";
       const targetUserId = parsedUser.attrs.id;
-      const targetUsername = await session.bot.getGuildMember(config.ggcqun, targetUserId);
+      const targetUsername = await session.bot.getGuildMember(session.guildId, targetUserId);
       const [targetprofile] = await ctx.database.get("sc2arcade_player", { userId: targetUserId });
       if (!targetprofile) return "对方尚未绑定句柄。";
       const initiatorHandle = `${profile.regionId}-S2-${profile.realmId}-${profile.profileId}`;
@@ -3400,7 +3494,7 @@ ${achievementList.join("\n")}`;
       pageNum < totalPages ? `输入 pk榜 ${pageNum + 1} 查看下一页` : "已是最后一页"
     ].join("\n");
   });
-  ctx.command("ggcevo/切换pk状态", "切换玩家对战状态").alias("切换pk", "pk状态").action(async ({ session }) => {
+  ctx.command("ggcevo/切换pk", "切换玩家对战状态").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}`;
@@ -3476,18 +3570,18 @@ ${validTypes.join("、")}`;
         `价格：${config2.price}金币`,
         "特性：",
         tagEffectsDesc,
-        config2.description
+        `描述：${config2.description}`
       ].join("\n");
     });
     return [
       `🏪 咕咕武器库 - ${type} 🏪`,
-      "使用“购买武器 武器名称”命令进行购买",
+      "使用“购买 武器名称”命令进行购买",
       "====================",
       ...items,
       items.length === 0 ? "⚠️ 该分类下暂无可用武器" : ""
     ].join("\n\n");
   });
-  ctx.command("ggcevo/购买武器 <weapon>").action(async ({ session }, weapon) => {
+  ctx.command("ggcevo/购买 <weapon>").action(async ({ session }, weapon) => {
     const [profile] = await ctx.database.get("sc2arcade_player", { userId: session.userId });
     if (!profile) return "您暂未绑定句柄。";
     const handle = `${profile.regionId}-S2-${profile.realmId}-${profile.profileId}`;
@@ -3496,7 +3590,7 @@ ${validTypes.join("、")}`;
       return `❌ 拒绝访问，您已被列入黑名单。`;
     }
     const [signInfo] = await ctx.database.get("ggcevo_sign", { handle });
-    if (!weapon) return "如果您想购买武器，请输入“购买武器 武器名称”。";
+    if (!weapon) return "请输入“购买 物品名称”来购买所需物品。";
     if (!weaponConfig[weapon]) return "无效的武器名称，请重新输入。";
     const config2 = weaponConfig[weapon];
     const allowedTypes = ["能量武器", "热能武器", "实弹武器"];
@@ -3586,7 +3680,7 @@ ${validTypes.join("、")}`;
     }));
     return [
       "🛡️ 您当前拥有的武器",
-      '使用"装备武器 武器名称"来装备武器',
+      '使用"装备 武器名称"来装备武器',
       "⚡表示当前装备武器",
       "──────────────",
       ...weaponDetails.length ? weaponDetails : ["空空如也，快去“武器库”看看吧！"],
@@ -3595,11 +3689,11 @@ ${validTypes.join("、")}`;
       "🔧 改装效果在战斗中生效"
     ].join("\n");
   });
-  ctx.command("ggcevo/装备武器 <weapon>").action(async ({ session }, weapon) => {
+  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 "请输入“装备武器 武器名称”来装备一把你拥有的武器。";
+    if (!weapon) return "请输入“装备 武器名称”来装备一把你拥有的武器。";
+    if (!weaponConfig[weapon]) return "请输入“装备 武器名称”来装备一把你拥有的武器。";
     const config2 = weaponConfig[weapon];
     const handle = `${profile.regionId}-S2-${profile.realmId}-${profile.profileId}`;
     const existingEntries = await ctx.database.get("ggcevo_blacklist", { handle });
@@ -3629,7 +3723,7 @@ ${validTypes.join("、")}`;
     });
     return `您已成功装备武器 ${weapon}！`;
   });
-  ctx.command("ggcevo/升级武器 <weapon>", "升级武器伤害").action(async ({ session }, weapon) => {
+  ctx.command("ggcevo/升级 <weapon>", "升级武器伤害").action(async ({ session }, weapon) => {
     const [profile] = await ctx.database.get("sc2arcade_player", { userId: session.userId });
     if (!profile) return "您暂未绑定句柄。";
     const handle = `${profile.regionId}-S2-${profile.realmId}-${profile.profileId}`;
@@ -3642,7 +3736,7 @@ ${validTypes.join("、")}`;
       handle,
       weaponId: weaponConfig[weapon]?.id
     });
-    if (!weapon) return "请输入“升级武器 武器名称”来升级你想要的武器。";
+    if (!weapon) return "请输入“升级 武器名称”来升级你想要的武器。";
     if (!equipment) return "尚未获得该武器。";
     if (equipment.level >= 6) return "该武器已达最大升级等级。";
     const activeWish = await ctx.database.get("ggcevo_Wish_Record", {
@@ -3689,7 +3783,7 @@ ${validTypes.join("、")}`;
     return `${message}
 当前等级：${newLevel}，伤害：${baseDamage}，拥有改装槽：${slots}个。`;
   });
-  ctx.command("ggcevo/改装武器 <weapon> [mod]", "安装武器模块").action(async ({ session }, weapon, mod) => {
+  ctx.command("ggcevo/改装 <weapon> [mod]", "安装武器模块").action(async ({ session }, weapon, mod) => {
     const isValidWeapon = weapon && weaponConfig[weapon]?.id !== void 0;
     const generateModList = /* @__PURE__ */ __name(() => {
       if (!isValidWeapon) {
@@ -3707,7 +3801,7 @@ ${validTypes.join("、")}`;
     if (!mod || !modConfig[mod]) {
       return [
         isValidWeapon ? `🛠️ ${weapon} 专属模块 🛠️` : "🛠️ 通用武器模块 🛠️",
-        isValidWeapon ? `使用「改装武器 ${weapon} 模块名称」安装专属模块` : weapon ? "※ 无效武器名称，请使用「改装武器 武器名称 模块名称」安装模块" : "※ 输入「改装武器 武器名称」查询专属模块\n※ 安装模块：「改装武器 武器名称 模块名称」",
+        isValidWeapon ? `使用「改装 ${weapon} 模块名称」安装专属模块` : weapon ? "※ 无效武器名称，请使用「改装 武器名称 模块名称」安装模块" : "※ 输入「改装 武器名称」查询专属模块\n※ 安装模块：「改装 武器名称 模块名称」",
         "====================",
         generateModList()
       ].join("\n\n");
@@ -3782,7 +3876,7 @@ ${validTypes.join("、")}`;
     if (!targetBoss) {
       const activeNames = await getActiveBossNames();
       return `当前没有找到名为 ${bossName} 的可攻击目标。
-当前存活的异形：${activeNames || "无"}。`;
+请攻击当前存活的异形：${activeNames || "无"}。`;
     }
     const [profile] = await ctx.database.get("sc2arcade_player", { userId: session.userId });
     if (!profile) return "您暂未绑定句柄。";
@@ -3805,7 +3899,7 @@ ${validTypes.join("、")}`;
       handle,
       equipped: true
     });
-    if (!equippedWeapon) return "请先输入“装备武器 武器名称”后再攻击。";
+    if (!equippedWeapon) return "请先输入“装备 武器名称”后再攻击。";
     const weaponConfigEntry = Object.entries(weaponConfig).find(([_, c]) => c.id === equippedWeapon.weaponId);
     const [weaponName, weaponData] = weaponConfigEntry;
     const { damage: baseDamage, hasCrit, effectMessage } = await calculateTotalDamage(ctx, session, equippedWeapon, targetBoss);
@@ -3955,7 +4049,8 @@ ${validTypes.join("、")}`;
     const resultMessage = [
       `🔥 ${session.username} 使用武器 ${weaponName} 对 ${targetBoss.name} 发起攻击！`,
       ...effectMessage.length > 0 ? [
-        `💫 祈愿效果：${effectMessage.join(" | ")}`
+        `触发效果：
+${effectMessage.join("\n")}`
       ] : [],
       `造成伤害：${initialDamage}${hasCrit ? "(✨ 暴击)" : ""}`,
       ...healMessages,
@@ -4267,7 +4362,7 @@ ${validTypes.join("、")}`;
         if (userCoins < 2e3) {
           return `加入辛迪加海盗需要2000金币，你当前拥有${userCoins}金币`;
         }
-        if (!pkData?.enable) {
+        if (pkData && !pkData?.enable) {
           return "当前PK功能未开启，无法加入辛迪加海盗。";
         }
         await session.send(`请问你确定要缴纳2000金币并且永久开启PK功能加入辛迪加海盗吗？(请在30秒内输入“是”确定加入)`);
@@ -4301,13 +4396,11 @@ ${validTypes.join("、")}`;
     }
     const [careerData] = await ctx.database.get("ggcevo_careers", { handle });
     if (!careerData) return "请先加入阵营后使用转职功能。";
-    let config2, factionTips;
+    let config2;
     if (careerData.group === "人类联盟") {
       config2 = spaceStationCrewConfig;
-      factionTips = "💰 转职消耗金币";
     } else if (careerData.group === "辛迪加海盗") {
       config2 = syndicatePirateConfig;
-      factionTips = "💰 消耗金币 + 🔴 消耗红晶";
     } else {
       return "未知阵营无法显示职业信息。";
     }
@@ -4412,17 +4505,13 @@ ${validTypes.join("、")}`;
     }
   });
   ctx.command("ggcevo/黑市 [type]", "辛迪加海盗专属黑市").usage("输入“黑市”查看类型，或“黑市 类型”查看详细").action(async ({ session }, type) => {
-    const [profile] = await ctx.database.get("sc2arcade_player", { userId: session.userId });
-    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 typeStats = Object.values(weaponConfig).reduce((stats, weapon) => {
-      stats[weapon.type] = (stats[weapon.type] || 0) + 1;
-      return stats;
-    }, {});
+    const typeStats = {};
+    Object.values(weaponConfig).forEach((weapon) => {
+      typeStats[weapon.type] = (typeStats[weapon.type] || 0) + 1;
+    });
+    Object.values(SyndicatedItems).forEach((item) => {
+      typeStats[item.type] = (typeStats[item.type] || 0) + 1;
+    });
     if (!type) {
       return [
         "🏴☠️ 辛迪加黑市 🏴☠️",
@@ -4434,30 +4523,39 @@ ${validTypes.join("、")}`;
     }
     const normalizedType = Object.keys(typeStats).find((t) => t === type);
     if (!normalizedType) return `无效类型，可用：${Object.keys(typeStats).join("、")}`;
-    const items = Object.entries(weaponConfig).filter(([_, config2]) => config2.type === normalizedType).map(([name2, config2]) => {
-      const infoBlocks = [
-        `【${name2}】`,
-        `类型：${config2.type}`,
-        // 选择性显示伤害值
-        ...config2.damage !== 0 ? [`基础伤害：${config2.damage}`] : [],
-        `订购价：${config2.redCrystalCost}红晶`
-      ];
-      if (Object.keys(config2.tagEffects).length > 0) {
-        const tagEffectsDesc = Object.entries(config2.tagEffects).map(([tag, mul]) => `▸ 对${tag}目标造成${(mul * 100).toFixed(0)}%伤害`).join("\n");
-        infoBlocks.push("特性：", tagEffectsDesc);
-      }
-      if (config2.effects && config2.effects.trim()) {
-        infoBlocks.push(`效果：${config2.effects}`);
-      }
-      infoBlocks.push(
-        config2.description,
-        "──────────────"
-      );
-      return infoBlocks.join("\n");
-    });
+    const items = [
+      ...Object.entries(weaponConfig).filter(([_, config2]) => config2.type === normalizedType).map(([name2, config2]) => {
+        const infoBlocks = [
+          `【${name2}】`,
+          `类型：${config2.type}`,
+          ...config2.damage ? [`基础伤害：${config2.damage}`] : [],
+          `订购价：${config2.redCrystalCost}红晶`
+        ];
+        if (Object.keys(config2.tagEffects).length > 0) {
+          const tagEffectsDesc = Object.entries(config2.tagEffects).map(([tag, mul]) => `▸ 对${tag}目标造成${(mul * 100).toFixed(0)}%伤害`).join("\n");
+          infoBlocks.push("特性：", tagEffectsDesc);
+        }
+        infoBlocks.push(
+          `描述：${config2.description}`,
+          "──────────────"
+        );
+        return infoBlocks.join("\n");
+      }),
+      ...Object.entries(SyndicatedItems).filter(([_, item]) => item.type === normalizedType).map(([name2, item]) => {
+        const infoBlocks = [
+          `【${name2}】`,
+          `类型：${item.type}`,
+          `订购价：${item.redCrystalCost}红晶`,
+          `效果：${item.effects}`,
+          item.description,
+          "──────────────"
+        ];
+        return infoBlocks.join("\n");
+      })
+    ];
     return [
       `🏴☠️ 辛迪加黑市 - ${normalizedType} 🏴☠️`,
-      "使用“订购 名称”进行购买（仅消耗红晶）",
+      "使用“订购 物品名称”进行购买（仅消耗红晶）",
       "====================",
       ...items
     ].join("\n\n");
@@ -4466,27 +4564,27 @@ ${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 existingEntries = await ctx.database.get("ggcevo_blacklist", { handle });
-    if (existingEntries.length > 0) {
+    if (await ctx.database.get("ggcevo_blacklist", { handle }).then((r) => r.length)) {
       return "❌ 拒绝访问，您已被列入黑名单";
     }
     const [careerData] = await ctx.database.get("ggcevo_careers", { handle });
     if (!careerData || careerData.group !== "辛迪加海盗") {
       return "🚫 该功能需要【辛迪加海盗】阵营权限";
     }
-    if (!item) return "请输入要订购的物品名称";
-    const config2 = weaponConfig[item];
-    if (!config2?.redCrystalCost) return "❌ 无效物品名称或该物品不可订购";
-    const weaponTypes = ["能量武器", "实弹武器", "热能武器"];
-    const isWeapon = weaponTypes.includes(config2.type);
+    if (!item) return "请输入“订购 物品名称”来向辛迪加订购物品。";
+    const isWeapon = Object.prototype.hasOwnProperty.call(weaponConfig, item);
+    const isSyndicatedItem = Object.prototype.hasOwnProperty.call(SyndicatedItems, item);
+    if (!isWeapon && !isSyndicatedItem) return "❌ 无效物品名称";
+    const itemConfig2 = isWeapon ? weaponConfig[item] : SyndicatedItems[item];
+    if (!itemConfig2.redCrystalCost) return "⛔ 该物品不可订购";
     if (isWeapon) {
       const existing = await ctx.database.get("ggcevo_equipment", {
         handle,
-        weaponId: config2.id
+        weaponId: itemConfig2.id
       });
-      if (existing.length) return "⚠️ 该武器已在仓库中";
+      if (existing.length) return "您已经拥有该武器。";
     }
-    const requiredRed = config2.redCrystalCost;
+    const requiredRed = itemConfig2.redCrystalCost;
     if ((careerData.redcrystal || 0) < requiredRed) {
       return `❌ 红晶不足！需要：${requiredRed} 当前：${careerData.redcrystal}`;
     }
@@ -4495,48 +4593,56 @@ ${validTypes.join("、")}`;
         redcrystal: careerData.redcrystal - requiredRed
       });
       if (isWeapon) {
-        await ctx.database.upsert("ggcevo_equipment", [{
+        await ctx.database.create("ggcevo_equipment", {
           handle,
-          weaponId: config2.id,
+          weaponId: itemConfig2.id,
           level: 0,
           modificationSlots: 1,
+          installedMods: [],
           equipped: false
-        }], ["handle", "weaponId"]);
+        });
         const equippedCount = await ctx.database.select("ggcevo_equipment").where({ handle, equipped: true }).execute((row) => import_koishi.$.count(row.weaponId));
         if (equippedCount === 0) {
           await ctx.database.set(
             "ggcevo_equipment",
-            { handle, weaponId: config2.id },
+            { handle, weaponId: itemConfig2.id },
             { equipped: true }
           );
         }
       } else {
-        const existingItems = await ctx.database.get("ggcevo_warehouse", {
+        const [existing] = await ctx.database.get("ggcevo_warehouse", {
           handle,
-          itemId: config2.id
+          itemId: itemConfig2.id
         });
         await ctx.database.upsert("ggcevo_warehouse", [{
           handle,
-          itemId: config2.id,
-          quantity: (existingItems[0]?.quantity || 0) + 1
+          itemId: itemConfig2.id,
+          quantity: (existing?.quantity || 0) + 1
         }], ["handle", "itemId"]);
       }
     });
     if (isWeapon) {
-      const equippedCount = await ctx.database.select("ggcevo_equipment").where({ handle, equipped: true }).execute((row) => import_koishi.$.count(row.weaponId));
-      let message = `✅ 成功订购【${item}】！消耗 ${requiredRed}红晶`;
-      if (equippedCount === 0) {
-        message += "\n已自动装备该武器！";
-      }
-      return message + '\n输入"武器仓库"查看已有装备';
+      const equippedStatus = await ctx.database.get("ggcevo_equipment", {
+        handle,
+        weaponId: itemConfig2.id
+      }).then((r) => r[0]?.equipped ? "已自动装备武器" : "需手动装备武器");
+      return [
+        `✅ 成功订购【${item}】！`,
+        `消耗红晶：${requiredRed}`,
+        `装备状态：${equippedStatus}`,
+        '输入 "武器仓库" 管理武器'
+      ].join("\n");
     } else {
-      const [warehouseData] = await ctx.database.get("ggcevo_warehouse", {
+      const currentStock = await ctx.database.get("ggcevo_warehouse", {
         handle,
-        itemId: config2.id
-      });
-      return `✅ 成功订购【${item}】x1！消耗 ${requiredRed}红晶
-当前库存：${warehouseData.quantity}件
-输入"仓库"查看所有物品`;
+        itemId: itemConfig2.id
+      }).then((r) => r[0]?.quantity || 1);
+      return [
+        `✅ 成功订购【${item}】x1！`,
+        `消耗红晶：${requiredRed}`,
+        `当前库存：${currentStock}件`,
+        '输入 "仓库" 查看所有物品'
+      ].join("\n");
     }
   });
   ctx.command("ggcevo/仓库").action(async (argv) => {
@@ -4554,21 +4660,29 @@ ${validTypes.join("、")}`;
     const message = [`【${handle}的仓库】`];
     message.push(`💰 金币：${totalRewards}`);
     if (redcrystal > 0) message.push(`🔴 红晶：${redcrystal}`);
-    const validItems = items.filter((item) => item.quantity > 0);
+    const validItems = items.filter(
+      (item) => Object.values(SyndicatedItems).some(
+        (specialItem) => specialItem.id === item.itemId
+      ) && item.quantity > 0
+    );
     if (!validItems.length) {
-      message.push("你的仓库空空如也。");
+      message.push("你的特殊物品仓库空空如也。");
     } else {
       message.push(
         validItems.map((warehouseItem) => {
-          const entry = Object.entries(weaponConfig).find(
+          const entry = Object.entries(SyndicatedItems).find(
             ([, item]) => item.id === warehouseItem.itemId
           );
-          if (!entry) return `未知物品 x ${warehouseItem.quantity}：数据异常，请联系管理员`;
           const [itemName, itemData] = entry;
-          let info = `${itemName} x ${warehouseItem.quantity} | 类型：${itemData.type || "未分类"}`;
-          if (itemData.effects?.trim()) info += `
-  功能：${itemData.effects}`;
-          return info;
+          return [
+            `${itemName}`,
+            // 移除数量显示在标题
+            `类型：${itemData.type} | 持有数量：${warehouseItem.quantity}`,
+            // 从warehouse表读取实际数量
+            `特效：${itemData.effects}`,
+            `描述：${itemData.description}`,
+            "―――――――――――――――"
+          ].join("\n");
         }).join("\n\n")
       );
     }
@@ -4577,38 +4691,48 @@ ${validTypes.join("、")}`;
   ctx.command("ggcevo/使用 [itemName]").action(async (argv, itemName) => {
     const session = argv.session;
     const [profile] = await ctx.database.get("sc2arcade_player", { userId: session.userId });
-    if (!profile) return "您暂未绑定句柄。";
+    if (!profile) return "🔒 需要先绑定游戏句柄";
     const handle = `${profile.regionId}-S2-${profile.realmId}-${profile.profileId}`;
-    const existingEntries = await ctx.database.get("ggcevo_blacklist", { handle });
-    if (existingEntries.length > 0) {
-      return "❌ 拒绝访问，您已被列入黑名单";
+    if (await ctx.database.get("ggcevo_blacklist", { handle }).then((r) => r.length)) {
+      return "⛔ 您已被列入黑名单";
     }
     try {
-      const items = await ctx.database.get("ggcevo_warehouse", { handle });
-      const targetItem = items.find((warehouseItem) => {
-        const entry = Object.entries(weaponConfig).find(
-          ([, config2]) => config2.id === warehouseItem.itemId
+      const warehouseItems = await ctx.database.get("ggcevo_warehouse", { handle });
+      const targetItem = warehouseItems.find((item) => {
+        const entry = Object.entries(SyndicatedItems).find(
+          ([_, cfg]) => cfg.id === item.itemId
         );
-        if (!entry) return false;
-        const [itemKey] = entry;
-        return itemKey.toLowerCase() === itemName?.toLowerCase();
+        return entry?.[0] === itemName;
       });
-      if (!targetItem) return `仓库中不存在 ${itemName} 或物品名称错误`;
-      if (targetItem.quantity < 1) return `${itemName} 数量不足`;
-      if (targetItem.itemId === 1e3) {
-        const [SentryTower] = await ctx.database.get("ggcevo_boss", { name: "空间站哨枪塔", isActive: true });
-        if (!SentryTower) return "当前没有“空间站哨枪塔”，无法使用E-2能量炸弹。";
+      if (!targetItem) return `❌ 未找到 ${itemName} 或物品不可用`;
+      if (targetItem.quantity < 1) return `⚠️ ${itemName} 库存不足`;
+      const itemEntry = Object.entries(SyndicatedItems).find(
+        ([_, item]) => item.id === targetItem.itemId
+      );
+      const [itemNameConfirmed, itemConfig2] = itemEntry;
+      if (itemConfig2.id === 1) {
+        const activeSentry = await ctx.database.get("ggcevo_boss", {
+          name: "空间站哨枪塔",
+          isActive: true
+        });
+        if (!activeSentry.length) return "⚠️ 目标「空间站哨枪塔」未激活";
       }
-      await ctx.database.set("ggcevo_warehouse", { handle, itemId: targetItem.itemId }, {
-        quantity: Math.max(targetItem.quantity - 1, 0)
-      });
-      const effectResult = await applyItemEffect(session, handle, targetItem.itemId);
-      return `使用成功！消耗 ${itemName} ×1
-剩余数量：${targetItem.quantity - 1}
-${effectResult}`;
+      const newQuantity = targetItem.quantity - 1;
+      await ctx.database.set(
+        "ggcevo_warehouse",
+        { handle, itemId: targetItem.itemId },
+        { quantity: newQuantity }
+      );
+      const effectResult = await applyItemEffect(session, handle, itemConfig2);
+      return [
+        `✅ 成功使用 ${itemNameConfirmed}`,
+        `├ 剩余数量：${newQuantity}`,
+        `└ 效果触发：${effectResult}`,
+        "─".repeat(25)
+      ].join("\n");
     } catch (error) {
       ctx.logger("GGCEVO").error(error);
-      return "物品使用失败，请稍后重试";
+      return "⚠️ 物品使用失败，请联系管理员";
     }
   });
 }

package/package.json

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