koishi-plugin-ciyi 1.2.3 → 1.2.5

package/lib/index.js

@@ -709,7 +709,7 @@ function renderWinCard(service, opts) {
       textLeft(ctx, stats[i].c, sx + s(14), y + s(44), `${s(10.5)}px ${FONT_SERIF}`, C.ink3);
     }
     const quip = opts.closest === null ? "一击即中，今日无需第二次落笔" : `从 #${opts.closest} 一步跨到 #1`;
-    const footerTip = "明日零点换新题 · ciyi.排行榜";
+    const footerTip = opts.canStartToday ? "ciyi.猜 山水 · 开启今日新题" : "明日零点换新题 · ciyi.排行榜";
     drawFooter(
       ctx,
       ix,
@@ -734,8 +734,15 @@ function renderWinCard(service, opts) {
 __name(renderWinCard, "renderWinCard");
 function renderRankCard(service, opts) {
   const innerW = s(620);
-  const rowCount = Math.max(opts.entries.length, 1);
-  const innerH = s(120 + rowCount * 52 + (opts.hidden > 0 ? 36 : 0) + 60);
+  const headerH = s(87);
+  const contentGap = s(20);
+  const rowH = s(52);
+  const emptyH = s(92);
+  const hiddenH = opts.hidden > 0 ? s(36) : 0;
+  const footerGap = s(20);
+  const footerH = s(60);
+  const contentH = opts.entries.length ? opts.entries.length * rowH + hiddenH : emptyH;
+  const innerH = headerH + contentGap + contentH + footerGap + footerH;
   return toPng(service, innerW, innerH, (ctx, ix, iy, iw, ih) => {
     let y = iy + drawHeader(ctx, ix, iy, iw, "每日挑战 · 累计猜中", {
       big: String(opts.players),
@@ -743,11 +750,12 @@ function renderRankCard(service, opts) {
     });
     y += s(20);
     if (!opts.entries.length) {
+      drawPanel(ctx, ix + s(22), y, iw - s(44), emptyH);
       textCenter(
         ctx,
         "榜上无名。",
         ix + iw / 2,
-        y + s(40),
+        y + s(31),
         `${s(13.5)}px ${FONT_SERIF}`,
         C.ink3
       );
@@ -755,7 +763,7 @@ function renderRankCard(service, opts) {
         ctx,
         "今日第一个猜中的人，会写在这里。",
         ix + iw / 2,
-        y + s(68),
+        y + s(61),
         `${s(13.5)}px ${FONT_SERIF}`,
         C.ink3
       );
@@ -763,7 +771,6 @@ function renderRankCard(service, opts) {
       let ry = y;
       for (let i = 0; i < opts.entries.length; i++) {
         const e = opts.entries[i];
-        const rowH = s(52);
         const midY = ry + rowH / 2;
         if (e.me) {
           ctx.fillStyle = "rgba(178,58,46,0.055)";
@@ -793,9 +800,13 @@ function renderRankCard(service, opts) {
         const name2 = e.username || "无名氏";
         const nameX = px + posSize + s(14);
         const nameFont = `${s(15)}px ${FONT_SERIF}`;
+        const score = String(e.score);
+        const scoreRight = ix + iw - s(38);
+        const scoreLeft = scoreRight - textWidth(score, s(19));
+        const meWidth = e.me ? textWidth("我", s(10.5)) + s(18) : 0;
         const fittedName = ellipsize(
           name2,
-          ix + iw - s(118) - nameX - (e.me ? s(28) : 0),
+          Math.max(0, scoreLeft - s(18) - nameX - meWidth),
           s(15)
         );
         textLeft(ctx, fittedName, nameX, midY, nameFont, C.ink);
@@ -805,8 +816,8 @@ function renderRankCard(service, opts) {
         }
         textRight(
           ctx,
-          String(e.score),
-          ix + iw - s(38),
+          score,
+          scoreRight,
           midY,
           `700 ${s(19)}px ${FONT_NUM}`,
           C.ink
@@ -868,8 +879,8 @@ var usage = `# 词意
 var inject = { required: ["database"], optional: ["canvas"] };
 var Config = import_koishi.Schema.object({
   atReply: import_koishi.Schema.boolean().default(false).description("响应时 @"),
-  quoteReply: import_koishi.Schema.boolean().default(true).description("响应时引用"),
-  isEnableMiddleware: import_koishi.Schema.boolean().default(false).description("是否启用中间件（若启用，猜测词语时可以不使用指令直接猜测）"),
+  quoteReply: import_koishi.Schema.boolean().default(false).description("响应时引用"),
+  isEnableMiddleware: import_koishi.Schema.boolean().default(true).description("是否启用中间件（若启用，猜测词语时可以不使用指令直接猜测）"),
   renderImage: import_koishi.Schema.boolean().default(true).description("渲染图片（复用 Koishi Canvas 服务；不可用时使用等价文本）"),
   maxHistory: import_koishi.Schema.number().default(10).min(0).description("猜测板最多列出的历史条数（最新一次猜测始终会列出）"),
   maxRank: import_koishi.Schema.number().default(10).min(0).description("最大排行榜人数")
@@ -1041,7 +1052,7 @@ function apply(ctx, cfg) {
         `累计　${o.username} 已猜中 ${o.score} 次`,
         o.neighbors.length ? `近旁　${o.neighbors.join(" · ")}` : null
       ].filter(Boolean),
-      "明日零点换新题 · ciyi.排行榜 看战绩"
+      o.canStartToday ? "继续 ciyi.猜 山水 · 开启今日新题" : "明日零点换新题 · ciyi.排行榜 看战绩"
     );
   }
   __name(winText, "winText");
@@ -1119,7 +1130,7 @@ function apply(ctx, cfg) {
   __name(phb, "phb");
   async function getTodayGame(session) {
     const current = (await ctx.database.get("ciyi", { channelId: session.channelId }))[0];
-    if (current && isSameDayInChina(session.timestamp, current.lastStartTimestamp)) {
+    if (current && (!current.isOver || isSameDayInChina(session.timestamp, current.lastStartTimestamp))) {
       return current;
     }
     const oldGuessedWords = current?.guessedWords ?? [];
@@ -1214,7 +1225,11 @@ function apply(ctx, cfg) {
         // 榜首是答案自己，紧随其后的几个才是「最像它的词」
         neighbors: gameInfo.rankList.slice(1, 6),
         username: session.username,
-        score
+        score,
+        canStartToday: !isSameDayInChina(
+          session.timestamp,
+          gameInfo.lastStartTimestamp
+        )
       };
       return await sendCard(session, () => renderWinCard(ctx.canvas, win), winText(win));
     }

package/lib/view.d.ts

@@ -38,6 +38,7 @@ export interface WinOptions {
     neighbors: string[];
     username: string;
     score: number;
+    canStartToday: boolean;
 }
 export interface RankEntry {
     username: string;

package/package.json

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