koishi-plugin-ggcevo-game 1.6.62 → 1.6.64

package/lib/database.d.ts

@@ -15,6 +15,8 @@ declare module 'koishi' {
         ggcevo_weapons: WeaponInventory;
         ggcevo_boss: BossInfo;
         ggcevo_boss_damage: BossDamage;
+        ggcevo_damage_logs: damageLogs;
+        ggcevo_boss_weights: bossweights;
         ggcevo_wish: WishRecord;
         ggcevo_careers: CareerInfo;
         ggcevo_warehouse: Warehouse;
@@ -240,3 +242,13 @@ export interface guess {
     wins: number;
     createdAt: Date;
 }
+export interface damageLogs {
+    id: number;
+    handle: string;
+    date: Date;
+}
+export interface bossweights {
+    bossId: number;
+    weight: number;
+    lastSpawn: Date;
+}

package/lib/index.js

@@ -4374,13 +4374,21 @@ function applyPassiveEffects(targetBoss, activeBosses, weaponName, damage, hasCr
       args: [targetBoss]
     }
   ];
-  const allImmuneEffects = [...coldImmuneEffects, ...fireImmuneEffects, ...chanceImmuneEffects, ...conditionImmuneEffects];
+  const hunterAlienImmune = [
+    {
+      effect: BattleEffectProcessor.handleHunterAlien,
+      args: [targetBoss, activeBosses, weaponName]
+    }
+  ];
+  const allImmuneEffects = [...coldImmuneEffects, ...fireImmuneEffects, ...chanceImmuneEffects, ...conditionImmuneEffects, ...hunterAlienImmune];
   for (const immuneEffect of allImmuneEffects) {
     const result = processEffect(immuneEffect.effect, ...immuneEffect.args);
     if (result) {
       isImmuneCold = isImmuneCold || result.immuneCold === true;
       isImmuneFire = isImmuneFire || result.immuneFire === true;
       if (result.isImmune) immune = true;
+      if (result.buffMultiplier !== void 0) totalBuffMultiplier += result.buffMultiplier;
+      if (result.nerfMultiplier !== void 0) totalNerfMultiplier += result.nerfMultiplier;
     }
   }
   const solarFlareResult = BattleEffectProcessor.handleSolarFlare(targetBoss, weaponName, activeBosses);
