From 140409336f7829665e183fc998d7f15f7945f6a3 Mon Sep 17 00:00:00 2001 From: Aluxes <568976222@qq.com> Date: Wed, 27 Sep 2023 21:20:05 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E9=82=A3=E7=BB=B4?= =?UTF-8?q?=E8=8E=B1=E7=89=B9=E4=BC=A4=E5=AE=B3=E8=AE=A1=E7=AE=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- resources/character/imgs/destiny.webp | Bin 35668 -> 0 bytes resources/character/profile-detail.css | 23 ++----- resources/character/profile-detail.html | 3 +- resources/character/profile-detail.less | 13 ---- resources/character/rank-profile-list.css | 11 ++-- resources/character/rank-profile-list.html | 10 +-- resources/character/rank-profile-list.less | 4 +- .../meta-sr/character/布洛妮娅/calc.js | 8 ++- resources/meta/artifact/artis-mark.js | 3 +- resources/meta/artifact/meta.js | 6 +- .../meta/character/莱欧斯利/detail.json | 4 +- resources/meta/character/那维莱特/calc.js | 60 ++++++++++++++++++ .../meta/character/那维莱特/data.json | 2 +- resources/meta/weapon/meta.js | 7 +- 14 files changed, 100 insertions(+), 54 deletions(-) delete mode 100644 resources/character/imgs/destiny.webp create mode 100644 resources/meta/character/那维莱特/calc.js diff --git a/resources/character/imgs/destiny.webp b/resources/character/imgs/destiny.webp deleted file mode 100644 index fd2c2b1c30ee96ff3b6545e8b2af6c9c4c8c844b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 35668 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 QVr5qW5C8@MWB>pF0NM!sH2?qr diff --git a/resources/character/profile-detail.css b/resources/character/profile-detail.css index 7d655792..11621229 100644 --- a/resources/character/profile-detail.css +++ b/resources/character/profile-detail.css @@ -108,7 +108,7 @@ body { display: inline-block; height: 16px; width: 16px; - background-image: url("./imgs/icon.png"); + background-image: url("imgs/icon.png"); background-size: auto 16px; } .char-attr li .title { @@ -260,18 +260,6 @@ body { top: 0; margin-left: -14px; } -.talent-icon.talent-destiny:after { - content: ""; - display: block; - width: 37px; - height: 37px; - background: url("../character/imgs/destiny.webp") no-repeat; - background-size: contain; - position: absolute; - left: 50%; - top: 0; - margin-left: -14px; -} .char-talents { display: flex; width: 300px; @@ -613,7 +601,7 @@ body { top: 9px; height: 8px; width: 50px; - background-image: url('./imgs/up-num-icon1.png'); + background-image: url('imgs/up-num-icon1.png'); background-position: 0 0; background-repeat: no-repeat; background-size: auto 500%; @@ -642,14 +630,14 @@ body { color: #ffe699; } .artis ul.detail li.great span.title i.up-num { - background-image: url("./imgs/up-num-icon2.png"); + background-image: url("imgs/up-num-icon2.png"); background-size: auto 500%; } .artis ul.detail li.nouse span { color: #888; } .artis ul.detail li.nouse span i.up-num { - background-image: url("./imgs/up-num-icon0.png"); + background-image: url("imgs/up-num-icon0.png"); background-size: auto 500%; } .artis ul.detail li.arti-main { @@ -855,7 +843,7 @@ body { margin-bottom: 25px; } .game-sr .char-attr .icon i { - background-image: url('./imgs/icon-sr.png'); + background-image: url('imgs/icon-sr.png'); } .sr-weapon { margin: 0 15px 5px 10px; @@ -1049,4 +1037,3 @@ body { .copyright.ad { font-size: 12px; } -/*# sourceMappingURL=profile-detail.css.map */ \ No newline at end of file diff --git a/resources/character/profile-detail.html b/resources/character/profile-detail.html index c43d5b4c..61b61689 100644 --- a/resources/character/profile-detail.html +++ b/resources/character/profile-detail.html @@ -30,8 +30,7 @@

+ {{talent.original >= 10 ? `talent-crown`:``}}">
{{talent.level}} diff --git a/resources/character/profile-detail.less b/resources/character/profile-detail.less index 0032c145..6b3ef083 100644 --- a/resources/character/profile-detail.less +++ b/resources/character/profile-detail.less @@ -310,19 +310,6 @@ body { top: 0; margin-left: -14px; } - - &.talent-destiny:after { - content: ""; - display: block; - width: 37px; - height: 37px; - background: url("../character/imgs/destiny.webp") no-repeat; - background-size: contain; - position: absolute; - left: 50%; - top: 0; - margin-left: -14px; - } } .char-talents { diff --git a/resources/character/rank-profile-list.css b/resources/character/rank-profile-list.css index 9afd6446..6a2a6a29 100644 --- a/resources/character/rank-profile-list.css +++ b/resources/character/rank-profile-list.css @@ -16,7 +16,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 +55,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 +66,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; } @@ -197,12 +197,12 @@ body { top: -2px; margin-left: -9px; } -.char-talent .talent-icon.talent-destiny:after { +.char-talent .talent-icon.talent-crown-sr:after { content: ""; display: block; width: 22px; height: 22px; - background: url("../character/imgs/destiny.webp") no-repeat; + background: url("../character/imgs/crown-sr.webp") no-repeat; background-size: contain; position: absolute; left: 50%; @@ -342,4 +342,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 263ae318..664e1b65 100644 --- a/resources/character/rank-profile-list.html +++ b/resources/character/rank-profile-list.html @@ -87,7 +87,7 @@
+ {{talent.original >= 10 && game === 'sr' ? `talent-crown-sr`:``}}">
{{talent.level}} @@ -98,15 +98,17 @@
{{set w = ds.weapon }} -
-
+
+
- {{w.name?.length > 4 ? (w.abbr||w.name) : w.name}} + {{w?.name?.length > 4 ? (w?.abbr||w?.name) : w?.name}}
+ {{if w}} 精{{w.affix}} Lv.{{w.leve || w.level}} + {{/if}}
diff --git a/resources/character/rank-profile-list.less b/resources/character/rank-profile-list.less index 62511d7d..86329ee3 100644 --- a/resources/character/rank-profile-list.less +++ b/resources/character/rank-profile-list.less @@ -223,12 +223,12 @@ body { margin-left: -9px; } - &.talent-destiny:after { + &.talent-crown-sr:after { content: ""; display: block; width: 22px; height: 22px; - background: url("../character/imgs/destiny.webp") no-repeat; + background: url("../character/imgs/crown-sr.webp") no-repeat; background-size: contain; position: absolute; left: 50%; diff --git a/resources/meta-sr/character/布洛妮娅/calc.js b/resources/meta-sr/character/布洛妮娅/calc.js index 4eed918d..2e7a6866 100644 --- a/resources/meta-sr/character/布洛妮娅/calc.js +++ b/resources/meta-sr/character/布洛妮娅/calc.js @@ -33,8 +33,14 @@ export const mainAttr = 'atk,cpct,cdmg' export const buffs = [{ title: '行迹-军势：布洛妮娅在场时，我方全体造成的伤害提高10%', - check: ({ trees }) => trees[103], + tree: 3, data: { dmg: 10 } +}, { + title: '行迹-号令：普攻的暴击率提高至[aCpct]%', + tree: 1, + data: { + aCpct: 100 + } }] diff --git a/resources/meta/artifact/artis-mark.js b/resources/meta/artifact/artis-mark.js index cdfb130e..0849f13d 100644 --- a/resources/meta/artifact/artis-mark.js +++ b/resources/meta/artifact/artis-mark.js @@ -70,5 +70,6 @@ export const usefulAttr = { 绮良良: { hp: 100, atk: 75, def: 0, cpct: 100, cdmg: 100, mastery: 0, dmg: 100, phy: 0, recharge: 0, heal: 0 }, 林尼: { hp: 0, atk: 75, def: 0, cpct: 100, cdmg: 100, mastery: 0, dmg: 100, phy: 0, recharge: 55, heal: 0 }, 琳妮特: { hp: 0, atk: 75, def: 0, cpct: 100, cdmg: 100, mastery: 0, dmg: 100, phy: 0, recharge: 55, heal: 0 }, - 菲米尼: { hp: 0, atk: 75, def: 0, cpct: 100, cdmg: 100, mastery: 0, dmg: 100, phy: 100, recharge: 55, heal: 0 } + 菲米尼: { hp: 0, atk: 75, def: 0, cpct: 100, cdmg: 100, mastery: 0, dmg: 100, phy: 100, recharge: 55, heal: 0 }, + 那维莱特: { hp: 100, atk: 0, def: 0, cpct: 100, cdmg: 100, mastery: 0, dmg: 100, phy: 0, recharge: 55, heal: 0 } } diff --git a/resources/meta/artifact/meta.js b/resources/meta/artifact/meta.js index 947813d3..c79f538d 100644 --- a/resources/meta/artifact/meta.js +++ b/resources/meta/artifact/meta.js @@ -42,7 +42,9 @@ export const abbr = { 沙上楼阁史话: '沙套', 乐园遗落之花: '乐园', 水仙之梦: '水仙', - 花海甘露之光: '花海' + 花海甘露之光: '花海', + 逐影猎人: '猎人', + 黄金剧团: '剧团' } export const mainAttr = { @@ -351,4 +353,4 @@ export const attrIdMap = { 501222: { key: 'cdmg', value: 0.062199998646974564 }, 501223: { key: 'cdmg', value: 0.06989999860525131 }, 501224: { key: 'cdmg', value: 0.07769999653100967 } -} \ No newline at end of file +} diff --git a/resources/meta/character/莱欧斯利/detail.json b/resources/meta/character/莱欧斯利/detail.json index 8b144bfc..ca2d78ea 100644 --- a/resources/meta/character/莱欧斯利/detail.json +++ b/resources/meta/character/莱欧斯利/detail.json @@ -224,8 +224,8 @@ "·提高莱欧斯利的抗打断能力；", "·生命值高于50%时，强化「普通攻击·迅烈倾霜拳」的斥逐拳，使其造成的伤害提升；命中时莱欧斯利将损失一定的生命值，每0.1秒至多因此损失一次生命值；", "效果将在莱欧斯利退场时解除。", - "「过去的裁罚已成定局，未来的选择犹在掌握。」", - "「若是不愿命运被一时的罪恶吞尽，还请珍重此刻的光阴。」" + "「过去的裁罚已成定局，未来的选择犹在掌握。」", + "「若是不愿命运被一时的罪恶吞尽，还请珍重此刻的光阴。」" ], "tables": [ { diff --git a/resources/meta/character/那维莱特/calc.js b/resources/meta/character/那维莱特/calc.js new file mode 100644 index 00000000..9af11010 --- /dev/null +++ b/resources/meta/character/那维莱特/calc.js @@ -0,0 +1,60 @@ +export const details = [{ + title: '重击伤害', + dmg: ({ talent, attr, calc }, { basic }) => basic(talent.a['重击·衡平推裁持续伤害'] * calc(attr.hp) / 100, 'a2') +}, { + title: 'E伤害', + dmg: ({ talent, attr, calc }, { basic }) => basic(talent.e['技能伤害'] * calc(attr.hp) / 100, 'e') +}, { + title: 'Q释放伤害', + dmg: ({ talent, attr, calc }, { basic }) => basic(talent.q['技能伤害'] * calc(attr.hp) / 100, 'q') +}, { + title: 'Q总伤害', + dmg: ({ talent, attr, calc }, { basic }) => { + const td = talent.q['技能伤害'] + talent.q['水瀑伤害'] * 2 + return basic(td * calc(attr.hp) / 100, 'q') + } +}, { + title: '满水滴一轮重击总伤害', + dmg: ({ talent, attr, calc, cons }, { basic }) => { + const count = cons >= 6 ? 30 : 8 + const td = talent.a['重击·衡平推裁持续伤害'] * count + const extraTd = cons >= 6 ? 20 * 6 : 0 + return basic((td + extraTd) * calc(attr.hp) / 100, 'a2') + } +}] + +export const defDmgIdx = 4 +export const mainAttr = 'hp,dmg,cpct,cdmg' + +export const buffs = [{ + title: '天赋-古海孑遗的权柄：按两层计算，重击·衡平推裁造成原本125%的伤害', + check: ({ cons }) => cons < 1, + data: { + a2Multi: 25 + } +}, { + title: '天赋-古海孑遗的权柄：按三层计算，重击·衡平推裁造成原本160%的伤害', + cons: 1, + data: { + a2Multi: 60 + } +}, { + title: '天赋-至高仲裁的纪律：基于当前生命值超出生命值上限30%的部分，提升[dmg]%水元素伤害', + data: { + dmg: 30 + } +}, { + title: '那维2命：重击·衡平推裁的暴击伤害提升[cdmg]%', + cons: 2, + data: { + cdmg: 42 + } +}, { + title: '那维6命：延长重击持续时间至12s，同时每2s，额外造成20%生命倍率的视为重击·衡平推裁的伤害', + cons: 6 +}, { + title: '双水Buff：生命值提高[hpPct]%', + data: { + hpPct: 25 + } +}] diff --git a/resources/meta/character/那维莱特/data.json b/resources/meta/character/那维莱特/data.json index 47e482e9..41e7662a 100644 --- a/resources/meta/character/那维莱特/data.json +++ b/resources/meta/character/那维莱特/data.json @@ -1,7 +1,7 @@ { "id": 10000087, "name": "那维莱特", - "abbr": "那维莱特", + "abbr": "那维", "title": "谕告的潮音", "star": 5, "elem": "hydro", diff --git a/resources/meta/weapon/meta.js b/resources/meta/weapon/meta.js index 2a9f7268..447d3e77 100644 --- a/resources/meta/weapon/meta.js +++ b/resources/meta/weapon/meta.js @@ -43,7 +43,9 @@ export const abbr = { 图莱杜拉的回忆: '图莱杜拉', 流浪的晚星: '流浪晚星', '「一心传」名刀': '一心传', - 东花坊时雨: '伞剑' + 东花坊时雨: '伞剑', + 最初的大魔术: '大魔术', + 万世流涌大典: '万世大典' } export const alias = { @@ -147,6 +149,7 @@ export const alias = { 流浪的晚星: '流浪的晚星,晚星', 证誓之明瞳: '证誓,明瞳,证誓明瞳', 嘟嘟可故事集: '嘟嘟可,故事集,故事书', + 万世流涌大典: '流涌大典,万世大典,万世流涌,万世涌流大典,万世涌流', // 弓 天空之翼: '天空弓', @@ -156,7 +159,7 @@ export const alias = { 终末嗟叹之诗: '终末,终末弓,叹气弓,乐团弓', 飞雷之弦振: '飞雷,飞雷弓,弦振', 猎人之径: '猎人', - 最初的大魔术: '大魔术', + 最初的大魔术: '大魔术,魔术弓', 曚云之月: '曚云弓', 祭礼弓: '祭礼弓箭', 黑岩战弓: '黑岩弓', From 7c8181088a89cd7cdc860d47c4e57f541d7f4ccd Mon Sep 17 00:00:00 2001 From: Aluxes <568976222@qq.com> Date: Wed, 27 Sep 2023 21:24:30 +0800 Subject: [PATCH 2/3] fix --- resources/meta/weapon/catalyst/calc.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/meta/weapon/catalyst/calc.js b/resources/meta/weapon/catalyst/calc.js index 1899c7ee..27c7d990 100644 --- a/resources/meta/weapon/catalyst/calc.js +++ b/resources/meta/weapon/catalyst/calc.js @@ -186,7 +186,7 @@ export default function (step, staticStep) { }], 万世流涌大典: [staticStep('hpPct', 16), { title: '生命值提升[_hpPct]%', - refile: { + refine: { _hpPct: step(16) } }, { From 87dc38f4c8d9eff74265d104d6a13b9167e0e7cd Mon Sep 17 00:00:00 2001 From: Aluxes <568976222@qq.com> Date: Wed, 27 Sep 2023 22:05:57 +0800 Subject: [PATCH 3/3] =?UTF-8?q?fix=E9=82=A3=E7=BB=B4=E4=BC=A4=E5=AE=B3?= =?UTF-8?q?=E8=AE=A1=E7=AE=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- resources/meta/character/那维莱特/calc.js | 20 +++++++++---------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/resources/meta/character/那维莱特/calc.js b/resources/meta/character/那维莱特/calc.js index 9af11010..0d62cfcc 100644 --- a/resources/meta/character/那维莱特/calc.js +++ b/resources/meta/character/那维莱特/calc.js @@ -1,6 +1,9 @@ export const details = [{ title: '重击伤害', - dmg: ({ talent, attr, calc }, { basic }) => basic(talent.a['重击·衡平推裁持续伤害'] * calc(attr.hp) / 100, 'a2') + dmg: ({ talent, attr, calc, cons }, { basic }) => { + const a2Multi = cons >= 1 ? 1.6 : 1.25 + return basic(a2Multi * talent.a['重击·衡平推裁持续伤害'] * calc(attr.hp) / 100, 'a2') + } }, { title: 'E伤害', dmg: ({ talent, attr, calc }, { basic }) => basic(talent.e['技能伤害'] * calc(attr.hp) / 100, 'e') @@ -19,7 +22,8 @@ export const details = [{ const count = cons >= 6 ? 30 : 8 const td = talent.a['重击·衡平推裁持续伤害'] * count const extraTd = cons >= 6 ? 20 * 6 : 0 - return basic((td + extraTd) * calc(attr.hp) / 100, 'a2') + const a2Multi = cons >= 1 ? 1.6 : 1.25 + return basic(a2Multi * (td + extraTd) * calc(attr.hp) / 100, 'a2') } }] @@ -28,16 +32,10 @@ export const mainAttr = 'hp,dmg,cpct,cdmg' export const buffs = [{ title: '天赋-古海孑遗的权柄：按两层计算，重击·衡平推裁造成原本125%的伤害', - check: ({ cons }) => cons < 1, - data: { - a2Multi: 25 - } + check: ({ cons }) => cons < 1 }, { title: '天赋-古海孑遗的权柄：按三层计算，重击·衡平推裁造成原本160%的伤害', - cons: 1, - data: { - a2Multi: 60 - } + cons: 1 }, { title: '天赋-至高仲裁的纪律：基于当前生命值超出生命值上限30%的部分，提升[dmg]%水元素伤害', data: { @@ -47,7 +45,7 @@ export const buffs = [{ title: '那维2命：重击·衡平推裁的暴击伤害提升[cdmg]%', cons: 2, data: { - cdmg: 42 + a2Cdmg: 42 } }, { title: '那维6命：延长重击持续时间至12s，同时每2s，额外造成20%生命倍率的视为重击·衡平推裁的伤害',