koishi-plugin-ggcevo-game 1.0.7 → 1.0.9

package/lib/index.js

@@ -195,16 +195,12 @@ function apply(ctx, config) {
   async function gachaWithHiddenAward(handle) {
     const backpackItems = await ctx.database.get("ggcevo_backpack", {
       handle,
-      itemId: { $in: [1, 2, 3] }
+      itemId: { $in: [2, 3] }
     });
     const itemMap = new Map(backpackItems.map((item) => [item.itemId, item]));
     const isWin = HiddenAward();
     if (isWin) {
       const updates = [
-        {
-          itemId: 1,
-          addAmount: 100
-        },
         {
           itemId: 2,
           addAmount: 1
@@ -293,7 +289,7 @@ function apply(ctx, config) {
       `🎰 您使用了 ${quantity} 枚咕咕币`,
       winCount > 0 ? `🎉 其中获得 ${winCount} 张兑换券！` : "💔 本次未获得任何兑换券",
       `📊 当前保底进度：${record.pityCounter}/90`,
-      ...hiddenWinCount > 0 ? [`🎉 恭喜你抽中隐藏奖励，额外获得 ${hiddenWinCount * 100} 枚咕咕币， ${hiddenWinCount} 张兑换券，以及 ${hiddenWinCount} 枚扭蛋币！`] : []
+      ...hiddenWinCount > 0 ? [`🎉 恭喜你抽中隐藏奖励，额外获得 ${hiddenWinCount} 张兑换券和 ${hiddenWinCount} 枚扭蛋币！`] : []
     ].join("\n");
   });
   ctx.command("ggcevo/单抽").action(async (argv) => {
@@ -325,7 +321,7 @@ function apply(ctx, config) {
     const [record] = await ctx.database.get("ggcevo_records", { handle });
     return [
       `${result ? "🎉 获得兑换券！" : "❌ 未中奖"} 保底进度：${record.pityCounter}/90`,
-      ...HiddenAward2 ? [`🎉 恭喜你抽中隐藏奖励，额外获得 100 枚咕咕币， 1 张兑换券，以及 1 枚扭蛋币！`] : []
+      ...HiddenAward2 ? [`🎉 恭喜你抽中隐藏奖励，额外获得 1 张兑换券和 1 枚扭蛋币！`] : []
     ].join("\n");
   });
   ctx.command("ggcevo/十连抽").action(async (argv) => {
@@ -364,7 +360,7 @@ function apply(ctx, config) {
       "十连抽结果：",
       ...results.map((r) => r ? "⭐获得兑换券" : "❌未中奖"),
       `保底进度：${record.pityCounter}/90`,
-      ...hiddenWinCount > 0 ? [`🎉 恭喜你抽中隐藏奖励，额外获得 ${hiddenWinCount * 100} 枚咕咕币， ${hiddenWinCount} 张兑换券，以及 ${hiddenWinCount} 枚扭蛋币！`] : []
+      ...hiddenWinCount > 0 ? [`🎉 恭喜你抽中隐藏奖励，额外获得 ${hiddenWinCount} 张兑换券和 ${hiddenWinCount} 枚扭蛋币！`] : []
     ].join("\n");
   });
   ctx.command("ggcevo/抽奖记录").action(async (argv) => {
@@ -1044,27 +1040,27 @@ ID：${activity.id}
     ].join("\n");
   });
   const itemConfig = {
-    "拾荒者": { 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 }
+    "拾荒者": { quality: "t3", type: "皮肤", cost: 3, isLimited: false },
+    "劳工": { quality: "t3", type: "皮肤", cost: 3, isLimited: false },
+    "老兵": { quality: "t2", type: "皮肤", cost: 4, isLimited: false },
+    "合成人": { quality: "t2", type: "皮肤", cost: 4, isLimited: false },
+    "阿斯塔特": { quality: "t1", type: "皮肤", cost: 5, isLimited: false },
+    "皇家指挥官": { quality: "t1", type: "皮肤", cost: 5, isLimited: false },
+    "个性开场白": { quality: "t1", type: "“入场特效", cost: 5, quantity: 5, isLimited: false },
+    "史蒂夫": { quality: "t0", type: "皮肤", cost: 6, quantity: 1, isLimited: true },
+    "ep4": { quality: "t0", type: "物品", cost: 6, quantity: 3, isLimited: false },
+    "小狗": { quality: "t3", type: "宠物", cost: 3, quantity: 5, isLimited: false },
+    "小猫": { quality: "t3", type: "宠物", cost: 3, quantity: 5, isLimited: false },
+    "小黄鸭": { quality: "t3", type: "宠物", cost: 3, quantity: 5, isLimited: false },
+    "萌萌熊": { quality: "t2", type: "宠物", cost: 4, quantity: 3, isLimited: false },
+    "荆棘蜥蜴": { quality: "t2", type: "宠物", cost: 4, quantity: 3, isLimited: false },
+    "萌宠小狗": { quality: "t1", type: "宠物", cost: 5, quantity: 2, isLimited: false },
+    "熔岩虫": { quality: "t1", type: "宠物", cost: 5, quantity: 2, isLimited: false },
+    "尸甲虫": { quality: "t1", type: "宠物", cost: 5, quantity: 2, isLimited: false },
+    "绿毛虫": { quality: "t0", type: "宠物", cost: 6, quantity: 1, isLimited: false },
+    "妙蛙种子": { quality: "t0", type: "宠物", cost: 6, quantity: 1, isLimited: false },
+    "皮卡丘": { quality: "t0", type: "宠物", cost: 6, quantity: 1, isLimited: false },
+    "哆啦A梦": { quality: "t0", type: "宠物", cost: 6, quantity: 1, isLimited: false }
   };
   ctx.command("ggcevo/兑换", "兑换物品").action(async ({ session }) => {
     try {
@@ -1098,9 +1094,12 @@ ${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 && config.ignoreGlobalLimit === false) {
-        const globalRecords = await ctx.database.get("ggcevo_exchange", { item: name2, GlobalLimit: true });
-        if (globalRecords.length >= configname.quantity) return "该物品已被兑换尽了";
+      if (configname.quantity !== void 0 && (configname.isLimited || 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 };
       const petItems = new Set(
@@ -1127,7 +1126,7 @@ ${items.join("、")}
         return `${requireMsg}
 当前持有：${coupon?.quantity || 0}个${couponName}`;
       }
-      const isGlobal = config.ignoreGlobalLimit === false;
+      const isGlobal = configname.isLimited || config.ignoreGlobalLimit === false;
       await ctx.database.withTransaction(async () => {
         await ctx.database.set(
           "ggcevo_backpack",

package/package.json

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