koishi-plugin-ciyi 1.2.0 → 1.2.2

package/lib/index.js

@@ -417,30 +417,38 @@ function measureBoard(opts) {
   return { innerW, innerH, rowH };
 }
 function drawBoardTable(ctx, x, y, w, opts, rowH) {
-  const cols = {
-    no: s(34),
-    nb: s(74),
-    gw: s(90),
-    rk: s(86),
-    mt: s(150)
-  };
+  const accentW = s(3);
+  const gutter = s(10);
   const tableW = w - s(44);
   const cx = x + s(22);
+  const usable = Math.max(tableW - gutter, s(1));
+  const natural = [32, 72, 88, 72, 72, 148];
+  const naturalSum = natural.reduce((a, b) => a + b, 0);
+  const scale = usable / naturalSum;
+  const cols = {
+    no: natural[0] * scale,
+    nb: natural[1] * scale,
+    gw: natural[2] * scale,
+    rk: natural[4] * scale,
+    mt: natural[5] * scale
+  };
+  const bx = cx + gutter;
+  const nb0 = bx + cols.no;
+  const gw0 = nb0 + cols.nb;
+  const nb1 = gw0 + cols.gw;
+  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 mtX = mt0 + Math.max(0, (cols.mt - meterBlockW) / 2);
   const headY = y;
   const fs = s(10.5);
-  textLeft(ctx, "\u5E8F", cx, headY, `${fs}px ${FONT_SERIF}`, C.ink3);
-  textCenter(ctx, "\u66F4\u8FD1 \u25C0", cx + cols.no + cols.nb / 2, headY, `${fs}px ${FONT_SERIF}`, C.ink3);
-  textCenter(ctx, "\u731C\u6D4B", cx + cols.no + cols.nb + cols.gw / 2, headY, `${fs}px ${FONT_SERIF}`, C.ink3);
-  textCenter(
-    ctx,
-    "\u25B6 \u66F4\u8FDC",
-    cx + cols.no + cols.nb + cols.gw + cols.nb / 2,
-    headY,
-    `${fs}px ${FONT_SERIF}`,
-    C.ink3
-  );
-  textRight(ctx, "\u6392\u540D", cx + cols.no + cols.nb + cols.gw + cols.nb + cols.rk, headY, `${fs}px ${FONT_SERIF}`, C.ink3);
-  textRight(ctx, "\u4EB2\u758F", cx + tableW, headY, `${fs}px ${FONT_SERIF}`, C.ink3);
+  textLeft(ctx, "序", noX, headY, `${fs}px ${FONT_SERIF}`, C.ink3);
+  textCenter(ctx, "更近 ◀", nb0 + cols.nb / 2, headY, `${fs}px ${FONT_SERIF}`, C.ink3);
+  textCenter(ctx, "猜测", gw0 + cols.gw / 2, headY, `${fs}px ${FONT_SERIF}`, C.ink3);
+  textCenter(ctx, "▶ 更远", nb1 + cols.nb / 2, headY, `${fs}px ${FONT_SERIF}`, C.ink3);
+  textCenter(ctx, "排名", rk0 + cols.rk / 2, headY, `${fs}px ${FONT_SERIF}`, C.ink3);
+  textCenter(ctx, "亲疏", mt0 + cols.mt / 2, headY, `${fs}px ${FONT_SERIF}`, C.ink3);
   let ry = y + s(22);
   let ordinal = 0;
   for (const row of opts.rows) {
@@ -448,7 +456,7 @@ function drawBoardTable(ctx, x, y, w, opts, rowH) {
       ry += s(8);
       textCenter(
         ctx,
-        `\u22EF \u53E6\u6709 ${row.gapBefore} \u8BCD\u672A\u5217 \u22EF`,
+        `⋯ 另有 ${row.gapBefore} 词未列 ⋯`,
         cx + tableW / 2,
         ry + s(10),
         `${s(11.5)}px ${FONT_SERIF}`,
@@ -470,7 +478,7 @@ function drawBoardTable(ctx, x, y, w, opts, rowH) {
       ctx.fillStyle = C.fresh;
       ctx.fillRect(cx, ry, tableW, rowH);
       ctx.fillStyle = C.seal;
-      ctx.fillRect(cx, ry, s(3), rowH);
+      ctx.fillRect(cx, ry, accentW, rowH);
     }
     ctx.strokeStyle = ordinal === 1 ? C.ruleDark : C.rule;
     ctx.lineWidth = s(1);
@@ -481,24 +489,25 @@ function drawBoardTable(ctx, x, y, w, opts, rowH) {
     textLeft(
       ctx,
       String(ordinal).padStart(2, "0"),
-      cx,
+      noX,
       midY,
       `${s(13)}px ${FONT_NUM}`,
       C.ink3
     );
-    const nbX = cx + cols.no + (cols.nb - gridWidth(history.leftHint, "sm")) / 2;
+    const nbX = nb0 + (cols.nb - gridWidth(history.leftHint, "sm")) / 2;
     drawWordGrid(ctx, nbX, midY - s(13), history.leftHint, "sm", 0);
-    const gwX = cx + cols.no + cols.nb + (cols.gw - gridWidth(history.guess, "md")) / 2;
+    const gwX = gw0 + (cols.gw - gridWidth(history.guess, "md")) / 2;
     drawWordGrid(ctx, gwX, midY - s(17), history.guess, "md");
-    const rbX = cx + cols.no + cols.nb + cols.gw + (cols.nb - gridWidth(history.rightHint, "sm")) / 2;
+    const rbX = nb1 + (cols.nb - gridWidth(history.rightHint, "sm")) / 2;
     drawWordGrid(ctx, rbX, midY - s(13), history.rightHint, "sm", 1);
-    const rkX = cx + cols.no + cols.nb + cols.gw + cols.nb + cols.rk;
     const rankText = String(history.rank);
     const rankFont = `700 ${s(21)}px ${FONT_NUM}`;
     const rankWidth = textWidth(rankText, s(21));
-    textRight(ctx, "#", rkX - rankWidth - s(3), midY, `${s(13)}px ${FONT_NUM}`, C.ink3);
-    textRight(ctx, rankText, rkX, midY, rankFont, tier.color);
-    const mtX = cx + tableW - cols.mt + s(10);
+    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.ink3);
+    textLeft(ctx, rankText, rankLeft + hashW + s(3), midY, rankFont, tier.color);
     drawNearBar(ctx, mtX, midY, pct, tier);
     ry += rowH;
   }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-ciyi",
   "description": "Koishi 的词意（猜词游戏）插件。根据词语的含义相似程度，猜测正确的词语。",
-  "version": "1.2.0",
+  "version": "1.2.2",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "files": [