koishi-plugin-ciyi 1.4.0 → 1.4.1

package/lib/index.js

@@ -430,7 +430,7 @@ 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.outline);
+    textCenter(ctx, "—", x + s(14), y + cell / 2, `${s(13)}px ${FONT_SANS}`, C.onSurfaceVariant);
     return s(28);
   }
   let cx = x;
@@ -472,7 +472,7 @@ function drawHeader(ctx, innerX, innerY, innerW, sub, right) {
     brandX,
     innerY + padTop + s(36),
     `italic ${s(10)}px ${FONT_NUM}`,
-    C.outline
+    C.onSurfaceVariant
   );
   const subRight = right ? innerX + innerW - padX - s(150) : innerX + innerW - padX;
   textLeftFit(
@@ -487,7 +487,7 @@ function drawHeader(ctx, innerX, innerY, innerW, sub, right) {
   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.outline);
+    textRight(ctx, right.cap, rx, innerY + padTop + s(44), `${s(10.5)}px ${FONT_SANS}`, C.onSurfaceVariant);
   }
   const lineY = innerY + h2;
   ctx.strokeStyle = C.outlineVariant;
@@ -527,7 +527,7 @@ function drawFooter(ctx, innerX, y, innerW, legendItems, tip) {
     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.outline);
+    textLeft(ctx, range, lx, cy, `${s(11)}px ${FONT_NUM}`, C.onSurfaceVariant);
     lx += textWidth(range, s(11)) + s(13);
   }
   const tipFont = `${s(11.5)}px ${FONT_SANS}`;
@@ -538,7 +538,7 @@ function drawFooter(ctx, innerX, y, innerW, legendItems, tip) {
     innerX + innerW - padX,
     cy,
     tipFont,
-    C.outline
+    C.onSurfaceVariant
   );
   return h2 + padY * 2;
 }
@@ -552,8 +552,8 @@ function drawLegendFull(ctx, x, y, w) {
     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.outline);
-    textLeft(ctx, t.note, cx + s(100), cy, `${s(11.5)}px ${FONT_SANS}`, C.outline);
+    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);
   }
   return rowH * Math.ceil(TIERS.length / 2) + s(8);
 }
