koishi-plugin-ggcevo-game 0.3.9 → 0.3.12

package/lib/index.d.ts

@@ -13,7 +13,6 @@ export declare const inject: {
 };
 declare module 'koishi' {
     interface Tables {
-        ggcevo_items: Item;
         ggcevo_backpack: backpack;
         ggcevo_sign: sign;
         ggcevo_records: record;
@@ -23,15 +22,9 @@ declare module 'koishi' {
         ggcevo_Punishment: Punishment;
         ggcevo_exchange: exchange;
         ggcevo_adminbenefit: adminbenefit;
+        ggcevo_blacklist: blacklist;
     }
 }
-export interface Item {
-    id: number;
-    name: string;
-    type: 'consumable' | 'equipment' | 'material';
-    description: string;
-    effect?: any;
-}
 export interface backpack {
     handle: string;
     itemId: number;
@@ -85,7 +78,6 @@ export interface Punishment {
     comment?: string;
 }
 export interface exchange {
-    id: number;
     userId: string;
     handle: string;
     item: string;
@@ -98,4 +90,9 @@ export interface adminbenefit {
     signmonth: number;
     lastSign: Date;
 }
+export interface blacklist {
+    userId: string;
+    handle: string;
+    createdAt: Date;
+}
 export declare function apply(ctx: Context, config: Config): void;

package/lib/index.js

@@ -39,15 +39,6 @@ var inject = {
   required: ["database"]
 };
 function apply(ctx, config) {
-  ctx.model.extend("ggcevo_items", {
-    id: "unsigned",
-    name: "string",
-    type: "string",
-    description: "text",
-    effect: "json"
-  }, {
-    primary: "name"
-  });
   ctx.model.extend("ggcevo_backpack", {
     handle: "string",
     itemId: "unsigned",
@@ -138,7 +129,6 @@ function apply(ctx, config) {
   });
   ctx.model.extend("ggcevo_exchange", {
     // 各字段定义
-    id: "unsigned",
     userId: "string",
     handle: "string",
     // 句柄
@@ -148,9 +138,7 @@ function apply(ctx, config) {
     date: "timestamp"
   }, {
     // 额外配置
-    primary: "id",
-    autoInc: true
-    // 启用自增ID
+    primary: ["handle", "item"]
   });
   ctx.model.extend("ggcevo_adminbenefit", {
     // 各字段定义
@@ -163,19 +151,24 @@ function apply(ctx, config) {
     // 额外配置
     primary: "userId"
   });
-  async function initDefaultItems() {
-    const defaultItems = [
-      { 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"]);
-  }
-  __name(initDefaultItems, "initDefaultItems");
+  ctx.model.extend("ggcevo_blacklist", {
+    // 各字段定义
+    userId: "string",
+    handle: "string",
+    createdAt: "timestamp"
+  }, {
+    // 额外配置
+    primary: "userId"
+  });
+  const initDefaultItems = {
+    "咕咕币": { id: 1, type: "抽奖道具", description: "用于进行抽奖" },
+    "兑换券": { id: 2, type: "兑换货币", description: "用于兑换赞助物品" },
+    "扭蛋币": { id: 3, type: "抽奖道具", description: "用于进行宠物扭蛋" },
+    "t3级宠物扭蛋": { id: 4, type: "宠物蛋", description: "用于兑换t3系列宠物" },
+    "t2级宠物扭蛋": { id: 5, type: "宠物蛋", description: "用于兑换t2系列宠物" },
+    "t1级宠物扭蛋": { id: 6, type: "宠物蛋", description: "用于兑换t1系列宠物" },
+    "t0级宠物扭蛋": { id: 7, type: "宠物蛋", description: "用于兑换t0系列宠物" }
+  };
   async function gachaWithPity(handle) {
     const [record] = await ctx.database.get("ggcevo_records", { handle });
     const currentPity = record?.pityCounter ?? 0;
@@ -237,15 +230,6 @@ function apply(ctx, config) {
     }
   }
   __name(checkSensitiveWord, "checkSensitiveWord");
-  ctx.command("ggcevo/物品初始化", "初始化物品数据", { authority: 3 }).action(async (_) => {
-    try {
-      await initDefaultItems();
-      return "物品初始化成功";
-    } catch (e) {
-      ctx.logger.error("初始化失败:", e);
-      return "物品初始化失败，请查看日志";
-    }
-  });
   ctx.command("ggcevo/抽奖").action(async (argv) => {
     const session = argv.session;
     let winCount = 0;
@@ -365,17 +349,18 @@ function apply(ctx, config) {
   ctx.command("ggcevo/背包").action(async (argv) => {
     const session = argv.session;
     const [profile] = await ctx.database.get("sc2arcade_player", { userId: session.userId });
-    if (!profile) {
-      return "您的 QQ 未绑定句柄。";
-    }
-    const { regionId, realmId, profileId } = profile;
-    const handle = `${regionId}-S2-${realmId}-${profileId}`;
+    if (!profile) return "您的 QQ 未绑定句柄。";
+    const handle = `${profile.regionId}-S2-${profile.realmId}-${profile.profileId}`;
     const items = await ctx.database.get("ggcevo_backpack", { handle });
     if (!items.length) return "你的背包空空如也~";
-    const itemDetails = await Promise.all(items.map(async (userItem) => {
-      const item = await ctx.database.get("ggcevo_items", { id: userItem.itemId }).then((res) => res[0]);
-      return `${item.name} × ${userItem.quantity}：${item.description}`;
-    }));
+    const itemDetails = items.map((userItem) => {
+      const entry = Object.entries(initDefaultItems).find(
+        ([name2, item]) => item.id === userItem.itemId
+      );
+      if (!entry) return `未知物品 × ${userItem.quantity}：数据异常，请联系管理员`;
+      const [itemName, itemData] = entry;
+      return `${itemName} × ${userItem.quantity}：${itemData.description}`;
+    });
     return `【你的背包】
 ${itemDetails.join("\n")}`;
   });
@@ -409,7 +394,8 @@ ${itemDetails.join("\n")}`;
       }
       const now = /* @__PURE__ */ new Date();
       const chinatime = convertUTCtoChinaTime(now);
-      if (!isSameDate(latestTime, chinatime)) {
+      const is23Hour = chinatime.getHours() === 23;
+      if (!is23Hour && !isSameDate(latestTime, chinatime)) {
         return "暂未查询到您今天最近的20场战绩内游玩过 咕咕虫-evolved 地图，请游玩1次后签到(对局记录上传有延迟)";
       }
       const [record] = await ctx.database.get("ggcevo_sign", { handle });
@@ -515,10 +501,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 未绑定句柄。";
@@ -591,7 +579,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: "进行中"
       // 完全依赖数据库状态
@@ -758,7 +746,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;
@@ -964,7 +952,7 @@ ${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 qualityMap = { "t3": 4, "t2": 5, "t1": 6, "t0": 7 };
       const petItems = new Set(
@@ -987,7 +975,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}`;
       }
@@ -1068,25 +1056,58 @@ ${output}`;
     if (!backpack || backpack.quantity < 1) {
       return `当前扭蛋币不足，剩余：${backpack?.quantity || 0}枚`;
     }
-    const award = PetCapsuleToy();
-    const items = await ctx.database.get("ggcevo_items", { name: award });
-    if (items.length === 0) {
-      return `系统错误，奖品${award}不存在，请联系管理员。`;
+    const awardName = PetCapsuleToy();
+    const awardItem = Object.entries(initDefaultItems).find(
+      ([name2, item]) => name2 === awardName
+    );
+    if (!awardItem) {
+      return `系统错误，奖品「${awardName}」不存在，请联系管理员。`;
     }
-    const item = items[0];
+    const [itemName, itemData] = awardItem;
     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 [userAward] = await ctx.database.get("ggcevo_backpack", { handle, itemId: itemData.id });
     const currentQuantity = userAward ? userAward.quantity : 0;
     await ctx.database.upsert("ggcevo_backpack", [{
       handle,
-      itemId: item.id,
+      itemId: itemData.id,
       quantity: currentQuantity + 1
     }]);
-    return `🎉 恭喜获得：${award}`;
+    return `🎉 恭喜获得：${itemName}`;
+  });
+  ctx.command("ggcevo/拉黑 <handle>", "添加用户到黑名单", { authority: 3 }).action(async (_, handle) => {
+    if (!handle) return "请指定需要拉黑的用户";
+    try {
+      const handleRegex = /^([1235])-S2-([12])-(\d+)$/;
+      if (!handleRegex.test(handle)) {
+        return "句柄格式错误，请重新输入";
+      }
+      const [, regionId, realmId, profileId] = handle.match(handleRegex).map(Number);
+      const existingEntries = await ctx.database.get("ggcevo_blacklist", { handle });
+      if (existingEntries.length > 0) {
+        return `${handle} 已在黑名单中`;
+      }
+      const [profile] = await ctx.database.get("sc2arcade_player", {
+        regionId,
+        realmId,
+        profileId
+      }, ["userId"]);
+      if (!profile) {
+        return `未找到与 ${handle} 绑定的QQ号`;
+      }
+      await ctx.database.create("ggcevo_blacklist", {
+        userId: profile.userId,
+        handle,
+        createdAt: /* @__PURE__ */ new Date()
+      });
+      return `✅ 用户 ${handle} 已被列入黑名单`;
+    } catch (error) {
+      ctx.logger.error("黑名单操作失败:", error);
+      return "操作失败，请稍后重试。错误详情已记录";
+    }
   });
 }
 __name(apply, "apply");

package/package.json

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