koishi-plugin-ggcevo-game 1.5.30 → 1.5.31

package/lib/index.js

@@ -10959,23 +10959,23 @@ ${Spacestationtechnology.map((t) => t.techname).join("、")}`;
     }
     let halfHours = Math.floor(duration / 30);
     let base = halfHours * 4;
-    const maxHalfHours = career.group === "人类联盟" && techLevel === 5 ? 96 : 48;
+    const maxHalfHours = career?.group === "人类联盟" && techLevel === 5 ? 96 : 48;
     halfHours = Math.min(halfHours, maxHalfHours);
     base = Math.min(base, maxHalfHours * 4);
     let techBonusRate = 0;
     let careerBonusRate = 0;
     let shipBonusRate = 0;
     let minerBonusRate = 0;
-    if (career.group === "人类联盟") {
+    if (career?.group === "人类联盟") {
       const baseTechRates = [0, 0.1, 0.2, 0.3, 0.4, 0.5];
       techBonusRate = baseTechRates[Math.min(techLevel, 5)];
       const techCareers = ["深空矿工", "情报副官"];
-      if (techCareers.includes(career.career)) {
+      if (techCareers.includes(career?.career)) {
         const careerBonusRates = [0, 0.1, 0.2, 0.3, 0.4, 0.5];
         careerBonusRate = careerBonusRates[Math.min(techLevel, 5)];
       }
     }
-    if (career.career === "深空矿工") {
+    if (career?.career === "深空矿工") {
       minerBonusRate = 0.5;
     }
     let shipName = "";
@@ -11048,7 +11048,7 @@ ${Spacestationtechnology.map((t) => t.techname).join("、")}`;
       if (hasMinerBonus) {
         reportLines.push(`▸ ⛏️ 深空矿工专业加成：+${(minerBonusRate * 100).toFixed(0)}%金币`);
       }
-      if (techLevel === 5 && career.group === "人类联盟") {
+      if (techLevel === 5 && career?.group === "人类联盟") {
         reportLines.push(`▸ ⏱️ 单次挖矿时间上限增加至48小时`);
       }
     }
@@ -11419,10 +11419,7 @@ ${Spacestationtechnology.map((t) => t.techname).join("、")}`;
       return "⛔ 您已被列入黑名单。";
     }
     const [career] = await ctx.database.get("ggcevo_careers", { handle });
-    const allowedGroups = ["人类联盟", "辛迪加海盗"];
-    if (!allowedGroups.includes(career.group)) {
-    }
-    const careerName = career.career;
+    const careerName = career?.career;
     const careerCoinBonus = careerName === "总工程师" ? 50 : 0;
     const [shipRecord] = await ctx.database.get("ggcevo_spaceship", { handle });
     let shipBonus = 0;
@@ -11457,7 +11454,7 @@ ${Spacestationtechnology.map((t) => t.techname).join("、")}`;
     const techLevel = techReactor?.level || 0;
     let techBonusRate = 0;
     let careerBonusRate = 0;
-    if (career.group === "人类联盟" && techLevel > 0) {
+    if (career?.group === "人类联盟" && techLevel > 0) {
       const baseRates = [0, 0.1, 0.2, 0.3, 0.4, 0.5];
       techBonusRate = baseRates[techLevel];
       const specialCareers = ["总工程师", "情报副官"];
@@ -11480,8 +11477,8 @@ ${Spacestationtechnology.map((t) => t.techname).join("、")}`;
         const returnsIncrement = (record.returns || 0) + 1;
         const galaxyData2 = galaxy[record.galaxy];
         let successRate = galaxyData2.success;
-        if (career.group === "人类联盟" && record.galaxy === "联盟星系") successRate += 0.1;
-        else if (career.group === "辛迪加海盗" && record.galaxy === "辛迪加星系") successRate += 0.1;
+        if (career?.group === "人类联盟" && record.galaxy === "联盟星系") successRate += 0.1;
+        else if (career?.group === "辛迪加海盗" && record.galaxy === "辛迪加星系") successRate += 0.1;
         if (stealthShipEffectAdded) successRate += 0.2;
         successRate = Math.min(successRate, 1);
         let baseCoinReward = Math.floor(Math.random() * 51) + 50;
@@ -11639,8 +11636,8 @@ ${Spacestationtechnology.map((t) => t.techname).join("、")}`;
     }], ["handle"]);
     const galaxyData = galaxy[galaxyName];
     let estimatedRate = galaxyData.success;
-    if (career.group === "人类联盟" && galaxyName === "联盟星系") estimatedRate += 0.1;
-    if (career.group === "辛迪加海盗" && galaxyName === "辛迪加星系") estimatedRate += 0.1;
+    if (career?.group === "人类联盟" && galaxyName === "联盟星系") estimatedRate += 0.1;
+    if (career?.group === "辛迪加海盗" && galaxyName === "辛迪加星系") estimatedRate += 0.1;
     if (isStealthShip) estimatedRate += 0.2;
     estimatedRate = Math.min(estimatedRate, 1) * 100;
     return [
@@ -11801,7 +11798,7 @@ ${Spacestationtechnology.map((t) => t.techname).join("、")}`;
     if (career.career === "指挥官") {
       upgradeCost = Math.floor(upgradeCost * 0.5);
       discountNotice = `
-✨ 指挥官职业生效！实际消耗: ${upgradeCost} (原价${upgradeConfig.upgradeCostBase}的50%)`;
+✨ 指挥官职业生效！实际消耗: ${upgradeCost} (原价：${upgradeConfig.upgradeCostBase})`;
     }
     if (career.redcrystal < upgradeCost) {
       return `🚫 红晶不足！升级需要${upgradeCost}红晶，您当前有${career.redcrystal}红晶`;

package/package.json

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