koishi-plugin-ggcevo-game 0.3.6 → 0.3.8

package/lib/index.js

@@ -960,22 +960,40 @@ ${items.join("、")}
       if (!name2) return "输入超时，请重新输入指令。";
       const handle = `${profile.regionId}-S2-${profile.realmId}-${profile.profileId}`;
       const configname = itemConfig[name2];
-      if (!configname) return `无效的物品名称，请重新输入指令。`;
+      if (!configname) return "无效的物品名称，请重新输入";
       const userRecords = await ctx.database.get("ggcevo_exchange", { handle, item: name2 });
       if (userRecords.length > 0) return "您已经兑换过该物品";
       if (configname.quantity !== void 0) {
         const globalRecords = await ctx.database.get("ggcevo_exchange", { item: name2 });
-        if (globalRecords.length >= configname.quantity) return "该物品已经被兑换尽了";
+        if (globalRecords.length >= configname.quantity) return "该物品已兑尽";
       }
-      const [coupon] = await ctx.database.get("ggcevo_backpack", { handle, itemId: 2 });
-      if (!coupon || coupon.quantity < configname.cost) {
-        return `兑换需要 ${configname.cost} 张兑奖券，当前持有：${coupon?.quantity || 0}`;
+      const petItems = /* @__PURE__ */ new Set(["小狗", "小猫", "小黄鸭", "萌萌熊", "荆棘蜥蜴", "爆笑小狗", "熔岩蟹", "远古蝗虫", "绿毛虫", "妙蛙种子", "皮卡丘", "哆啦A梦"]);
+      const qualityMap = { "t3": 4, "t2": 5, "t1": 6, "t0": 7 };
+      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]
+        });
+        if (specialCoupon?.quantity >= 1) {
+          itemId = qualityMap[configname.quality];
+          cost = 1;
+          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}个兑奖券`;
+        return `${requireMsg}
+当前持有：${coupon?.quantity || 0}个${couponName}`;
       }
       await ctx.database.withTransaction(async () => {
         await ctx.database.set(
           "ggcevo_backpack",
-          { handle, itemId: 2 },
-          { quantity: coupon.quantity - configname.cost }
+          { handle, itemId },
+          { quantity: coupon.quantity - cost }
         );
         await ctx.database.create("ggcevo_exchange", {
           userId: session.userId,
@@ -984,10 +1002,10 @@ ${items.join("、")}
           date: /* @__PURE__ */ new Date()
         });
       });
-      return `兑换成功！消耗 ${configname.cost} 张兑奖券获得【${name2}】(游戏物品发放请联系管理员)`;
+      return `兑换成功！消耗 ${cost} 个${couponName}获得【${name2}】`;
     } catch (error) {
       console.error("兑换失败:", error);
-      return `兑换失败`;
+      return "兑换失败";
     }
   });
   ctx.command("ggcevo/兑换记录").action(async ({ session }) => {
@@ -1046,17 +1064,17 @@ ${output}`;
     if (!backpack || backpack.quantity < 1) {
       return `当前扭蛋币不足，剩余：${backpack?.quantity || 0}枚`;
     }
-    await ctx.database.upsert("ggcevo_backpack", [{
-      handle,
-      itemId: 3,
-      quantity: backpack.quantity - 1
-    }]);
     const award = PetCapsuleToy();
     const items = await ctx.database.get("ggcevo_items", { name: award });
     if (items.length === 0) {
       return `系统错误，奖品${award}不存在，请联系管理员。`;
     }
     const item = items[0];
+    await ctx.database.upsert("ggcevo_backpack", [{
+      handle,
+      itemId: 3,
+      quantity: backpack.quantity - 1
+    }]);
     const [userAward] = await ctx.database.get("ggcevo_backpack", { handle, itemId: item.id });
     const currentQuantity = userAward ? userAward.quantity : 0;
     await ctx.database.upsert("ggcevo_backpack", [{

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-ggcevo-game",
   "description": "星际争霸2游戏大厅地图咕咕虫-evo小游戏",
-  "version": "0.3.6",
+  "version": "0.3.8",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "files": [