koishi-plugin-xxck-1 0.3.6 → 0.3.7

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": "升格价格",
@@ -342,7 +344,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 +367,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 +377,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 +969,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));
 }
@@ -1361,6 +1365,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 +1373,7 @@ async function _do_shop(ctx, session, signResetHour, signResetMinute) {
       today,
       dist,
       vapor,
+      drawLeft,
       0,
       0,
       shopCardList
@@ -1894,6 +1900,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.7",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "files": [