koishi-plugin-cchess 2.0.1 → 2.2.0

package/README.md

@@ -16,17 +16,18 @@ yarn add koishi-plugin-cchess
 | --- | --- |
 | `cchess.开始 [红/黑] [人人/人机]` | 入座并开局，双方就位后自动开战 |
 | `cchess.开始 <FEN>` | 摆谱，导入局面后再 `cchess.开始` 即可 |
+| `cchess.落子 <着法>` | 按棋谱落子，如 `炮二平五` |
 | `cchess.悔棋 [同意/拒绝]` | 请求悔棋，也可直接回复同意或拒绝表决 |
 | `cchess.认输` | 认输 |
-| `cchess.结束` | 强制结束棋局 |
-| `cchess.棋绩 [@某人/榜] [胜场/输场] [人数]` | 查询战绩与排行榜 |
+| `cchess.结束` | 结束正在进行的一局 |
+| `cchess.战绩 [@某人/榜] [胜场/输场] [人数]` | 查询战绩与排行榜 |
 | `cchess.查看云库残局 [DTM/DTC]` | 云库残局统计 |
 
 发送 `cchess.开始` 即入座，双方就位后自动开局，无需单独的加入与退出指令。
 
-着法可直接发送，例如 `炮二平五` 或 `b2e2`。
+着法可直接发送，例如 `炮二平五` 或 `b2e2`，也可以写成 `cchess.落子 炮二平五`。
 
-悔棋请求送出后，对方直接回复 `同意` 或 `拒绝` 即可表决，不必带指令前缀。
+悔棋请求送出后，对方直接回复 `同意` 或 `拒绝` 即可表决，不必带指令前缀；请求方发送 `cchess.悔棋 拒绝` 可撤下请求。
 
 ## 许可证
 

package/lib/index.d.ts

@@ -1,15 +1,17 @@
 import { Context, Schema } from 'koishi';
 export declare const name = "cchess";
