From 4d26ec737bfb5e68e46ee8c244d63b0c0999b258 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=89=8B=E7=93=9C=E4=B8=80=E5=8D=81=E9=9B=AA?= Date: Wed, 26 Mar 2025 12:32:54 +0800 Subject: [PATCH] fix --- src/plugin/drawTime.ts | 2 +- src/shell/drawJson.ts | 2 +- src/shell/napcat.ts | 11 ++++++----- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/plugin/drawTime.ts b/src/plugin/drawTime.ts index db0343f2..65a96bb7 100644 --- a/src/plugin/drawTime.ts +++ b/src/plugin/drawTime.ts @@ -43,7 +43,7 @@ export async function drawTimePattern(data: { const ctx = canvas.getContext('2d'); // 加载背景图 - const backgroundImage = await loadImage(path.join(current_path,'.\\fonts\\post.jpg')); + const backgroundImage = await loadImage(path.join(current_path,'./fonts/post.jpg')); const pattern = ctx.createPattern(backgroundImage, 'repeat'); ctx.fillStyle = pattern; ctx.fillRect(0, 0, width, height); diff --git a/src/shell/drawJson.ts b/src/shell/drawJson.ts index e063e74e..739ddf07 100644 --- a/src/shell/drawJson.ts +++ b/src/shell/drawJson.ts @@ -29,7 +29,7 @@ export async function drawJsonContent(jsonContent: string) { const finalCanvas = createCanvas(width, height); const finalCtx = finalCanvas.getContext('2d'); - const backgroundImage = await loadImage(path.join(current_path,'.\\fonts\\post.jpg')); + const backgroundImage = await loadImage(path.join(current_path,'./fonts/post.jpg')); const pattern = finalCtx.createPattern(backgroundImage, 'repeat'); finalCtx.fillStyle = pattern; finalCtx.fillRect(0, 0, width, height); diff --git a/src/shell/napcat.ts b/src/shell/napcat.ts index 0c719ecf..0ac9d185 100644 --- a/src/shell/napcat.ts +++ b/src/shell/napcat.ts @@ -1,9 +1,10 @@ -import { dirname, join } from 'node:path'; + import { NCoreInitShell } from './base'; import { GlobalFonts } from '@napi-rs/canvas'; -import { fileURLToPath } from 'node:url'; +import { current_path } from '@/plugin/data'; +import path from 'path'; -let current_path = dirname(fileURLToPath(import.meta.url)); -GlobalFonts.registerFromPath(join(current_path, '.\\fonts\\JetBrainsMono.ttf'), 'JetBrains Mono'); -GlobalFonts.registerFromPath(join(current_path, '.\\fonts\\AaCute.ttf', 'Aa偷吃可爱长大的')); +GlobalFonts.registerFromPath(path.join(current_path, './fonts/JetBrainsMono.ttf'), 'JetBrains Mono'); +GlobalFonts.registerFromPath(path.join(current_path, './fonts/AaCute.ttf'), 'Aa偷吃可爱长大的'); +console.log('字体注册完成'); NCoreInitShell(); \ No newline at end of file