koishi-plugin-xxck-1 0.3.6 → 0.3.8

package/lib/index.js

@@ -80,6 +80,8 @@ var zh_CN_default = {
   "tip.draw.upgrade": "✅ 原有卡片升级成功\n",
   "tip.draw.vapor": "💧 水汽 +{vapor}\n",
   "tip.draw.disturb": "🌪️ 热带扰动 +{disturbanceTotal}",
+  "tip.draw.left": "🔢 剩余普通抽数：{left}抽",
+  "tip.eventDraw.left": "🔢 剩余{star}星限时抽数：{left}抽",
   "tip.eventDraw.pityReset": "✨ 已获得当期限时{star}星卡，保底进度重置；",
   "tip.eventDraw.pityProgress": "📊 限时{star}星保底进度：{current}/{threshold}抽（再抽{left}抽必出）；",
   // ==============================================
@@ -140,7 +142,7 @@ var zh_CN_default = {
   "image.warehouse.empty": "你的仓库暂无任何卡片，快去抽卡吧！",
   "image.shop.title": "WWC每日商店（{date}）",
   "image.shop.userInfo": "玩家：{name}",
-  "image.shop.asset": "热带扰动： {disturb} | 水汽：{vapor}",
+  "image.shop.asset": "热带扰动： {disturb} | 水汽：{vapor} | 剩余抽数：{draw}",
   "image.shop.exchangeCount": "今日普通兑换：{used}/{limit}抽（单次最多40）",
   "image.shop.header.card": "卡片信息",
   "image.shop.header.price": "升格价格",
@@ -203,6 +205,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, "&");
@@ -342,7 +361,7 @@ async function _warehouse_draw_image(ctx, user_cards, show_name, titleText, empt
   }
 }
 __name(_warehouse_draw_image, "_warehouse_draw_image");
-async function _shop_draw_image(ctx, session, userName, date, disturbance, vapor, usedExchange, limitExchange, shopCards) {
+async function _shop_draw_image(ctx, session, userName, date, disturbance, vapor, drawLeft, usedExchange, limitExchange, shopCards) {
   ctx.logger.info("开始绘制店铺图片（最终稳定版）");
   try {
     if (!ctx.canvas) return null;
@@ -365,6 +384,7 @@ async function _shop_draw_image(ctx, session, userName, date, disturbance, vapor
     ctx2d.textAlign = "left";
     const distStr = String(disturbance ?? 0);
     const vaporStr = String(vapor ?? 0);
+    const drawStr = String(drawLeft ?? 0);
     ctx2d.save();
     ctx2d.textAlign = "center";
     ctx2d.fillStyle = "#E53E3E";
@@ -374,7 +394,7 @@ async function _shop_draw_image(ctx, session, userName, date, disturbance, vapor
     ctx2d.fillStyle = "#222";
     ctx2d.font = `20px ${FONT_FAMILY}`;
     ctx2d.fillText(`玩家：${userName}`, BASE_X, BASE_Y + 80);
-    ctx2d.fillText(`热带扰动：${distStr}｜水汽：${vaporStr}`, BASE_X, BASE_Y + 120);
+    ctx2d.fillText(`热带扰动：${distStr}｜水汽：${vaporStr}｜剩余抽数：${drawStr}`, BASE_X, BASE_Y + 120);
     const headerY = BASE_Y + 200;
     ctx2d.save();
     ctx2d.fillStyle = "#000";
@@ -966,6 +986,7 @@ async function _do_draw(ctx, session, draw_times, star7Threshold, star6Threshold
   if (isUpgrade) info += session.text("tip.draw.upgrade");
   info += session.text("tip.draw.vapor", { vapor: waterVaporTotal });
   info += session.text("tip.draw.disturb", { disturbanceTotal });
+  info += "\n" + session.text("tip.draw.left", { left: haveDraw - draw_times });
   if (info) msg += "\n" + info.replace(/；$/, "");
   await session.send(build_msg(session, msg));
 }
@@ -1023,7 +1044,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));
@@ -1043,6 +1064,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,
@@ -1085,14 +1107,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,
@@ -1296,7 +1321,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 }),
@@ -1309,7 +1334,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) {
@@ -1335,7 +1362,7 @@ async function _do_shop(ctx, session, signResetHour, signResetMinute) {
           });
         }
       }
-      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]));
@@ -1361,6 +1388,7 @@ async function _do_shop(ctx, session, signResetHour, signResetMinute) {
     const userAsset = await ctx.database.get("gacha_user_draw_count", { qq });
     const dist = userAsset[0]?.tropical_disturbance ?? 0;
     const vapor = userAsset[0]?.water_vapor ?? 0;
+    const drawLeft = userAsset[0]?.draw_count ?? 0;
     const img = await _shop_draw_image(
       ctx,
       session,
@@ -1368,6 +1396,7 @@ async function _do_shop(ctx, session, signResetHour, signResetMinute) {
       today,
       dist,
       vapor,
+      drawLeft,
       0,
       0,
       shopCardList
@@ -1894,6 +1923,7 @@ async function _do_event_draw(ctx, session, data, event6Threshold, event7Thresho
   } else {
     info += session.text("tip.eventDraw.pityReset", { star: limitStar });
   }
+  info += "\n" + session.text("tip.eventDraw.left", { star: limitStar, left: have - count });
   if (info) msg += "\n" + info.replace(/；$/, "");
   await session.send(build_msg(session, msg));
   if (true) {

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

@@ -41,6 +41,8 @@ declare const _default: {
     "tip.draw.upgrade": string;
     "tip.draw.vapor": string;
     "tip.draw.disturb": string;
+    "tip.draw.left": string;
+    "tip.eventDraw.left": string;
     "tip.eventDraw.pityReset": string;
     "tip.eventDraw.pityProgress": string;
     "error.common.noPermission": string;

package/package.json

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