koishi-plugin-xxck-1 0.3.7 → 0.3.9

package/lib/index.d.ts

@@ -118,11 +118,6 @@ declare module 'koishi' {
             exchange_date: string;
             exchange_count: number;
         };
-        gacha_shop_limit: {
-            card_id: string;
-            total_limit: number;
-            left_limit: number;
-        };
         gacha_event_pool: {
             code: string;
             card_id: string;

package/lib/index.js

@@ -101,7 +101,7 @@ var zh_CN_default = {
   "error.draw.poolEmpty": "❌ 普通卡池暂无卡片！请联系主人录入卡片",
   "error.upgrade.cardNotInShop": "❌ 升格失败！编号【{cid}】不在今日店铺中！请查看WWC店铺获取最新卡片",
   "error.upgrade.cardNotInPool": "❌ 升格失败！编号【{cid}】不在卡池中！该卡片已被移除",
-  "error.upgrade.cardLimitExceed": "❌ 升格失败！编号【{cid}】全服剩余可购买次数不足！当前剩余：{left}次",
+  "error.upgrade.cardLimitExceed": "❌ 升格失败！编号【{cid}】全服剩余可购买次数不足！当前剩余：{remaining}次",
   "error.upgrade.disturb.notEnough": "❌ 升格失败！热带扰动不足！当前拥有：{have}，需要：{need}",
   "error.upgrade.paramInvalid": "❌ 升格参数错误！请输入店铺内的卡片编号，多个编号用空格分隔",
   "error.exchange.count.invalid": "❌ 兑换数量错误！请输入1-40之间的正整数！",
@@ -121,12 +121,7 @@ var zh_CN_default = {
   "error.disturbDraw.count.notEnough": "❌ 扰动抽数不足！\n当前剩余：{have} 次 | 需要：{need} 次（可使用 WWC扰动兑换 兑换）",
   "error.switch.private": "❌ 私信场景无需设置群开关！该指令仅可在群聊中使用",
   "error.switch.fail": "❌ 开关操作失败！{msg}",
-  "error.shop.no7starCard": "❌ 店铺生成失败！普通卡池中无7星卡片，请联系主人录入",
-  "error.shop.fail": "❌ 店铺功能执行异常，请稍后再试！",
   "error.shop.cardNotEnough": "店铺卡片数量不足，无法刷新",
-  "error.shop.cardNotInShop": "卡片{cid}不在今日店铺中，无法兑换",
-  "error.shop.cardNotInPool": "卡片{cid}未在卡池注册，无法兑换",
-  "error.shop.cardLimitExceed": "卡片{cid}限购超限，剩余仅{remaining}张",
   "error.collection.fail": "❌ 收藏功能执行异常，请稍后再试！",
   "error.ranking.fail": "❌ 排名功能执行异常，请稍后再试！",
   // ==============================================
@@ -140,15 +135,6 @@ var zh_CN_default = {
   // ==============================================
   "image.warehouse.title": "{name} 的卡片仓库（带【限定】标记为限时卡）",
   "image.warehouse.empty": "你的仓库暂无任何卡片，快去抽卡吧！",
-  "image.shop.title": "WWC每日商店（{date}）",
-  "image.shop.userInfo": "玩家：{name}",
-  "image.shop.asset": "热带扰动： {disturb} | 水汽：{vapor} | 剩余抽数：{draw}",
-  "image.shop.exchangeCount": "今日普通兑换：{used}/{limit}抽（单次最多40）",
-  "image.shop.header.card": "卡片信息",
-  "image.shop.header.price": "升格价格",
-  "image.shop.header.cmd": "兑换指令",
-  "image.shop.footerTip": "每日刷新卡片，全服限购5次",
-  "image.shop.cmdTemplate": "WWC升格 {cid}",
   "image.collection.title": "{showName} 的卡片收藏图鉴（含限定卡）",
   "image.collection.title1": "{showName} 的卡片收藏图鉴1（分类规则见配置项）",
   "image.collection.title2": "{showName} 的卡片收藏图鉴2（分类规则见配置项）",
@@ -205,6 +191,23 @@ async function getNextId(ctx, table) {
   return list.length ? list[0].id + 1 : 1;
 }
 __name(getNextId, "getNextId");
+async function getShopRowsByDate(ctx, shopDate) {
+  const rows = await ctx.database.get("gacha_shop_daily", { shop_date: shopDate });
+  const merged = /* @__PURE__ */ new Map();
+  for (const row of rows) {
+    const key = String(row.card_id);
+    const exist = merged.get(key);
+    if (!exist) {
+      merged.set(key, { ...row });
+      continue;
+    }
+    if ((row.server_bought ?? 0) > (exist.server_bought ?? 0)) {
+      exist.server_bought = row.server_bought ?? 0;
+    }
+  }
+  return Array.from(merged.values());
+}
+__name(getShopRowsByDate, "getShopRowsByDate");
 function unescapeHtml(str) {
   if (!str || typeof str !== "string") return "";
   return str.replace(/&/gi, "&");
@@ -743,20 +746,6 @@ async function _do_sign(ctx, session, signResetHour, signResetMinute) {
   const SIGN_DRAW_COUNT = 40;
   const userAsset = await ctx.database.get("gacha_user_draw_count", { qq });
   const newDrawCount = (userAsset[0]?.draw_count ?? 0) + SIGN_DRAW_COUNT;
-  let resetDate = new Date(now);
-  resetDate.setHours(resetHour, resetMinute, 0, 0);
-  if (now < resetDate) {
-    resetDate.setDate(resetDate.getDate() - 1);
-  }
-  const resetDateStr = `${resetDate.getFullYear()}${String(resetDate.getMonth() + 1).padStart(2, "0")}${String(resetDate.getDate()).padStart(2, "0")}`;
-  const allCards = await ctx.database.get("gacha_shop_limit", {});
-  for (const card of allCards) {
-    await ctx.database.upsert("gacha_shop_limit", [{
-      card_id: card.card_id,
-      left_limit: 5
-    }]);
-  }
-  ctx.logger.info(`签到重置：所有店铺卡片限购次数已恢复为5次`);
   await ctx.database.upsert("gacha_user_draw_count", [{
     qq,
     draw_count: newDrawCount,
@@ -1027,7 +1016,7 @@ async function _do_upgrade(ctx, session, card_ids, signResetHour, signResetMinut
   let total_cost = 0;
   const shop_card_info = [];
   const [shopCards, cardPool] = await Promise.all([
-    ctx.database.get("gacha_shop_daily", { shop_date: today }),
+    getShopRowsByDate(ctx, today),
     ctx.database.get("gacha_card_pool", {})
   ]);
   ctx.logger.info(`[升格] 当前店铺卡片:`, shopCards.map((s) => s.card_id));
@@ -1047,6 +1036,7 @@ async function _do_upgrade(ctx, session, card_ids, signResetHour, signResetMinut
     }
     for (let i = 0; i < num; i++) {
       shop_card_info.push({
+        id: shopCard.id,
         card_id: shopCard.card_id,
         card_name: cardInfo.card_name,
         card_star: shopCard.card_star,
@@ -1089,14 +1079,17 @@ async function _do_upgrade(ctx, session, card_ids, signResetHour, signResetMinut
         if (d > 0) disturbance_total += d;
       }
     }
-    await ctx.database.upsert("gacha_shop_daily", [{
+    const shopRow = {
       shop_date: today,
       card_id: card.card_id,
       card_star: card.card_star,
       price: card.price,
       server_limit: card.server_limit,
       server_bought: card.server_bought + 1
-    }]);
+    };
+    await ctx.database.upsert("gacha_shop_daily", [
+      card.id != null ? { id: card.id, ...shopRow } : { ...shopRow }
+    ]);
   }
   await ctx.database.upsert("gacha_user_draw_count", [{
     qq,
@@ -1300,7 +1293,7 @@ async function _do_shop(ctx, session, signResetHour, signResetMinute) {
       todayDate.setDate(todayDate.getDate() - 1);
     }
     const today = `${todayDate.getFullYear()}${String(todayDate.getMonth() + 1).padStart(2, "0")}${String(todayDate.getDate()).padStart(2, "0")}`;
-    let todayShop = await ctx.database.get("gacha_shop_daily", { shop_date: today });
+    let todayShop = await getShopRowsByDate(ctx, today);
     if (todayShop.length === 0) {
       const [sevenStarCards, sixStarCards, fiveStarCards] = await Promise.all([
         ctx.database.get("gacha_card_pool", { card_star: 7 }),
@@ -1313,7 +1306,9 @@ async function _do_shop(ctx, session, signResetHour, signResetMinute) {
       const selected7 = sevenStarCards.sort(() => Math.random() - 0.5).slice(0, 4);
       const selected6 = sixStarCards.sort(() => Math.random() - 0.5).slice(0, 6);
       const selected5 = fiveStarCards.sort(() => Math.random() - 0.5).slice(0, 10);
-      const allCards = [...selected7, ...selected6, ...selected5];
+      const allCards = Array.from(
+        new Map([...selected7, ...selected6, ...selected5].map((c) => [String(c.card_id), c])).values()
+      );
       const SHOP_PRICE_BASE = { 7: 800, 6: 200, 5: 20 };
       const SHOP_PRICE_RANGE = { 7: 80, 6: 30, 5: 0 };
       for (const card of allCards) {
@@ -1330,35 +1325,21 @@ async function _do_shop(ctx, session, signResetHour, signResetMinute) {
           server_bought: 0,
           server_limit: 5
         });
-        const exist = await ctx.database.get("gacha_shop_limit", { card_id: card.card_id });
-        if (!exist.length) {
-          await ctx.database.create("gacha_shop_limit", {
-            card_id: card.card_id,
-            total_limit: 5,
-            left_limit: 5
-          });
-        }
       }
-      todayShop = await ctx.database.get("gacha_shop_daily", { shop_date: today });
+      todayShop = await getShopRowsByDate(ctx, today);
     }
     const pool = await ctx.database.get("gacha_card_pool", {});
     const poolMap = new Map(pool.map((p) => [p.card_id, p]));
-    const limitList = await ctx.database.get("gacha_shop_limit", {
-      card_id: { $in: todayShop.map((s) => s.card_id) }
-    });
-    const limitMap = /* @__PURE__ */ new Map();
-    todayShop.forEach((s) => {
-      const lim = limitList.find((x) => x.card_id === s.card_id);
-      limitMap.set(s.card_id, lim?.left_limit ?? 5);
-    });
     const shopCardList = todayShop.map((item) => {
       const card = poolMap.get(item.card_id);
+      const limit = item.server_limit ?? 5;
+      const bought = item.server_bought ?? 0;
       return {
         id: item.card_id,
         name: card?.card_name || "未知",
         star: item.card_star,
         price: item.price,
-        leftLimit: limitMap.get(item.card_id)
+        leftLimit: Math.max(0, limit - bought)
       };
     });
     shopCardList.sort((a, b) => b.star - a.star || String(a.id).localeCompare(String(b.id)));
@@ -1724,6 +1705,11 @@ async function _do_event_draw(ctx, session, data, event6Threshold, event7Thresho
     hasGot: limitStar === 6 ? pityRecord[0].got6 || false : pityRecord[0].got7 || false
   };
   const threshold = limitStar === 6 ? event6Threshold : event7Threshold;
+  if (!currentPity.hasGot && currentPity.pityCount >= threshold) {
+    ctx.logger.warn(`[限时保底修复] ${showName}(${qq}) 卡池${code}：计数${currentPity.pityCount}≥阈值${threshold}却未标记已获得，按已触发硬保底修正`);
+    currentPity.hasGot = true;
+    currentPity.pityCount = 0;
+  }
   await ctx.database.upsert("gacha_user_event_draw", [{ qq, [key]: have - count }]);
   ctx.logger.info(`[限时抽卡] ${showName}(${qq}) 扣除${count}次${limitStar}星限时抽数，剩余${have - count}次`);
   const normalCards = await ctx.database.get("gacha_card_pool", {});
@@ -1770,10 +1756,12 @@ async function _do_event_draw(ctx, session, data, event6Threshold, event7Thresho
   for (let i = 0; i < count; i++) {
     let drawCard;
     newPityCount++;
-    const isGuarantee = !currentPity.hasGot && newPityCount === threshold;
+    const isGuarantee = !currentPity.hasGot && newPityCount >= threshold;
     if (isGuarantee) {
       drawCard = eventCard;
-      ctx.logger.info(`[限时累计保底触发] ${showName}(${qq}) 抽卡${code}期，累计${newPityCount}抽，保底获得${limitStar}星限时卡：${eventCard.card_name}`);
+      currentPity.hasGot = true;
+      newPityCount = 0;
+      ctx.logger.info(`[限时累计保底触发] ${showName}(${qq}) 抽卡${code}期，累计${currentPity.pityCount + 1}抽，保底获得${limitStar}星限时卡：${eventCard.card_name}`);
     } else {
       const randIndex = Math.floor(Math.random() * probabilityPool.length);
       const selectedStar = probabilityPool[randIndex];
@@ -1895,7 +1883,7 @@ async function _do_event_draw(ctx, session, data, event6Threshold, event7Thresho
   info += session.text("tip.draw.vapor", { vapor: waterVaporTotal });
   info += session.text("tip.draw.disturb", { disturbanceTotal });
   if (!currentPity.hasGot) {
-    const remaining = threshold - newPityCount;
+    const remaining = Math.max(0, threshold - newPityCount);
     info += session.text("tip.eventDraw.pityProgress", { star: limitStar, current: newPityCount, threshold, left: remaining });
   } else {
     info += session.text("tip.eventDraw.pityReset", { star: limitStar });
@@ -2157,11 +2145,6 @@ async function apply(ctx, config) {
     exchange_date: { type: "string" },
     exchange_count: { type: "integer" }
   }, { primary: ["qq", "exchange_date"] });
-  ctx.model.extend("gacha_shop_limit", {
-    card_id: { type: "string" },
-    total_limit: { type: "integer" },
-    left_limit: { type: "integer" }
-  }, { primary: ["card_id"] });
   ctx.model.extend("gacha_user_exchange", {
     qq: { type: "string" },
     create_at: { type: "integer" },

package/lib/locales/zh-CN/index.d.ts

@@ -79,27 +79,13 @@ declare const _default: {
     "error.disturbDraw.count.notEnough": string;
     "error.switch.private": string;
     "error.switch.fail": string;
-    "error.shop.no7starCard": string;
-    "error.shop.fail": string;
     "error.shop.cardNotEnough": string;
-    "error.shop.cardNotInShop": string;
-    "error.shop.cardNotInPool": string;
-    "error.shop.cardLimitExceed": string;
     "error.collection.fail": string;
     "error.ranking.fail": string;
     "draw.broadcast.title": string;
     "draw.broadcast.getCard": string;
     "image.warehouse.title": string;
     "image.warehouse.empty": string;
-    "image.shop.title": string;
-    "image.shop.userInfo": string;
-    "image.shop.asset": string;
-    "image.shop.exchangeCount": string;
-    "image.shop.header.card": string;
-    "image.shop.header.price": string;
-    "image.shop.header.cmd": string;
-    "image.shop.footerTip": string;
-    "image.shop.cmdTemplate": string;
     "image.collection.title": string;
     "image.collection.title1": string;
     "image.collection.title2": string;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-xxck-1",
   "description": "抽卡系统|完整指令说明见readme|建议使用skia-canvas",
-  "version": "0.3.7",
+  "version": "0.3.9",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "files": [