koishi-plugin-ggcevo-game 0.3.7 → 0.3.9

package/lib/index.d.ts

@@ -89,6 +89,7 @@ export interface exchange {
     userId: string;
     handle: string;
     item: string;
+    type: string;
     date: Date;
 }
 export interface adminbenefit {

package/lib/index.js

@@ -46,9 +46,7 @@ function apply(ctx, config) {
     description: "text",
     effect: "json"
   }, {
-    primary: "id",
-    autoInc: true,
-    unique: ["name"]
+    primary: "name"
   });
   ctx.model.extend("ggcevo_backpack", {
     handle: "string",
@@ -146,6 +144,7 @@ function apply(ctx, config) {
     // 句柄
     item: "string",
     // 兑换物品
+    type: "string",
     date: "timestamp"
   }, {
     // 额外配置
@@ -166,13 +165,13 @@ function apply(ctx, config) {
   });
   async function initDefaultItems() {
     const defaultItems = [
-      { name: "咕咕币", type: "consumable", description: "用于进行抽奖" },
-      { name: "兑换券", type: "material", description: "用于兑换赞助物品，输入 兑换图 查看详情" },
-      { name: "扭蛋币", type: "consumable", description: "用于进行宠物扭蛋" },
-      { name: "t3级宠物扭蛋", type: "material", description: "用于兑换t3系列宠物" },
-      { name: "t2级宠物扭蛋", type: "material", description: "用于兑换t2系列宠物" },
-      { name: "t1级宠物扭蛋", type: "material", description: "用于兑换t1系列宠物" },
-      { name: "t0级宠物扭蛋", type: "material", description: "用于兑换t0系列宠物" }
+      { id: 1, name: "咕咕币", type: "consumable", description: "用于进行抽奖" },
+      { id: 2, name: "兑换券", type: "material", description: "用于兑换赞助物品，输入 兑换图 查看详情" },
+      { id: 3, name: "扭蛋币", type: "consumable", description: "用于进行宠物扭蛋" },
+      { id: 4, name: "t3级宠物扭蛋", type: "material", description: "用于兑换t3系列宠物" },
+      { id: 5, name: "t2级宠物扭蛋", type: "material", description: "用于兑换t2系列宠物" },
+      { id: 6, name: "t1级宠物扭蛋", type: "material", description: "用于兑换t1系列宠物" },
+      { id: 7, name: "t0级宠物扭蛋", type: "material", description: "用于兑换t0系列宠物" }
     ];
     await ctx.database.upsert("ggcevo_items", defaultItems, ["name"]);
   }
@@ -913,27 +912,27 @@ ID：${activity.id}
     ].join("\n");
   });
   const itemConfig = {
-    "拾荒者": { quality: "t3", cost: 3 },
-    "劳工": { quality: "t3", cost: 3 },
-    "老兵": { quality: "t2", cost: 4 },
-    "合成人": { quality: "t2", cost: 4 },
-    "阿斯塔特": { quality: "t1", cost: 5 },
-    "皇家指挥官": { quality: "t1", cost: 5 },
-    "个性开场白": { quality: "t1", cost: 5, quantity: 5 },
-    "史蒂夫": { quality: "t0", cost: 6, quantity: 1 },
-    "ep4": { quality: "t0", cost: 6, quantity: 3 },
-    "小狗": { quality: "t3", cost: 3, quantity: 5 },
-    "小猫": { quality: "t3", cost: 3, quantity: 5 },
-    "小黄鸭": { quality: "t3", cost: 3, quantity: 5 },
-    "萌萌熊": { quality: "t2", cost: 4, quantity: 3 },
-    "荆棘蜥蜴": { quality: "t2", cost: 4, quantity: 3 },
-    "爆笑小狗": { quality: "t1", cost: 5, quantity: 2 },
-    "熔岩蟹": { quality: "t1", cost: 5, quantity: 2 },
-    "远古蝗虫": { quality: "t1", cost: 5, quantity: 2 },
-    "绿毛虫": { quality: "t0", cost: 6, quantity: 1 },
-    "妙蛙种子": { quality: "t0", cost: 6, quantity: 1 },
-    "皮卡丘": { quality: "t0", cost: 6, quantity: 1 },
-    "哆啦A梦": { quality: "t0", cost: 6, quantity: 1 }
+    "拾荒者": { quality: "t3", type: "皮肤", cost: 3 },
+    "劳工": { quality: "t3", type: "皮肤", cost: 3 },
+    "老兵": { quality: "t2", type: "皮肤", cost: 4 },
+    "合成人": { quality: "t2", type: "皮肤", cost: 4 },
+    "阿斯塔特": { quality: "t1", type: "皮肤", cost: 5 },
+    "皇家指挥官": { quality: "t1", type: "皮肤", cost: 5 },
+    "个性开场白": { quality: "t1", type: "“入场特效", cost: 5, quantity: 5 },
+    "史蒂夫": { quality: "t0", type: "皮肤", cost: 6, quantity: 1 },
+    "ep4": { quality: "t0", type: "物品", cost: 6, quantity: 3 },
+    "小狗": { quality: "t3", type: "宠物", cost: 3, quantity: 5 },
+    "小猫": { quality: "t3", type: "宠物", cost: 3, quantity: 5 },
+    "小黄鸭": { quality: "t3", type: "宠物", cost: 3, quantity: 5 },
+    "萌萌熊": { quality: "t2", type: "宠物", cost: 4, quantity: 3 },
+    "荆棘蜥蜴": { quality: "t2", type: "宠物", cost: 4, quantity: 3 },
+    "爆笑小狗": { quality: "t1", type: "宠物", cost: 5, quantity: 2 },
+    "熔岩蟹": { quality: "t1", type: "宠物", cost: 5, quantity: 2 },
+    "远古蝗虫": { quality: "t1", type: "宠物", cost: 5, quantity: 2 },
+    "绿毛虫": { quality: "t0", type: "宠物", cost: 6, quantity: 1 },
+    "妙蛙种子": { quality: "t0", type: "宠物", cost: 6, quantity: 1 },
+    "皮卡丘": { quality: "t0", type: "宠物", cost: 6, quantity: 1 },
+    "哆啦A梦": { quality: "t0", type: "宠物", cost: 6, quantity: 1 }
   };
   ctx.command("ggcevo/兑换", "兑换物品").action(async ({ session }) => {
     try {
@@ -960,34 +959,57 @@ ${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 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]
+        });
+        if (specialCoupon?.quantity >= 1) {
+          itemId = qualityMap[configname.quality];
+          cost = 1;
+          couponName = `${configname.quality}级宠物扭蛋`;
+        }
       }
-      const [coupon] = await ctx.database.get("ggcevo_backpack", { handle, itemId: 2 });
-      if (!coupon || coupon.quantity < configname.cost) {
-        return `兑换需要 ${configname.cost} 张兑奖券，当前持有：${coupon?.quantity || 0}`;
+      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,
           handle,
           item: name2,
+          type: configname.type,
+          // 从配置中获取类型
           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 }) => {
@@ -1008,7 +1030,7 @@ ${items.join("、")}
         second: "2-digit",
         hour12: false
       });
-      return `物品: ${e.item} | 时间: ${cnTime}`;
+      return `${e.type}: ${e.item} | 时间: ${cnTime}`;
     }).join("\n");
     return `${handle} 的兑换记录：
 ${output}`;

package/package.json

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