-export declare const usage = "## \u4F7F\u7528\n\n`cchess.\u5F00\u59CB` \u5373\u53EF\u5165\u5EA7\uFF0C\u53CC\u65B9\u5C31\u4F4D\u540E\u81EA\u52A8\u5F00\u5C40\uFF1B`cchess.\u5F00\u59CB \u4EBA\u673A` \u76F4\u63A5\u6311\u6218\u76AE\u5361\u9C7C\u3002\u7740\u6CD5\u53EF\u76F4\u63A5\u53D1\u9001\uFF0C\u4F8B\u5982 `\u70AE\u4E8C\u5E73\u4E94` \u6216 `b2e2`\u3002\n\n\u6094\u68CB\u8BF7\u6C42\u9001\u51FA\u540E\uFF0C\u5BF9\u65B9\u65E0\u9700\u5E26\u6307\u4EE4\u524D\u7F00\uFF0C\u76F4\u63A5\u56DE\u590D `\u540C\u610F` \u6216 `\u62D2\u7EDD` \u5373\u53EF\u8868\u51B3\u3002\n\n## \u6307\u4EE4\n\n| \u6307\u4EE4 | \u8BF4\u660E |\n| --- | --- |\n| `cchess.\u5F00\u59CB [\u7EA2/\u9ED1] [\u4EBA\u4EBA/\u4EBA\u673A]` | \u5165\u5EA7\u5E76\u5F00\u5C40\uFF0C\u53CC\u65B9\u5C31\u4F4D\u540E\u81EA\u52A8\u5F00\u6218 |\n| `cchess.\u5F00\u59CB <FEN>` | \u6446\u8C31\uFF0C\u5BFC\u5165\u5C40\u9762\u540E\u518D `cchess.\u5F00\u59CB` \u5373\u53EF |\n| `cchess.\u6094\u68CB [\u540C\u610F/\u62D2\u7EDD]` | \u8BF7\u6C42\u6094\u68CB\uFF0C\u4E5F\u53EF\u76F4\u63A5\u56DE\u590D\u540C\u610F\u6216\u62D2\u7EDD\u8868\u51B3 |\n| `cchess.\u8BA4\u8F93` | \u8BA4\u8F93\u5E76\u7ED3\u675F\u5BF9\u5C40 |\n| `cchess.\u7ED3\u675F` | \u7ED3\u675F\u5F53\u524D\u5BF9\u5C40 |\n| `cchess.\u6218\u7EE9 [@\u67D0\u4EBA/\u699C] [\u80DC\u573A/\u8F93\u573A] [\u4EBA\u6570]` | \u67E5\u8BE2\u6218\u7EE9\u6216\u6392\u884C\u699C |\n| `cchess.\u67E5\u770B\u4E91\u5E93\u6B8B\u5C40 [DTM/DTC]` | \u67E5\u8BE2\u4E91\u5E93\u6B8B\u5C40\u7EDF\u8BA1 |";
+export declare const usage = "## \u4F7F\u7528\n\n`cchess.\u5F00\u59CB` \u5373\u53EF\u5165\u5EA7\uFF0C\u53CC\u65B9\u5C31\u4F4D\u540E\u81EA\u52A8\u5F00\u5C40\uFF1B`cchess.\u5F00\u59CB \u4EBA\u673A` \u76F4\u63A5\u6311\u6218\u76AE\u5361\u9C7C\u3002\u7740\u6CD5\u53EF\u76F4\u63A5\u53D1\u9001\uFF0C\u4F8B\u5982 `\u70AE\u4E8C\u5E73\u4E94` \u6216 `b2e2`\uFF0C\u4E5F\u53EF\u4EE5\u5199\u6210 `cchess.\u843D\u5B50 \u70AE\u4E8C\u5E73\u4E94`\u3002\n\n\u6094\u68CB\u8BF7\u6C42\u9001\u51FA\u540E\uFF0C\u5BF9\u65B9\u65E0\u9700\u5E26\u6307\u4EE4\u524D\u7F00\uFF0C\u76F4\u63A5\u56DE\u590D `\u540C\u610F` \u6216 `\u62D2\u7EDD` \u5373\u53EF\u8868\u51B3\uFF1B\u8BF7\u6C42\u65B9\u53D1\u9001 `cchess.\u6094\u68CB \u62D2\u7EDD` \u53EF\u64A4\u4E0B\u8BF7\u6C42\u3002\n\n## \u6307\u4EE4\n\n| \u6307\u4EE4 | \u8BF4\u660E |\n| --- | --- |\n| `cchess.\u5F00\u59CB [\u7EA2/\u9ED1] [\u4EBA\u4EBA/\u4EBA\u673A]` | \u5165\u5EA7\u5E76\u5F00\u5C40\uFF0C\u53CC\u65B9\u5C31\u4F4D\u540E\u81EA\u52A8\u5F00\u6218 |\n| `cchess.\u5F00\u59CB <FEN>` | \u6446\u8C31\uFF0C\u5BFC\u5165\u5C40\u9762\u540E\u518D `cchess.\u5F00\u59CB` \u5373\u53EF |\n| `cchess.\u843D\u5B50 <\u7740\u6CD5>` | \u6309\u68CB\u8C31\u843D\u5B50\uFF0C\u5982 `\u70AE\u4E8C\u5E73\u4E94` |\n| `cchess.\u6094\u68CB [\u540C\u610F/\u62D2\u7EDD]` | \u8BF7\u6C42\u6094\u68CB\uFF0C\u4E5F\u53EF\u76F4\u63A5\u56DE\u590D\u540C\u610F\u6216\u62D2\u7EDD\u8868\u51B3 |\n| `cchess.\u8BA4\u8F93` | \u8BA4\u8F93\u5E76\u7ED3\u675F\u5BF9\u5C40 |\n| `cchess.\u7ED3\u675F` | \u7ED3\u675F\u6B63\u5728\u8FDB\u884C\u7684\u4E00\u5C40 |\n| `cchess.\u6218\u7EE9 [@\u67D0\u4EBA/\u699C] [\u80DC\u573A/\u8F93\u573A] [\u4EBA\u6570]` | \u67E5\u8BE2\u6218\u7EE9\u6216\u6392\u884C\u699C |\n| `cchess.\u67E5\u770B\u4E91\u5E93\u6B8B\u5C40 [DTM/DTC]` | \u67E5\u8BE2\u4E91\u5E93\u6B8B\u5C40\u7EDF\u8BA1 |";
 export declare const inject: string[];
 export interface Config {
     boardSkin: string;
     pieceSkin: string;
     defaultEngineThinkingDepth: number;
     allowFreePieceMovementInHumanMachineMode: boolean;
+    enableDirectInput: boolean;
     defaultMaxLeaderboardEntries: number;
     retractDelay: number;
     isChessImageWithOutlineEnabled: boolean;
+    disableImages: boolean;
     imgScale: number;
     imageType: "png" | "jpeg" | "webp";
 }

package/lib/index.js

