koishi-plugin-ciyi 2.0.0 → 2.1.1

package/README.md

@@ -1,6 +1,6 @@
 # koishi-plugin-ciyi
 
-词意猜词：每天一个两字词，在群里开猜
+词意 · 每天一个两字词，在群里开猜
 
 ## 安装
 
@@ -15,11 +15,11 @@ yarn add koishi-plugin-ciyi
 | 指令 | 说明 |
 | --- | --- |
 | `ciyi` | 玩法 |
-| `ciyi.猜 <词>` | 开始今日游戏并提交猜测 |
+| `ciyi.猜 <词>` | 开始今日对局并报一个两字词 |
 | `ciyi.裸词 [开/关]` | 切换本频道无前缀续猜 |
-| `ciyi.排行榜` | 猜中次数排行 |
+| `ciyi.排行榜` | 累计猜中排行榜 |
 
-首次用 `ciyi.猜 <词>` 开题，之后可直接发送两字词继续猜。裸词设置只对当前群生效，重启后恢复默认。
+首次用 `ciyi.猜 <词>` 开题，之后可直接发送两字词继续猜。裸词设置只对当前频道生效，重启后恢复默认。
 
 ## 许可证
 

package/lib/index.js

@@ -203,6 +203,25 @@ var SHAPE = {
   full: 9999
 };
 var FONT_STACK = '"Roboto Flex", "Roboto", "Noto Sans SC", "PingFang SC", "Microsoft YaHei", "Source Han Sans SC", system-ui, sans-serif';
