koishi-plugin-xxck-1 0.3.4 → 0.3.6

package/lib/index.d.ts

@@ -11,6 +11,7 @@ export interface PluginConfig {
     eventExchangePrice7: number;
     collectionPart1Pattern: string;
     collectionPart2Pattern: string;
+    disturbExchangePrice: number;
     normalStar7Threshold: number;
     normalStar6Threshold: number;
     normalStar6Prob: number;
@@ -27,6 +28,7 @@ export declare const Config: Schema<Schemastery.ObjectS<{
     eventExchangePrice7: Schema<number, number>;
     collectionPart1Pattern: Schema<string, string>;
     collectionPart2Pattern: Schema<string, string>;
+    disturbExchangePrice: Schema<number, number>;
     normalStar7Threshold: Schema<number, number>;
     normalStar6Threshold: Schema<number, number>;
     normalStar6Prob: Schema<number, number>;
@@ -42,6 +44,7 @@ export declare const Config: Schema<Schemastery.ObjectS<{
     eventExchangePrice7: Schema<number, number>;
     collectionPart1Pattern: Schema<string, string>;
     collectionPart2Pattern: Schema<string, string>;
+    disturbExchangePrice: Schema<number, number>;
     normalStar7Threshold: Schema<number, number>;
     normalStar6Threshold: Schema<number, number>;
     normalStar6Prob: Schema<number, number>;
@@ -144,6 +147,10 @@ declare module 'koishi' {
             got6: boolean;
             got7: boolean;
         };
+        gacha_user_disturb_draw: {
+            qq: string;
+            draw_count: number;
+        };
         gacha_battle_user: {
             qq: string;
             win: number;

package/lib/index.js

@@ -40,14 +40,16 @@ var zh_CN_default = {
   "command.wwc.help.sign": "签到：每日领取抽数 | 指令：WWC签到 | 说明：每日1次，获得40抽",
   "command.wwc.help.draw": "抽卡：普通抽卡 | 指令：WWC抽卡 [次数] | 说明：1-20连，消耗普通抽数，默认1连",
   "command.wwc.help.warehouse": "仓库：查看已拥有卡片 | 指令：WWC仓库 | 说明：显示等级/星级/限定标记，按星级排序",
-  "command.wwc.help.shop": "店铺：查看今日可升格卡片 | 指令：WWC店铺 | 说明：每日随机刷新3个7星卡，全服限购",
+  "command.wwc.help.shop": "店铺：查看今日可升格卡片 | 指令：WWC店铺 | 说明：每日随机刷新4个7星、6个6星、10个5星（均来自普通卡池），全服限购5次",
   "command.wwc.help.upgrade": "升格：兑换店铺卡片 | 指令：WWC升格 [卡片编号...] | 说明：消耗热带扰动，重复卡片自动升级",
   "command.wwc.help.exchange": "兑换：水汽换普通抽数 | 指令：WWC兑换 [次数] | 说明：100水汽=1抽，每日上限80抽，单次1-40",
   "command.wwc.help.collection": "收藏：查看卡片收藏进度 | 指令：WWC收藏（全部分类）；WWC收藏1 / WWC收藏2 / WWC收藏3 为拆分版（分类正则可在插件配置项 collectionPart1Pattern / collectionPart2Pattern 中定义，收藏3 = 两者都不匹配的类别）| 说明：含普通+限定卡",
-  "command.wwc.help.ranking": "排名：查看全服收藏排行 | 指令：WWC排名1/WWC排行1 | 说明：显示前20名+自身排名，按收藏数排序",
+  "command.wwc.help.ranking": "排名：查看全服排行 | 指令：WWC排名1（按收藏数）；WWC排名2（按7/6星战力分：7星0级20分每级+15，普通6星0级5分每级+3，限时6星0级8分每级+6）| 说明：显示前20名+自身排名",
   "command.wwc.help.eventStatus": "限时状态：查看开放的限时卡池 | 指令：WWC限时状态 | 说明：显示期数/名称/星级/开放时间",
   "command.wwc.help.eventDraw": "限时抽卡：参与限时卡池 | 指令：WWC限时抽卡 [期数] [次数] | 说明：1-20连，消耗限时抽数，无期限数匹配唯一开放池",
   "command.wwc.help.eventExchange": "限时兑换：水汽换限时抽数 | 指令：WWC限时兑换 [期数] [次数] | 说明：6星300水汽/抽，7星450水汽/抽，单次1-40",
+  "command.wwc.help.disturbDraw": "扰动抽卡：使用扰动抽数抽卡 | 指令：WWC扰动抽卡 [次数] | 说明：普通卡池5/6/7星，7星10%、6星36%、5星54%，单次1-20连",
+  "command.wwc.help.disturbExchange": "扰动兑换：热带扰动换扰动抽数 | 指令：WWC扰动兑换 [次数] | 说明：每抽消耗扰动由配置项决定（默认100），单次1-40",
   "command.wwc.help.tip": "💡 提示：所有指令前缀为「WWC」，区分大小写；抽卡/兑换次数超出限制会自动兜底为1次",
   // ==============================================
   // 2. 功能操作成功提示
@@ -64,6 +66,8 @@ var zh_CN_default = {
   "tip.switch.groupClose": "❌ 本群WWC抽卡功能已关闭！群成员无法使用任何指令",
   "tip.eventAdd.success": "✅ 限时卡池创建成功：{code} | 请检查时间戳是否正确",
   "tip.eventExchange.success": "✅ 限时兑换成功\n卡池：{code} | 数量：{count}抽 | 消耗：{cost}水汽",
+  "tip.disturbExchange.success": "✅ 扰动兑换成功\n数量：{count}抽 | 消耗：{cost}热带扰动 | 当前扰动抽数：{left}抽",
+  "tip.disturbDraw.title": "🎲 [{name}] 扰动抽卡完成（剩余扰动抽数：{left}抽）！获得以下卡片：",
   "tip.eventStatus.info": "📅 限时卡池【{code}】\n卡片：{cardName}（{star}星）\n类型：{type}\n开放时间：{start} ~ {end}",
   "tip.upgrade.success": "✅ 升格成功！恭喜您获得了以下卡片：\n",
   "tip.upgrade.cost": "💸 消耗扰动：-{total_cost}",
@@ -111,6 +115,8 @@ var zh_CN_default = {
   "error.eventDraw.count.notEnough": "❌ {star}星限时抽数不足：\n当前{have}抽/需要{need}抽\n可使用WWC限时兑换获取",
   "error.eventDraw.param.invalid": "❌ 抽卡参数无效，请传入期数和次数",
   "error.eventExchange.pool.none": "❌ 该期数限时卡池未开放或不存在！\n请使用WWC限时状态查看",
+  "error.disturbExchange.disturb.notEnough": "❌ 热带扰动不足！\n本次兑换需要：{need}扰动 | 当前拥有：{have}扰动",
+  "error.disturbDraw.count.notEnough": "❌ 扰动抽数不足！\n当前剩余：{have} 次 | 需要：{need} 次（可使用 WWC扰动兑换 兑换）",
   "error.switch.private": "❌ 私信场景无需设置群开关！该指令仅可在群聊中使用",
   "error.switch.fail": "❌ 开关操作失败！{msg}",
   "error.shop.no7starCard": "❌ 店铺生成失败！普通卡池中无7星卡片，请联系主人录入",
@@ -154,6 +160,9 @@ var zh_CN_default = {
   "image.ranking.header.player": "玩家",
   "image.ranking.header.count": "收藏数量",
   "image.ranking.mine": "你的排名：第{rank}名 | 收藏卡片：{count}张",
+  "image.ranking2.title": "WWC全服7/6星战力排行榜（前20名）",
+  "image.ranking2.header.score": "综合得分",
+  "image.ranking2.mine": "你的排名：第{rank}名 | 综合得分：{score}分",
   // ==============================================
   // 6. 系统日志/通知（主人私信）
   // ==============================================
@@ -177,6 +186,7 @@ var Config = import_koishi.Schema.object({
   eventExchangePrice7: import_koishi.Schema.number().description("限时卡池7星兑换每抽消耗的水汽量（默认450）").default(450).min(1).max(1e4),
   collectionPart1Pattern: import_koishi.Schema.string().description('WWC收藏1的分类正则：类别名匹配此正则的归入收藏图1（默认匹配"纯数字且≥2000"）').default("^([2-9]\\d{3}|\\d{5,})$").role("textarea"),
   collectionPart2Pattern: import_koishi.Schema.string().description('WWC收藏2的分类正则：类别名匹配此正则的归入收藏图2（默认匹配"纯数字且<2000"）；两个正则都不匹配的类别归入WWC收藏3').default("^(\\d{1,3}|1\\d{3})$").role("textarea"),
+  disturbExchangePrice: import_koishi.Schema.number().description("扰动兑换：每抽扰动抽数消耗的热带扰动量（默认100）").default(100).min(1).max(1e5),
   normalStar7Threshold: import_koishi.Schema.number().description("普通卡池7星保底抽数（默认1500）").default(1500).min(1).max(1e4),
   normalStar6Threshold: import_koishi.Schema.number().description("普通卡池6星保底抽数（默认300）").default(300).min(1).max(1e4),
   normalStar6Prob: import_koishi.Schema.number().description("普通卡池6星保底抽出6星概率百分比（减去为抽出7星概率）").default(90).min(0).max(100),
@@ -339,8 +349,12 @@ async function _shop_draw_image(ctx, session, userName, date, disturbance, vapor
     const BASE_X = 40;
     const BASE_Y = 30;
     const CANVAS_WIDTH = 900;
-    const CANVAS_HEIGHT = 1100;
     const CARD_ITEM_HEIGHT = 85;
+    const FIRST_CARD_Y = BASE_Y + 235;
+    const CANVAS_HEIGHT = Math.max(
+      1100,
+      FIRST_CARD_Y + Math.max(0, (shopCards?.length ?? 0) - 1) * CARD_ITEM_HEIGHT + 70
+    );
     const FONT_FAMILY = "Microsoft YaHei, SimHei, 黑体, 宋体, sans-serif";
     const canvas = ctx.canvas.createCanvas(CANVAS_WIDTH, CANVAS_HEIGHT);
     const ctx2d = canvas.getContext("2d");
@@ -1284,20 +1298,24 @@ async function _do_shop(ctx, session, signResetHour, signResetMinute) {
     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 });
     if (todayShop.length === 0) {
-      const [sevenStarCards, sixStarCards] = await Promise.all([
+      const [sevenStarCards, sixStarCards, fiveStarCards] = await Promise.all([
         ctx.database.get("gacha_card_pool", { card_star: 7 }),
-        ctx.database.get("gacha_card_pool", { card_star: 6 })
+        ctx.database.get("gacha_card_pool", { card_star: 6 }),
+        ctx.database.get("gacha_card_pool", { card_star: 5 })
       ]);
-      if (sevenStarCards.length < 4 || sixStarCards.length < 6) {
+      if (sevenStarCards.length < 4 || sixStarCards.length < 6 || fiveStarCards.length < 10) {
         return await session.send(import_koishi.h.text(session.text("error.shop.cardNotEnough")));
       }
       const selected7 = sevenStarCards.sort(() => Math.random() - 0.5).slice(0, 4);
       const selected6 = sixStarCards.sort(() => Math.random() - 0.5).slice(0, 6);
-      const allCards = [...selected7, ...selected6];
+      const selected5 = fiveStarCards.sort(() => Math.random() - 0.5).slice(0, 10);
+      const allCards = [...selected7, ...selected6, ...selected5];
+      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) {
-        const basePrice = card.card_star === 7 ? 800 : 200;
-        const range = card.card_star === 7 ? 80 : 30;
-        const randomPrice = basePrice + Math.floor(Math.random() * (range * 2 + 1)) - range;
+        const basePrice = SHOP_PRICE_BASE[card.card_star] ?? 10;
+        const range = SHOP_PRICE_RANGE[card.card_star] ?? 0;
+        const randomPrice = range > 0 ? basePrice + Math.floor(Math.random() * (range * 2 + 1)) - range : basePrice;
         const nextId = await getNextId(ctx, "gacha_shop_daily");
         await ctx.database.create("gacha_shop_daily", {
           id: nextId,
@@ -1339,6 +1357,7 @@ async function _do_shop(ctx, session, signResetHour, signResetMinute) {
         leftLimit: limitMap.get(item.card_id)
       };
     });
+    shopCardList.sort((a, b) => b.star - a.star || String(a.id).localeCompare(String(b.id)));
     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;
@@ -1429,6 +1448,97 @@ async function _do_ranking(ctx, session) {
   }
 }
 __name(_do_ranking, "_do_ranking");
+async function _do_ranking2(ctx, session) {
+  ctx.logger.info("WWC排名2 开始执行");
+  try {
+    const qq = await getUnifiedQQ(ctx, session);
+    const user = await ctx.database.get("gacha_user", { qq });
+    if (!user.length) {
+      await session.send(build_msg(session, session.text("error.common.notRegister")));
+      return;
+    }
+    const show_name = user[0].status === 1 ? user[0].nickname : qq;
+    const [normalPoolCards, eventPoolCards] = await Promise.all([
+      ctx.database.get("gacha_card_pool", {}, { fields: ["card_id", "card_star"] }),
+      ctx.database.get("gacha_event_pool", {}, { fields: ["card_id", "card_star"] })
+    ]);
+    const poolInfo = /* @__PURE__ */ new Map();
+    normalPoolCards.forEach((c) => {
+      if (!poolInfo.has(c.card_id)) poolInfo.set(c.card_id, { star: c.card_star, isLimit: false });
+    });
+    eventPoolCards.forEach((c) => {
+      if (!poolInfo.has(c.card_id)) poolInfo.set(c.card_id, { star: c.card_star, isLimit: true });
+    });
+    const all_users = await ctx.database.get("gacha_user", {});
+    const ranking_data = [];
+    for (const u of all_users) {
+      try {
+        const cards = await ctx.database.get("gacha_user_card", { qq: u.qq }, { fields: ["card_id", "card_level"] });
+        const levelMap = /* @__PURE__ */ new Map();
+        cards.forEach((c) => {
+          const lv = c.card_level || 0;
+          const prev = levelMap.get(c.card_id);
+          if (prev === void 0 || lv > prev) levelMap.set(c.card_id, lv);
+        });
+        let totalScore = 0;
+        levelMap.forEach((lv, cid) => {
+          const info = poolInfo.get(cid);
+          if (!info) return;
+          if (info.star >= 7) totalScore += 20 + 15 * lv;
+          else if (info.star === 6) totalScore += info.isLimit ? 8 + 6 * lv : 5 + 3 * lv;
+        });
+        ranking_data.push({
+          qq: u.qq,
+          show_name: u.status === 1 ? u.nickname : u.qq,
+          total_score: totalScore
+        });
+      } catch (e) {
+        continue;
+      }
+    }
+    ranking_data.sort((a, b) => b.total_score - a.total_score);
+    const ranking_list = [];
+    let user_rank = 0;
+    let user_score = 0;
+    ranking_data.forEach((item, idx) => {
+      const rank = idx + 1;
+      if (item.qq === qq) {
+        user_rank = rank;
+        user_score = item.total_score;
+      }
+      if (rank <= 20) {
+        ranking_list.push([rank, item.show_name, item.total_score]);
+      }
+    });
+    const titleText = session.text("image.ranking2.title");
+    const headerRankText = session.text("image.ranking.header.rank");
+    const headerPlayerText = session.text("image.ranking.header.player");
+    const headerCountText = session.text("image.ranking2.header.score");
+    const mineText = session.text("image.ranking2.mine", { rank: user_rank, score: user_score });
+    const img_base64 = await _ranking_draw_image(
+      ctx,
+      ranking_list,
+      user_rank,
+      user_score,
+      show_name,
+      titleText,
+      headerRankText,
+      headerPlayerText,
+      headerCountText,
+      mineText
+    );
+    if (img_base64) {
+      await session.send(img_base64);
+      ctx.logger.info("WWC排名2 图片发送成功");
+    } else {
+      await session.send(build_msg(session, session.text("error.common.imageGenerate")));
+    }
+  } catch (e) {
+    ctx.logger.error("WWC排名2 报错：", e);
+    await session.send(build_msg(session, session.text("error.ranking.fail")));
+  }
+}
+__name(_do_ranking2, "_do_ranking2");
 async function _do_switch(ctx, session, type, action, masterQQ) {
   const userQQ = await getUnifiedQQ(ctx, session);
   if (userQQ !== masterQQ) {
@@ -1800,6 +1910,128 @@ async function _do_event_draw(ctx, session, data, event6Threshold, event7Thresho
   }
 }
 __name(_do_event_draw, "_do_event_draw");
+async function _do_disturb_exchange(ctx, session, cnt, price) {
+  const qq = await getUnifiedQQ(ctx, session);
+  const realCnt = Math.min(Math.max(cnt | 0, 1), 40);
+  const user = await ctx.database.get("gacha_user", { qq });
+  if (!user.length) return await session.send(build_msg(session, session.text("error.common.notRegister")));
+  const total = price * realCnt;
+  const asset = await ctx.database.get("gacha_user_draw_count", { qq });
+  const disturb = asset[0]?.tropical_disturbance ?? 0;
+  if (disturb < total) {
+    ctx.logger.warn(`[扰动兑换] 玩家${qq}兑换失败：热带扰动不足（拥有${disturb}，需${total}）`);
+    return await session.send(build_msg(session, session.text("error.disturbExchange.disturb.notEnough", { need: total, have: disturb })));
+  }
+  await ctx.database.upsert("gacha_user_draw_count", [{ qq, tropical_disturbance: disturb - total }]);
+  const ud = await ctx.database.get("gacha_user_disturb_draw", { qq });
+  const have = ud[0]?.draw_count ?? 0;
+  await ctx.database.upsert("gacha_user_disturb_draw", [{ qq, draw_count: have + realCnt }]);
+  ctx.logger.info(`[扰动兑换] 玩家${qq}兑换成功：获得${realCnt}抽，消耗扰动${total}，扰动抽数${have}→${have + realCnt}`);
+  await session.send(build_msg(
+    session,
+    session.text("tip.disturbExchange.success", { count: realCnt, cost: total, left: have + realCnt })
+  ));
+}
+__name(_do_disturb_exchange, "_do_disturb_exchange");
+async function _do_disturb_draw(ctx, session, count) {
+  ctx.logger.info("执行扰动抽卡，次数：", count);
+  const qq = await getUnifiedQQ(ctx, session);
+  const user = await ctx.database.get("gacha_user", { qq });
+  if (!user.length) return await session.send(build_msg(session, session.text("error.common.notRegister")));
+  const showName = user[0].status === 1 ? user[0].nickname : qq;
+  if (!Number.isInteger(count) || count < 1 || count > 20) {
+    return await session.send(build_msg(session, session.text("error.draw.count.invalid")));
+  }
+  const ud = await ctx.database.get("gacha_user_disturb_draw", { qq });
+  const have = ud[0]?.draw_count ?? 0;
+  if (have < count) {
+    return await session.send(build_msg(session, session.text("error.disturbDraw.count.notEnough", {
+      need: count,
+      have
+    })));
+  }
+  const allCards = await ctx.database.get("gacha_card_pool", {});
+  const starCardMap = { 5: [], 6: [], 7: [] };
+  allCards.forEach((card) => {
+    if (starCardMap[card.card_star]) starCardMap[card.card_star].push(card);
+  });
+  const DISTURB_STAR_PROB = { 7: 10, 6: 36, 5: 54 };
+  const weightedPool = [];
+  for (const [star, prob] of Object.entries(DISTURB_STAR_PROB)) {
+    if (!starCardMap[+star]?.length) continue;
+    for (let i = 0; i < prob; i++) weightedPool.push(+star);
+  }
+  if (!weightedPool.length) {
+    return await session.send(build_msg(session, session.text("error.draw.poolEmpty")));
+  }
+  const STAR_TO_DISTURBANCE = { 0: 0, 1: 0, 2: 0, 3: 1, 4: 5, 5: 20, 6: 100, 7: 500 };
+  const INIT_WATER_VAPOR = { 0: 50, 1: 100, 2: 150, 3: 200, 4: 500, 5: 1e3, 6: 2e3, 7: 5e3 };
+  const UPGRADE_WATER_VAPOR = { 0: 25, 1: 50, 2: 75, 3: 100, 4: 200, 5: 500, 6: 1e3, 7: 2e3 };
+  const drawResult = [];
+  let disturbanceTotal = 0;
+  let waterVaporTotal = 0;
+  let isUpgrade = false;
+  for (let i = 0; i < count; i++) {
+    const selectedStar = weightedPool[Math.floor(Math.random() * weightedPool.length)];
+    const cardList = starCardMap[selectedStar];
+    const card = cardList[Math.floor(Math.random() * cardList.length)];
+    drawResult.push({ star: selectedStar, cid: card.card_id, name: card.card_name });
+    const userCard = await ctx.database.get("gacha_user_card", { qq, card_id: card.card_id });
+    if (!userCard.length) {
+      await ctx.database.upsert("gacha_user_card", [{
+        qq,
+        card_id: card.card_id,
+        card_level: 0,
+        obtain_at: Date.now()
+      }]);
+      waterVaporTotal += INIT_WATER_VAPOR[selectedStar];
+      ctx.logger.info(`[扰动抽卡] 新增卡片：${card.card_id} ${card.card_name}，等级0`);
+    } else {
+      const currentLevel = userCard[0].card_level;
+      if (currentLevel < CARD_LEVEL_MAX) {
+        await ctx.database.upsert("gacha_user_card", [{
+          id: userCard[0].id,
+          qq,
+          card_id: card.card_id,
+          card_level: currentLevel + 1,
+          obtain_at: Date.now()
+        }]);
+        isUpgrade = true;
+        waterVaporTotal += UPGRADE_WATER_VAPOR[selectedStar];
+        ctx.logger.info(`[扰动抽卡] 卡片升级：${card.card_id}，等级${currentLevel}→${currentLevel + 1}`);
+      } else {
+        const d = STAR_TO_DISTURBANCE[selectedStar];
+        if (d > 0) {
+          disturbanceTotal += d;
+          ctx.logger.info(`[扰动抽卡] 卡片满级：${card.card_id}，转化为${d}热带扰动`);
+        }
+      }
+    }
+  }
+  await ctx.database.upsert("gacha_user_disturb_draw", [{ qq, draw_count: have - count }]);
+  const asset = await ctx.database.get("gacha_user_draw_count", { qq });
+  await ctx.database.upsert("gacha_user_draw_count", [{
+    qq,
+    draw_count: asset[0]?.draw_count ?? 0,
+    tropical_disturbance: (asset[0]?.tropical_disturbance ?? 0) + disturbanceTotal,
+    water_vapor: (asset[0]?.water_vapor ?? 0) + waterVaporTotal,
+    no_6star_draws: asset[0]?.no_6star_draws ?? 0,
+    no_7star_draws: asset[0]?.no_7star_draws ?? 0
+  }]);
+  ctx.logger.info(`[扰动抽卡] ${showName}(${qq}) 消耗${count}抽，剩余${have - count}，水汽+${waterVaporTotal}，热带扰动+${disturbanceTotal}`);
+  let msg = session.text("tip.disturbDraw.title", { name: showName, left: have - count }) + "\n";
+  drawResult.forEach((item) => {
+    msg += `${get_star_symbol(item.star)} ${item.cid} ${item.name}
+`;
+  });
+  let info = "";
+  if (isUpgrade) info += session.text("tip.draw.upgrade");
+  info += session.text("tip.draw.vapor", { vapor: waterVaporTotal });
+  info += session.text("tip.draw.disturb", { disturbanceTotal });
+  if (info) msg += "\n" + info.replace(/；$/, "");
+  await session.send(build_msg(session, msg));
+}
+__name(_do_disturb_draw, "_do_disturb_draw");
 async function _do_broadcast(ctx, session, msg, masterQQ) {
   const userQQ = await getUnifiedQQ(ctx, session);
   if (userQQ !== masterQQ) return;
@@ -1851,7 +2083,7 @@ async function _do_reject(ctx, session, rejectQQ, masterQQ) {
 }
 __name(_do_reject, "_do_reject");
 async function _do_help(ctx, session) {
-  const helpMsg = session.text("command.wwc.help.title") + "\n" + session.text("command.wwc.help.register") + "\n" + session.text("command.wwc.help.sign") + "\n" + session.text("command.wwc.help.draw") + "\n" + session.text("command.wwc.help.warehouse") + "\n" + session.text("command.wwc.help.shop") + "\n" + session.text("command.wwc.help.upgrade") + "\n" + session.text("command.wwc.help.exchange") + "\n" + session.text("command.wwc.help.collection") + "\n" + session.text("command.wwc.help.ranking") + "\n" + session.text("command.wwc.help.eventStatus") + "\n" + session.text("command.wwc.help.eventDraw") + "\n" + session.text("command.wwc.help.eventExchange") + "\n" + session.text("command.wwc.help.tip");
+  const helpMsg = session.text("command.wwc.help.title") + "\n" + session.text("command.wwc.help.register") + "\n" + session.text("command.wwc.help.sign") + "\n" + session.text("command.wwc.help.draw") + "\n" + session.text("command.wwc.help.warehouse") + "\n" + session.text("command.wwc.help.shop") + "\n" + session.text("command.wwc.help.upgrade") + "\n" + session.text("command.wwc.help.exchange") + "\n" + session.text("command.wwc.help.collection") + "\n" + session.text("command.wwc.help.ranking") + "\n" + session.text("command.wwc.help.eventStatus") + "\n" + session.text("command.wwc.help.eventDraw") + "\n" + session.text("command.wwc.help.eventExchange") + "\n" + session.text("command.wwc.help.disturbDraw") + "\n" + session.text("command.wwc.help.disturbExchange") + "\n" + session.text("command.wwc.help.tip");
   await session.send(build_msg(session, helpMsg));
 }
 __name(_do_help, "_do_help");
@@ -1951,6 +2183,10 @@ async function apply(ctx, config) {
     got6: { type: "boolean" },
     got7: { type: "boolean" }
   }, { primary: ["qq", "event_code"] });
+  ctx.model.extend("gacha_user_disturb_draw", {
+    qq: { type: "string" },
+    draw_count: { type: "integer" }
+  }, { primary: ["qq"] });
   ctx.model.extend("gacha_group_member", {
     group_id: { type: "string" },
     qq: { type: "string" },
@@ -2090,6 +2326,11 @@ async function apply(ctx, config) {
     const session = argv.session;
     await _do_ranking(ctx, session);
   });
+  ctx.command("WWC排名2", "查看全服7/6星战力评分排行（7星0级20分每级+15，普通6星0级5分每级+3，限时6星0级8分每级+6），显示前20名+自身排名").alias("wwc排名2").alias("WWC排行2").action(async (argv) => {
+    if (!argv.session) return;
+    const session = argv.session;
+    await _do_ranking2(ctx, session);
+  });
   ctx.command("WWC开启", "开启本群WWC功能，仅主人可用").alias("wwc开启").action(async (argv) => {
     if (!argv.session) return;
     const session = argv.session;
@@ -2131,6 +2372,20 @@ async function apply(ctx, config) {
     const cnt = Number.isInteger(num) && num >= 1 && num <= 40 ? num : 1;
     await _do_event_exchange(ctx, session, { code, cnt }, config.eventExchangePrice6, config.eventExchangePrice7);
   });
+  ctx.command("WWC扰动抽卡 [次数]", "使用扰动抽数抽卡（普通卡池：7星10%、6星36%、5星54%），支持1-20连").alias("wwc扰动抽卡").alias("WWC扰动抽").action(async (argv, count) => {
+    if (!argv.session) return;
+    const session = argv.session;
+    const num = Number(count);
+    const times = Number.isInteger(num) && num >= 1 && num <= 20 ? num : 1;
+    await _do_disturb_draw(ctx, session, times);
+  });
+  ctx.command("WWC扰动兑换 <次数>", "热带扰动兑换扰动抽数，每抽消耗由配置项决定（默认100），单次1-40").alias("wwc扰动兑换").alias("WWC扰动换抽").action(async (argv, count) => {
+    if (!argv.session) return;
+    const session = argv.session;
+    const num = Number(count);
+    const cnt = Number.isInteger(num) && num >= 1 && num <= 40 ? num : 1;
+    await _do_disturb_exchange(ctx, session, cnt, config.disturbExchangePrice);
+  });
   ctx.command("WWC限时录入 <参数...>", "录入限时卡池信息，仅主人可用（格式：期数 ID 名称 星级 类别 开始戳 结束戳）").alias("wwc限时录入").action(async (argv, ...params) => {
     if (!argv.session) return;
     const session = argv.session;

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

@@ -12,6 +12,8 @@ declare const _default: {
     "command.wwc.help.eventStatus": string;
     "command.wwc.help.eventDraw": string;
     "command.wwc.help.eventExchange": string;
+    "command.wwc.help.disturbDraw": string;
+    "command.wwc.help.disturbExchange": string;
     "command.wwc.help.tip": string;
     "tip.register.success": string;
     "tip.register.modify": string;
@@ -25,6 +27,8 @@ declare const _default: {
     "tip.switch.groupClose": string;
     "tip.eventAdd.success": string;
     "tip.eventExchange.success": string;
+    "tip.disturbExchange.success": string;
+    "tip.disturbDraw.title": string;
     "tip.eventStatus.info": string;
     "tip.upgrade.success": string;
     "tip.upgrade.cost": string;
@@ -69,6 +73,8 @@ declare const _default: {
     "error.eventDraw.count.notEnough": string;
     "error.eventDraw.param.invalid": string;
     "error.eventExchange.pool.none": string;
+    "error.disturbExchange.disturb.notEnough": string;
+    "error.disturbDraw.count.notEnough": string;
     "error.switch.private": string;
     "error.switch.fail": string;
     "error.shop.no7starCard": string;
@@ -105,6 +111,9 @@ declare const _default: {
     "image.ranking.header.player": string;
     "image.ranking.header.count": string;
     "image.ranking.mine": string;
+    "image.ranking2.title": string;
+    "image.ranking2.header.score": string;
+    "image.ranking2.mine": string;
     "sys.notify.register": string;
     "sys.notify.sign": string;
     "sys.notify.draw": string;

package/package.json

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