koishi-plugin-xxck-1 0.3.3 → 0.3.5

package/lib/index.d.ts

@@ -9,6 +9,8 @@ export interface PluginConfig {
     exchangeVaporPerDraw: number;
     eventExchangePrice6: number;
     eventExchangePrice7: number;
+    collectionPart1Pattern: string;
+    collectionPart2Pattern: string;
     normalStar7Threshold: number;
     normalStar6Threshold: number;
     normalStar6Prob: number;
@@ -23,6 +25,8 @@ export declare const Config: Schema<Schemastery.ObjectS<{
     exchangeVaporPerDraw: Schema<number, number>;
     eventExchangePrice6: Schema<number, number>;
     eventExchangePrice7: Schema<number, number>;
+    collectionPart1Pattern: Schema<string, string>;
+    collectionPart2Pattern: Schema<string, string>;
     normalStar7Threshold: Schema<number, number>;
     normalStar6Threshold: Schema<number, number>;
     normalStar6Prob: Schema<number, number>;
@@ -36,6 +40,8 @@ export declare const Config: Schema<Schemastery.ObjectS<{
     exchangeVaporPerDraw: Schema<number, number>;
     eventExchangePrice6: Schema<number, number>;
     eventExchangePrice7: Schema<number, number>;
+    collectionPart1Pattern: Schema<string, string>;
+    collectionPart2Pattern: Schema<string, string>;
     normalStar7Threshold: Schema<number, number>;
     normalStar6Threshold: Schema<number, number>;
     normalStar6Prob: Schema<number, number>;

package/lib/index.js

@@ -43,8 +43,8 @@ var zh_CN_default = {
   "command.wwc.help.shop": "店铺：查看今日可升格卡片 | 指令：WWC店铺 | 说明：每日随机刷新3个7星卡，全服限购",
   "command.wwc.help.upgrade": "升格：兑换店铺卡片 | 指令：WWC升格 [卡片编号...] | 说明：消耗热带扰动，重复卡片自动升级",
   "command.wwc.help.exchange": "兑换：水汽换普通抽数 | 指令：WWC兑换 [次数] | 说明：100水汽=1抽，每日上限80抽，单次1-40",
-  "command.wwc.help.collection": "收藏：查看卡片收藏进度 | 指令：WWC收藏 | 说明：生成收藏进度图片，含普通+限定卡",
-  "command.wwc.help.ranking": "排名：查看全服收藏排行 | 指令：WWC排名1/WWC排行1 | 说明：显示前20名+自身排名，按收藏数排序",
+  "command.wwc.help.collection": "收藏：查看卡片收藏进度 | 指令：WWC收藏（全部分类）；WWC收藏1 / WWC收藏2 / WWC收藏3 为拆分版（分类正则可在插件配置项 collectionPart1Pattern / collectionPart2Pattern 中定义，收藏3 = 两者都不匹配的类别）| 说明：含普通+限定卡",
+  "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",
@@ -142,6 +142,9 @@ var zh_CN_default = {
   "image.shop.footerTip": "每日刷新卡片，全服限购5次",
   "image.shop.cmdTemplate": "WWC升格 {cid}",
   "image.collection.title": "{showName} 的卡片收藏图鉴（含限定卡）",
+  "image.collection.title1": "{showName} 的卡片收藏图鉴1（分类规则见配置项）",
+  "image.collection.title2": "{showName} 的卡片收藏图鉴2（分类规则见配置项）",
+  "image.collection.title3": "{showName} 的卡片收藏图鉴3（其他类别）",
   "image.collection.totalProgress": "总收藏进度：{collected}/{total}（{rate}%）",
   "image.collection.emptyText": "暂无任何卡片收藏，快去抽卡解锁图鉴吧！",
   "image.collection.cateTitleFormat": "【{cate}】",
@@ -151,6 +154,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. 系统日志/通知（主人私信）
   // ==============================================
@@ -172,6 +178,8 @@ var Config = import_koishi.Schema.object({
   exchangeVaporPerDraw: import_koishi.Schema.number().description("普通兑换每抽消耗的水汽量（默认100）").default(100).min(0).max(1e4),
   eventExchangePrice6: import_koishi.Schema.number().description("限时卡池6星兑换每抽消耗的水汽量（默认300）").default(300).min(1).max(1e4),
   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"),
   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),
@@ -1157,8 +1165,27 @@ ${session.text("tip.exchange.info", {
   ctx.logger.info(`[普通兑换抽数] 玩家${qq}兑换成功：获得${exchange_num}抽，今日剩余${leftToday}抽`);
 }
 __name(_do_exchange, "_do_exchange");
-async function _do_collection(ctx, session) {
-  ctx.logger.info("收到指令：WWC收藏（含限定卡+灰色占位）");
+var DEFAULT_COLLECTION_PART1_PATTERN = "^([2-9]\\d{3}|\\d{5,})$";
+var DEFAULT_COLLECTION_PART2_PATTERN = "^(\\d{1,3}|1\\d{3})$";
+function compileCollectionPatterns(ctx, part1, part2) {
+  const compile = /* @__PURE__ */ __name((pattern, fallback, label) => {
+    const source = (pattern ?? "").trim() || fallback;
+    try {
+      return new RegExp(source);
+    } catch (e) {
+      ctx.logger.warn(`收藏图${label}分类正则无效（${source}），已回退默认规则`);
+      return new RegExp(fallback);
+    }
+  }, "compile");
+  return {
+    part1: compile(part1, DEFAULT_COLLECTION_PART1_PATTERN, "1"),
+    part2: compile(part2, DEFAULT_COLLECTION_PART2_PATTERN, "2")
+  };
+}
+__name(compileCollectionPatterns, "compileCollectionPatterns");
+async function _do_collection(ctx, session, part, patterns) {
+  const partPatterns = patterns ?? compileCollectionPatterns(ctx);
+  ctx.logger.info(`收到指令：WWC收藏${part ?? ""}（含限定卡+灰色占位）`);
   try {
     const qq = await getUnifiedQQ(ctx, session);
     const user = await ctx.database.get("gacha_user", { qq });
@@ -1194,11 +1221,19 @@ async function _do_collection(ctx, session) {
       }
     });
     const allCards = Array.from(allCardMap.values());
-    const totalAll = allCards.length;
-    const totalCollected = allCards.filter((c) => userCardIds.has(c.id)).length;
+    const isTargetCategory = /* @__PURE__ */ __name((cate) => {
+      if (!part) return true;
+      const c = cate || "";
+      if (part === 1) return partPatterns.part1.test(c);
+      if (part === 2) return partPatterns.part2.test(c);
+      return !partPatterns.part1.test(c) && !partPatterns.part2.test(c);
+    }, "isTargetCategory");
+    const partCards = allCards.filter((c) => isTargetCategory(c.category));
+    const totalAll = partCards.length;
+    const totalCollected = partCards.filter((c) => userCardIds.has(c.id)).length;
     const totalRate = totalAll > 0 ? (totalCollected / totalAll * 100).toFixed(1) : "0.0";
     const categoryGroup = {};
-    allCards.forEach((card) => {
+    partCards.forEach((card) => {
       const cate = card.category || "未分类";
       if (!categoryGroup[cate]) categoryGroup[cate] = [];
       categoryGroup[cate].push({
@@ -1208,7 +1243,8 @@ async function _do_collection(ctx, session) {
       });
     });
     const categories = Object.keys(categoryGroup).sort();
-    const titleText = session.text("image.collection.title", { showName: show_name });
+    const titleKey = part === 1 ? "image.collection.title1" : part === 2 ? "image.collection.title2" : part === 3 ? "image.collection.title3" : "image.collection.title";
+    const titleText = session.text(titleKey, { showName: show_name });
     const totalText = session.text("image.collection.totalProgress", {
       collected: totalCollected,
       total: totalAll,
@@ -1396,6 +1432,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) {
@@ -2031,16 +2158,37 @@ async function apply(ctx, config) {
     const num = Number.isInteger(Number(count)) && Number(count) >= 1 && Number(count) <= 40 ? Number(count) : 1;
     await _do_exchange(ctx, session, num, config.dailyExchangeLimit, config.exchangeVaporPerDraw);
   });
+  const collectionPatterns = compileCollectionPatterns(ctx, config.collectionPart1Pattern, config.collectionPart2Pattern);
   ctx.command("WWC收藏", "查看卡片收藏进度，含限定卡，生成可视化收藏图").alias("wwc收藏").alias("WWC收集进度").action(async (argv) => {
     if (!argv.session) return;
     const session = argv.session;
     await _do_collection(ctx, session);
   });
+  ctx.command("WWC收藏1", "查看卡片收藏进度1（分类正则见配置项 collectionPart1Pattern），含限定卡，生成可视化收藏图").alias("wwc收藏1").action(async (argv) => {
+    if (!argv.session) return;
+    const session = argv.session;
+    await _do_collection(ctx, session, 1, collectionPatterns);
+  });
+  ctx.command("WWC收藏2", "查看卡片收藏进度2（分类正则见配置项 collectionPart2Pattern），含限定卡，生成可视化收藏图").alias("wwc收藏2").action(async (argv) => {
+    if (!argv.session) return;
+    const session = argv.session;
+    await _do_collection(ctx, session, 2, collectionPatterns);
+  });
+  ctx.command("WWC收藏3", "查看卡片收藏进度3（不匹配收藏1/2正则的类别），含限定卡，生成可视化收藏图").alias("wwc收藏3").action(async (argv) => {
+    if (!argv.session) return;
+    const session = argv.session;
+    await _do_collection(ctx, session, 3, collectionPatterns);
+  });
   ctx.command("WWC排名1", "查看全服收藏排行，显示前20名+自身排名，生成可视化排行图").alias("wwc排名1").alias("WWC排行1").alias("WWC榜单").action(async (argv) => {
     if (!argv.session) return;
     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;

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

@@ -93,6 +93,9 @@ declare const _default: {
     "image.shop.footerTip": string;
     "image.shop.cmdTemplate": string;
     "image.collection.title": string;
+    "image.collection.title1": string;
+    "image.collection.title2": string;
+    "image.collection.title3": string;
     "image.collection.totalProgress": string;
     "image.collection.emptyText": string;
     "image.collection.cateTitleFormat": string;
@@ -102,6 +105,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.3",
+  "version": "0.3.5",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "files": [