koishi-plugin-ggcevo-game 1.6.33 → 1.6.34

package/lib/index.js

@@ -5457,7 +5457,8 @@ var ggcevoUpdates = [
 - 回调了能量武器专家的职业效果
 - 禁用了棱镜水晶，使用拆卸可返还100%金币
 - 新增资源商店，输入“兑换资源”查看
-- 修改“兑换”指令，更改为“兑换赞助物品”
+- 修改“兑换”指令，更改为“兑换赞助物品”，并且优化了显示信息
+- 暂时关闭了“兑换金币”和“兑换红晶”
     `.trim()
   }
 ];
@@ -8616,6 +8617,17 @@ ${ticketMessage}${effectMessage}`;
         return `⛔ 您已被列入黑名单。`;
       }
       const currentSeason = config.rankseason;
+      const backpackItems = await ctx.database.get("ggcevo_backpack", { handle });
+      const normalCoupon = backpackItems.find((item) => item.itemId === 2);
+      const petCoupons = backpackItems.filter((item) => item.itemId >= 3 && item.itemId <= 6);
+      const petCouponMap = { 3: "t3", 4: "t2", 5: "t1", 6: "t0" };
+      let petCouponInfo = "";
+      for (const coupon of petCoupons) {
+        const quality = petCouponMap[coupon.itemId];
+        if (petCouponInfo) petCouponInfo += " | ";
+        petCouponInfo += `${quality}级券(${coupon.quantity})`;
+      }
+      if (!petCouponInfo) petCouponInfo = "无";
       const qualityGroups = {};
       for (const [itemName, config2] of Object.entries(itemConfig)) {
         const configname2 = config2;
@@ -8645,7 +8657,13 @@ ${ticketMessage}${effectMessage}`;
         t0: 6
       };
       const order = ["t0", "t1", "t2", "t3"];
-      let message = "请在30秒内输入可兑换物品名称(显示格式：物品名 [剩余/总量]):\n";
+      let message = "===== 当前资源 =====\n";
+      message += `普通兑奖券: ${normalCoupon?.quantity || 0}张
+`;
+      message += `宠物扭蛋券: ${petCouponInfo}
+
+`;
+      message += "请在30秒内输入可兑换物品名称(显示格式：物品名 [剩余/总量]):\n";
       message += "注意：限量物品将在赛季更新时补货，限定物品[史蒂夫]除外。\n";
       for (const quality of order) {
         const items = qualityGroups[quality] || [];
@@ -8675,52 +8693,48 @@ ${items.join("、")}
       }
       const qualityMap = { "t3": 4, "t2": 5, "t1": 6, "t0": 7 };
       const petItems = new Set(
-        // 动态生成宠物集合
         Object.entries(itemConfig).filter(([_, config2]) => config2.type === "宠物").map(([name3]) => name3)
       );
       let cost = configname.cost;
       let itemId = 2;
       let couponName = "兑奖券";
       if (petItems.has(name2)) {
-        const [specialCoupon] = await ctx.database.get("ggcevo_backpack", {
-          handle,
-          itemId: qualityMap[configname.quality]
-        });
+        const specialCoupon = backpackItems.find(
+          (item) => item.itemId === qualityMap[configname.quality]
+        );
         if (specialCoupon?.quantity >= 1) {
           itemId = qualityMap[configname.quality];
           cost = 1;
-          couponName = `${configname.quality}级宠物扭蛋`;
+          couponName = `${configname.quality}级宠物扭蛋券`;
         }
       }
-      const [coupon] = await ctx.database.get("ggcevo_backpack", { handle, itemId });
-      if (!coupon || coupon.quantity < cost) {
-        const requireMsg = petItems.has(name2) ? `需要1个${configname.quality}级宠物扭蛋或${configname.cost}张兑奖券` : `需要${configname.cost}张兑奖券`;
+      const couponItem = backpackItems.find((item) => item.itemId === itemId);
+      if (!couponItem || couponItem.quantity < cost) {
+        const requireMsg = petItems.has(name2) ? `需要1个${configname.quality}级宠物扭蛋券或${configname.cost}张普通兑奖券` : `需要${configname.cost}张普通兑奖券`;
         return `${requireMsg}
-您当前持有：${coupon?.quantity || 0}个${couponName}`;
+您当前持有：${couponItem?.quantity || 0}个${couponName}`;
       }
       const isGlobal = configname.isLimited || config.ignoreGlobalLimit === false;
       await ctx.database.withTransaction(async () => {
         await ctx.database.set(
           "ggcevo_backpack",
           { handle, itemId },
-          { quantity: coupon.quantity - cost }
+          { quantity: couponItem.quantity - cost }
         );
         await ctx.database.create("ggcevo_exchange", {
           userId: session.userId,
           handle,
           item: name2,
           type: configname.type,
-          // 从配置中获取类型
           date: /* @__PURE__ */ new Date(),
           GlobalLimit: isGlobal,
-          // 关键字段设置
           season: currentSeason
         });
       });
       return `🎉 恭喜！您使用${cost}个${couponName}兑换了【${name2}】`;
     } catch (error) {
       console.error("兑换失败:", error);
-      return "兑换失败";
+      return "兑换失败，请稍后再试";
     }
   });
   ctx.command("ggcevo/兑换扭蛋币").action(async ({ session }) => {
@@ -12173,7 +12187,7 @@ ${Spacestationtechnology.map((t) => t.techname).join("、")}`;
       return "⛔ 您已被列入黑名单。";
     }
     const [signRecord] = await ctx.database.get("ggcevo_sign", { handle });
-    if (!signRecord) return "⛔ 请先进行至少一次签到获得金币后购买飞船";
+    if (!signRecord) return "请先进行至少一次签到获得金币后购买飞船";
     const coins = signRecord.totalRewards;
     if (!shipName) {
       const shipList = Object.keys(spaceship).map((name2) => {
@@ -12244,7 +12258,7 @@ ${Spacestationtechnology.map((t) => t.techname).join("、")}`;
       return "⛔ 您已被列入黑名单。";
     }
     const [career] = await ctx.database.get("ggcevo_careers", { handle });
-    if (!career) return "🚫 未查询到您的阵营信息";
+    if (!career) return "🚫 仅限辛迪加海盗阵营使用";
     if (career.group !== "辛迪加海盗") {
       return `🚫 仅限辛迪加海盗阵营使用`;
     }
@@ -12472,6 +12486,9 @@ ${validBossNames.join("、")}`;
     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 })).length) {
+      return "⛔ 您已被列入黑名单。";
+    }
     const resourceItems = {
       "金币": { valuePerCoupon: 100, currencyField: "totalRewards", table: "ggcevo_sign" },
       "红晶": { valuePerCoupon: 1, currencyField: "redcrystal", table: "ggcevo_careers" }
@@ -12493,6 +12510,12 @@ ${validBossNames.join("、")}`;
     }
     const config2 = resourceItems[name2];
     if (!config2) return `⚠️ 无效物品名称，可用选项：${Object.keys(resourceItems).join("、")}`;
+    if (name2 === "红晶") {
+      const [career] = await ctx.database.get("ggcevo_careers", { handle });
+      if (!career || career.group !== "辛迪加海盗") {
+        return `⚠️ 兑换红晶失败：仅限【辛迪加海盗】组织成员兑换，您当前属于【${career?.group || "无"}】`;
+      }
+    }
     const exchangeAmount = parseInt(amount) || 1;
     if (exchangeAmount <= 0 || exchangeAmount > 100) return "⚠️ 兑换数量需在1-100之间";
     const [couponItem] = await ctx.database.get("ggcevo_backpack", {

package/package.json

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