@@ -4458,7 +4466,6 @@ function applyPassiveEffects(targetBoss, activeBosses, weaponName, damage, hasCr
     { effect: BattleEffectProcessor.handleIsolated, args: [targetBoss, activeBosses, isolatedImmunityMark] },
     { effect: BattleEffectProcessor.handleInfectedSpaceStation, args: [targetBoss, activeBosses] },
     { effect: BattleEffectProcessor.handleInfernalBomb, args: [targetBoss, activeBosses] },
-    { effect: BattleEffectProcessor.handleHunterAlien, args: [targetBoss, activeBosses, weaponName] },
     { effect: BattleEffectProcessor.handleHiveMind, args: [targetBoss, activeBosses] },
     { effect: BattleEffectProcessor.handleReleasePheromones, args: [targetBoss] },
     { effect: BattleEffectProcessor.handleWeakeningSpit, args: [targetBoss, activeBosses] },
@@ -4615,11 +4622,15 @@ function applyPassiveEffects(targetBoss, activeBosses, weaponName, damage, hasCr
   if (hasCrit) {
     finalDamage *= 2;
   }
+  let burnDamage;
   if (weaponName === "焚烧枪" || weaponName === "龙息霰弹枪") {
     const currentBurnLayers = Math.min(targetBoss?.burnLayers || 0, 100);
-    const burnDamage = currentBurnLayers * 1;
+    burnDamage = currentBurnLayers * 1;
+    const burnDebuffMultiplier = totalNerfMultiplier * 0.5;
+    burnDamage *= 1 - burnDebuffMultiplier;
     if (burnDamage > 0) {
-      messages.push(`🔥 【燃烧】效果造成额外${burnDamage}点伤害`);
+      const debuffText = burnDebuffMultiplier > 0 ? `（受到${Math.round(burnDebuffMultiplier * 100)}%的减伤效果）` : "";
+      messages.push(`🔥 【燃烧】效果造成额外${burnDamage}点伤害${debuffText}`);
     }
     finalDamage += burnDamage;
   }
@@ -5182,11 +5193,11 @@ var wishConfig = {
     },
     {
       name: "金柚赐福",
-      effect: "立即获得250枚金币"
+      effect: "立即获得3张资源兑换券"
     },
     {
       name: "夜市赠礼",
-      effect: "立即获得5张资源兑换券"
+      effect: "立即获得3枚咕咕币"
     }
   ],
   // 稀有祈愿（总概率 5 * 1=5%）
@@ -5523,6 +5534,14 @@ var ggcevoUpdates = [
 - 新增兑换资源，1张兑换券可以兑换20张资源兑换券
     `.trim()
   },
+  {
+    version: "1.6.61",
+    time: "2025-08-5",
+    content: `
+- 优化探索掠夺机制，现在相同名称的飞船互相掠夺成功率固定为50%
+- 修改TX-12S隐形巡洋舰的机制，现在只有当掠夺金币加成≤0时，探索才不会被掠夺
+    `.trim()
+  },
   {
     version: "1.6.62",
     time: "2025-08-9",
@@ -5531,11 +5550,14 @@ var ggcevoUpdates = [
     `.trim()
   },
   {
-    version: "1.6.61",
-    time: "2025-08-5",
+    version: "1.6.63",
+    time: "2025-08-10",
     content: `
-- 优化探索掠夺机制，现在相同名称的飞船互相掠夺成功率固定为50%
-- 修改TX-12S隐形巡洋舰的机制，现在只有当掠夺金币加成≤0时，探索才不会被掠夺
+- 修改了斩杀机制，现在进入斩杀阶段后变为攻击时段内可以攻击2次，而不是原来的分为4个攻击时段
+- 修改了主宰复活机制，现在采用权重计算
+- 削弱了燃烧机制，现在燃烧伤害会受到目标减伤效果的50%影响
+- 斩杀阶段删除了验证码机制
+- 同一用户攻击指令增加了5秒的使用冷却时间
     `.trim()
   }
 ];
@@ -5618,15 +5640,6 @@ function isSameDate(a, b) {
   return a.getUTCFullYear() === b.getUTCFullYear() && a.getUTCMonth() === b.getUTCMonth() && a.getUTCDate() === b.getUTCDate();
 }
 __name(isSameDate, "isSameDate");