+var MONO_STACK = '"Roboto Mono", "JetBrains Mono", "SF Mono", "Cascadia Mono", Consolas, "Noto Sans Mono", monospace';
+var TYPE = {
+  displayLarge: { size: 57, line: 64, weight: 400, tracking: -0.25 },
+  displayMedium: { size: 45, line: 52, weight: 400, tracking: 0 },
+  displaySmall: { size: 36, line: 44, weight: 400, tracking: 0 },
+  headlineLarge: { size: 32, line: 40, weight: 400, tracking: 0 },
+  headlineMedium: { size: 28, line: 36, weight: 400, tracking: 0 },
+  headlineSmall: { size: 24, line: 32, weight: 400, tracking: 0 },
+  titleLarge: { size: 22, line: 28, weight: 400, tracking: 0 },
+  titleMedium: { size: 16, line: 24, weight: 500, tracking: 0.15 },
+  titleSmall: { size: 14, line: 20, weight: 500, tracking: 0.1 },
+  bodyLarge: { size: 16, line: 24, weight: 400, tracking: 0.5 },
+  bodyMedium: { size: 14, line: 20, weight: 400, tracking: 0.25 },
+  bodySmall: { size: 12, line: 16, weight: 400, tracking: 0.4 },
+  labelLarge: { size: 14, line: 20, weight: 500, tracking: 0.1 },
+  labelMedium: { size: 12, line: 16, weight: 500, tracking: 0.5 },
+  labelSmall: { size: 11, line: 16, weight: 500, tracking: 0.5 }
+};
+var EMPHASIZED_WEIGHT = { display: 600, headline: 600, title: 600, label: 600 };
 var MEDAL = {
   gold: lch(58, 52, 85),
   silver: lch(66, 5, 260),
@@ -247,11 +266,13 @@ var C = {
   primary: SCHEME.primary,
   onPrimary: SCHEME.onPrimary,
   primaryContainer: SCHEME.primaryContainer,
-  onPrimaryContainer: SCHEME.onPrimaryContainer
+  onPrimaryContainer: SCHEME.onPrimaryContainer,
+  secondaryContainer: SCHEME.secondaryContainer,
+  onSecondaryContainer: SCHEME.onSecondaryContainer
 };
 var FRESH = lch(94, 14, HUE);
 var FONT_SANS = FONT_STACK;
-var FONT_NUM = FONT_STACK;
+var FONT_NUM = `${MONO_STACK},${FONT_STACK}`;
 function s(n) {
   return Math.round(n * SCALE);
 }
@@ -317,7 +338,7 @@ function textRight(ctx, text, x, y, font, color, offsetY = 0) {
 }
 __name(textRight, "textRight");
 function fontSizeOf(font) {
-  return Number(font.match(/([\d.]+)px/)?.[1] ?? s(12));
+  return Number(font.match(/([\d.]+)px/)?.[1] ?? s(TYPE.bodySmall.size));
 }
 __name(fontSizeOf, "fontSizeOf");
 function textWidth(text, fontSize) {
@@ -378,9 +399,30 @@ async function toPng(service, innerW, innerH, draw) {
 }
 __name(toPng, "toPng");
 var GRID = {
-  sm: { cell: 26, gap: 4, font: 15, border: 1 },
-  md: { cell: 34, gap: 4, font: 20, border: 1 },
-  lg: { cell: 78, gap: 9, font: 46, border: 1.5 }
+  sm: {
+    cell: 26,
+    gap: 4,
+    border: 1,
+    font: TYPE.labelLarge.size,
+    weight: EMPHASIZED_WEIGHT.label,
+    radius: SHAPE.extraSmall
+  },
+  md: {
+    cell: 34,
+    gap: 4,
+    border: 1,
+    font: TYPE.titleLarge.size,
+    weight: EMPHASIZED_WEIGHT.title,
+    radius: SHAPE.small
+  },
+  lg: {
+    cell: 78,
+    gap: 9,
+    border: 1.5,
+    font: TYPE.displayMedium.size,
+    weight: EMPHASIZED_WEIGHT.display,
+    radius: SHAPE.large
+  }
 };
 function gridWidth(word, size) {
   const g = GRID[size];
@@ -389,9 +431,9 @@ function gridWidth(word, size) {
   return s(g.cell * n + g.gap * (n - 1));
 }
 __name(gridWidth, "gridWidth");
-function drawGridCell(ctx, x, y, size, ch, mode, fontSize, borderW) {
+function drawGridCell(ctx, x, y, size, ch, mode, g) {
   const half = size / 2;
-  const radius = Math.min(s(SHAPE.large), Math.max(s(SHAPE.extraSmall), size * 0.2));
+  const radius = s(g.radius);
   if (mode === "mk") {
     fillRound(ctx, x, y, size, size, radius, C.surfaceContainerHighest);
     ctx.save();
@@ -404,20 +446,20 @@ function drawGridCell(ctx, x, y, size, ch, mode, fontSize, borderW) {
       size - s(1),
       radius,
       C.outline,
-      s(borderW)
+      s(g.border)
     );
     ctx.restore();
     return;
   }
   fillRound(ctx, x, y, size, size, radius, C.surfaceContainerHigh);
   if (ch) {
-    const fs = s(fontSize);
+    const fs = s(g.font);
     textCenter(
       ctx,
       ch,
       x + half,
       y + half,
-      `600 ${fs}px ${FONT_SANS}`,
+      `${g.weight} ${fs}px ${FONT_SANS}`,
       C.onSurface,
       cjkOffset(fs)
     );
@@ -430,15 +472,15 @@ function drawWordGrid(ctx, x, y, word, size, mask) {
   const gap = s(g.gap);
   const chars = Array.from(word || "");
   if (chars.length === 0) {
-    textCenter(ctx, "—", x + s(14), y + cell / 2, `${s(13)}px ${FONT_SANS}`, C.onSurfaceVariant);
+    textCenter(ctx, "—", x + s(14), y + cell / 2, `${s(TYPE.bodySmall.size)}px ${FONT_SANS}`, C.onSurfaceVariant);
     return s(28);
   }
   let cx = x;
   for (let i = 0; i < chars.length; i++) {
     if (i === mask) {
-      drawGridCell(ctx, cx, y, cell, null, "mk", g.font, g.border);
+      drawGridCell(ctx, cx, y, cell, null, "mk", g);
     } else {
-      drawGridCell(ctx, cx, y, cell, chars[i], "on", g.font, g.border);
+      drawGridCell(ctx, cx, y, cell, chars[i], "on", g);
     }
     cx += cell + gap;
   }
@@ -447,12 +489,12 @@ function drawWordGrid(ctx, x, y, word, size, mask) {
 __name(drawWordGrid, "drawWordGrid");
 function drawSeal(ctx, x, y, size, lines) {
   fillRound(ctx, x, y, size, size, s(SHAPE.extraLarge), C.primary);
-  const fs = s(19);
+  const fs = s(TYPE.titleLarge.size);
   const lh = fs * 1.06;
   const total = lh * lines.length;
   let cy = y + size / 2 - total / 2 + lh / 2;
   for (const line of lines) {
-    textCenter(ctx, line, x + size / 2, cy, `600 ${fs}px ${FONT_SANS}`, C.onPrimary);
+    textCenter(ctx, line, x + size / 2, cy, `${EMPHASIZED_WEIGHT.title} ${fs}px ${FONT_SANS}`, C.onPrimary);
     cy += lh;
   }
 }
@@ -465,13 +507,20 @@ function drawHeader(ctx, innerX, innerY, innerW, sub, right) {
   const h2 = padTop + sealSize + padBottom;
   drawSeal(ctx, innerX + padX, innerY + padTop, sealSize, ["词", "意"]);
   const brandX = innerX + padX + sealSize + s(15);
-  textLeft(ctx, "词意", brandX, innerY + padTop + s(14), `700 ${s(26)}px ${FONT_SANS}`, C.onSurface);
+  textLeft(
+    ctx,
+    "词意",
+    brandX,
+    innerY + padTop + s(14),
+    `${EMPHASIZED_WEIGHT.headline} ${s(TYPE.headlineMedium.size)}px ${FONT_SANS}`,
+    C.onSurface
+  );
   textLeft(
     ctx,
     "ci yi",
     brandX,
     innerY + padTop + s(36),
-    `italic ${s(10)}px ${FONT_NUM}`,
+    `italic ${s(TYPE.labelSmall.size)}px ${FONT_SANS}`,
     C.onSurfaceVariant
   );
   const subRight = right ? innerX + innerW - padX - s(150) : innerX + innerW - padX;
@@ -481,13 +530,27 @@ function drawHeader(ctx, innerX, innerY, innerW, sub, right) {
     brandX,
     innerY + padTop + s(58),
     subRight - brandX,
-    `${s(12.5)}px ${FONT_SANS}`,
+    `${s(TYPE.bodySmall.size)}px ${FONT_SANS}`,
     C.onSurfaceVariant
   );
   if (right) {
     const rx = innerX + innerW - padX;
-    textRight(ctx, right.big, rx, innerY + padTop + s(16), `700 ${s(31)}px ${FONT_NUM}`, C.primary);
-    textRight(ctx, right.cap, rx, innerY + padTop + s(44), `${s(10.5)}px ${FONT_SANS}`, C.onSurfaceVariant);
+    textRight(
+      ctx,
+      right.big,
+      rx,
+      innerY + padTop + s(16),
+      `${EMPHASIZED_WEIGHT.headline} ${s(TYPE.headlineLarge.size)}px ${FONT_NUM}`,
+      C.primary
+    );
+    textRight(
+      ctx,
+      right.cap,
+      rx,
+      innerY + padTop + s(44),
+      `${s(TYPE.labelSmall.size)}px ${FONT_SANS}`,
+      C.onSurfaceVariant
+    );
   }
   const lineY = innerY + h2;
   ctx.strokeStyle = C.outlineVariant;
@@ -525,16 +588,16 @@ function drawFooter(ctx, innerX, y, innerW, legendItems, tip) {
   for (const { tier, range } of legendItems) {
     fillRound(ctx, lx, cy - s(4.5), s(9), s(9), s(SHAPE.full), tier.color);
     lx += s(9) + s(6);
-    textLeft(ctx, tier.name, lx, cy, `${s(11.5)}px ${FONT_SANS}`, C.onSurfaceVariant);
-    lx += textWidth(tier.name, s(11.5)) + s(4);
-    textLeft(ctx, range, lx, cy, `${s(11)}px ${FONT_NUM}`, C.onSurfaceVariant);
-    lx += textWidth(range, s(11)) + s(13);
+    textLeft(ctx, tier.name, lx, cy, `${s(TYPE.labelSmall.size)}px ${FONT_SANS}`, C.onSurfaceVariant);
+    lx += textWidth(tier.name, s(TYPE.labelSmall.size)) + s(4);
+    textLeft(ctx, range, lx, cy, `${s(TYPE.labelSmall.size)}px ${FONT_NUM}`, C.onSurfaceVariant);
+    lx += textWidth(range, s(TYPE.labelSmall.size)) + s(13);
   }
-  const tipFont = `${s(11.5)}px ${FONT_SANS}`;
+  const tipFont = `${s(TYPE.labelSmall.size)}px ${FONT_SANS}`;
   const maxTipWidth = legendItems.length ? s(145) : innerW - padX * 2;
   textRight(
     ctx,
-    ellipsize(tip, maxTipWidth, s(11.5)),
+    ellipsize(tip, maxTipWidth, s(TYPE.labelSmall.size)),
     innerX + innerW - padX,
     cy,
     tipFont,
@@ -551,17 +614,24 @@ function drawLegendFull(ctx, x, y, w) {
     const cx = x + i % 2 * colW;
     const cy = y + Math.floor(i / 2) * rowH;
     fillRound(ctx, cx, cy - s(4.5), s(9), s(9), s(SHAPE.full), t.color);
-    textLeft(ctx, t.name, cx + s(15), cy, `${s(11.5)}px ${FONT_SANS}`, C.onSurfaceVariant);
-    textLeft(ctx, tierRange(i), cx + s(52), cy, `${s(11)}px ${FONT_NUM}`, C.onSurfaceVariant);
-    textLeft(ctx, t.note, cx + s(100), cy, `${s(11.5)}px ${FONT_SANS}`, C.onSurfaceVariant);
+    textLeft(ctx, t.name, cx + s(15), cy, `${s(TYPE.labelSmall.size)}px ${FONT_SANS}`, C.onSurfaceVariant);
+    textLeft(ctx, tierRange(i), cx + s(52), cy, `${s(TYPE.labelSmall.size)}px ${FONT_NUM}`, C.onSurfaceVariant);
+    textLeft(ctx, t.note, cx + s(100), cy, `${s(TYPE.labelSmall.size)}px ${FONT_SANS}`, C.onSurfaceVariant);
   }
   return rowH * Math.ceil(TIERS.length / 2) + s(8);
 }
 __name(drawLegendFull, "drawLegendFull");
 function drawSectionTitle(ctx, x, y, w, title) {
   fillRound(ctx, x, y - s(1), s(3), s(12), s(SHAPE.full), C.primary);
-  textLeft(ctx, title, x + s(15), y + s(5), `600 ${s(11.5)}px ${FONT_SANS}`, C.onSurfaceVariant);
-  const tw = textWidth(title, s(11.5));
+  textLeft(
+    ctx,
+    title,
+    x + s(15),
+    y + s(5),
+    `${EMPHASIZED_WEIGHT.label} ${s(TYPE.labelMedium.size)}px ${FONT_SANS}`,
+    C.onSurfaceVariant
+  );
+  const tw = textWidth(title, s(TYPE.labelMedium.size));
   ctx.strokeStyle = C.outlineVariant;
   ctx.lineWidth = s(1);
   ctx.beginPath();
@@ -581,7 +651,7 @@ function drawNearBar(ctx, x, y, pct, tier) {
   const gap = s(3);
   const fillW = Math.max(barH, barW * pct / 100);
   const top = y - barH / 2;
-  fillRound(ctx, x, top, fillW, barH, barH / 2, tier.color);
+  fillRound(ctx, x, top, fillW, barH, s(SHAPE.full), tier.color);
   if (fillW + gap < barW) {
     fillRound(
       ctx,
@@ -589,11 +659,18 @@ function drawNearBar(ctx, x, y, pct, tier) {
       top,
       barW - fillW - gap,
       barH,
-      barH / 2,
+      s(SHAPE.full),
       C.surfaceContainerHighest
     );
   }
-  textLeft(ctx, tier.name, x + barW + s(9), y, `600 ${s(12.5)}px ${FONT_SANS}`, tier.color);
+  textLeft(
+    ctx,
+    tier.name,
+    x + barW + s(9),
+    y,
+    `${EMPHASIZED_WEIGHT.label} ${s(TYPE.labelMedium.size)}px ${FONT_SANS}`,
+    tier.color
+  );
 }
 __name(drawNearBar, "drawNearBar");
 function measureBoard(opts) {
@@ -633,10 +710,10 @@ function drawBoardTable(ctx, x, y, w, opts, rowH) {
   const rk0 = nb1 + cols.nb;
   const mt0 = rk0 + cols.rk;
   const noX = bx + s(2);
-  const meterBlockW = s(88) + s(9) + textWidth("咫尺", s(12.5));
+  const meterBlockW = s(88) + s(9) + textWidth("咫尺", s(TYPE.labelMedium.size));
   const mtX = mt0 + Math.max(0, (cols.mt - meterBlockW) / 2);
   const headY = y;
-  const fs = s(10.5);
+  const fs = s(TYPE.labelSmall.size);
   textLeft(ctx, "序", noX, headY, `${fs}px ${FONT_SANS}`, C.onSurfaceVariant);
   textCenter(ctx, "更近 ◀", nb0 + cols.nb / 2, headY, `${fs}px ${FONT_SANS}`, C.onSurfaceVariant);
   textCenter(ctx, "猜测", gw0 + cols.gw / 2, headY, `${fs}px ${FONT_SANS}`, C.onSurfaceVariant);
@@ -653,7 +730,7 @@ function drawBoardTable(ctx, x, y, w, opts, rowH) {
         `…… 另有 ${row.gapBefore} 词未列`,
         cx + tableW / 2,
         ry + s(10),
-        `${s(11.5)}px ${FONT_SANS}`,
+        `${s(TYPE.labelSmall.size)}px ${FONT_SANS}`,
         C.onSurfaceVariant
       );
       ctx.strokeStyle = C.outlineVariant;
@@ -683,7 +760,7 @@ function drawBoardTable(ctx, x, y, w, opts, rowH) {
       String(ordinal).padStart(2, "0"),
       noX,
       midY,
-      `${s(13)}px ${FONT_NUM}`,
+      `${s(TYPE.labelMedium.size)}px ${FONT_NUM}`,
       C.onSurfaceVariant
     );
     const nbX = nb0 + (cols.nb - gridWidth(history.leftHint, "sm")) / 2;
@@ -693,12 +770,12 @@ function drawBoardTable(ctx, x, y, w, opts, rowH) {
     const rbX = nb1 + (cols.nb - gridWidth(history.rightHint, "sm")) / 2;
     drawWordGrid(ctx, rbX, midY - s(13), history.rightHint, "sm", 1);
     const rankText = String(history.rank);
-    const rankFont = `700 ${s(21)}px ${FONT_NUM}`;
-    const rankWidth = textWidth(rankText, s(21));
-    const hashW = textWidth("#", s(13));
+    const rankFont = `${EMPHASIZED_WEIGHT.title} ${s(TYPE.titleLarge.size)}px ${FONT_NUM}`;
+    const rankWidth = textWidth(rankText, s(TYPE.titleLarge.size));
+    const hashW = textWidth("#", s(TYPE.labelMedium.size));
     const rankBlock = hashW + s(3) + rankWidth;
     const rankLeft = rk0 + (cols.rk - rankBlock) / 2;
-    textLeft(ctx, "#", rankLeft, midY, `${s(13)}px ${FONT_NUM}`, C.onSurfaceVariant);
+    textLeft(ctx, "#", rankLeft, midY, `${s(TYPE.labelMedium.size)}px ${FONT_NUM}`, C.onSurfaceVariant);
     textLeft(ctx, rankText, rankLeft + hashW + s(3), midY, rankFont, tier.color);
     drawNearBar(ctx, mtX, midY, pct, tier);
     ry += rowH;
@@ -740,31 +817,59 @@ function renderIntroCard(service, opts) {
     y += s(11);
     const p1h = s(104);
     drawPanel(ctx, ix + s(22), y, iw - s(44), p1h);
-    textLeft(ctx, "开始", ix + s(38), y + s(24), `${s(14)}px ${FONT_SANS}`, C.primary);
-    textLeft(ctx, "ciyi.猜 山水", ix + s(96), y + s(24), `${s(13.5)}px ${FONT_NUM}`, C.onSurface);
+    textLeft(ctx, "开始", ix + s(38), y + s(24), `${s(TYPE.labelLarge.size)}px ${FONT_SANS}`, C.primary);
+    textLeft(
+      ctx,
+      "ciyi.猜 山水",
+      ix + s(96),
+      y + s(24),
+      `${s(TYPE.labelLarge.size)}px ${FONT_SANS}`,
+      C.onSurface
+    );
     textLeftFit(
       ctx,
       `开题并报一个两字词${opts.middleware ? "；开题后可直接发词" : ""}`,
       ix + s(230),
       y + s(24),
       iw - s(268),
-      `${s(14)}px ${FONT_SANS}`,
+      `${s(TYPE.bodyMedium.size)}px ${FONT_SANS}`,
+      C.onSurface
+    );
+    textLeft(ctx, "切换", ix + s(38), y + s(52), `${s(TYPE.labelLarge.size)}px ${FONT_SANS}`, C.primary);
+    textLeft(
+      ctx,
+      "ciyi.裸词 开/关",
+      ix + s(96),
+      y + s(52),
+      `${s(TYPE.labelLarge.size)}px ${FONT_SANS}`,
       C.onSurface
     );
-    textLeft(ctx, "切换", ix + s(38), y + s(52), `${s(14)}px ${FONT_SANS}`, C.primary);
-    textLeft(ctx, "ciyi.裸词 开/关", ix + s(96), y + s(52), `${s(13.5)}px ${FONT_NUM}`, C.onSurface);
     textLeftFit(
       ctx,
       "临时改本频道的续猜方式",
       ix + s(230),
       y + s(52),
       iw - s(268),
-      `${s(14)}px ${FONT_SANS}`,
+      `${s(TYPE.bodyMedium.size)}px ${FONT_SANS}`,
+      C.onSurface
+    );
+    textLeft(ctx, "排行", ix + s(38), y + s(80), `${s(TYPE.labelLarge.size)}px ${FONT_SANS}`, C.primary);
+    textLeft(
+      ctx,
+      "ciyi.排行榜",
+      ix + s(96),
+      y + s(80),
+      `${s(TYPE.labelLarge.size)}px ${FONT_SANS}`,
+      C.onSurface
+    );
+    textLeft(
+      ctx,
+      "看谁猜中得最多",
+      ix + s(230),
+      y + s(80),
+      `${s(TYPE.bodyMedium.size)}px ${FONT_SANS}`,
       C.onSurface
     );
-    textLeft(ctx, "排行", ix + s(38), y + s(80), `${s(14)}px ${FONT_SANS}`, C.primary);
-    textLeft(ctx, "ciyi.排行榜", ix + s(96), y + s(80), `${s(13.5)}px ${FONT_NUM}`, C.onSurface);
-    textLeft(ctx, "看谁猜中得最多", ix + s(230), y + s(80), `${s(14)}px ${FONT_SANS}`, C.onSurface);
     y += p1h + s(19);
     y += drawSectionTitle(ctx, ix + s(22), y, iw - s(44), "读板");
     y += s(11);
@@ -788,7 +893,7 @@ function renderIntroCard(service, opts) {
       "这一行是说：「企业」与今日答案的意思相近程度，排在第 467 位。",
       ix + s(38),
       y + s(104),
-      `${s(12)}px ${FONT_SANS}`,
+      `${s(TYPE.bodySmall.size)}px ${FONT_SANS}`,
       C.onSurfaceVariant
     );
     textLeft(
@@ -796,7 +901,7 @@ function renderIntroCard(service, opts) {
       "两侧空格各藏一字：左邻更近，右邻更远。",
       ix + s(38),
       y + s(126),
-      `${s(12)}px ${FONT_SANS}`,
+      `${s(TYPE.bodySmall.size)}px ${FONT_SANS}`,
       C.onSurfaceVariant
     );
     textLeft(
@@ -804,7 +909,7 @@ function renderIntroCard(service, opts) {
       "名次越小，离答案越近；#1 就是答案本身。",
       ix + s(38),
       y + s(148),
-      `${s(12)}px ${FONT_SANS}`,
+      `${s(TYPE.bodySmall.size)}px ${FONT_SANS}`,
       C.onSurfaceVariant
     );
     y += sampleH + s(19);
@@ -827,7 +932,7 @@ function renderIntroCard(service, opts) {
       "一日一词，猜中即止，次日零点换题",
       ix + s(22),
       iy + ih - s(30),
-      `${s(11.5)}px ${FONT_SANS}`,
+      `${s(TYPE.labelSmall.size)}px ${FONT_SANS}`,
       C.onSurfaceVariant
     );
   });
@@ -842,37 +947,44 @@ function renderWinCard(service, opts) {
     const revealH = s(130);
     drawPanel(ctx, ix + s(22), y, iw - s(44), revealH);
     drawSeal(ctx, ix + iw - s(80), y - s(13), s(42), ["中"]);
-    textLeft(ctx, "今日答案", ix + s(38), y + s(24), `${s(11.5)}px ${FONT_SANS}`, C.onSurfaceVariant);
+    textLeft(ctx, "今日答案", ix + s(38), y + s(24), `${s(TYPE.labelSmall.size)}px ${FONT_SANS}`, C.onSurfaceVariant);
     drawWordGrid(ctx, ix + s(38), y + s(40), opts.answer, "lg");
     const ax = ix + iw - s(310);
     if (opts.neighbors.length) {
-      textLeft(ctx, "意思最近的几个词", ax, y + s(24), `${s(11.5)}px ${FONT_SANS}`, C.onSurfaceVariant);
+      textLeft(ctx, "意思最近的几个词", ax, y + s(24), `${s(TYPE.labelSmall.size)}px ${FONT_SANS}`, C.onSurfaceVariant);
       let nx = ax;
       let ny = y + s(48);
-      const chipFont = `${s(14)}px ${FONT_SANS}`;
+      const chipFont = `${s(TYPE.labelLarge.size)}px ${FONT_SANS}`;
       const chipRight = ix + iw - s(38);
       for (const word of opts.neighbors) {
-        const fittedWord = ellipsize(word, s(116), s(14));
-        const pw = textWidth(fittedWord, s(14)) + s(20);
+        const fittedWord = ellipsize(word, s(116), s(TYPE.labelLarge.size));
+        const pw = textWidth(fittedWord, s(TYPE.labelLarge.size)) + s(20);
         if (nx !== ax && nx + pw > chipRight) {
           nx = ax;
           ny += s(36);
         }
         if (ny + s(14) > y + revealH - s(12)) break;
-        fillRound(ctx, nx, ny - s(14), pw, s(28), s(SHAPE.full), SCHEME.secondaryContainer);
+        fillRound(ctx, nx, ny - s(14), pw, s(28), s(SHAPE.full), C.secondaryContainer);
         textCenter(
           ctx,
           fittedWord,
           nx + pw / 2,
           ny,
           chipFont,
-          SCHEME.onSecondaryContainer,
-          cjkOffset(s(14))
+          C.onSecondaryContainer,
+          cjkOffset(s(TYPE.labelLarge.size))
         );
         nx += pw + s(7);
       }
     } else {
-      textLeft(ctx, "今日一词，就此收笔。", ax, y + s(50), `${s(13.5)}px ${FONT_SANS}`, C.onSurfaceVariant);
+      textLeft(
+        ctx,
+        "今日一词，就此收笔。",
+        ax,
+        y + s(50),
+        `${s(TYPE.bodyMedium.size)}px ${FONT_SANS}`,
+        C.onSurfaceVariant
+      );
     }
     y += revealH + s(14);
     const statW = (iw - s(44) - s(20)) / 3;
@@ -884,11 +996,32 @@ function renderWinCard(service, opts) {
     for (let i = 0; i < 3; i++) {
       const sx = ix + s(22) + i * (statW + s(10));
       drawPanel(ctx, sx, y, statW, s(56));
-      textLeft(ctx, stats[i].n, sx + s(14), y + s(22), `700 ${s(23)}px ${FONT_NUM}`, C.primary);
+      textLeft(
+        ctx,
+        stats[i].n,
+        sx + s(14),
+        y + s(22),
+        `${EMPHASIZED_WEIGHT.headline} ${s(TYPE.headlineSmall.size)}px ${FONT_NUM}`,
+        C.primary
+      );
       if (stats[i].u) {
-        textLeft(ctx, stats[i].u, sx + s(14) + textWidth(stats[i].n, s(23)) + s(3), y + s(26), `${s(12)}px ${FONT_SANS}`, C.onSurfaceVariant);
+        textLeft(
+          ctx,
+          stats[i].u,
+          sx + s(14) + textWidth(stats[i].n, s(TYPE.headlineSmall.size)) + s(3),
+          y + s(26),
+          `${s(TYPE.labelMedium.size)}px ${FONT_SANS}`,
+          C.onSurfaceVariant
+        );
       }
-      textLeft(ctx, stats[i].c, sx + s(14), y + s(44), `${s(10.5)}px ${FONT_SANS}`, C.onSurfaceVariant);
+      textLeft(
+        ctx,
+        stats[i].c,
+        sx + s(14),
+        y + s(44),
+        `${s(TYPE.labelSmall.size)}px ${FONT_SANS}`,
+        C.onSurfaceVariant
+      );
     }
     const quip = opts.closest === null ? "一击即中，今日无需第二次落笔" : `从 #${opts.closest} 一步跨到 #1`;
     const footerTip = opts.canStartToday ? "ciyi.猜 山水 · 开启今日新题" : "明日零点换新题 · ciyi.排行榜";
@@ -900,8 +1033,8 @@ function renderWinCard(service, opts) {
       [],
       footerTip
     );
-    const footerFont = `${s(11.5)}px ${FONT_SANS}`;
-    const footerTipWidth = textWidth(footerTip, s(11.5));
+    const footerFont = `${s(TYPE.labelSmall.size)}px ${FONT_SANS}`;
+    const footerTipWidth = textWidth(footerTip, s(TYPE.labelSmall.size));
     textLeftFit(
       ctx,
       `${opts.username} 拿下今日一词 · ${quip}`,
@@ -941,10 +1074,10 @@ function renderRankCard(service, opts) {
     if (!opts.entries.length) {
       textCenter(
         ctx,
-        "榜上无名。",
+        "排行榜还空着",
         panelX + panelW / 2,
         y + s(31),
-        `${s(13.5)}px ${FONT_SANS}`,
+        `${s(TYPE.bodyMedium.size)}px ${FONT_SANS}`,
         C.onSurfaceVariant
       );
       textCenter(
@@ -952,7 +1085,7 @@ function renderRankCard(service, opts) {
         "今日第一个猜中的人，会写在这里。",
         panelX + panelW / 2,
         y + s(61),
-        `${s(13.5)}px ${FONT_SANS}`,
+        `${s(TYPE.bodyMedium.size)}px ${FONT_SANS}`,
         C.onSurfaceVariant
       );
     } else {
@@ -974,35 +1107,49 @@ function renderRankCard(service, opts) {
         const px = contentLeft;
         const py = midY - posSize / 2;
         const podium = [MEDAL.gold, MEDAL.silver, MEDAL.bronze];
-        const pc = i < 3 ? { bg: podium[i], fg: "#ffffff" } : { bg: C.surfaceContainerHighest, fg: C.onSurfaceVariant };
+        const pc = i < 3 ? { bg: podium[i], fg: C.onPrimary } : { bg: C.surfaceContainerHighest, fg: C.onSurfaceVariant };
         fillRound(ctx, px, py, posSize, posSize, s(SHAPE.full), pc.bg);
-        textCenter(ctx, String(i + 1), px + posSize / 2, midY, `600 ${s(14)}px ${FONT_NUM}`, pc.fg);
+        textCenter(
+          ctx,
+          String(i + 1),
+          px + posSize / 2,
+          midY,
+          `${EMPHASIZED_WEIGHT.label} ${s(TYPE.labelLarge.size)}px ${FONT_NUM}`,
+          pc.fg
+        );
         const name2 = e.username || "无名氏";
         const nameX = px + posSize + s(14);
-        const nameFont = `${s(15)}px ${FONT_SANS}`;
+        const nameFont = `${s(TYPE.titleMedium.size)}px ${FONT_SANS}`;
         const score = String(e.score);
-        const unitFont = s(11.5);
+        const unitFont = s(TYPE.labelSmall.size);
         const unitW = textWidth("次", unitFont);
-        const scoreFont = s(19);
+        const scoreFont = s(TYPE.titleLarge.size);
         const scoreRight = contentRight - unitW - s(8);
         const scoreLeft = scoreRight - textWidth(score, scoreFont);
-        const meWidth = e.me ? textWidth("我", s(10.5)) + s(18) : 0;
+        const meWidth = e.me ? textWidth("我", s(TYPE.labelSmall.size)) + s(18) : 0;
         const fittedName = ellipsize(
           name2,
           Math.max(0, scoreLeft - s(16) - nameX - meWidth),
-          s(15)
+          s(TYPE.titleMedium.size)
         );
         textLeft(ctx, fittedName, nameX, midY, nameFont, C.onSurface);
         if (e.me) {
-          const nw = textWidth(fittedName, s(15));
-          textLeft(ctx, "我", nameX + nw + s(8), midY, `${s(10.5)}px ${FONT_SANS}`, C.primary);
+          const nw = textWidth(fittedName, s(TYPE.titleMedium.size));
+          textLeft(
+            ctx,
+            "我",
+            nameX + nw + s(8),
+            midY,
+            `${s(TYPE.labelSmall.size)}px ${FONT_SANS}`,
+            C.primary
+          );
         }
         textRight(
           ctx,
           score,
           scoreRight,
           midY,
-          `700 ${scoreFont}px ${FONT_NUM}`,
+          `${EMPHASIZED_WEIGHT.title} ${scoreFont}px ${FONT_NUM}`,
           C.onSurface
         );
         textRight(ctx, "次", contentRight, midY, `${unitFont}px ${FONT_SANS}`, C.onSurfaceVariant);
@@ -1014,7 +1161,7 @@ function renderRankCard(service, opts) {
           `…… 另有 ${opts.hidden} 人在榜`,
           contentLeft,
           ry + s(16),
-          `${s(11.5)}px ${FONT_SANS}`,
+          `${s(TYPE.labelSmall.size)}px ${FONT_SANS}`,
           C.onSurfaceVariant
         );
       }
@@ -1032,7 +1179,7 @@ function renderRankCard(service, opts) {
       "每猜中一日之词，记一次",
       panelX,
       iy + ih - s(30),
-      `${s(11.5)}px ${FONT_SANS}`,
+      `${s(TYPE.labelSmall.size)}px ${FONT_SANS}`,
       C.onSurfaceVariant
     );
   });
@@ -1310,7 +1457,7 @@ function apply(ctx, cfg) {
   __name(middlewareSwitchText, "middlewareSwitchText");
   function winText(o) {
     return textCard(
-      "猜中了 · 今日已封题",
+      "🏆 猜中了 · 今日已封题",
       `答案　${o.answer}`,
       [
         `猜测　${o.attempts} 次`,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-ciyi",
-  "description": "Koishi 的词意猜词插件。",
-  "version": "2.0.0",
+  "description": "Koishi 插件 · 词意。",
+  "version": "2.1.1",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "files": [