koishi-plugin-ggcevo-game 1.4.21 → 1.4.23

package/lib/index.js

@@ -137,6 +137,7 @@ var weaponConfig = {
     redCrystalCost: 10,
     isantiair: true,
     tagEffects: {
+      "轻甲": 0.5,
       "重甲": 0.2
     }
   },
@@ -144,7 +145,7 @@ var weaponConfig = {
     id: 8,
     type: "热能武器",
     category: "热能武器",
-    damage: 20,
+    damage: 22,
     description: "喷射稳定的液氮恒流，对长时间接触者造成致命的损伤",
     specialeffect: "攻击使目标叠加“寒冷”层数，每层使其受到的伤害+2.5%(至多+50%)",
     price: 775,
@@ -174,7 +175,7 @@ var weaponConfig = {
     id: 10,
     type: "热能武器",
     category: "热能武器",
-    damage: 25,
+    damage: 24,
     description: "一种高度危险性的武器，设计用辐射照射并伤害敌人",
     specialeffect: "攻击使生物目标(无机械标签)叠加“辐射”层数，每层使其受到的伤害+2.5%(至多+50%)",
     price: 825,
@@ -445,7 +446,7 @@ var SyndicatedItems = {
     price: 0,
     redCrystalCost: 60,
     condition: "辛迪加海盗阵营",
-    effects: "每日签到金币奖励+50%，每有一名人类联盟玩家额外增加1%(至多额外增加50%)"
+    effects: "每日签到金币奖励+50%，每有一名人类联盟玩家额外+1%(至多额外+50%)"
   },
   "脉冲手雷": {
     id: 4,
@@ -2059,8 +2060,8 @@ async function handleTechUpgrade(ctx, handle, target) {
     costInfo,
     ...discountInfo,
     // 折扣信息
-    `📝 ${levelData.description}`,
-    `💼 ${levelData.careerBonus}`,
+    `📝 基础效果：${levelData.description}`,
+    `💼 职业效果：${levelData.careerBonus}`,
     ...permissionMessage
     // 权限解锁信息
   ].filter(Boolean).join("\n");
@@ -2623,7 +2624,7 @@ var PassiveHandler = {
     let statusMsg = `☢️ 【辐射】生效：当前${radiationLayers}层辐射`;
     statusMsg += `，受到的伤害+${damageIncrease}%`;
     if (damageIncrease >= maxIncrease) {
-      statusMsg += `(达到上限)`;
+      statusMsg += ``;
     }
     messages.push(statusMsg);
     return {
@@ -2664,7 +2665,7 @@ var PassiveHandler = {
     let statusMsg = `❄️ 【寒冷】生效：当前${freezingLayers}层`;
     statusMsg += `，受到的伤害+${damageIncrease}%`;
     if (damageIncrease >= maxIncrease) {
-      statusMsg += `(达到上限)`;
+      statusMsg += ``;
     }
     messages.push(statusMsg);
     return {
@@ -6267,13 +6268,13 @@ ${validTypes.join("、")}`;
         if (activeWish) {
           const wishDiscount = 20;
           totalDiscount += wishDiscount;
-          discountDetails.push(`▸ 🦗 蚱蜢优购祈愿：${wishDiscount}%折扣`);
+          discountDetails.push(`🦗 蚱蜢优购祈愿：${wishDiscount}%折扣`);
         }
       }
       if (isWeapon && careerData?.career === "武器中士") {
         const specialistDiscount = 20;
         totalDiscount += specialistDiscount;
-        discountDetails.push(`▸ 🎖️ 武器中士职业：${specialistDiscount}%折扣`);
+        discountDetails.push(`🎖️ 武器中士职业：${specialistDiscount}%折扣`);
       }
       totalDiscount = Math.min(totalDiscount, 100);
     }
@@ -7878,67 +7879,63 @@ ${Spacestationtechnology.map((t) => t.techname).join("、")}`;
         handle,
         taskId: taskConfig.id
       });
-      if (!taskData) return `⚠️ ⚠️ 任务进度不足！无法完成"${taskName}"任务`;
+      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;
       const [careerData] = await ctx.database.get("ggcevo_careers", { handle });
       const [systemFirmwareTech] = await ctx.database.get("ggcevo_tech", { handle, techId: 5 }).catch(() => [{ level: 0 }]);
       const techLevel = Math.min(systemFirmwareTech?.level || 0, 5);
-      let baseReward = taskConfig.price;
-      let actualReward = baseReward;
-      let bonusPercent = 0;
+      const completableTimes = Math.floor(taskData.progress / taskConfig.target);
+      const remainingProgress = taskData.progress % taskConfig.target;
+      const newCompletions = taskData.Completions + completableTimes;
+      const baseTotal = taskConfig.price * completableTimes;
+      let baseBonus = 0;
       if (techLevel > 0) {
-        const normalBonus = [0, 5, 10, 15, 20, 25][techLevel];
-        const careerBonus = careerData?.group === "人类联盟" && ["舰长", "情报副官"].includes(careerData?.career) ? [0, 10, 20, 30, 40, 50][techLevel] : 0;
-        bonusPercent = Math.max(normalBonus, careerBonus);
-      }
-      if (careerData?.group === "人类联盟" && careerData.career === "舰长") {
-        bonusPercent += 50;
-      }
-      if (bonusPercent > 0) {
-        actualReward = Math.round(baseReward * (1 + bonusPercent / 100));
+        baseBonus = careerData?.group === "人类联盟" && ["舰长", "情报副官"].includes(careerData?.career) ? [0, 10, 20, 30, 40, 50][techLevel] : [0, 5, 10, 15, 20, 25][techLevel];
       }
+      const captainBonus = careerData?.group === "人类联盟" && careerData.career === "舰长" ? 50 : 0;
+      const totalBonus = baseBonus + captainBonus;
+      const totalReward = totalBonus > 0 ? Math.round(baseTotal * (1 + totalBonus / 100)) : baseTotal;
       await ctx.database.set("ggcevo_task", {
         handle,
         taskId: taskConfig.id
       }, {
-        progress: newProgress,
+        progress: remainingProgress,
         Completions: newCompletions
       });
       const [signData] = await ctx.database.get("ggcevo_sign", { handle });
+      const newTotalRewards = (signData?.totalRewards || 0) + totalReward;
       await ctx.database.upsert("ggcevo_sign", [{
         handle,
-        totalRewards: (signData?.totalRewards || 0) + actualReward
+        totalRewards: newTotalRewards
       }], ["handle"]);
-      const [updatedSignData] = await ctx.database.get("ggcevo_sign", { handle });
       const response = [
-        `🎉 恭喜您成功完成【${taskName}】任务！`
+        `🎉 成功完成【${taskName}】任务！`
       ];
-      if (bonusPercent > 0) {
-        response.push(`任务奖励：${actualReward}金币 (基础值：${baseReward}金币)`);
+      if (totalBonus > 0) {
+        response.push(`💰 获得总奖励：${totalReward}金币 (基础值: ${baseTotal}金币)`);
       } else {
-        response.push(`任务奖励：${actualReward}金币`);
+        response.push(`💰 获得总奖励：${totalReward}金币`);
       }
-      if (bonusPercent > 0) {
-        let bonusType = "";
-        if (careerData?.group === "人类联盟" && ["舰长", "情报副官"].includes(careerData.career)) {
-          bonusType = "(职业专属加成)";
-        } else {
-          bonusType = "(普通加成)";
-        }
+      if (totalBonus > 0) {
         response.push(`⚡ 加成效果：`);
-        response.push(`▸ ⚙️ 关键系统固件Lv.${techLevel}：+${bonusPercent}%金币`);
+        if (baseBonus > 0) {
+          response.push(`▸ ⚙️ 关键系统固件Lv.${techLevel}: +${baseBonus}%金币`);
+        }
+        if (captainBonus > 0) {
+          response.push(`▸ 🚀 舰长职业: +${captainBonus}%金币`);
+        }
       }
       response.push(
-        `累计完成次数：${newCompletions}次`,
-        `剩余进度点数：${newProgress}`,
-        `当前拥有金币：${updatedSignData.totalRewards}`
+        `📊 累计完成次数: ${newCompletions}次`,
+        `⚙️ 剩余进度点数: ${remainingProgress}/${taskConfig.target}`
       );
-      if (newProgress >= taskConfig.target) {
-        response.push(`💡 当前剩余进度可再完成${Math.floor(newProgress / taskConfig.target)}次任务`);
+      if (remainingProgress > 0) {
+        response.push(`💡 剩余进度可完成 ${Math.floor(remainingProgress / taskConfig.target)} 次`);
+      }
+      if (completableTimes > 1) {
+        response.push(`💡 成功完成${completableTimes}次任务，已发放全部奖励`);
       }
       return response.join("\n");
     } catch (error) {

package/lib/weapons.d.ts

@@ -102,6 +102,7 @@ export declare const weaponConfig: {
         redCrystalCost: number;
         isantiair: boolean;
         tagEffects: {
+            轻甲: number;
             重甲: number;
         };
     };

package/package.json

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