-function isSameHalfDay(a, b) {
-  if (!isSameDate(a, b)) {
-    return false;
-  }
-  const hour1 = a.getUTCHours();
-  const hour2 = b.getUTCHours();
-  return hour1 < 12 && hour2 < 12 || hour1 >= 12 && hour2 >= 12;
-}
-__name(isSameHalfDay, "isSameHalfDay");
 function convertUTCtoChinaTime(input) {
   const utcDate = new Date(input);
   if (isNaN(utcDate.getTime())) {
@@ -5654,17 +5667,26 @@ function createHpBar(current, max) {
 }
 __name(createHpBar, "createHpBar");
 async function activateNextBossGroup(ctx, currentBossId = null) {
-  let availableIndices = [];
-  bossPool.forEach((bossGroup, index) => {
-    if (currentBossId === null || bossGroup.id !== currentBossId) {
-      availableIndices.push(index);
-    }
-  });
-  if (availableIndices.length === 0) {
-    availableIndices = Array.from({ length: bossPool.length }, (_, i) => i);
+  const allWeights = await ctx.database.get("ggcevo_boss_weights", {});
+  let candidateWeights = allWeights;
+  if (currentBossId !== null) {
+    candidateWeights = allWeights.filter((w) => w.bossId !== currentBossId);
+  }
+  const totalWeight = candidateWeights.reduce((sum, w) => sum + w.weight, 0);
+  let random = Math.random() * totalWeight;
+  let selectedBossId;
+  for (const weight of candidateWeights) {
+    random -= weight.weight;
+    if (random <= 0) {
+      selectedBossId = weight.bossId;
+      break;
+    }
+  }
+  selectedBossId = selectedBossId || candidateWeights[candidateWeights.length - 1].bossId;
+  const nextBossGroup = bossPool.find((g) => g.id === selectedBossId);
+  if (!nextBossGroup) {
+    throw new Error(`Boss group ${selectedBossId} not found in bossPool`);
   }
-  const randomIndex = availableIndices[Math.floor(Math.random() * availableIndices.length)];
-  const nextBossGroup = bossPool[randomIndex];
   const mainBoss = await ctx.database.create("ggcevo_boss", {
     name: nextBossGroup.main.name,
     type: nextBossGroup.main.type,
@@ -6386,6 +6408,44 @@ function privateChatCurfewCheck(session, config) {
   return true;
 }
 __name(privateChatCurfewCheck, "privateChatCurfewCheck");
+function getHalfDayIdentifier(date) {
+  const year = date.getFullYear();
+  const month = date.getMonth() + 1;
+  const day = date.getDate();
+  const period = date.getHours() < 12 ? "am" : "pm";
+  return `${year}${month}${day}_${period}`;
+}
+__name(getHalfDayIdentifier, "getHalfDayIdentifier");
+async function initWeights(ctx) {
+  for (let id = 1; id <= 12; id++) {
+    await ctx.database.create("ggcevo_boss_weights", {
+      bossId: id,
+      weight: 100,
+      lastSpawn: /* @__PURE__ */ new Date(0)
+      // 设置为遥远的过去
+    });
+  }
+}
+__name(initWeights, "initWeights");
+async function updateWeights(ctx, selectedId) {
+  const allWeights = await ctx.database.get("ggcevo_boss_weights", {});
+  for (const weight of allWeights) {
+    if (weight.bossId === selectedId) {
+      const newWeight = Math.max(50, Math.floor(weight.weight / 2));
+      await ctx.database.set("ggcevo_boss_weights", { bossId: weight.bossId }, {
+        weight: newWeight,
+        lastSpawn: /* @__PURE__ */ new Date()
+      });
+    } else {
+      const newWeight = Math.min(200, Math.floor(weight.weight * 1.2));
+      await ctx.database.set("ggcevo_boss_weights", { bossId: weight.bossId }, {
+        weight: newWeight,
+        lastSpawn: weight.lastSpawn
+      });
+    }
+  }
+}
+__name(updateWeights, "updateWeights");
 
 // src/boss/damagecalculation.ts
 async function calculateTotalDamage(ctx, session, config, equippedWeapon, targetBoss, careerData) {
@@ -7088,6 +7148,11 @@ async function updateBossDamageRecord(ctx, handle, playerName, bossGroupId, dama
     attackCount: (existingRecord?.attackCount || 0) + 1,
     lastattackDate: /* @__PURE__ */ new Date()
   }], ["handle", "bossGroupId"]);
+  await ctx.database.create("ggcevo_damage_logs", {
+    handle,
+    date: /* @__PURE__ */ new Date()
+    // 使用当前时间戳
+  });
 }
 __name(updateBossDamageRecord, "updateBossDamageRecord");
 async function updateTaskProgress(ctx, handle, taskUpdates) {
@@ -7297,33 +7362,9 @@ async function verifyFinalBlow(ctx, session, bossName, targetBoss) {
       verificationPassed: false
     };
   }
-  const verificationCode = Array(6).fill(0).map(
-    () => Math.floor(Math.random() * 10)
-  ).join("");
-  await session.send(
-    `<quote id="${session.messageId}"/>⚠️ ${bossName}进入斩杀阶段！每6小时周期（0点、6点、12点或18点）即可攻击一次，但需完成安全验证
-请在30秒内输入验证码:【${verificationCode}】`
-  );
-  const userInput = (await session.prompt(3e4))?.trim();
-  if (!userInput) {
-    await session.send("⏱️ 验证超时！请重新发起攻击。");
-    return { success: false };
-  }
-  if (userInput !== verificationCode) {
-    await session.send("❌ 验证码错误！攻击已中断。");
-    return { success: false };
-  }
-  const [updatedBoss] = await ctx.database.get("ggcevo_boss", {
-    name: bossName,
-    isActive: true
-  });
-  if (!updatedBoss) {
-    await session.send(`✅ 验证通过！但${bossName}已被其他玩家消灭。`);
-    return { success: false };
-  }
   return {
     success: true,
-    updatedBoss,
+    updatedBoss: targetBoss,
     verificationPassed: true
   };
 }
@@ -7614,6 +7655,21 @@ function apply(ctx, config) {
   }, {
     primary: "handle"
   });
+  ctx.model.extend("ggcevo_damage_logs", {
+    id: "unsigned",
+    handle: "string",
+    date: "timestamp"
+  }, {
+    primary: "id",
+    autoInc: true
+  });
+  ctx.model.extend("ggcevo_boss_weights", {
+    bossId: "unsigned",
+    weight: "unsigned",
+    lastSpawn: "timestamp"
+  }, {
+    primary: "bossId"
+  });
   ctx.model.extend("ggcevo_wish", {
     id: "unsigned",
     handle: "string",
@@ -7719,6 +7775,10 @@ function apply(ctx, config) {
     primary: ["handle", "itemId"]
   });
   ctx.setInterval(async () => {
+    const weightCount = await ctx.database.get("ggcevo_boss_weights", {});
+    if (!weightCount || weightCount.length === 0) {
+      await initWeights(ctx);
+    }
     const totalBosses = await ctx.database.select("ggcevo_boss").execute((row) => import_koishi.$.count(row.name));
     const groupIds = [...config.groupId];
     if (totalBosses === 0) {
@@ -7740,6 +7800,7 @@ function apply(ctx, config) {
       await ctx.database.set("ggcevo_weapons", {}, { comboCount: 0 });
       await ctx.database.set("ggcevo_weapons", {}, { pityCounter: 0 });
       const newBossGroup = await activateNextBossGroup(ctx, currentGroupId);
+      await updateWeights(ctx, newBossGroup.groupId);
       const nextBossName = newBossGroup.name;
       const guessingRecords = await ctx.database.get("ggcevo_guess", {
         itemId: 1
@@ -10234,22 +10295,28 @@ ${discountDetails.join("\n")}`;
     const verifiedBoss = verification.updatedBoss || targetBoss;
     const unlimitedBossAttack = config.unlimitedBossAttack;
     if (!unlimitedBossAttack) {
-      const lastAttacks = await ctx.database.get("ggcevo_boss_damage", { handle });
-      if (lastAttacks.length > 0) {
-        const lastAttack = lastAttacks[0];
-        const lastDate = convertUTCtoChinaTime(new Date(lastAttack.lastattackDate));
-        const today = convertUTCtoChinaTime(/* @__PURE__ */ new Date());
-        if (verification.verificationPassed) {
-          const lastQuarter = Math.floor(lastDate.getUTCHours() / 6);
-          const currentQuarter = Math.floor(today.getUTCHours() / 6);
-          const sameDay = lastDate.getUTCDate() === today.getUTCDate() && lastDate.getUTCMonth() === today.getUTCMonth() && lastDate.getUTCFullYear() === today.getUTCFullYear();
-          if (sameDay && lastQuarter === currentQuarter) {
-            return "您在当前时间段内已参与过斩杀攻击，请等待下一个6小时周期（0点、6点、12点或18点）再挑战！";
-          }
+      const now = /* @__PURE__ */ new Date();
+      const currentHalfDayIdentifier = getHalfDayIdentifier(now);
+      console.log(currentHalfDayIdentifier);
+      const attackLogs = await ctx.database.select("ggcevo_damage_logs").where({ handle }).orderBy("date", "desc").limit(4).execute();
+      let currentHalfDayCount = 0;
+      for (const log of attackLogs) {
+        const logTime = log.date;
+        if (getHalfDayIdentifier(logTime) === currentHalfDayIdentifier) {
+          currentHalfDayCount++;
         } else {
-          if (isSameHalfDay(lastDate, today)) {
-            return "您在当前时段内已经攻击过了，请在12点或0点后再来挑战！";
-          }
+          break;
+        }
+      }
+      if (verification.verificationPassed) {
+        if (currentHalfDayCount >= 2) {
+          const nextResetHour = now.getHours() < 12 ? 12 : 24;
+          return `您在当前时间段（${now.getHours() < 12 ? "0-12点" : "12-24点"}）已攻击过2次（斩杀阶段），请${nextResetHour === 12 ? "中午12点" : "次日0点"}后再挑战！`;
+        }
+      } else {
+        if (currentHalfDayCount >= 1) {
+          const nextResetHour = now.getHours() < 12 ? 12 : 24;
+          return `您在当前时间段（${now.getHours() < 12 ? "0-12点" : "12-24点"}）已攻击过1次，请${nextResetHour === 12 ? "中午12点" : "次日0点"}后再挑战！`;
         }
       }
     }
@@ -10778,7 +10845,12 @@ ${testResult.passiveMessages.map((m) => `▸ ${m}`).join("\n")}`
     const effect = pool[Math.floor(Math.random() * pool.length)];
     switch (effect.name) {
       case "金柚赐福":
-        newGold += 250;
+        const [ResourceExchangeVoucher] = await ctx.database.get("ggcevo_backpack", { handle, itemId: 8 });
+        await ctx.database.upsert("ggcevo_backpack", [{
+          handle,
+          itemId: 8,
+          quantity: (ResourceExchangeVoucher?.quantity || 0) + 3
+        }]);
         break;
       case "酥手空空":
         newGold = Math.max(0, newGold - 50);
@@ -10787,10 +10859,10 @@ ${testResult.passiveMessages.map((m) => `▸ ${m}`).join("\n")}`
         await ctx.broadcast(groupId, kfcMsg);
         break;
       case "夜市赠礼":
-        const [backpack] = await ctx.database.get("ggcevo_backpack", { handle, itemId: 8 });
+        const [backpack] = await ctx.database.get("ggcevo_backpack", { handle, itemId: 1 });
         await ctx.database.upsert("ggcevo_backpack", [{
           handle,
-          itemId: 8,
+          itemId: 1,
           quantity: (backpack?.quantity || 0) + 5
         }]);
         break;
@@ -13009,8 +13081,8 @@ PK同玩家限战：1次/日
 🦗 ​​蚱蜢优购​​：下一次购买武器(非传奇)享有20%的折扣
 🦊 ​​灵狐升运​​：下一次升级武器享有20%的折扣
 👑 ​​王权增幅​​：攻击伤害提高5%
-🍊 ​​金柚赐福​​：立即获得250枚金币
-🪙 ​​夜市赠礼​​：立即获得5张资源兑换券
+🍊 ​​金柚赐福​​：立即获得3张资源兑换券
+🪙 ​​夜市赠礼​​：立即获得5枚咕咕币
       
 🔮 ​​稀有祈愿池（5%概率）​​
 🗡️ ​​悲鸣之锋​​：攻击伤害提高10%，武器每等级提高5%伤害

package/lib/utils.d.ts

@@ -7,7 +7,6 @@ export declare function checkSensitiveWord(ctx: Context, content: string): Promi
 export declare function getRandomInt(min: number, max: number): number;
 export declare function PetCapsuleToy(): "t3级宠物扭蛋" | "t2级宠物扭蛋" | "t1级宠物扭蛋" | "t0级宠物扭蛋";
 export declare function isSameDate(a: Date, b: Date): boolean;
-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;
@@ -51,3 +50,6 @@ export declare function fixedCurfewCheck(session: any, config: Config): true | f
  * @returns 是否允许私聊
  */
 export declare function privateChatCurfewCheck(session: any, config: Config): boolean;
+export declare function getHalfDayIdentifier(date: any): string;
+export declare function initWeights(ctx: any): Promise<void>;
+export declare function updateWeights(ctx: Context, selectedId: number): Promise<void>;

package/lib/wish.d.ts

@@ -10,10 +10,10 @@ export declare const wishConfig: {
         readonly effect: "攻击伤害提高5%";
     }, {
         readonly name: "金柚赐福";
-        readonly effect: "立即获得250枚金币";
+        readonly effect: "立即获得3张资源兑换券";
     }, {
         readonly name: "夜市赠礼";
-        readonly effect: "立即获得5张资源兑换券";
+        readonly effect: "立即获得3枚咕咕币";
     }];
     readonly rare: readonly [{
         readonly name: "悲鸣之锋";

package/package.json

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