koishi-plugin-xxck-1 0.3.7 → 0.3.8

package/lib/index.js

@@ -205,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, "&");
@@ -1027,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));
@@ -1047,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,
@@ -1089,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,
@@ -1300,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 }),
@@ -1313,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) {
@@ -1339,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]));

package/package.json

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