diff --git a/package.json b/package.json index 738cd03..1a3ccb4 100644 --- a/package.json +++ b/package.json @@ -46,6 +46,7 @@ "prettier": "3.2.5", "rimraf": "^5.0.5", "sort-package-json": "^2.8.0", + "tianjie": "^0.0.12", "typedoc": "0.25.9", "typedoc-plugin-markdown": "3.17.1", "typescript": "^5.3.3", diff --git a/packages/oh-my-live2d/package.json b/packages/oh-my-live2d/package.json index 88b57a2..e2a1898 100644 --- a/packages/oh-my-live2d/package.json +++ b/packages/oh-my-live2d/package.json @@ -38,7 +38,6 @@ "csstype": "^3.1.3", "pixi-live2d-display": "0.4.0", "pixi.js": "6.5.10", - "tianjie": "^0.0.11", "vite": "5.1.4" } } diff --git a/packages/oh-my-live2d/src/modules/index.ts b/packages/oh-my-live2d/src/modules/index.ts index 851914a..54d0d32 100644 --- a/packages/oh-my-live2d/src/modules/index.ts +++ b/packages/oh-my-live2d/src/modules/index.ts @@ -42,7 +42,7 @@ export class OhMyLive2D { initialize(): void { this.verifyWindowSizeType(); if (this.windowSizeType !== WindowSizeType.pc) { - this.statusBar.popup('暂不支持移动端', SystemState.info, 8000); + this.statusBar.popup('看板娘休息中', SystemState.info, 8000); return; } @@ -94,7 +94,7 @@ export class OhMyLive2D { }); } - setStageStyle(style: Record): void { + setStageStyle(style: Record): void { handleStyleSize(style); this.stage.setStyle(style); this.application.resize(); @@ -196,7 +196,7 @@ export class OhMyLive2D { export const setup = (loadMethod: LoadMethod): ((options: Options) => Promise) => { let oml2d; - const loadOml2d = async (options: Options) => { + const loadOml2d = async (options: Options): Promise => { const { parentElement } = options; const finalOptions = mergeDeep(DEFAULT_OPTIONS, options); diff --git a/packages/oh-my-live2d/src/modules/tips.ts b/packages/oh-my-live2d/src/modules/tips.ts index 4ccd9ae..8c0020f 100644 --- a/packages/oh-my-live2d/src/modules/tips.ts +++ b/packages/oh-my-live2d/src/modules/tips.ts @@ -1,4 +1,4 @@ -import { getRandomElement, isFunction, mergeDeep, setIntervalAsync } from 'tianjie'; +import { getRandomArrayItem, isFunction, mergeDeep, setIntervalAsync } from 'tianjie'; import { CONFIG } from '../config/index.js'; import type { IdleTimer } from '../types/common.js'; @@ -139,10 +139,10 @@ export class Tips { * 复制时提示 */ copy(): void { - if (this.tipsOptions.copyTips?.message?.length) { - const messageText = getRandomElement(this.tipsOptions.copyTips.message); + if (this.tipsOptions.copyTips.message.length) { + const messageText = getRandomArrayItem(this.tipsOptions.copyTips.message) || ''; - this.notification(messageText!, this.tipsOptions.copyTips.duration, this.tipsOptions.copyTips.priority); + this.notification(messageText, this.tipsOptions.copyTips.duration, this.tipsOptions.copyTips.priority); } } @@ -168,7 +168,7 @@ export class Tips { if (isFunction(messages)) { message = await messages(); } else { - message = getRandomElement(messages || []) || ''; + message = getRandomArrayItem(messages || []) || ''; } } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 078d58e..1a98c44 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -65,6 +65,9 @@ importers: sort-package-json: specifier: ^2.8.0 version: 2.8.0 + tianjie: + specifier: ^0.0.12 + version: 0.0.12 typedoc: specifier: 0.25.9 version: 0.25.9(typescript@5.3.3) @@ -101,9 +104,6 @@ importers: pixi.js: specifier: 6.5.10 version: 6.5.10 - tianjie: - specifier: ^0.0.11 - version: 0.0.11 vite: specifier: 5.1.4 version: 5.1.4 @@ -6327,8 +6327,8 @@ packages: resolution: {integrity: sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==} dev: true - /tianjie@0.0.11: - resolution: {integrity: sha512-DmRriexBHYilDCHoqteD/ZtU5T0FLktE6qF0I1ccjyTLy6qAk1JuSjJqT6RHTXqXKA96I+J81VOGTaZzSag2yA==} + /tianjie@0.0.12: + resolution: {integrity: sha512-iXVc4RfoW1rTCBrOaAvSt3YpmsBnH6otDYSS0Y5IwvQnY0kQ1WWhpfN613vCjkrJQi7fvQxpaDdK0AXGUy8OwQ==} dev: true /tmp@0.0.33: