koishi-plugin-ggcevo-game 1.3.30 → 1.3.31

package/lib/index.d.ts

@@ -41,6 +41,7 @@ declare module 'koishi' {
         ggcevo_warehouse: warehouse;
         ggcevo_tech: tech;
         ggcevo_Mining: Mining;
+        ggcevo_task: task;
     }
 }
 export interface backpack {
@@ -189,4 +190,10 @@ export interface Mining {
     handle: string;
     startTime: Date;
 }
+export interface task {
+    handle: string;
+    taskId: number;
+    progress: number;
+    Completions: number;
+}
 export declare function apply(ctx: Context, config: Config): void;

package/lib/index.js

@@ -284,6 +284,14 @@ function apply(ctx, config) {
   }, {
     primary: "handle"
   });
+  ctx.model.extend("ggcevo_task", {
+    handle: "string",
+    taskId: "unsigned",
+    progress: "unsigned",
+    Completions: "unsigned"
+  }, {
+    primary: ["handle", "taskId"]
+  });
   const weaponConfig = {
     // 武器配置
     "高斯步枪": {
@@ -631,11 +639,11 @@ function apply(ctx, config) {
     },
     "吸血唾液": {
       effect: 0,
-      description: "受到攻击将会获得一层“吸血”，每层“吸血”提供5%的减伤(至多10层)"
+      description: "受到攻击将会获得一层“吸血”，每层“吸血”提供5%的减伤(至多20层)"
     },
     "进食": {
       effect: 0,
-      description: "当“吸血”达到10层后，下一次受到攻击将会消耗所有层数回复自身20%的最大生命值"
+      description: "当“吸血”达到20层后，下一次受到攻击将会消耗所有层数回复自身20%的最大生命值"
     },
     "嗜血狂暴": {
       effect: 0,
@@ -643,7 +651,7 @@ function apply(ctx, config) {
     },
     "吐血": {
       effect: 0,
-      description: "当无“吸血”层数时，受到的伤害+10%"
+      description: "当无“吸血”层数时，受到的伤害+20%"
     },
     "辐射": {
       effect: 0,
@@ -956,19 +964,19 @@ function apply(ctx, config) {
           level: 3,
           cost: 2950,
           description: "提高挖矿效率，每日签到金币奖励+15%",
-          careerBonus: "深空矿工/情报副官: 每日签到金币奖励+30%; 解锁太空“挖矿”权限"
+          careerBonus: "深空矿工/情报副官: 每日签到金币奖励+30%; 解锁太空“挖矿”权限; 建造矿骡协同挖矿，效率提高20%"
         },
         {
           level: 4,
           cost: 4250,
           description: "提高挖矿效率，每日签到金币奖励+20%",
-          careerBonus: "深空矿工/情报副官: 每日签到金币奖励+40%; 解锁太空“挖矿”权限; 建造矿骡协同挖矿，效率提高25%"
+          careerBonus: "深空矿工/情报副官: 每日签到金币奖励+40%; 解锁太空“挖矿”权限; 建造矿骡协同挖矿，效率提高40%"
         },
         {
           level: 5,
           cost: 5375,
           description: "提高挖矿效率，每日签到金币奖励+25%",
-          careerBonus: "深空矿工/情报副官: 每日签到金币奖励+50%; 解锁太空“挖矿”权限; 建造矿骡协同挖矿，效率提高50%"
+          careerBonus: "深空矿工/情报副官: 每日签到金币奖励+50%; 解锁太空“挖矿”权限; 建造矿骡协同挖矿，效率提高60%，并且单次挖矿时间上限增加至48小时"
         }
       ]
     },
@@ -1032,6 +1040,17 @@ function apply(ctx, config) {
       ]
     }
   ];
+  const Tasklist = {
+    "成人之美": {
+      id: 1,
+      type: "可重复任务",
+      description: "每一个成功人士的背后总有默默付出的辅助，而你，我的朋友，理应获得补助",
+      target: 2,
+      price: 100,
+      redCrystalCost: 0,
+      condition: "使用伽马枪攻击异形并成功使辐射层数+1"
+    }
+  };
   async function calculateTotalDamage(ctx2, session, equippedWeapon, targetBoss, options) {
     let effectMessage = [];
     const finalTags = options?.customTags || targetBoss.tags || [];
@@ -1669,8 +1688,8 @@ function apply(ctx, config) {
         messages.push(`🔥 【嗜血狂暴】生效：血量低于50%，进入狂暴状态，受到的伤害-20%`);
       }
       if (targetBoss.skills.includes("吐血") && bloodStacks < 1) {
-        damageMultiplier += 0.1;
-        messages.push(`💔 【吐血】生效：无“吸血”层数，受到的伤害+10%`);
+        damageMultiplier += 0.2;
+        messages.push(`💔 【吐血】生效：无“吸血”层数，受到的伤害+20%`);
       }
       return { damageMultiplier, messages };
     }, "handleBloodEffects"),
@@ -1682,7 +1701,7 @@ function apply(ctx, config) {
       let updatedHP = currentHP;
       let newStacks;
       const oldStacks = targetBoss.Skillcountpoints || 0;
-      if (oldStacks >= 10 && targetBoss.skills.includes("进食")) {
+      if (oldStacks >= 20 && targetBoss.skills.includes("进食")) {
         const heal = Math.floor(maxHP * 0.2);
         updatedHP = Math.min(currentHP + heal, maxHP);
         await ctx2.database.set("ggcevo_boss", { name: targetBoss.name }, { Skillcountpoints: 0 });
@@ -1697,8 +1716,8 @@ function apply(ctx, config) {
         newStacks += 1;
         messages.push(`🔥 【嗜血狂暴】生效：额外获得1层“吸血”`);
       }
-      newStacks = Math.min(newStacks, 10);
-      if (oldStacks < 10 && newStacks >= 10) {
+      newStacks = Math.min(newStacks, 20);
+      if (oldStacks < 20 && newStacks >= 20) {
         messages.push(`🩸 “吸血”层数达到${newStacks}，下次受到攻击将触发【进食】`);
       }
       await ctx2.database.set("ggcevo_boss", { name: targetBoss.name }, { Skillcountpoints: newStacks });
@@ -1710,21 +1729,24 @@ function apply(ctx, config) {
         return null;
       }
       const messages = [];
+      let radiationApplied = false;
       const hasRadiation = targetBoss.skills.includes("辐射");
       const currentLayers = targetBoss.Vulnerability || 0;
       const skillUpdates = [];
       const newLayers = hasRadiation ? Math.min(currentLayers + 1, 100) : 1;
       let layerMsg;
       if (!hasRadiation) {
-        layerMsg = `☢️ ${targetBoss.name} 获得【辐射】效果`;
+        layerMsg = `☢️ ${targetBoss.name} 获得【辐射】效果(初始层数1)`;
         skillUpdates.push({
           name: targetBoss.name,
           add: ["辐射"]
         });
+        radiationApplied = true;
       } else if (newLayers === currentLayers) {
         layerMsg = `☢️ 辐射层数已达上限(100层)`;
       } else {
         layerMsg = `☢️ 辐射层数+1`;
+        radiationApplied = true;
       }
       await ctx2.database.set(
         "ggcevo_boss",
@@ -1734,7 +1756,12 @@ function apply(ctx, config) {
         }
       );
       messages.push(layerMsg);
-      return { messages, skillUpdates };
+      return {
+        messages,
+        skillUpdates,
+        radiationApplied
+        // 返回辐射应用标志
+      };
     }, "handleGammaRadiation"),
     // 伽马枪辐射计算（返回增伤系数）
     calculateRadiationDamage: /* @__PURE__ */ __name((targetBoss) => {
@@ -1751,6 +1778,7 @@ function apply(ctx, config) {
       let messages = [];
       let skillUpdates = [];
       let totalMultiplier = 0;
+      let radiationApplied = false;
       const frostEvoResult = this.handleFrostEvolution(targetBoss, weaponName, initialDamage, maxHP);
       if (frostEvoResult) {
         return {
@@ -1769,9 +1797,6 @@ function apply(ctx, config) {
           initialDamage: 0
         };
       }
-      if (currentHP <= 0 && !targetBoss.skills.includes("求生本能I") && !targetBoss.skills.includes("求生本能II")) {
-        return { currentHP, messages: [], skillUpdates: [], initialDamage };
-      }
       targetBoss.skills.forEach((skill) => {
         const config2 = passiveConfig[skill];
         if (config2 && config2.effect !== void 0 && config2.effect !== 0) {
@@ -1801,14 +1826,16 @@ function apply(ctx, config) {
         messages.push(...radiationCalc.messages);
       }
       const originalMultiplier = totalMultiplier;
-      totalMultiplier = Math.max(totalMultiplier, -0.99);
-      if (originalMultiplier < -0.99) {
-        messages.push(`⚠️ 减伤效果已达上限(99%)`);
+      if (originalMultiplier < -1) {
+        messages.push(`⚠️ 触发伤害保底机制：强制造成1点伤害`);
       }
       let finalDamage = initialDamage * (1 + totalMultiplier);
       finalDamage = Math.floor(finalDamage);
       finalDamage = Math.max(finalDamage, 1);
       currentHP = targetBoss.HP - finalDamage;
+      if (currentHP <= 0 && !targetBoss.skills.includes("求生本能I") && !targetBoss.skills.includes("求生本能II")) {
+        return { currentHP, messages: [], skillUpdates: [], initialDamage };
+      }
       const frostSurroundResult = await this.handleFrostSurround(ctx2, targetBoss, currentHP, maxHP);
       if (frostSurroundResult) {
         currentHP = frostSurroundResult.updatedHP;
@@ -1848,12 +1875,15 @@ function apply(ctx, config) {
       if (gammaRadResult) {
         messages.push(...gammaRadResult.messages);
         skillUpdates.push(...gammaRadResult.skillUpdates);
+        radiationApplied = gammaRadResult.radiationApplied;
       }
       return {
         currentHP,
         messages,
         skillUpdates,
-        initialDamage: finalDamage
+        initialDamage: finalDamage,
+        radiationApplied
+        // 新增返回辐射应用标记
       };
     }, "handlePassives"),
     // 应用技能更新到数据库（优化合并同名boss的更新）
@@ -4649,6 +4679,7 @@ ${validTypes.join("、")}`;
     let initialDamage = Math.min(damage, targetBoss.HP);
     let currentHP = targetBoss.HP - initialDamage;
     let passiveMessages = [];
+    let radiationApplied;
     const passiveResult = await PassiveHandler.handlePassives(
       ctx,
       targetBoss,
@@ -4663,6 +4694,7 @@ ${validTypes.join("、")}`;
     currentHP = passiveResult.currentHP;
     initialDamage = passiveResult.initialDamage;
     passiveMessages.push(...passiveResult.messages);
+    radiationApplied = passiveResult.radiationApplied;
     if (passiveResult.skillUpdates.length > 0) {
       await PassiveHandler.applySkillUpdates(ctx, passiveResult.skillUpdates);
     }
@@ -4681,6 +4713,15 @@ ${validTypes.join("、")}`;
       attackCount: (existingRecord?.attackCount || 0) + 1,
       lastattackDate: /* @__PURE__ */ new Date()
     }], ["handle"]);
+    const [RadiationRecord] = await ctx.database.get("ggcevo_task", {
+      handle,
+      taskId: 1
+    });
+    await ctx.database.upsert("ggcevo_task", [{
+      handle,
+      taskId: 1,
+      progress: (RadiationRecord?.progress || 0) + 1
+    }], ["handle"]);
     if (isDefeated) {
       if (targetBoss.type === "主宰") {
         await ctx.database.set(
@@ -5633,7 +5674,7 @@ ${Spacestationtechnology.map((t) => t.techname).join("、")}`;
         startTime: /* @__PURE__ */ new Date()
         // 记录当前时间为开始时间
       });
-      return "⛏️ 挖矿作业已开始，至少1小时后可收获。";
+      return "⛏️ 首次挖矿作业已开始，等待至少1小时后可收获。";
     }
     const nowtime = /* @__PURE__ */ new Date();
     const chinaStart = convertUTCtoChinaTime(record.startTime);
@@ -5654,14 +5695,18 @@ ${Spacestationtechnology.map((t) => t.techname).join("、")}`;
     const halfHours = Math.floor(duration / 30);
     let base = halfHours * 6;
     base = Math.round(base);
-    base = Math.min(base, 288);
+    const maxHalfHours = tech.level === 5 ? 96 : 48;
+    base = Math.min(base, maxHalfHours * 6);
     let multiplier = 0;
     switch (tech.level) {
+      case 3:
+        multiplier = 0.2;
+        break;
       case 4:
-        multiplier = 0.25;
+        multiplier = 0.4;
         break;
       case 5:
-        multiplier = 0.5;
+        multiplier = 0.6;
         break;
     }
     const total = Math.round(base * (1 + multiplier));
@@ -5686,20 +5731,123 @@ ${Spacestationtechnology.map((t) => t.techname).join("、")}`;
       `⏱️ 结束时间：${nowtime.toLocaleString("zh-CN", { hour12: false })}`,
       `⏳ 持续时间：${formatTime(duration)}`
     ];
-    if (duration > 24 * 60) {
-      reportLines.push("⚠️ 注意：收益已在24小时达到上限");
+    const maxHours = tech.level === 5 ? 48 : 24;
+    if (duration > maxHours * 60) {
+      reportLines.push(`⚠️ 注意：收益已在${maxHours}小时达到上限`);
     }
     let rewardLine = `💰 实际获得：${total}金币`;
-    if (tech.level >= 4) {
+    if (tech.level >= 3) {
       rewardLine += ` (基础值：${base}金币)`;
     }
     reportLines.push(rewardLine);
-    if (tech.level >= 4) {
+    if (tech.level >= 3) {
       reportLines.push(`🔧 挖矿系统 Lv.${tech.level}：金币+${multiplier * 100}%`);
     }
     reportLines.push("💡 已自动开始下一轮挖矿");
     return reportLines.join("\n");
   });
+  ctx.command("ggcevo/任务 [name]").usage('输入"任务"查看所有任务列表，或"任务 任务名称"查看详细任务信息').action(async ({ session }, name2) => {
+    const [profile] = await ctx.database.get("sc2arcade_player", { userId: session.userId });
+    if (!profile) return "⚠️ 需要先绑定游戏句柄";
+    const handle = `${profile.regionId}-S2-${profile.realmId}-${profile.profileId}`;
+    if (!name2) {
+      const taskList = [];
+      for (const [taskName, task2] of Object.entries(Tasklist)) {
+        const [playerTask2] = await ctx.database.get("ggcevo_task", {
+          handle,
+          taskId: task2.id
+        }).catch(() => [null]);
+        const completionStatus = playerTask2 ? `进度: ${playerTask2.progress}/${task2.target}` : "尚未开始";
+        taskList.push([
+          `▸ 【${taskName}】`,
+          `类型: ${task2.type}`,
+          `目标: ${task2.target}次`,
+          `奖励: ${task2.price}金币`,
+          `状态: ${completionStatus}`
+        ].join("\n"));
+      }
+      return [
+        "📋 任务列表",
+        '使用"任务 任务名称"查看详细任务信息',
+        "====================",
+        ...taskList,
+        "===================="
+      ].join("\n\n");
+    }
+    const task = Object.entries(Tasklist).find(
+      ([taskName]) => taskName === name2
+    )?.[1];
+    if (!task) return "⚠️ 未找到该任务，请检查任务名称是否正确";
+    const [playerTask] = await ctx.database.get("ggcevo_task", {
+      handle,
+      taskId: task.id
+    }).catch(() => [null]);
+    const progress = playerTask ? playerTask.progress : 0;
+    const completions = playerTask ? playerTask.Completions : 0;
+    return [
+      `📝 任务详情: ${name2}`,
+      "====================",
+      `任务名称: ${name2}`,
+      `任务类型: ${task.type}`,
+      `任务目标: ${task.target}次`,
+      `任务奖励: ${task.price}金币`,
+      `当前进度: ${progress}/${task.target}`,
+      `累计完成: ${completions}次`,
+      "-------------------",
+      "任务描述:",
+      task.description,
+      "-------------------",
+      "完成条件:",
+      task.condition,
+      "====================",
+      `📌 使用"完成任务 ${name2}"领取奖励`
+    ].join("\n");
+  });
+  ctx.command("ggcevo/完成任务 <name:text>", "完成指定任务领取奖励").usage('输入"完成任务 任务名称"来完成任务并领取奖励').action(async ({ session }, name2) => {
+    const [profile] = await ctx.database.get("sc2arcade_player", { userId: session.userId });
+    if (!profile) return "⚠️ 需要先绑定游戏句柄";
+    const handle = `${profile.regionId}-S2-${profile.realmId}-${profile.profileId}`;
+    if (await ctx.database.get("ggcevo_blacklist", { handle }).then((r) => r.length)) {
+      return "⛔ 您已被列入黑名单";
+    }
+    const taskEntry = Object.entries(Tasklist).find(
+      ([taskName2]) => taskName2.includes(name2)
+    );
+    if (!name2) return "请输入“完成任务 任务名称”领取任务奖励";
+    if (!taskEntry) return `⚠️ 未找到名称包含"${name2}"的任务`;
+    const [taskName, taskConfig] = taskEntry;
+    const [taskData] = await ctx.database.get("ggcevo_task", {
+      handle,
+      taskId: taskConfig.id
+    });
+    if (!taskData) return `⚠️ 您尚未开始"${taskName}"任务`;
+    if (taskData.progress < taskConfig.target) {
+      return `⚠️ 任务进度不足！当前进度：${taskData.progress}/${taskConfig.target}`;
+    }
+    const newProgress = taskData.progress - taskConfig.target;
+    const newCompletions = taskData.Completions + 1;
+    await ctx.database.set("ggcevo_task", {
+      handle,
+      taskId: taskConfig.id
+    }, {
+      progress: newProgress,
+      Completions: newCompletions
+    });
+    const [signData] = await ctx.database.get("ggcevo_sign", { handle });
+    await ctx.database.upsert("ggcevo_sign", [{
+      handle,
+      totalRewards: (signData?.totalRewards || 0) + taskConfig.price
+    }], ["handle"]);
+    const [updatedSignData] = await ctx.database.get("ggcevo_sign", { handle });
+    return [
+      `🎉 恭喜您成功完成【${taskName}】任务！`,
+      `任务奖励：${taskConfig.price}金币`,
+      `累计完成次数：${newCompletions}次`,
+      `剩余进度点数：${newProgress}`,
+      `当前拥有金币：${updatedSignData.totalRewards}`,
+      newProgress >= taskConfig.target ? `💡 当前剩余进度可再完成${Math.floor(newProgress / taskConfig.target)}次任务` : ``
+    ].join("\n");
+  });
 }
 __name(apply, "apply");
 function simpleDraw() {

package/package.json

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