From 3835f84bd50c0891f770227e7936b56ab0b93a13 Mon Sep 17 00:00:00 2001 From: Aluxes <39981645+AshenAshes@users.noreply.github.com> Date: Sat, 13 Apr 2024 20:33:08 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=B8=8B=E6=98=9F=E9=93=81?= =?UTF-8?q?=E7=BE=A4=E6=8E=92=E5=90=8D=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/profile/ProfileChange.js | 34 +++++++++++----------- models/ProfileDmg.js | 2 +- resources/character/rank-profile-list.css | 11 ++----- resources/character/rank-profile-list.html | 13 +++++++++ resources/character/rank-profile-list.less | 5 ---- resources/meta-sr/weapon/alias.js | 5 ++-- 6 files changed, 37 insertions(+), 33 deletions(-) diff --git a/apps/profile/ProfileChange.js b/apps/profile/ProfileChange.js index cf020e0f..6c6efdb1 100644 --- a/apps/profile/ProfileChange.js +++ b/apps/profile/ProfileChange.js @@ -40,24 +40,24 @@ const ProfileChange = { const isGs = game === 'gs' const keyMap = isGs ? { - artis: '圣遗物', - arti1: '花,生之花', - arti2: '毛,羽,羽毛,死之羽', - arti3: '沙,沙漏,表,时之沙', - arti4: '杯,杯子,空之杯', - arti5: '头,冠,理之冠,礼冠,帽子,帽', - weapon: '武器' - } + artis: '圣遗物', + arti1: '花,生之花', + arti2: '毛,羽,羽毛,死之羽', + arti3: '沙,沙漏,表,时之沙', + arti4: '杯,杯子,空之杯', + arti5: '头,冠,理之冠,礼冠,帽子,帽', + weapon: '武器' + } : { - artis: '圣遗物,遗器', - arti1: '头,帽子,头部', - arti2: '手,手套,手部', - arti3: '衣,衣服,甲,躯干,', - arti4: '鞋,靴,鞋子,靴子,脚,脚部', - arti5: '球,位面球', - arti6: '绳,线,链接绳,连接绳', - weapon: '武器,光锥' - } + artis: '圣遗物,遗器', + arti1: '头,帽子,头部', + arti2: '手,手套,手部', + arti3: '衣,衣服,甲,躯干,', + arti4: '鞋,靴,鞋子,靴子,脚,脚部', + arti5: '球,位面球', + arti6: '绳,线,链接绳,连接绳', + weapon: '武器,光锥' + } let keyTitleMap = {} lodash.forEach(keyMap, (val, key) => { lodash.forEach(val.split(','), (v) => { diff --git a/models/ProfileDmg.js b/models/ProfileDmg.js index eb92ecd0..70002197 100644 --- a/models/ProfileDmg.js +++ b/models/ProfileDmg.js @@ -8,7 +8,7 @@ import DmgCalc from './dmg/DmgCalc.js' import { MiaoError, Meta, Common } from '#miao' export default class ProfileDmg extends Base { - constructor(profile = {}, game = 'gs') { + constructor (profile = {}, game = 'gs') { super() this.profile = profile this.game = game diff --git a/resources/character/rank-profile-list.css b/resources/character/rank-profile-list.css index 3fdccb47..87e4f5f6 100644 --- a/resources/character/rank-profile-list.css +++ b/resources/character/rank-profile-list.css @@ -4,11 +4,7 @@ .font-NZBZ { font-family: Number, "印品南征北战NZBZ体", NZBZ, "汉仪文黑-65W", YS, PingFangSC-Medium, "PingFang SC", sans-serif; } -body { - width: 820px; -} .container { - width: 820px; padding: 0; background-size: cover; overflow: hidden; @@ -16,7 +12,7 @@ body { .group-rank-icon { width: 16px; height: 16px; - background: url("./imgs/mark-icon.png"); + background: url("imgs/mark-icon.png"); background-size: auto 100%; display: inline-block; vertical-align: bottom; @@ -55,7 +51,7 @@ body { width: 24px; height: 24px; margin: 13px 12px; - background: url('./imgs/mark-icon.png'); + background: url('imgs/mark-icon.png'); background-size: auto 100%; text-align: center; font-size: 12px; @@ -66,7 +62,7 @@ body { .char-idx .idx-icon.mode-dmg.idx-1 { width: 48px; margin: 13px 0; - background-image: url('./imgs/mark-icon2.png'); + background-image: url('imgs/mark-icon2.png'); color: rgba(0, 0, 0, 0); text-shadow: none; } @@ -342,4 +338,3 @@ body { font-size: 12px; color: #aaa; } -/*# sourceMappingURL=rank-profile-list.css.map */ \ No newline at end of file diff --git a/resources/character/rank-profile-list.html b/resources/character/rank-profile-list.html index 664e1b65..37b6b2fe 100644 --- a/resources/character/rank-profile-list.html +++ b/resources/character/rank-profile-list.html @@ -2,6 +2,19 @@ {{block 'css'}} +{{if game==='sr'}} + +{{else}} + +{{/if}} {{/block}} {{set talentMap = game === 'sr' ? {a: '普攻', e: '战技', t:'天赋', q: '爆发'} : {a: '普攻', e: '战技', q: '爆发'} }} diff --git a/resources/character/rank-profile-list.less b/resources/character/rank-profile-list.less index be9ca38d..bb660589 100644 --- a/resources/character/rank-profile-list.less +++ b/resources/character/rank-profile-list.less @@ -1,11 +1,6 @@ @import "../common/base.less"; -body { - width: 820px; -} - .container { - width: 820px; padding: 0; background-size: cover; overflow: hidden; diff --git a/resources/meta-sr/weapon/alias.js b/resources/meta-sr/weapon/alias.js index 7098bfbf..8026e0a1 100644 --- a/resources/meta-sr/weapon/alias.js +++ b/resources/meta-sr/weapon/alias.js @@ -20,7 +20,8 @@ export const abbr = { 美梦小镇大冒险: '美梦小镇', // 智识 别让世界静下来: '别让世界静下', - 今日亦是和平的一日: '今日亦是和平' + 今日亦是和平的一日: '今日亦是和平', + '片刻,留在眼底': '片刻留在眼底' } export const aliasCfg = { @@ -131,6 +132,6 @@ export const aliasCfg = { 今日亦是和平的一日: '和平的一日,和平一日', 银河铁道之夜: '银河铁道,星穹铁道之夜,星穹铁道', 拂晓之前: '拂晓', - '片刻,留在眼底': '留在眼底,眼一直留', + '片刻,留在眼底': '片刻留在眼底,留在眼底,眼一直留', 银河沦陷日: '银河沦陷,沦陷日' }