koishi-plugin-ggcevo-game 0.3.23 → 0.4.2

package/lib/index.d.ts

@@ -6,6 +6,7 @@ export interface Config {
     ggcqun: string;
     signrequire: boolean;
     autorank: boolean;
+    ignoreGlobalLimit: boolean;
 }
 export declare const Config: Schema<Config>;
 export declare const inject: {
@@ -83,6 +84,7 @@ export interface exchange {
     item: string;
     type: string;
     date: Date;
+    GlobalLimit: boolean;
 }
 export interface adminbenefit {
     userId: string;

package/lib/index.js

@@ -33,7 +33,8 @@ var Config = import_koishi.Schema.object({
   proxyAgent: import_koishi.Schema.string().description("代理服务器地址"),
   ggcqun: import_koishi.Schema.string().description("开启咕咕虫排行榜的群组").required(),
   signrequire: import_koishi.Schema.boolean().description("是否开启签到要求每日一场").default(true),
-  autorank: import_koishi.Schema.boolean().description("是否开启每小时自动同步rank数据").default(true)
+  autorank: import_koishi.Schema.boolean().description("是否开启每小时自动同步rank数据").default(true),
+  ignoreGlobalLimit: import_koishi.Schema.boolean().description("是否开启无限制兑换").default(false)
 });
 var inject = {
   required: ["database"]
@@ -135,7 +136,8 @@ function apply(ctx, config) {
     item: "string",
     // 兑换物品
     type: "string",
-    date: "timestamp"
+    date: "timestamp",
+    GlobalLimit: "boolean"
   }, {
     // 额外配置
     primary: ["handle", "item"]
@@ -578,7 +580,7 @@ ${itemDetails.join("\n")}`;
   });
   ctx.command("ggcevo/领取福利").alias("领取奖励").action(async (argv) => {
     const session = argv.session;
-    await session.send("请在30秒内输入活动名称:\n(输入 咕咕币活动 以查看活动列表)");
+    await session.send("请在30秒内输入活动名称:");
     const name2 = await session.prompt(3e4);
     if (!name2) {
       return "输入超时，请重新输入指令。";
@@ -599,7 +601,7 @@ ${itemDetails.join("\n")}`;
       // 新增状态条件
     });
     if (!activity) {
-      return "当前活动未在进行中，请检查活动名称";
+      return "当前活动未在进行中，请检查输入 咕咕币活动 查看正在进行中的活动。";
     }
     const id = activity.id;
     const quantity = activity.quantity;
@@ -911,18 +913,22 @@ ID：${activity.id}
 ------------------------------`;
     }
   });
-  ctx.command("ggcevo/给予咕咕币 <handle> <amount:number>", "增加指定用户的咕咕币", { authority: 3 }).action(async (_, handle, amount) => {
+  ctx.command("ggcevo/给予 <handle> <itemId:number> <amount:number>", "增加指定用户的物品", { authority: 3 }).action(async (_, handle, itemId, amount) => {
     try {
-      const [backpack] = await ctx.database.get("ggcevo_backpack", { handle, itemId: 1 });
-      if (!backpack) {
-        return "该用户不存在";
+      if (!handle || !itemId || !amount) {
+        return `请输入正确的指令格式`;
       }
+      const itemIdToNameMap = Object.fromEntries(
+        Object.entries(initDefaultItems).map(([name2, item]) => [item.id, name2])
+      );
+      const itemName = itemIdToNameMap[itemId];
+      const [backpack] = await ctx.database.get("ggcevo_backpack", { handle, itemId });
       await ctx.database.upsert("ggcevo_backpack", [{
         handle,
-        itemId: 1,
+        itemId,
         quantity: (backpack?.quantity || 0) + amount
-      }]);
-      return `成功为 ${handle} 增加 ${amount} 个咕咕币！`;
+      }], ["handle", "itemId"]);
+      return `成功为 ${handle} 增加 ${amount} 个${itemName}！`;
     } catch (err) {
       console.error("数据库操作失败:", err);
       return "操作失败，请稍后再试";
@@ -993,9 +999,9 @@ ID：${activity.id}
     "小黄鸭": { 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: "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 },
@@ -1033,8 +1039,8 @@ ${items.join("、")}
       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 (configname.quantity !== void 0 && config.ignoreGlobalLimit === false) {
+        const globalRecords = await ctx.database.get("ggcevo_exchange", { item: name2, GlobalLimit: true });
         if (globalRecords.length >= configname.quantity) return "该物品已被兑换尽了";
       }
       const qualityMap = { "t3": 4, "t2": 5, "t1": 6, "t0": 7 };
@@ -1062,6 +1068,7 @@ ${items.join("、")}
         return `${requireMsg}
 当前持有：${coupon?.quantity || 0}个${couponName}`;
       }
+      const isGlobal = config.ignoreGlobalLimit === false;
       await ctx.database.withTransaction(async () => {
         await ctx.database.set(
           "ggcevo_backpack",
@@ -1074,7 +1081,9 @@ ${items.join("、")}
           item: name2,
           type: configname.type,
           // 从配置中获取类型
-          date: /* @__PURE__ */ new Date()
+          date: /* @__PURE__ */ new Date(),
+          GlobalLimit: isGlobal
+          // 关键字段设置
         });
       });
       return `兑换成功！消耗 ${cost} 个${couponName}获得【${name2}】`;
@@ -1186,7 +1195,7 @@ ${output}`;
       });
       return `✅ 用户 ${handle} 已被列入黑名单`;
     } catch (error) {
-      ctx.logger.error("黑名单操作失败:", error);
+      console.error("黑名单操作失败:", error);
       return "操作失败，请稍后重试。错误详情已记录";
     }
   });

package/package.json

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

package/readme.md

@@ -2,4 +2,4 @@
 
 [![npm](https://img.shields.io/npm/v/koishi-plugin-ggcevo-game?style=flat-square)](https://www.npmjs.com/package/koishi-plugin-ggcevo-game)
 
-
+2