From d977fccbabaf1d82423e2f47bf0fa3269b19ead7 Mon Sep 17 00:00:00 2001 From: Kokomi <102026640+yoimiya-kokomi@users.noreply.github.com> Date: Tue, 4 Jul 2023 02:31:22 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B03.8=E7=9B=B8=E5=85=B3?= =?UTF-8?q?=E8=B5=84=E6=BA=90=20@Ca(HCO=E2=82=83)=E2=82=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- plugins/genshin/defSet/gacha/pool.yaml | 18 +++++++++ plugins/genshin/defSet/pool/301.yaml | 10 +++++ plugins/genshin/defSet/pool/302.yaml | 12 ++++++ plugins/genshin/model/base.js | 2 +- .../genshin/resources/html/user/uid-list.css | 36 ++++++++++-------- .../genshin/resources/html/user/uid-list.html | 33 ++++++++++------ .../genshin/resources/html/user/uid-list.less | 11 ++++-- .../genshin/resources/img/namecard/优菈.png | Bin 0 -> 155441 bytes 8 files changed, 90 insertions(+), 32 deletions(-) create mode 100644 plugins/genshin/resources/img/namecard/优菈.png diff --git a/plugins/genshin/defSet/gacha/pool.yaml b/plugins/genshin/defSet/gacha/pool.yaml index a04c5f0..11118c4 100644 --- a/plugins/genshin/defSet/gacha/pool.yaml +++ b/plugins/genshin/defSet/gacha/pool.yaml @@ -1,3 +1,21 @@ +- up4: + - 米卡 + - 雷泽 + - 托马 + up5: + - 优菈 + up5_2: + - 可莉 + weapon5: + - 松籁响起之时 + - 四风原典 + weapon4: + - 暗巷闪光 + - 暗巷猎手 + - 雨裁 + - 西风长枪 + - 昭心 + endTime: "2023-07-25 18:00:00" - up4: - 瑶瑶 - 鹿野院平藏 diff --git a/plugins/genshin/defSet/pool/301.yaml b/plugins/genshin/defSet/pool/301.yaml index 224febe..7d19cae 100644 --- a/plugins/genshin/defSet/pool/301.yaml +++ b/plugins/genshin/defSet/pool/301.yaml @@ -1,3 +1,13 @@ +- from: '2023-07-05 06:00:00' + to: '2023-07-25 17:59:59' + five: + - 优菈 + - 可莉 + four: + - 米卡 + - 雷泽 + - 托马 + name: 浪涌之瞬|闪焰的驻足 - from: '2023-06-13 18:00:00' to: '2023-07-04 14:59:59' five: diff --git a/plugins/genshin/defSet/pool/302.yaml b/plugins/genshin/defSet/pool/302.yaml index b69ac1d..ca08f1e 100644 --- a/plugins/genshin/defSet/pool/302.yaml +++ b/plugins/genshin/defSet/pool/302.yaml @@ -1,3 +1,15 @@ +- from: '2023-07-05 06:00:00' + to: '2023-07-25 17:59:59' + five: + - 松籁响起之时 + - 四风原典 + four: + - 暗巷闪光 + - 暗巷猎手 + - 雨裁 + - 西风长枪 + - 昭心 + name: 神铸赋形 - from: '2023-06-13 18:00:00' to: '2023-07-04 14:59:59' five: diff --git a/plugins/genshin/model/base.js b/plugins/genshin/model/base.js index b18b6d5..a0df52a 100644 --- a/plugins/genshin/model/base.js +++ b/plugins/genshin/model/base.js @@ -18,7 +18,7 @@ export default class base { * @param pluResPath 插件资源路径 */ get screenData() { - let headImg = '枫原万叶' + let headImg = '优菈' return { saveId: this.userId, diff --git a/plugins/genshin/resources/html/user/uid-list.css b/plugins/genshin/resources/html/user/uid-list.css index b6a2ea9..58a98cc 100644 --- a/plugins/genshin/resources/html/user/uid-list.css +++ b/plugins/genshin/resources/html/user/uid-list.css @@ -71,12 +71,16 @@ nobr { border-radius: 33px; background: right top no-repeat #f0ece4; background-size: auto 100%; - padding: 4px; width: 375px; - display: flex; position: relative; } -.uid-list .game-bar .face { +.uid-list .game-inner { + display: flex; + background: linear-gradient(to right, rgba(240, 236, 228, 0.7), rgba(240, 236, 228, 0.5), rgba(240, 236, 228, 0)); + padding: 4px; + border-radius: 33px; +} +.uid-list .game-inner .face { width: 56px; height: 56px; border-radius: 30px; @@ -85,23 +89,23 @@ nobr { overflow: hidden; background-size: cover; } -.uid-list .game-bar .face span { +.uid-list .game-inner .face span { display: block; width: 64px; height: 64px; background-size: auto 100%; background-repeat: no-repeat; } -.uid-list .game-bar .info { +.uid-list .game-inner .info { padding: 4px 10px; line-height: 18px; color: #414e64; } -.uid-list .game-bar .info div.shadow { +.uid-list .game-inner .info div.shadow { position: relative; -webkit-text-stroke: 2px #fff; } -.uid-list .game-bar .info div.shadow span { +.uid-list .game-inner .info div.shadow span { font-weight: normal; display: block; position: absolute; @@ -109,18 +113,18 @@ nobr { left: 0; top: 0; } -.uid-list .game-bar .info .uid-info { +.uid-list .game-inner .info .uid-info { height: 25px; font-size: 24px; display: flex; margin-top: 5px; } -.uid-list .game-bar .info .uid-info .uid { +.uid-list .game-inner .info .uid-info .uid { font-weight: normal; display: block; padding-right: 8px; } -.uid-list .game-bar .info .uid-info .type { +.uid-list .game-inner .info .uid-info .type { width: 35px; font-size: 12px; font-weight: normal; @@ -133,25 +137,25 @@ nobr { vertical-align: middle; transform: scale(0.9); } -.uid-list .game-bar .info .uid-info .type.ck { +.uid-list .game-inner .info .uid-info .type.ck { background: #d3bc8e; color: #3a2702; font-weight: bold; box-shadow: 0 0 3px 0 #000; } -.uid-list .game-bar .info .uid-info .type.reg { +.uid-list .game-inner .info .uid-info .type.reg { background: #666; } -.uid-list .game-bar .info .detail { +.uid-list .game-inner .info .detail { font-size: 14px; text-shadow: 0 0 2px #fff; } -.uid-list .game-bar .info .detail .no-info { +.uid-list .game-inner .info .detail .no-info { color: #555; font-size: 12px; text-shadow: 0 0 1px #fff; } -.uid-list .game-bar:after { +.uid-list .game-inner:after { display: block; content: ""; width: 36px; @@ -174,7 +178,7 @@ nobr { .uid-list .game-li.active .game-bar { box-shadow: 0 0 1px 1px #fff, 0 0 5px 2px #d3bc8e; } -.uid-list .game-li.active .game-bar:after { +.uid-list .game-li.active .game-inner:after { opacity: 1; background: url('../../img/icon/check.webp') center center no-repeat #4a5366; background-size: 70% auto; diff --git a/plugins/genshin/resources/html/user/uid-list.html b/plugins/genshin/resources/html/user/uid-list.html index c7351ef..58565fd 100644 --- a/plugins/genshin/resources/html/user/uid-list.html +++ b/plugins/genshin/resources/html/user/uid-list.html @@ -27,18 +27,20 @@ sr:{mark:'*'} {{idx+1}}