From 103585a6472dc835455ac840cc526491d0c26e27 Mon Sep 17 00:00:00 2001 From: Rrrrrrray <28804884+Rrrrrrray@users.noreply.github.com> Date: Thu, 4 May 2023 02:14:53 +0800 Subject: [PATCH 1/2] =?UTF-8?q?update=EF=BC=9A=E6=98=9F=E9=93=81=E6=8A=BD?= =?UTF-8?q?=E5=8D=A1=E8=AE=B0=E5=BD=95=E6=9F=A5=E7=9C=8B=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E6=80=BB=E8=A7=88=EF=BC=8C=E6=B7=BB=E5=8A=A0=E6=98=9F=E9=93=81?= =?UTF-8?q?=E4=B8=96=E7=95=8C=E5=90=8D=E7=89=87=E7=AD=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- plugins/genshin/apps/gcLog.js | 19 +++++---- plugins/genshin/model/gachaLog.js | 2 +- .../StarRail/html/gachaLog/gachaLog.css | 38 ++++++++++-------- .../StarRail/html/gachaLog/gachaLog.html | 6 +-- .../StarRail/html/logCount/logCount.css | 31 +++++++------- .../StarRail/html/logCount/logCount.html | 9 ++--- .../StarRail/img/items/{.webp => star.webp} | Bin .../resources/StarRail/img/items/巡�猎.webp | Bin 994 -> 0 bytes .../resources/StarRail/img/other/logo.png | Bin 0 -> 30081 bytes .../resources/StarRail/img/role/三月七.webp | Bin 7032 -> 13376 bytes .../resources/StarRail/img/role/丹恒.webp | Bin 5758 -> 10008 bytes .../resources/StarRail/img/role/佩拉.webp | Bin 6448 -> 11592 bytes .../resources/StarRail/img/role/停云.webp | Bin 6726 -> 13494 bytes .../resources/StarRail/img/role/克拉拉.webp | Bin 6216 -> 10284 bytes .../resources/StarRail/img/role/卡芙卡.webp | Bin 5412 -> 8452 bytes .../resources/StarRail/img/role/姬子.webp | Bin 7552 -> 10562 bytes .../resources/StarRail/img/role/娜塔莎.webp | Bin 6396 -> 10094 bytes .../resources/StarRail/img/role/布洛妮娅.webp | Bin 6870 -> 10960 bytes .../resources/StarRail/img/role/希儿.webp | Bin 6136 -> 7770 bytes .../resources/StarRail/img/role/希露瓦.webp | Bin 7456 -> 9516 bytes .../resources/StarRail/img/role/彦卿.webp | Bin 7094 -> 12208 bytes .../resources/StarRail/img/role/星.webp | Bin 0 -> 12804 bytes .../resources/StarRail/img/role/景元.webp | Bin 7350 -> 18426 bytes .../resources/StarRail/img/role/杰帕德.webp | Bin 6898 -> 10338 bytes .../resources/StarRail/img/role/桑博.webp | Bin 7258 -> 9472 bytes .../resources/StarRail/img/role/瓦尔特.webp | Bin 6030 -> 9340 bytes .../resources/StarRail/img/role/白露.webp | Bin 6184 -> 13742 bytes .../resources/StarRail/img/role/穹.webp | Bin 0 -> 8812 bytes .../resources/StarRail/img/role/素裳.webp | Bin 7004 -> 12412 bytes .../resources/StarRail/img/role/罗刹.webp | Bin 6388 -> 11598 bytes .../resources/StarRail/img/role/艾丝妲.webp | Bin 6054 -> 7938 bytes .../resources/StarRail/img/role/虎克.webp | Bin 7018 -> 12394 bytes .../resources/StarRail/img/role/银狼.webp | Bin 7692 -> 18680 bytes .../resources/StarRail/img/role/阿兰.webp | Bin 6742 -> 8908 bytes .../resources/StarRail/img/role/青雀.webp | Bin 5908 -> 10822 bytes .../resources/StarRail/img/role/黑塔.webp | Bin 6346 -> 12624 bytes .../resources/StarRail/img/side2/三月七.webp | Bin 0 -> 7032 bytes .../resources/StarRail/img/side2/丹恒.webp | Bin 0 -> 5758 bytes .../resources/StarRail/img/side2/佩拉.webp | Bin 0 -> 6448 bytes .../resources/StarRail/img/side2/停云.webp | Bin 0 -> 6726 bytes .../resources/StarRail/img/side2/克拉拉.webp | Bin 0 -> 6216 bytes .../resources/StarRail/img/side2/卡芙卡.webp | Bin 0 -> 5412 bytes .../resources/StarRail/img/side2/姬子.webp | Bin 0 -> 7552 bytes .../resources/StarRail/img/side2/娜塔莎.webp | Bin 0 -> 6396 bytes .../StarRail/img/side2/布洛妮娅.webp | Bin 0 -> 6870 bytes .../resources/StarRail/img/side2/希儿.webp | Bin 0 -> 6136 bytes .../resources/StarRail/img/side2/希露瓦.webp | Bin 0 -> 7456 bytes .../resources/StarRail/img/side2/彦卿.webp | Bin 0 -> 7094 bytes .../resources/StarRail/img/side2/景元.webp | Bin 0 -> 7350 bytes .../resources/StarRail/img/side2/杰帕德.webp | Bin 0 -> 6898 bytes .../resources/StarRail/img/side2/桑博.webp | Bin 0 -> 7258 bytes .../resources/StarRail/img/side2/瓦尔特.webp | Bin 0 -> 6030 bytes .../resources/StarRail/img/side2/白露.webp | Bin 0 -> 6184 bytes .../resources/StarRail/img/side2/素裳.webp | Bin 0 -> 7004 bytes .../resources/StarRail/img/side2/罗刹.webp | Bin 0 -> 6388 bytes .../resources/StarRail/img/side2/艾丝妲.webp | Bin 0 -> 6054 bytes .../resources/StarRail/img/side2/虎克.webp | Bin 0 -> 7018 bytes .../resources/StarRail/img/side2/银狼.webp | Bin 0 -> 7692 bytes .../resources/StarRail/img/side2/阿兰.webp | Bin 0 -> 6742 bytes .../resources/StarRail/img/side2/青雀.webp | Bin 0 -> 5908 bytes .../resources/StarRail/img/side2/黑塔.webp | Bin 0 -> 6346 bytes .../resources/StarRail/img/worldcard/仙舟.png | Bin 0 -> 180705 bytes .../StarRail/img/worldcard/星河猎手.png | Bin 0 -> 122638 bytes .../StarRail/img/worldcard/星穹列车.png | Bin 0 -> 205954 bytes .../StarRail/img/worldcard/空间站.png | Bin 0 -> 127997 bytes .../StarRail/img/worldcard/贝洛伯格.png | Bin 0 -> 169656 bytes 66 files changed, 57 insertions(+), 48 deletions(-) rename plugins/genshin/resources/StarRail/img/items/{.webp => star.webp} (100%) delete mode 100644 plugins/genshin/resources/StarRail/img/items/巡�猎.webp create mode 100644 plugins/genshin/resources/StarRail/img/other/logo.png create mode 100644 plugins/genshin/resources/StarRail/img/role/星.webp create mode 100644 plugins/genshin/resources/StarRail/img/role/穹.webp create mode 100644 plugins/genshin/resources/StarRail/img/side2/三月七.webp create mode 100644 plugins/genshin/resources/StarRail/img/side2/丹恒.webp create mode 100644 plugins/genshin/resources/StarRail/img/side2/佩拉.webp create mode 100644 plugins/genshin/resources/StarRail/img/side2/停云.webp create mode 100644 plugins/genshin/resources/StarRail/img/side2/克拉拉.webp create mode 100644 plugins/genshin/resources/StarRail/img/side2/卡芙卡.webp create mode 100644 plugins/genshin/resources/StarRail/img/side2/姬子.webp create mode 100644 plugins/genshin/resources/StarRail/img/side2/娜塔莎.webp create mode 100644 plugins/genshin/resources/StarRail/img/side2/布洛妮娅.webp create mode 100644 plugins/genshin/resources/StarRail/img/side2/希儿.webp create mode 100644 plugins/genshin/resources/StarRail/img/side2/希露瓦.webp create mode 100644 plugins/genshin/resources/StarRail/img/side2/彦卿.webp create mode 100644 plugins/genshin/resources/StarRail/img/side2/景元.webp create mode 100644 plugins/genshin/resources/StarRail/img/side2/杰帕德.webp create mode 100644 plugins/genshin/resources/StarRail/img/side2/桑博.webp create mode 100644 plugins/genshin/resources/StarRail/img/side2/瓦尔特.webp create mode 100644 plugins/genshin/resources/StarRail/img/side2/白露.webp create mode 100644 plugins/genshin/resources/StarRail/img/side2/素裳.webp create mode 100644 plugins/genshin/resources/StarRail/img/side2/罗刹.webp create mode 100644 plugins/genshin/resources/StarRail/img/side2/艾丝妲.webp create mode 100644 plugins/genshin/resources/StarRail/img/side2/虎克.webp create mode 100644 plugins/genshin/resources/StarRail/img/side2/银狼.webp create mode 100644 plugins/genshin/resources/StarRail/img/side2/阿兰.webp create mode 100644 plugins/genshin/resources/StarRail/img/side2/青雀.webp create mode 100644 plugins/genshin/resources/StarRail/img/side2/黑塔.webp create mode 100644 plugins/genshin/resources/StarRail/img/worldcard/仙舟.png create mode 100644 plugins/genshin/resources/StarRail/img/worldcard/星河猎手.png create mode 100644 plugins/genshin/resources/StarRail/img/worldcard/星穹列车.png create mode 100644 plugins/genshin/resources/StarRail/img/worldcard/空间站.png create mode 100644 plugins/genshin/resources/StarRail/img/worldcard/贝洛伯格.png diff --git a/plugins/genshin/apps/gcLog.js b/plugins/genshin/apps/gcLog.js index 09c6a5a..144b84b 100644 --- a/plugins/genshin/apps/gcLog.js +++ b/plugins/genshin/apps/gcLog.js @@ -55,6 +55,7 @@ export class gcLog extends plugin { }) this.androidUrl = 'docs.qq.com/doc/DUWpYaXlvSklmVXlX' + this._path = process.cwd().replace(/\\/g, '/') } async init () { @@ -99,8 +100,9 @@ export class gcLog extends plugin { if (!data) return let url='gachaLog' if(this.e.isSr){ - data.tplFile='./plugins/genshin/resources/StarRail/html/gachaLog/gachaLog.html' - url='StarRail/gachaLog' + url ='StarRail/gachaLog' + data.tplFile = './plugins/genshin/resources/StarRail/html/gachaLog/gachaLog.html' + data.headStyle = `` } let img = await puppeteer.screenshot(url, data) if (img) await this.reply(img) @@ -126,8 +128,9 @@ export class gcLog extends plugin { if (typeof data != 'object') return let url='gachaLog' if(this.e.isSr){ - data.tplFile='./plugins/genshin/resources/StarRail/html/gachaLog/gachaLog.html' - url='StarRail/gachaLog' + url ='StarRail/gachaLog' + data.tplFile = './plugins/genshin/resources/StarRail/html/gachaLog/gachaLog.html' + data.headStyle = `` } let img = await puppeteer.screenshot(url, data) if (img) await this.reply(img) @@ -139,8 +142,9 @@ export class gcLog extends plugin { if (!data) return let url='gachaLog' if(this.e.isSr){ - data.tplFile='./plugins/genshin/resources/StarRail/html/gachaLog/gachaLog.html' - url='StarRail/gachaLog' + url ='StarRail/gachaLog' + data.tplFile = './plugins/genshin/resources/StarRail/html/gachaLog/gachaLog.html' + data.headStyle = `` } let img = await puppeteer.screenshot(url, data) if (img) await this.reply(img) @@ -217,8 +221,9 @@ export class gcLog extends plugin { if (!data) return let url='logCount' if(this.e.isSr){ - data.tplFile='./plugins/genshin/resources/StarRail/html/logCount/logCount.html' url='StarRail/logCount' + data.tplFile = './plugins/genshin/resources/StarRail/html/logCount/logCount.html' + data.headStyle = `` } let img = await puppeteer.screenshot(url, data) if (img) await this.reply(img) diff --git a/plugins/genshin/model/gachaLog.js b/plugins/genshin/model/gachaLog.js index 905361f..141c949 100644 --- a/plugins/genshin/model/gachaLog.js +++ b/plugins/genshin/model/gachaLog.js @@ -55,7 +55,7 @@ export default class GachaLog extends base { if (i <= 1) await common.sleep(500) } - await this.e.reply('抽卡记录更新完成,您还可回复\n【#武器记录】统计武器池数据\n【#角色统计】按卡池统计数据\n【#导出记录】导出记录数据') + await this.e.reply(`抽卡记录更新完成,您还可回复\n【#${this?.e?.isSr?'光锥':'武器'}记录】统计武器池数据\n【#角色统计】按卡池统计数据\n【#导出记录】导出记录数据`) this.isLogUrl = true diff --git a/plugins/genshin/resources/StarRail/html/gachaLog/gachaLog.css b/plugins/genshin/resources/StarRail/html/gachaLog/gachaLog.css index f93af9f..68d6211 100644 --- a/plugins/genshin/resources/StarRail/html/gachaLog/gachaLog.css +++ b/plugins/genshin/resources/StarRail/html/gachaLog/gachaLog.css @@ -1,6 +1,6 @@ @font-face { font-family: "tttgbnumber"; - src: url("../../../../../resources/font/tttgbnumber.ttf"); + src: url("../../../../../../resources/font/tttgbnumber.ttf"); font-weight: normal; font-style: normal; } @@ -36,18 +36,22 @@ body { } .head_box .id_text { - font-size: 24px; + color: #f5e7f4; + padding: 5px 0; + font-size: 26px; } .head_box .day_text { - font-size: 20px; + color: #f5e7f4; + padding: 5px 0; + font-size: 22px; } -.head_box .genshin_logo { +.head_box .starrail_logo { position: absolute; - top: 1px; - right: 15px; - width: 97px; + top: 5px; + right: 10px; + width: 115px; } .logo { @@ -156,20 +160,17 @@ body { } .card_list .item.star5 img { - background-image: url(../../img/other/bg5.png); + background: #885550; + background: linear-gradient(180deg,#885550,#c9a36a 53%); width: 100%; height: 70px; - /*filter: brightness(1.1);*/ - background-size: 100%; - background-repeat: no-repeat; } .card_list .item.star4 img { + background: #343659; + background: linear-gradient(180deg,#343659,#8a5fcc 53%); width: 100%; height: 70px; - background-image: url(../../img/other/bg4.png); - background-size: 100%; - background-repeat: no-repeat; } .card_list .item .num { @@ -222,17 +223,20 @@ body { background: #d3bc8d; } -.label_301 { +.label_11 { background-color: rgb(235 106 75); } -.label_302 { +.label_12{ background-color: #E69449; } -.label_200 { +.label_1 { background-color: #757CC8; } +.label_2 { + background-color: #75c895; +} .label { color: #fff; diff --git a/plugins/genshin/resources/StarRail/html/gachaLog/gachaLog.html b/plugins/genshin/resources/StarRail/html/gachaLog/gachaLog.html index 9b79198..2b48450 100644 --- a/plugins/genshin/resources/StarRail/html/gachaLog/gachaLog.html +++ b/plugins/genshin/resources/StarRail/html/gachaLog/gachaLog.html @@ -3,10 +3,9 @@
- + - - + {{@headStyle}} @@ -21,6 +20,7 @@ {{allNum}}抽 {{typeName}}池 +BG|
z>fst*nwj+v_BQ6nKRJ`Eb}HOjKR4ZUHLW>aAC~{oDEGO|d}_8Lq~PY5=ABW8m_Qhp
z?+jEAe$<_MwXfFA8#&DEMC)Mdfa+*$1?p_>>TDL7>RA>