koishi-plugin-ggcevo-game 0.3.8 → 0.3.11

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"]);
   }
@@ -516,10 +515,12 @@ ${itemDetails.join("\n")}`;
     }]);
     return `[管理专属] 成功领取本月津贴！获得 50 枚咕咕币`;
   });
-  ctx.command("ggcevo/领取福利 <name>").action(async (argv, name2) => {
+  ctx.command("ggcevo/领取福利").alias("领取奖励").action(async (argv) => {
     const session = argv.session;
+    await session.send("请在30秒内输入活动名称:\n(输入 咕咕币活动 以查看活动列表)");
+    const name2 = await session.prompt(3e4);
     if (!name2) {
-      return "活动名称不能为空，请输入 咕咕币活动 查看进行中的活动";
+      return "输入超时，请重新输入指令。";
     }
     const [profile] = await ctx.database.get("sc2arcade_player", { userId: session.userId });
     if (!profile) return "您的 QQ 未绑定句柄。";
@@ -592,7 +593,7 @@ ${itemDetails.join("\n")}`;
 ID：${activity.id}
 状态：${status}`;
   });
-  ctx.command("ggcevo/咕咕币活动", "查看进行中的活动").action(async () => {
+  ctx.command("ggcevo/咕咕币活动", "查看进行中的活动").alias("活动列表").action(async () => {
     const activities = await ctx.database.get("ggcevo_activity", {
       status: "进行中"
       // 完全依赖数据库状态
@@ -759,7 +760,7 @@ ID：${activity.id}
       return "服务器繁忙，请稍后尝试。";
     }
   });
-  ctx.command("ggcevo/胜点榜 [page]").usage("输入 rank [页码] 查看对应页的排行榜，每页10条").action(async (_, page) => {
+  ctx.command("ggcevo/胜点榜 [page]").alias("排行榜").usage("输入 rank [页码] 查看对应页的排行榜，每页10条").action(async (_, page) => {
     const pageNum = parseInt(page) || 1;
     if (pageNum < 1) return "请输入有效的页码。";
     const offset = (pageNum - 1) * 10;
@@ -913,27 +914,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 {
@@ -965,10 +966,13 @@ ${items.join("、")}
       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 petItems = /* @__PURE__ */ new Set(["小狗", "小猫", "小黄鸭", "萌萌熊", "荆棘蜥蜴", "爆笑小狗", "熔岩蟹", "远古蝗虫", "绿毛虫", "妙蛙种子", "皮卡丘", "哆啦A梦"]);
       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 = "兑奖券";
@@ -985,7 +989,7 @@ ${items.join("、")}
       }
       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 requireMsg = petItems.has(name2) ? `需要 1 个${configname.quality}级宠物扭蛋 或 ${configname.cost}个兑奖券` : `需要 ${configname.cost}个兑奖券`;
         return `${requireMsg}
 当前持有：${coupon?.quantity || 0}个${couponName}`;
       }
@@ -999,6 +1003,8 @@ ${items.join("、")}
           userId: session.userId,
           handle,
           item: name2,
+          type: configname.type,
+          // 从配置中获取类型
           date: /* @__PURE__ */ new Date()
         });
       });
@@ -1026,7 +1032,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.8",
+  "version": "0.3.11",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "files": [