@@ -637,12 +637,12 @@ function drawBoardTable(ctx, x, y, w, opts, rowH) {
   const mtX = mt0 + Math.max(0, (cols.mt - meterBlockW) / 2);
   const headY = y;
   const fs = s(10.5);
-  textLeft(ctx, "序", noX, headY, `${fs}px ${FONT_SANS}`, C.outline);
-  textCenter(ctx, "更近 ◀", nb0 + cols.nb / 2, headY, `${fs}px ${FONT_SANS}`, C.outline);
-  textCenter(ctx, "猜测", gw0 + cols.gw / 2, headY, `${fs}px ${FONT_SANS}`, C.outline);
-  textCenter(ctx, "▶ 更远", nb1 + cols.nb / 2, headY, `${fs}px ${FONT_SANS}`, C.outline);
-  textCenter(ctx, "排名", rk0 + cols.rk / 2, headY, `${fs}px ${FONT_SANS}`, C.outline);
-  textCenter(ctx, "亲疏", mt0 + cols.mt / 2, headY, `${fs}px ${FONT_SANS}`, C.outline);
+  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);
+  textCenter(ctx, "▶ 更远", nb1 + cols.nb / 2, headY, `${fs}px ${FONT_SANS}`, C.onSurfaceVariant);
+  textCenter(ctx, "排名", rk0 + cols.rk / 2, headY, `${fs}px ${FONT_SANS}`, C.onSurfaceVariant);
+  textCenter(ctx, "亲疏", mt0 + cols.mt / 2, headY, `${fs}px ${FONT_SANS}`, C.onSurfaceVariant);
   let ry = y + s(22);
   let ordinal = 0;
   for (const row of opts.rows) {
@@ -654,7 +654,7 @@ function drawBoardTable(ctx, x, y, w, opts, rowH) {
         cx + tableW / 2,
         ry + s(10),
         `${s(11.5)}px ${FONT_SANS}`,
-        C.outline
+        C.onSurfaceVariant
       );
       ctx.strokeStyle = C.outlineVariant;
       ctx.beginPath();
@@ -684,7 +684,7 @@ function drawBoardTable(ctx, x, y, w, opts, rowH) {
       noX,
       midY,
       `${s(13)}px ${FONT_NUM}`,
-      C.outline
+      C.onSurfaceVariant
     );
     const nbX = nb0 + (cols.nb - gridWidth(history.leftHint, "sm")) / 2;
     drawWordGrid(ctx, nbX, midY - s(13), history.leftHint, "sm", 0);
@@ -698,7 +698,7 @@ function drawBoardTable(ctx, x, y, w, opts, rowH) {
     const hashW = textWidth("#", s(13));
     const rankBlock = hashW + s(3) + rankWidth;
     const rankLeft = rk0 + (cols.rk - rankBlock) / 2;
-    textLeft(ctx, "#", rankLeft, midY, `${s(13)}px ${FONT_NUM}`, C.outline);
+    textLeft(ctx, "#", rankLeft, midY, `${s(13)}px ${FONT_NUM}`, C.onSurfaceVariant);
     textLeft(ctx, rankText, rankLeft + hashW + s(3), midY, rankFont, tier.color);
     drawNearBar(ctx, mtX, midY, pct, tier);
     ry += rowH;
@@ -789,7 +789,7 @@ function renderIntroCard(service, opts) {
       ix + s(38),
       y + s(104),
       `${s(12)}px ${FONT_SANS}`,
-      C.outline
+      C.onSurfaceVariant
     );
     textLeft(
       ctx,
@@ -797,7 +797,7 @@ function renderIntroCard(service, opts) {
       ix + s(38),
       y + s(126),
       `${s(12)}px ${FONT_SANS}`,
-      C.outline
+      C.onSurfaceVariant
     );
     textLeft(
       ctx,
@@ -828,7 +828,7 @@ function renderIntroCard(service, opts) {
       ix + s(22),
       iy + ih - s(30),
       `${s(11.5)}px ${FONT_SANS}`,
-      C.outline
+      C.onSurfaceVariant
     );
   });
 }
@@ -842,11 +842,11 @@ 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.outline);
+    textLeft(ctx, "今日答案", ix + s(38), y + s(24), `${s(11.5)}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.outline);
+      textLeft(ctx, "意思最近的几个词", ax, y + s(24), `${s(11.5)}px ${FONT_SANS}`, C.onSurfaceVariant);
       let nx = ax;
       let ny = y + s(48);
       const chipFont = `${s(14)}px ${FONT_SANS}`;
@@ -888,7 +888,7 @@ function renderWinCard(service, opts) {
       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].c, sx + s(14), y + s(44), `${s(10.5)}px ${FONT_SANS}`, C.outline);
+      textLeft(ctx, stats[i].c, sx + s(14), y + s(44), `${s(10.5)}px ${FONT_SANS}`, C.onSurfaceVariant);
     }
     const quip = opts.closest === null ? "一击即中，今日无需第二次落笔" : `从 #${opts.closest} 一步跨到 #1`;
     const footerTip = opts.canStartToday ? "ciyi.猜 山水 · 开启今日新题" : "明日零点换新题 · ciyi.排行榜";
@@ -945,7 +945,7 @@ function renderRankCard(service, opts) {
         panelX + panelW / 2,
         y + s(31),
         `${s(13.5)}px ${FONT_SANS}`,
-        C.outline
+        C.onSurfaceVariant
       );
       textCenter(
         ctx,
@@ -953,7 +953,7 @@ function renderRankCard(service, opts) {
         panelX + panelW / 2,
         y + s(61),
         `${s(13.5)}px ${FONT_SANS}`,
-        C.outline
+        C.onSurfaceVariant
       );
     } else {
       let ry = y;
@@ -1005,7 +1005,7 @@ function renderRankCard(service, opts) {
           `700 ${scoreFont}px ${FONT_NUM}`,
           C.onSurface
         );
-        textRight(ctx, "次", contentRight, midY, `${unitFont}px ${FONT_SANS}`, C.outline);
+        textRight(ctx, "次", contentRight, midY, `${unitFont}px ${FONT_SANS}`, C.onSurfaceVariant);
         ry += rowH;
       }
       if (opts.hidden > 0) {
@@ -1015,7 +1015,7 @@ function renderRankCard(service, opts) {
           contentLeft,
           ry + s(16),
           `${s(11.5)}px ${FONT_SANS}`,
-          C.outline
+          C.onSurfaceVariant
         );
       }
     }
@@ -1033,7 +1033,7 @@ function renderRankCard(service, opts) {
       panelX,
       iy + ih - s(30),
       `${s(11.5)}px ${FONT_SANS}`,
-      C.outline
+      C.onSurfaceVariant
     );
   });
 }

package/package.json

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