From 9cbe501ae2e782c4ab4a21196a2222970252e22e Mon Sep 17 00:00:00 2001 From: sunlei Date: Fri, 5 Jun 2026 20:11:13 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=20Tsugu=20=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E5=B8=83=E5=B1=80=E8=BF=90=E8=A1=8C=E6=9C=9F=E5=AF=BC?= =?UTF-8?q?=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/qqbot/plugins/bangDream/tsugu/layout/list/attribute.ts | 2 +- src/qqbot/plugins/bangDream/tsugu/layout/list/band-detail.ts | 4 ++-- src/qqbot/plugins/bangDream/tsugu/layout/list/band.ts | 2 +- .../plugins/bangDream/tsugu/layout/list/card-icon-list.ts | 2 +- .../plugins/bangDream/tsugu/layout/list/card-sd-character.ts | 2 +- .../plugins/bangDream/tsugu/layout/list/character-detail.ts | 2 +- src/qqbot/plugins/bangDream/tsugu/layout/list/character.ts | 2 +- src/qqbot/plugins/bangDream/tsugu/layout/list/degree-list.ts | 2 +- .../plugins/bangDream/tsugu/layout/list/difficulty-detail.ts | 2 +- src/qqbot/plugins/bangDream/tsugu/layout/list/event-stage.ts | 2 +- .../bangDream/tsugu/layout/list/gacha-payment-method.ts | 2 +- .../plugins/bangDream/tsugu/layout/list/gacha-pick-up.ts | 4 ++-- src/qqbot/plugins/bangDream/tsugu/layout/list/gacha-rate.ts | 4 ++-- .../bangDream/tsugu/layout/list/player-card-icon-list.ts | 2 +- src/qqbot/plugins/bangDream/tsugu/layout/list/rarity.ts | 2 +- src/qqbot/plugins/bangDream/tsugu/layout/list/skill.ts | 5 +---- src/qqbot/plugins/bangDream/tsugu/layout/list/song.ts | 5 +---- src/qqbot/plugins/bangDream/tsugu/layout/list/stat.ts | 2 +- src/qqbot/plugins/bangDream/tsugu/layout/list/time.ts | 2 +- 19 files changed, 22 insertions(+), 28 deletions(-) diff --git a/src/qqbot/plugins/bangDream/tsugu/layout/list/attribute.ts b/src/qqbot/plugins/bangDream/tsugu/layout/list/attribute.ts index ad05e2d..a2bd498 100644 --- a/src/qqbot/plugins/bangDream/tsugu/layout/list/attribute.ts +++ b/src/qqbot/plugins/bangDream/tsugu/layout/list/attribute.ts @@ -1,5 +1,5 @@ import { Attribute } from '@/qqbot/plugins/bangDream/tsugu/domain/attribute'; -import { drawList } from '@/qqbot/plugins/bangDream/tsugu/layout/list'; +import { drawList } from '../list'; import { Canvas, Image } from 'skia-canvas'; interface AttributeInListOptions { diff --git a/src/qqbot/plugins/bangDream/tsugu/layout/list/band-detail.ts b/src/qqbot/plugins/bangDream/tsugu/layout/list/band-detail.ts index acc6f06..dbe7777 100644 --- a/src/qqbot/plugins/bangDream/tsugu/layout/list/band-detail.ts +++ b/src/qqbot/plugins/bangDream/tsugu/layout/list/band-detail.ts @@ -1,10 +1,10 @@ import { Player } from '@/qqbot/plugins/bangDream/tsugu/domain/player'; import { Canvas, Image } from 'skia-canvas'; -import { drawList } from '@/qqbot/plugins/bangDream/tsugu/layout/list'; +import { drawList } from '../list'; import { resizeImage } from '@/qqbot/plugins/bangDream/tsugu/layout/utils'; import { Band } from '@/qqbot/plugins/bangDream/tsugu/domain/band'; import { drawTextWithImages } from '@/qqbot/plugins/bangDream/tsugu/graphics/text'; -import { starList } from '@/qqbot/plugins/bangDream/tsugu/layout/list/rarity'; +import { starList } from './rarity'; import mainAPI from '@/qqbot/plugins/bangDream/tsugu/domain/main-api'; import { bestdoriUrl } from '@/qqbot/plugins/bangDream/tsugu/runtime/tsugu-config'; import { assetsRootPath } from '@/qqbot/plugins/bangDream/tsugu/runtime/tsugu-config'; diff --git a/src/qqbot/plugins/bangDream/tsugu/layout/list/band.ts b/src/qqbot/plugins/bangDream/tsugu/layout/list/band.ts index 2a1f1ed..f05125a 100644 --- a/src/qqbot/plugins/bangDream/tsugu/layout/list/band.ts +++ b/src/qqbot/plugins/bangDream/tsugu/layout/list/band.ts @@ -1,6 +1,6 @@ import { Band } from '@/qqbot/plugins/bangDream/tsugu/domain/band'; import { getServerByPriority } from '@/qqbot/plugins/bangDream/tsugu/domain/server'; -import { drawList } from '@/qqbot/plugins/bangDream/tsugu/layout/list'; +import { drawList } from '../list'; import { Canvas, Image } from 'skia-canvas'; interface BandInListOptions { diff --git a/src/qqbot/plugins/bangDream/tsugu/layout/list/card-icon-list.ts b/src/qqbot/plugins/bangDream/tsugu/layout/list/card-icon-list.ts index d73086d..0bf874e 100644 --- a/src/qqbot/plugins/bangDream/tsugu/layout/list/card-icon-list.ts +++ b/src/qqbot/plugins/bangDream/tsugu/layout/list/card-icon-list.ts @@ -1,4 +1,4 @@ -import { drawList } from '@/qqbot/plugins/bangDream/tsugu/layout/list'; +import { drawList } from '../list'; import { Canvas } from 'skia-canvas'; import { drawCardIcon } from '@/qqbot/plugins/bangDream/tsugu/layout/card'; import { Card } from '@/qqbot/plugins/bangDream/tsugu/domain/card'; diff --git a/src/qqbot/plugins/bangDream/tsugu/layout/list/card-sd-character.ts b/src/qqbot/plugins/bangDream/tsugu/layout/list/card-sd-character.ts index 4fb0ad7..8e7fd44 100644 --- a/src/qqbot/plugins/bangDream/tsugu/layout/list/card-sd-character.ts +++ b/src/qqbot/plugins/bangDream/tsugu/layout/list/card-sd-character.ts @@ -1,7 +1,7 @@ import { Costume } from '@/qqbot/plugins/bangDream/tsugu/domain/costume'; import { Card } from '@/qqbot/plugins/bangDream/tsugu/domain/card'; import { Canvas } from 'skia-canvas'; -import { drawList } from '@/qqbot/plugins/bangDream/tsugu/layout/list'; +import { drawList } from '../list'; export async function drawSdCharacterInList(card: Card): Promise { const costumeId = card.costumeId; diff --git a/src/qqbot/plugins/bangDream/tsugu/layout/list/character-detail.ts b/src/qqbot/plugins/bangDream/tsugu/layout/list/character-detail.ts index 368e4bf..4c9d441 100644 --- a/src/qqbot/plugins/bangDream/tsugu/layout/list/character-detail.ts +++ b/src/qqbot/plugins/bangDream/tsugu/layout/list/character-detail.ts @@ -1,6 +1,6 @@ import { Player } from '@/qqbot/plugins/bangDream/tsugu/domain/player'; import { Canvas, Image } from 'skia-canvas'; -import { drawList } from '@/qqbot/plugins/bangDream/tsugu/layout/list'; +import { drawList } from '../list'; import { resizeImage } from '@/qqbot/plugins/bangDream/tsugu/layout/utils'; import { drawTextWithImages } from '@/qqbot/plugins/bangDream/tsugu/graphics/text'; import { Character } from '@/qqbot/plugins/bangDream/tsugu/domain/character'; diff --git a/src/qqbot/plugins/bangDream/tsugu/layout/list/character.ts b/src/qqbot/plugins/bangDream/tsugu/layout/list/character.ts index 4a6f539..89ce9fd 100644 --- a/src/qqbot/plugins/bangDream/tsugu/layout/list/character.ts +++ b/src/qqbot/plugins/bangDream/tsugu/layout/list/character.ts @@ -4,7 +4,7 @@ import { Server, getServerByPriority, } from '@/qqbot/plugins/bangDream/tsugu/domain/server'; -import { drawList } from '@/qqbot/plugins/bangDream/tsugu/layout/list'; +import { drawList } from '../list'; import { Canvas, Image } from 'skia-canvas'; interface CharacterInListOptions { diff --git a/src/qqbot/plugins/bangDream/tsugu/layout/list/degree-list.ts b/src/qqbot/plugins/bangDream/tsugu/layout/list/degree-list.ts index 0ef1336..99538a7 100644 --- a/src/qqbot/plugins/bangDream/tsugu/layout/list/degree-list.ts +++ b/src/qqbot/plugins/bangDream/tsugu/layout/list/degree-list.ts @@ -1,4 +1,4 @@ -import { drawList } from '@/qqbot/plugins/bangDream/tsugu/layout/list'; +import { drawList } from '../list'; import { Canvas } from 'skia-canvas'; import { drawDegree } from '@/qqbot/plugins/bangDream/tsugu/layout/degree'; import { Degree } from '@/qqbot/plugins/bangDream/tsugu/domain/degree'; diff --git a/src/qqbot/plugins/bangDream/tsugu/layout/list/difficulty-detail.ts b/src/qqbot/plugins/bangDream/tsugu/layout/list/difficulty-detail.ts index 6b822c1..0c23d8e 100644 --- a/src/qqbot/plugins/bangDream/tsugu/layout/list/difficulty-detail.ts +++ b/src/qqbot/plugins/bangDream/tsugu/layout/list/difficulty-detail.ts @@ -5,7 +5,7 @@ import { import { drawRoundedRectWithText } from '@/qqbot/plugins/bangDream/tsugu/graphics/draw-rect'; import { Canvas, Image } from 'skia-canvas'; import { drawTextWithImages } from '@/qqbot/plugins/bangDream/tsugu/graphics/text'; -import { drawList } from '@/qqbot/plugins/bangDream/tsugu/layout/list'; +import { drawList } from '../list'; import { Player } from '@/qqbot/plugins/bangDream/tsugu/domain/player'; interface drawDifficultyDetailInListOptions { diff --git a/src/qqbot/plugins/bangDream/tsugu/layout/list/event-stage.ts b/src/qqbot/plugins/bangDream/tsugu/layout/list/event-stage.ts index ffe18bd..7fee629 100644 --- a/src/qqbot/plugins/bangDream/tsugu/layout/list/event-stage.ts +++ b/src/qqbot/plugins/bangDream/tsugu/layout/list/event-stage.ts @@ -11,7 +11,7 @@ import { } from '@/qqbot/plugins/bangDream/tsugu/domain/song'; import { Canvas, Image, FontLibrary } from 'skia-canvas'; import { assetsRootPath } from '@/qqbot/plugins/bangDream/tsugu/runtime/tsugu-config'; -import { formatTime } from '@/qqbot/plugins/bangDream/tsugu/layout/list/time'; +import { formatTime } from './time'; import { setFontStyle } from '@/qqbot/plugins/bangDream/tsugu/graphics/text'; import { stackImageHorizontal } from '../utils'; import { loadImageFromPath } from '@/qqbot/plugins/bangDream/tsugu/graphics/utils'; diff --git a/src/qqbot/plugins/bangDream/tsugu/layout/list/gacha-payment-method.ts b/src/qqbot/plugins/bangDream/tsugu/layout/list/gacha-payment-method.ts index 194a307..7ce94cf 100644 --- a/src/qqbot/plugins/bangDream/tsugu/layout/list/gacha-payment-method.ts +++ b/src/qqbot/plugins/bangDream/tsugu/layout/list/gacha-payment-method.ts @@ -1,4 +1,4 @@ -import { drawList } from '@/qqbot/plugins/bangDream/tsugu/layout/list'; +import { drawList } from '../list'; import { Gacha } from '@/qqbot/plugins/bangDream/tsugu/domain/gacha'; import { Server } from '@/qqbot/plugins/bangDream/tsugu/domain/server'; import { Item } from '@/qqbot/plugins/bangDream/tsugu/domain/item'; diff --git a/src/qqbot/plugins/bangDream/tsugu/layout/list/gacha-pick-up.ts b/src/qqbot/plugins/bangDream/tsugu/layout/list/gacha-pick-up.ts index b4f3d4d..8bb9818 100644 --- a/src/qqbot/plugins/bangDream/tsugu/layout/list/gacha-pick-up.ts +++ b/src/qqbot/plugins/bangDream/tsugu/layout/list/gacha-pick-up.ts @@ -1,7 +1,7 @@ import { Gacha } from '@/qqbot/plugins/bangDream/tsugu/domain/gacha'; import { Server } from '@/qqbot/plugins/bangDream/tsugu/domain/server'; -import { drawList } from '@/qqbot/plugins/bangDream/tsugu/layout/list'; -import { drawCardListInList } from '@/qqbot/plugins/bangDream/tsugu/layout/list/card-icon-list'; +import { drawList } from '../list'; +import { drawCardListInList } from './card-icon-list'; import { Card } from '@/qqbot/plugins/bangDream/tsugu/domain/card'; import { stackImage } from '@/qqbot/plugins/bangDream/tsugu/layout/utils'; import { Canvas } from 'skia-canvas'; diff --git a/src/qqbot/plugins/bangDream/tsugu/layout/list/gacha-rate.ts b/src/qqbot/plugins/bangDream/tsugu/layout/list/gacha-rate.ts index 0c2048e..bc0e3fe 100644 --- a/src/qqbot/plugins/bangDream/tsugu/layout/list/gacha-rate.ts +++ b/src/qqbot/plugins/bangDream/tsugu/layout/list/gacha-rate.ts @@ -1,9 +1,9 @@ -import { drawRarityInList } from '@/qqbot/plugins/bangDream/tsugu/layout/list/rarity'; +import { drawRarityInList } from './rarity'; import { Gacha } from '@/qqbot/plugins/bangDream/tsugu/domain/gacha'; import { Server } from '@/qqbot/plugins/bangDream/tsugu/domain/server'; import { stackImage } from '@/qqbot/plugins/bangDream/tsugu/layout/utils'; import { Canvas } from 'skia-canvas'; -import { drawList } from '@/qqbot/plugins/bangDream/tsugu/layout/list'; +import { drawList } from '../list'; export async function drawGachaRateInList( gacha: Gacha, diff --git a/src/qqbot/plugins/bangDream/tsugu/layout/list/player-card-icon-list.ts b/src/qqbot/plugins/bangDream/tsugu/layout/list/player-card-icon-list.ts index 2cd35d1..44eab5c 100644 --- a/src/qqbot/plugins/bangDream/tsugu/layout/list/player-card-icon-list.ts +++ b/src/qqbot/plugins/bangDream/tsugu/layout/list/player-card-icon-list.ts @@ -2,7 +2,7 @@ import { Card } from '@/qqbot/plugins/bangDream/tsugu/domain/card'; import { Player } from '@/qqbot/plugins/bangDream/tsugu/domain/player'; import { Canvas } from 'skia-canvas'; import { drawCardIcon } from '@/qqbot/plugins/bangDream/tsugu/layout/card'; -import { drawList } from '@/qqbot/plugins/bangDream/tsugu/layout/list'; +import { drawList } from '../list'; export async function drawPlayerCardInList( player: Player, diff --git a/src/qqbot/plugins/bangDream/tsugu/layout/list/rarity.ts b/src/qqbot/plugins/bangDream/tsugu/layout/list/rarity.ts index bcdb565..e29184f 100644 --- a/src/qqbot/plugins/bangDream/tsugu/layout/list/rarity.ts +++ b/src/qqbot/plugins/bangDream/tsugu/layout/list/rarity.ts @@ -1,5 +1,5 @@ import { Canvas, Image } from 'skia-canvas'; -import { drawList } from '@/qqbot/plugins/bangDream/tsugu/layout/list'; +import { drawList } from '../list'; import { assetsRootPath } from '@/qqbot/plugins/bangDream/tsugu/runtime/tsugu-config'; import * as path from 'path'; import { loadImageFromPath } from '@/qqbot/plugins/bangDream/tsugu/graphics/utils'; diff --git a/src/qqbot/plugins/bangDream/tsugu/layout/list/skill.ts b/src/qqbot/plugins/bangDream/tsugu/layout/list/skill.ts index b2aa583..bb46f23 100644 --- a/src/qqbot/plugins/bangDream/tsugu/layout/list/skill.ts +++ b/src/qqbot/plugins/bangDream/tsugu/layout/list/skill.ts @@ -3,10 +3,7 @@ import { Server, getServerByPriority, } from '@/qqbot/plugins/bangDream/tsugu/domain/server'; -import { - drawTipsInList, - drawListByServerList, -} from '@/qqbot/plugins/bangDream/tsugu/layout/list'; +import { drawTipsInList, drawListByServerList } from '../list'; import { stackImage } from '@/qqbot/plugins/bangDream/tsugu/layout/utils'; import { Canvas } from 'skia-canvas'; import { Card } from '@/qqbot/plugins/bangDream/tsugu/domain/card'; diff --git a/src/qqbot/plugins/bangDream/tsugu/layout/list/song.ts b/src/qqbot/plugins/bangDream/tsugu/layout/list/song.ts index f83d852..bb8056d 100644 --- a/src/qqbot/plugins/bangDream/tsugu/layout/list/song.ts +++ b/src/qqbot/plugins/bangDream/tsugu/layout/list/song.ts @@ -7,10 +7,7 @@ import { import { Song } from '@/qqbot/plugins/bangDream/tsugu/domain/song'; import { drawText } from '@/qqbot/plugins/bangDream/tsugu/graphics/text'; import { resizeImage } from '@/qqbot/plugins/bangDream/tsugu/layout/utils'; -import { - drawDifficultyList, - drawDifficulty, -} from '@/qqbot/plugins/bangDream/tsugu/layout/list/difficulty'; +import { drawDifficultyList, drawDifficulty } from './difficulty'; import { globalDefaultServer } from '@/qqbot/plugins/bangDream/tsugu/runtime/tsugu-config'; import { drawList } from '../list'; import { drawDottedLine } from '@/qqbot/plugins/bangDream/tsugu/graphics/dotted-line'; diff --git a/src/qqbot/plugins/bangDream/tsugu/layout/list/stat.ts b/src/qqbot/plugins/bangDream/tsugu/layout/list/stat.ts index a5082df..f06c118 100644 --- a/src/qqbot/plugins/bangDream/tsugu/layout/list/stat.ts +++ b/src/qqbot/plugins/bangDream/tsugu/layout/list/stat.ts @@ -1,6 +1,6 @@ import { Canvas } from 'skia-canvas'; import { drawText } from '@/qqbot/plugins/bangDream/tsugu/graphics/text'; -import { drawList } from '@/qqbot/plugins/bangDream/tsugu/layout/list'; +import { drawList } from '../list'; import { stackImage } from '@/qqbot/plugins/bangDream/tsugu/layout/utils'; import { drawRoundedRect } from '@/qqbot/plugins/bangDream/tsugu/graphics/draw-rect'; import { diff --git a/src/qqbot/plugins/bangDream/tsugu/layout/list/time.ts b/src/qqbot/plugins/bangDream/tsugu/layout/list/time.ts index b47f6b4..511a2cc 100644 --- a/src/qqbot/plugins/bangDream/tsugu/layout/list/time.ts +++ b/src/qqbot/plugins/bangDream/tsugu/layout/list/time.ts @@ -4,7 +4,7 @@ import { Server, getServerByName, } from '@/qqbot/plugins/bangDream/tsugu/domain/server'; -import { drawListByServerList } from '@/qqbot/plugins/bangDream/tsugu/layout/list'; +import { drawListByServerList } from '../list'; import { Canvas } from 'skia-canvas'; import { Event } from '@/qqbot/plugins/bangDream/tsugu/domain/event'; import mainAPI from '@/qqbot/plugins/bangDream/tsugu/domain/main-api';