koishi-plugin-ggcevo-game 1.2.57 → 1.2.59

package/lib/index.js

@@ -3255,18 +3255,20 @@ ${achievementList.join("\n")}`;
           await ctx.database.set("ggcevo_sign", targetHandle, { totalRewards: targetGold + goldTransfer });
         }
         if (isWin) {
-          const [initiatorCareer] = await ctx.database.get("ggcevo_careers", {
+          const [initiatorCareer2] = await ctx.database.get("ggcevo_careers", {
             handle: initiatorHandle
           });
-          if (initiatorCareer?.group === "辛迪加海盗") {
+          if (initiatorCareer2?.group === "辛迪加海盗") {
             await ctx.database.upsert("ggcevo_careers", [{
               handle: initiatorHandle,
-              redcrystal: (initiatorCareer.redcrystal || 0) + 1
+              redcrystal: (initiatorCareer2.redcrystal || 0) + 1
             }], ["handle"]);
-            result.push(`🔴 海盗阵营奖励：获得1红晶`);
           }
         }
       });
+      const [initiatorCareer] = await ctx.database.get("ggcevo_careers", {
+        handle: initiatorHandle
+      });
       const result = [
         `⚔️【对战结果】${isWin ? "胜利" : "失败"}`,
         `🏅 挑战者：${initiatorRankname}(积分 ${initiatorRank})`,
@@ -3275,6 +3277,7 @@ ${achievementList.join("\n")}`;
         `🎰 金币变动：${stealPercentage}%`
       ];
       isWin ? result.push(`💰 您从对方的口袋里抢夺了${goldTransfer}枚金币`) : result.push(`💸 您从口袋里拿出了${goldTransfer}枚金币上交给对方`);
+      isWin && initiatorCareer?.group === "辛迪加海盗" ? result.push(`🔴 海盗阵营奖励：获得1红晶`) : "";
       result.push(`📅 剩余挑战次数：${config.dailyPKLimit - (initiatorPK.todayCount + 1)}`);
       return result.join("\n");
     } catch (error) {
@@ -4096,7 +4099,7 @@ ${validTypes.join("、")}`;
         }
         await session.send(`请问你确定要缴纳1000金币加入人类联盟吗？(请在30秒内输入“是”确定加入)`);
         const cost = await session.prompt(3e4);
-        if (!cost) return "已取消加入。";
+        if (cost !== "是") return "已取消加入。";
         await ctx.database.upsert("ggcevo_sign", [{
           handle,
           totalRewards: signData?.totalRewards - 1e3
@@ -4118,7 +4121,7 @@ ${validTypes.join("、")}`;
         }
         await session.send(`请问你确定要缴纳2000金币并且永久开启PK功能加入辛迪加海盗吗？(请在30秒内输入“是”确定加入)`);
         const cost = await session.prompt(3e4);
-        if (!cost) return "已取消加入。";
+        if (cost !== "是") return "已取消加入。";
         await ctx.database.upsert("ggcevo_sign", [{
           handle,
           totalRewards: signData?.totalRewards - 2e3

package/package.json

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