From 151331e36d660359f1b85a24eda1758105eb876d Mon Sep 17 00:00:00 2001 From: bbaban <3102509561@qq.com> Date: Sat, 19 Aug 2023 19:48:02 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- plugins/genshin/apps/calculator.js | 2 +- plugins/genshin/apps/dailyNote.js | 2 +- plugins/genshin/apps/gcLog.js | 8 ++++---- plugins/genshin/apps/ledger.js | 6 +++--- plugins/genshin/model/base.js | 8 +++++--- 5 files changed, 14 insertions(+), 12 deletions(-) diff --git a/plugins/genshin/apps/calculator.js b/plugins/genshin/apps/calculator.js index f3312e7..084224e 100644 --- a/plugins/genshin/apps/calculator.js +++ b/plugins/genshin/apps/calculator.js @@ -66,7 +66,7 @@ export class calculator extends plugin { if (!data) return /** 生成图片 */ - let img = await puppeteer.screenshot(this.e.isSr ?'StarRail/calculator':'calculator', data) + let img = await puppeteer.screenshot(`${data.srtempFile}calculator`, data) if (img) await this.reply(img) } } diff --git a/plugins/genshin/apps/dailyNote.js b/plugins/genshin/apps/dailyNote.js index bc71be3..4224e50 100644 --- a/plugins/genshin/apps/dailyNote.js +++ b/plugins/genshin/apps/dailyNote.js @@ -27,7 +27,7 @@ export class dailyNote extends plugin { if (!data) return /** 生成图片 */ - let img = await puppeteer.screenshot(this.e.isSr ? 'StarRail/dailyNote' : 'dailyNote', data) + let img = await puppeteer.screenshot(`${data.srtempFile}dailyNote`, data) if (img) await this.reply(img) } diff --git a/plugins/genshin/apps/gcLog.js b/plugins/genshin/apps/gcLog.js index e1c3539..5a56f64 100644 --- a/plugins/genshin/apps/gcLog.js +++ b/plugins/genshin/apps/gcLog.js @@ -98,7 +98,7 @@ export class gcLog extends plugin { let data = await new GachaLog(this.e).logUrl() if (!data) return - let img = await puppeteer.screenshot(this.e.isSr ? 'StarRail/gachaLog' : 'gachaLog', data) + let img = await puppeteer.screenshot(`${data.srtempFile}gachaLog`, data) if (img) await this.reply(img) } @@ -121,7 +121,7 @@ export class gcLog extends plugin { if (typeof data != 'object') return - let img = await puppeteer.screenshot(this.e.isSr ? 'StarRail/gachaLog' : 'gachaLog', data) + let img = await puppeteer.screenshot(`${data.srtempFile}gachaLog`, data) if (img) await this.reply(img) } @@ -130,7 +130,7 @@ export class gcLog extends plugin { let data = await new GachaLog(this.e).getLogData() if (!data) return - let img = await puppeteer.screenshot(this.e.isSr ? 'StarRail/gachaLog' : 'gachaLog', data) + let img = await puppeteer.screenshot(`${data.srtempFile}gachaLog`, data) if (img) await this.reply(img) } @@ -204,7 +204,7 @@ export class gcLog extends plugin { let data = await new LogCount(this.e).count() if (!data) return - let img = await puppeteer.screenshot(this.e.isSr ? 'StarRail/logCount' : 'logCount', data) + let img = await puppeteer.screenshot(`${data.srtempFile}logCount`, data) if (img) await this.reply(img) } } diff --git a/plugins/genshin/apps/ledger.js b/plugins/genshin/apps/ledger.js index 3323fb3..d6d30e9 100644 --- a/plugins/genshin/apps/ledger.js +++ b/plugins/genshin/apps/ledger.js @@ -47,7 +47,7 @@ export class ledger extends plugin { if (!data) return /** 生成图片 */ - let img = await puppeteer.screenshot(this.e.isSr ?'StarRail/ledger':'ledger', data) + let img = await puppeteer.screenshot(`${data.srtempFile}ledger`, data) if (img) await this.reply(img) } @@ -62,7 +62,7 @@ export class ledger extends plugin { if (!data) return /** 生成图片 */ - let img = await puppeteer.screenshot(this.e.isSr ?'StarRail/ledgerCount':'ledgerCount', data) + let img = await puppeteer.screenshot(`${data.srtempFile}ledgerCount`, data) if (img) await this.reply(img) } @@ -71,7 +71,7 @@ export class ledger extends plugin { if (!data) return /** 生成图片 */ - let img = await puppeteer.screenshot(this.e.isSr ? 'StarRail/ledgerCount' : 'ledgerCount', data) + let img = await puppeteer.screenshot(`${data.srtempFile}ledgerCount`, data) if (img) await this.reply(img) } } diff --git a/plugins/genshin/model/base.js b/plugins/genshin/model/base.js index 78a8080..cde7dbf 100644 --- a/plugins/genshin/model/base.js +++ b/plugins/genshin/model/base.js @@ -20,14 +20,15 @@ export default class base { get screenData() { let headImg = '林尼' - if(this.e?.isSr) + if (this.e?.isSr) return { saveId: this.userId, cwd: this._path, tplFile: `./plugins/genshin/resources/StarRail/html/${this.model}/${this.model}.html`, /** 绝对路径 */ pluResPath: `${this._path}/plugins/genshin/resources/StarRail/`, - headStyle: `` + headStyle: ``, + srtempFile: 'StarRail/' } return { @@ -36,7 +37,8 @@ export default class base { tplFile: `./plugins/genshin/resources/html/${this.model}/${this.model}.html`, /** 绝对路径 */ pluResPath: `${this._path}/plugins/genshin/resources/`, - headStyle: `` + headStyle: ``, + srtempFile: '' } } }