@@ -234,6 +234,24 @@ 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 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),
@@ -246,9 +264,9 @@ var fs = __toESM(require("fs"));
 var name = "cchess";
 var usage = `## 使用
 
-\`cchess.开始\` 即可入座，双方就位后自动开局；\`cchess.开始 人机\` 直接挑战皮卡鱼。着法可直接发送，例如 \`炮二平五\` 或 \`b2e2\`。
+\`cchess.开始\` 即可入座，双方就位后自动开局；\`cchess.开始 人机\` 直接挑战皮卡鱼。着法可直接发送，例如 \`炮二平五\` 或 \`b2e2\`，也可以写成 \`cchess.落子 炮二平五\`。
 
-悔棋请求送出后，对方无需带指令前缀，直接回复 \`同意\` 或 \`拒绝\` 即可表决。
+悔棋请求送出后，对方无需带指令前缀，直接回复 \`同意\` 或 \`拒绝\` 即可表决；请求方发送 \`cchess.悔棋 拒绝\` 可撤下请求。
 
 ## 指令
 
@@ -256,9 +274,10 @@ var usage = `## 使用
 | --- | --- |
 | \`cchess.开始 [红/黑] [人人/人机]\` | 入座并开局，双方就位后自动开战 |
 | \`cchess.开始 <FEN>\` | 摆谱，导入局面后再 \`cchess.开始\` 即可 |
+| \`cchess.落子 <着法>\` | 按棋谱落子，如 \`炮二平五\` |
 | \`cchess.悔棋 [同意/拒绝]\` | 请求悔棋，也可直接回复同意或拒绝表决 |
 | \`cchess.认输\` | 认输并结束对局 |
-| \`cchess.结束\` | 结束当前对局 |
+| \`cchess.结束\` | 结束正在进行的一局 |
 | \`cchess.战绩 [@某人/榜] [胜场/输场] [人数]\` | 查询战绩或排行榜 |
 | \`cchess.查看云库残局 [DTM/DTC]\` | 查询云库残局统计 |`;
 var inject = ["database", "canvas"];
@@ -268,14 +287,15 @@ var Config = import_koishi.Schema.object({
   boardSkin: import_koishi.Schema.union(boardSkins).default("象甲2023棋盘").description(`棋盘皮肤。`),
   pieceSkin: import_koishi.Schema.union(pieceSkins).default("象甲棋子").description(`棋子皮肤。`),
   allowFreePieceMovementInHumanMachineMode: import_koishi.Schema.boolean().default(false).description(`人机模式下，允许所有人自由移动棋子，开启后可以不入座直接开始人机对局。`),
+  enableDirectInput: import_koishi.Schema.boolean().default(true).description(`对局中直接发送棋谱或「同意」「拒绝」即可落子与应答，无需指令前缀。`),
   defaultEngineThinkingDepth: import_koishi.Schema.number().min(0).max(100).default(10).description(`默认引擎思考深度，越高 AI 棋力越强，耗时也越长（小于 1 时按 1 计算）。由于 Nodejs 不支持 SIMD，所以不建议设置过高。`),
-  defaultMaxLeaderboardEntries: import_koishi.Schema.number().min(0).default(10).description(`排行榜默认显示的人数。`),
+  defaultMaxLeaderboardEntries: import_koishi.Schema.number().min(0).default(4).description(`排行榜默认显示的人数。`),
   retractDelay: import_koishi.Schema.number().min(0).default(0).description(`自动撤回延迟（秒），0 表示不撤回。`),
   imgScale: import_koishi.Schema.number().min(1).default(1).description(`图片分辨率倍率。`),
   imageType: import_koishi.Schema.union(["png", "jpeg", "webp"]).default("png").description(`发送的图片格式。`),
-  isChessImageWithOutlineEnabled: import_koishi.Schema.boolean().default(true).description(`给棋盘图片加上坐标外框。关闭后出图明显更快，但没有外框，玩起来可能会比较累。`)
+  isChessImageWithOutlineEnabled: import_koishi.Schema.boolean().default(true).description(`给棋盘图片加上坐标外框。关闭后出图明显更快，但没有外框，玩起来可能会比较累。`),
+  disableImages: import_koishi.Schema.boolean().default(false).description(`全部改用文本，不发送棋盘图片。`)
 });
-var RULE = "━━━━━━━━━━━━━━";
 var SIDE_ICONS = { 红方: "🔴", 黑方: "⚫" };
 var MEDALS = ["🥇", "🥈", "🥉"];
 function withSideIcon(side) {
@@ -291,12 +311,12 @@ function isLine(line) {
 }
 __name(isLine, "isLine");
 function panel(options) {
-  const { icon = "♟️", title, at, body = [], tips = [], image } = options;
-  const lines = [`${icon} ${title}`, RULE];
+  const { icon, title, at, body = [], tips = [], image } = options;
+  const lines = [`${icon} ${title}`];
   if (at) lines.push(`@${at}`);
   lines.push(...body.filter(isLine));
   const validTips = tips.filter(isLine).filter(Boolean);
-  if (validTips.length) lines.push(RULE, ...validTips);
+  if (validTips.length) lines.push(...validTips);
   if (image) lines.push(image);
   return lines.join("\n");
 }
@@ -306,6 +326,7 @@ function apply(ctx, config) {
   const engines = {};
   const enginePromises = {};
   const busyChannels = /* @__PURE__ */ new Set();
+  const regretTicket = /* @__PURE__ */ new Map();
   ctx.on("dispose", () => {
     const channelIds = Object.keys(engines);
     channelIds.forEach((channelId) => {
@@ -430,6 +451,7 @@ function apply(ctx, config) {
   }
   __name(matchRegretDecision, "matchRegretDecision");
   ctx.middleware(async (session, next) => {
+    if (!config.enableDirectInput) return next();
     const { channelId, content, userId } = session;
     if (!channelId || !content) return next();
     const decision = matchRegretDecision(content);
@@ -441,6 +463,7 @@ function apply(ctx, config) {
     await resolveRegret(session, decision === "agree");
   });
   ctx.middleware(async (session, next) => {
+    if (!config.enableDirectInput) return next();
     const { channelId, content, userId, username } = session;
     if (!channelId || !content) return next();
     const moveOperation = content.trim();
@@ -462,7 +485,19 @@ function apply(ctx, config) {
   ctx.command("cchess", "中国象棋 · 楚河汉界").action(async ({ session }) => {
     await session.execute(`cchess -h`);
   });
-  ctx.command("cchess.开始 [args:text]", "入座并开局").usage("可选阵营「红」「黑」与对手「人人」「人机」；直接粘贴 FEN 串则按摆谱处理。").example("cchess.开始 红 人机").action(async ({ session }, args) => {
+  ctx.command("cchess.开始 [args:text]", "入座，双方就位后开局").usage("可选阵营「红」「黑」与对手「人人」「人机」；直接粘贴 FEN 串则按摆谱处理。").example("cchess.开始 红 人机").action(async ({ session }, args) => {
+    const { username, channelId } = session;
+    if (busyChannels.has(channelId)) {
+      return await sendMessage(session, busyPanel(username));
+    }
+    busyChannels.add(channelId);
+    try {
+      return await startGame(session, args);
+    } finally {
+      busyChannels.delete(channelId);
+    }
+  });
+  async function startGame(session, args) {
     const { username, userId, channelId } = session;
     await updateNameInPlayerRecord(userId, username);
     const gameRecord = await getGameRecord(channelId);
@@ -520,11 +555,10 @@ function apply(ctx, config) {
         title: "已入座，静候对手",
         at: username,
         body: [
-          field("阵营", withSideIcon(selfSide)),
-          field("当前人数", `${players.length} 人`),
+          field("阵营", withSideIcon(selfSide)) + "　" + field("当前人数", `${players.length} 人`),
           !blackPlayers.length ? "黑方尚无人。" : "红方尚无人。"
         ],
-        tips: ["好友发送「cchess.开始」补位，双方就位即自动开局", "「cchess.开始 黑」可指定阵营"]
+        tips: ["好友发送「cchess.开始」即可补位，指定阵营可发「cchess.开始 黑」"]
       }));
     }
     await ctx.database.set("cchess_game_records", { channelId }, { isStarted: true });
@@ -533,32 +567,46 @@ function apply(ctx, config) {
       icon: "✅",
       title: "楚河汉界，对局开始",
       body: [
-        `${withSideIcon("红方")}（${redPlayers.length}）`,
-        ...redPlayers.map((player) => `　@${player.username}`),
-        "",
-        `${withSideIcon("黑方")}（${blackPlayers.length}）`,
-        ...blackPlayers.map((player) => `　@${player.username}`),
-        "",
-        field("先手", withSideIcon(sideString))
+        `${withSideIcon("红方")} · ${redPlayers.map((player) => `@${player.username}`).join("、")}`,
+        `${withSideIcon("黑方")} · ${blackPlayers.map((player) => `@${player.username}`).join("、")}`,
+        `先手 · ${withSideIcon(sideString)}`
       ],
       tips: ["直接发送着法即可落子，如「炮二平五」或「b2e2」"],
       image: await renderBoard(channelId)
     }));
-  });
-  ctx.command("cchess.结束", "结束当前对局").action(async ({ session }) => {
+  }
+  __name(startGame, "startGame");
+  ctx.command("cchess.结束", "结束正在进行的一局").userFields(["id", "name", "authority"]).action(async ({ session }) => {
     const { username, userId, channelId } = session;
     await updateNameInPlayerRecord(userId, username);
     const gameRecord = await getGameRecord(channelId);
     if (!gameRecord.isStarted) {
       return await sendMessage(session, panel({
-        icon: "⚠️",
+        icon: "💡",
         title: "棋盘尚且空空",
         at: username,
         body: ["当前没有进行中的对局，无需收拾残局。"],
         tips: ["发送「cchess.开始」入座，再开一局"]
       }));
     }
-    await endGame(channelId);
+    const playerRecord = await ctx.database.get("cchess_gaming_player_records", { channelId, userId });
+    if (!playerRecord.length && (session.user?.authority ?? 0) < 2) {
+      return await sendMessage(session, panel({
+        icon: "⚠️",
+        title: "权限不够",
+        at: username,
+        body: ["只有本局棋手或权限 2 以上的人能结束这一局。"]
+      }));
+    }
+    if (busyChannels.has(channelId)) {
+      return await sendMessage(session, busyPanel(username));
+    }
+    busyChannels.add(channelId);
+    try {
+      await endGame(channelId);
+    } finally {
+      busyChannels.delete(channelId);
+    }
     return await sendMessage(session, panel({
       icon: "✅",
       title: "对局已结束",
@@ -567,6 +615,9 @@ function apply(ctx, config) {
       tips: ["发送「cchess.开始」重整旗鼓"]
     }));
   });
+  ctx.command("cchess.落子 [move:string]", "发送着法，如「炮二平五」").usage("着法可用中式纵线记谱，也可用坐标，如 `b2e2`。").example("cchess.落子 炮二平五").action(async ({ session }, move) => {
+    return await handleMove(session, move);
+  });
   async function handleMove(session, moveOperation) {
     const { username, userId, channelId } = session;
     await updateNameInPlayerRecord(userId, username);
@@ -575,12 +626,7 @@ function apply(ctx, config) {
       return await sendMessage(session, invalidMovePanel(username, "看不懂这一着"));
     }
     if (busyChannels.has(channelId)) {
-      return await sendMessage(session, panel({
-        icon: "⏳",
-        title: "棋局正在推演",
-        at: username,
-        body: ["上一着棋尚未结算，稍候片刻。"]
-      }));
+      return await sendMessage(session, busyPanel(username));
     }
     busyChannels.add(channelId);
     try {
@@ -593,7 +639,7 @@ function apply(ctx, config) {
           icon: "⏳",
           title: "悔棋请求待决",
           at: username,
-          body: ["对方的悔棋请求尚未答复，棋局暂歇。"],
+          body: ["对方的悔棋请求尚未答复，对局暂歇。"],
           tips: ["对方回复「同意」或「拒绝」即可表决"]
         }));
       }
@@ -679,6 +725,7 @@ function apply(ctx, config) {
       }
       const newMoves = record.moveList.slice(movesBefore);
       return await sendMessage(session, panel({
+        icon: "✅",
         title: `第 ${record.moveList.length} 手`,
         body: [
           ...newMoves.map((move) => `${withSideIcon(convertTurnToString(move.side))}　${move.chnMoveName}　${move.move}`),
@@ -691,7 +738,7 @@ function apply(ctx, config) {
     }
   }
   __name(handleMove, "handleMove");
-  ctx.command("cchess.悔棋 [decision:string]", "请求悔棋或答复对方").usage("请求送出后，对方直接回复「同意」或「拒绝」即可表决，无需指令前缀。").action(async ({ session }, decision) => {
+  ctx.command("cchess.悔棋 [decision:string]", "请求悔棋或答复对方").usage("请求送出后，对方直接回复「同意」或「拒绝」即可表决，无需指令前缀；请求方发送「cchess.悔棋 拒绝」可撤下请求。").action(async ({ session }, decision) => {
     const { username, userId, channelId } = session;
     await updateNameInPlayerRecord(userId, username);
     if (decision) {
@@ -727,8 +774,8 @@ function apply(ctx, config) {
     }
     if (gameRecord.moveList.length < 1) {
       return await sendMessage(session, panel({
-        icon: "⚠️",
-        title: "棋局初开",
+        icon: "💡",
+        title: "对局初开",
         at: username,
         body: ["一子未落，无悔可言。"]
       }));
@@ -755,15 +802,32 @@ function apply(ctx, config) {
       }));
     }
     await ctx.database.set("cchess_game_records", { channelId }, { isRegretRequest: true });
+    const ticket = (regretTicket.get(channelId) ?? 0) + 1;
+    regretTicket.set(channelId, ticket);
+    ctx.setTimeout(async () => {
+      if (regretTicket.get(channelId) !== ticket) return;
+      const current = await getGameRecord(channelId);
+      if (!current?.isRegretRequest) return;
+      await ctx.database.set("cchess_game_records", { channelId }, { isRegretRequest: false });
+      await sendMessage(session, panel({
+        icon: "⏳",
+        title: "悔棋请求已作罢",
+        body: ["等了 30 秒没有等到答复，请求自动撤回。"],
+        tips: ["发送「cchess.悔棋」可以再提一次。"]
+      }));
+    }, 30 * 1e3);
     return await sendMessage(session, panel({
       icon: "⏳",
       title: "悔棋请求已送出",
       at: username,
-      body: [field("等待答复", withSideIcon(sideString))],
-      tips: ["对方回复「同意」或「拒绝」即可表决"]
+      body: [
+        field("等待答复", withSideIcon(sideString)),
+        "对方回复「同意」或「拒绝」即可表决，30 秒等不到答复会自动作废。"
+      ],
+      tips: ["发送「cchess.悔棋 拒绝」可撤下这次请求"]
     }));
   });
-  ctx.command("cchess.认输", "认输并结束对局").action(async ({ session }) => {
+  ctx.command("cchess.认输", "认输并判对方获胜").action(async ({ session }) => {
     const { username, userId, channelId } = session;
     await updateNameInPlayerRecord(userId, username);
     const gameRecord = await getGameRecord(channelId);
@@ -823,7 +887,7 @@ function apply(ctx, config) {
         session,
         byLose ? "lose" : "win",
         byLose ? "总输场排行榜" : "总胜场排行榜",
-        byLose ? "🍂" : "🏆",
+        "📋",
         size
       );
     }
@@ -842,7 +906,7 @@ function apply(ctx, config) {
         win: 0
       });
       return await sendMessage(session, panel({
-        icon: "🔍",
+        icon: "📋",
         title: "棋士档案",
         at: session.username,
         body: [field("查询对象", username), "尚无对局记录，静待首战。"],
@@ -853,41 +917,39 @@ function apply(ctx, config) {
     const total = win + lose;
     const winRate = total === 0 ? "—" : `${(win / total * 100).toFixed(1)}%`;
     return await sendMessage(session, panel({
-      icon: "🔍",
+      icon: "📋",
       title: "棋士档案",
       at: session.username,
       body: [
         field("查询对象", username),
-        field("胜　场", `${win} 局`),
-        field("负　场", `${lose} 局`),
-        field("总对局", `${total} 局`),
-        field("胜　率", winRate)
+        field("胜　场", `${win} 局`) + "　" + field("负　场", `${lose} 局`),
+        field("总对局", `${total} 局`) + "　" + field("胜　率", winRate)
       ]
     }));
   });
   function notStartedPanel(username) {
     return panel({
-      icon: "⚠️",
-      title: "棋局尚未开始",
+      icon: "💡",
+      title: "对局尚未开始",
       at: username,
       body: ["当前频道还没有进行中的对局。"],
-      tips: ["「cchess.开始」入座并对弈", "「cchess.开始 人机」挑战皮卡鱼"]
+      tips: ["「cchess.开始」入座对弈 · 「cchess.开始 人机」挑战皮卡鱼"]
     });
   }
   __name(notStartedPanel, "notStartedPanel");
   function alreadyStartedPanel(username) {
     return panel({
-      icon: "⚠️",
-      title: "棋局已经开战",
+      icon: "💡",
+      title: "对局已经开战",
       at: username,
       body: ["本局尚未结束，不必重开。"],
-      tips: ["「cchess.认输」结束本局", "「cchess.结束」强制清盘"]
+      tips: ["「cchess.认输」结束本局 · 「cchess.结束」清盘"]
     });
   }
   __name(alreadyStartedPanel, "alreadyStartedPanel");
   function notJoinedPanel(username) {
     return panel({
-      icon: "⚠️",
+      icon: "💡",
       title: "你尚未入座",
       at: username,
       body: ["先入座，才好落子。"],
@@ -895,6 +957,15 @@ function apply(ctx, config) {
     });
   }
   __name(notJoinedPanel, "notJoinedPanel");
+  function busyPanel(username) {
+    return panel({
+      icon: "⏳",
+      title: "对局正在推演",
+      at: username,
+      body: ["上一着棋尚未结算，稍候片刻。"]
+    });
+  }
+  __name(busyPanel, "busyPanel");
   function analyzingPanel(username) {
     return panel({
       icon: "⏳",
@@ -906,7 +977,7 @@ function apply(ctx, config) {
   __name(analyzingPanel, "analyzingPanel");
   function notYourTurnPanel(username, yourSide, currentSide) {
     return panel({
-      icon: "⚠️",
+      icon: "⏳",
       title: "尚未轮到你",
       at: username,
       body: [field("你的阵营", withSideIcon(yourSide)), field("当前轮走", withSideIcon(currentSide))],
@@ -916,11 +987,11 @@ function apply(ctx, config) {
   __name(notYourTurnPanel, "notYourTurnPanel");
   function invalidMovePanel(username, reason) {
     return panel({
-      icon: "❌",
+      icon: "⚠️",
       title: reason,
       at: username,
       body: ["请确认着法是否合乎棋规。"],
-      tips: ["纵线：炮二平五 / 炮8平5", "坐标：b2e2", "详见 https://www.xqbase.com/protocol/cchess_move.htm"]
+      tips: ["纵线：炮二平五 / 炮8平5 · 坐标：b2e2", "详见 https://www.xqbase.com/protocol/cchess_move.htm"]
     });
   }
   __name(invalidMovePanel, "invalidMovePanel");
@@ -937,15 +1008,21 @@ function apply(ctx, config) {
   function invalidLeaderboardSizePanel(username) {
     return panel({
       icon: "⚠️",
-      title: "榜单人数有误",
+      title: "排行榜人数有误",
       at: username,
-      body: ["请输入不小于 0 的整数。"],
-      tips: ["例如：cchess.战绩 榜 10"]
+      body: ["请发送不小于 0 的整数。"],
+      tips: ["发送「cchess.战绩 榜 10」可查询前 10 名"]
     });
   }
   __name(invalidLeaderboardSizePanel, "invalidLeaderboardSizePanel");
   async function renderBoard(channelId) {
-    return import_koishi.h.image(await drawChessBoard(channelId), imageMimeType).toString();
+    if (config.disableImages) return void 0;
+    try {
+      return import_koishi.h.image(await drawChessBoard(channelId), imageMimeType).toString();
+    } catch (error) {
+      logger.warn("棋盘渲染失败，本次只发文本：%s", error.message);
+      return void 0;
+    }
   }
   __name(renderBoard, "renderBoard");
   async function settleVictory(channelId, winSide, loseSide, title, options = {}) {
@@ -963,8 +1040,7 @@ function apply(ctx, config) {
       at,
       body: [
         ...extra,
-        field("胜方", withSideIcon(convertTurnToString(winSide))),
-        field("棋手", winners.length ? winners.map((player) => `@${player.username}`).join("、") : "皮卡鱼")
+        field("胜方", withSideIcon(convertTurnToString(winSide))) + "　" + field("棋手", winners.length ? winners.map((player) => `@${player.username}`).join("、") : "皮卡鱼")
       ],
       tips: ["发送「cchess.开始」再战一局"],
       image
@@ -1005,8 +1081,7 @@ function apply(ctx, config) {
       body: [
         field("棋　手", withSideIcon(humanSide)),
         field("皮卡鱼", withSideIcon(engineSide)),
-        field("先　手", withSideIcon(sideString)),
-        field("思考深度", `${thinkingDepth} 层`)
+        field("先　手", withSideIcon(sideString)) + "　" + field("思考深度", `${thinkingDepth} 层`)
       ],
       tips: ["直接发送着法即可落子，如「炮二平五」或「b2e2」"],
       image: await renderBoard(channelId)
@@ -1031,6 +1106,15 @@ function apply(ctx, config) {
     if (playerRecord.length === 0) return await sendMessage(session, notJoinedPanel(username));
     const sideString = convertTurnToString(gameRecord.turn);
     if (playerRecord[0].side !== sideString) {
+      if (!agree) {
+        await ctx.database.set("cchess_game_records", { channelId }, { isRegretRequest: false });
+        return await sendMessage(session, panel({
+          icon: "✅",
+          title: "悔棋请求已撤下",
+          at: username,
+          body: ["对局继续，落子无悔。"]
+        }));
+      }
       return await sendMessage(session, panel({
         icon: "⚠️",
         title: "无权表决",
@@ -1044,7 +1128,7 @@ function apply(ctx, config) {
         icon: "⚠️",
         title: "悔棋被拒",
         at: username,
-        body: ["落子无悔，棋局继续。"],
+        body: ["落子无悔，对局继续。"],
         image: await renderBoard(channelId)
       }));
     }
@@ -1109,8 +1193,8 @@ function apply(ctx, config) {
     return await sendMessage(session, panel({
       icon,
       title,
-      body: topPlayers.length ? topPlayers.map((player, index) => `${MEDALS[index] ?? `${index + 1}.`} ${player.username}　${player[sortField]} 局`) : ["榜上尚无名姓，快去手谈一局。"],
-      tips: topPlayers.length ? [] : ["发送「cchess.开始」开启对局"]
+      body: topPlayers.length ? topPlayers.map((player, index) => `${MEDALS[index] ?? `${index + 1}.`} ${player.username}　${player[sortField]} 局`) : ["榜上尚无名姓。", "第一局分出胜负，名字就会写在这里。"],
+      tips: topPlayers.length ? [] : ["发送「cchess.开始」开启一局"]
     }));
   }
   __name(getLeaderboard, "getLeaderboard");
@@ -1632,23 +1716,25 @@ function apply(ctx, config) {
     const rowAt = /* @__PURE__ */ __name((row) => FRAME_BOARD.y + (row * CELL_WIDTH + BOARD_PADDING) * FRAME_ZOOM, "rowAt");
     context.textAlign = "center";
     context.textBaseline = "middle";
-    const label = /* @__PURE__ */ __name((text, x, y, size, color) => {
-      context.font = `600 ${size}px ${FONT_STACK}`;
+    const labelFont = `${EMPHASIZED_WEIGHT.title} ${TYPE.titleLarge.size}px ${FONT_STACK}`;
+    const labelSideFont = `${EMPHASIZED_WEIGHT.headline} ${TYPE.headlineSmall.size}px ${FONT_STACK}`;
+    const label = /* @__PURE__ */ __name((text, x, y, font, color) => {
+      context.font = font;
       context.fillStyle = color;
       context.fillText(text, x, y);
     }, "label");
     for (let col = 0; col < 9; col++) {
       const x = columnAt(isFlipBoard ? 8 - col : col);
-      label(FILES[col], x, 30, 22, FRAME.onSurfaceVariant);
-      label(String(col + 1), x, 64, 22, FRAME.onSurfaceVariant);
-      label(RED_FILES[col], x, FRAME_HEIGHT - 62, 24, FRAME.onSurfaceVariant);
-      label(FILES[col], x, FRAME_HEIGHT - 26, 22, FRAME.onSurfaceVariant);
+      label(FILES[col], x, 30, labelFont, FRAME.onSurfaceVariant);
+      label(String(col + 1), x, 64, labelFont, FRAME.onSurfaceVariant);
+      label(RED_FILES[col], x, FRAME_HEIGHT - 62, labelSideFont, FRAME.onSurfaceVariant);
+      label(FILES[col], x, FRAME_HEIGHT - 26, labelFont, FRAME.onSurfaceVariant);
     }
     for (let row = 0; row < 10; row++) {
       const y = rowAt(isFlipBoard ? 9 - row : row);
       const text = String(9 - row);
-      label(text, 19, y, 22, FRAME.onSurfaceVariant);
-      label(text, FRAME_WIDTH - 19, y, 22, FRAME.onSurfaceVariant);
+      label(text, 19, y, labelFont, FRAME.onSurfaceVariant);
+      label(text, FRAME_WIDTH - 19, y, labelFont, FRAME.onSurfaceVariant);
     }
     return canvas.toBuffer(imageMimeType);
   }
@@ -2132,7 +2218,7 @@ function apply(ctx, config) {
     }
   }
   __name(drawChessBoard, "drawChessBoard");
-  async function drawLineArrow(ctx2, fromX, fromY, toX, toY, color = "black", headSize = 20) {
+  async function drawLineArrow(ctx2, fromX, fromY, toX, toY, color = FRAME.onSurface, headSize = 20) {
     var angle = Math.atan2(toY - fromY, toX - fromX);
     var headAngle = 45 * Math.PI / 180;
     ctx2.beginPath();

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-cchess",
   "description": "Koishi 的中国象棋插件。",
-  "version": "2.0.1",
+  "version": "2.2.0",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "files": [