#角色面板 伤害计算增加凝光、七七、可莉

This commit is contained in:
yoimiya-kokomi 2022-05-14 03:31:49 +08:00
parent 769e98ecad
commit dc16c5480b
14 changed files with 148 additions and 44 deletions

View File

@ -1,3 +1,11 @@
# 1.5.1
* `#角色面板` 伤害计算增加部分角色,目前支持
* 长柄武器:雷神、胡桃、魈、钟离、香菱
* 法器:神子、心海、可莉ⁿᵉʷ、凝光ⁿᵉʷ
* 弓:甘雨、宵宫、公子
* 单手剑:绫人、绫华、刻晴、阿贝多、行秋、班尼特、七七ⁿᵉʷ
# 1.5.0
* 增加`#喵喵日历` 功能

View File

@ -426,6 +426,9 @@ let Calc = {
}
dmgFn.heal = function (num) {
if(showDetail){
console.log(num, calc(attr.heal), attr.heal.inc)
}
return {
avg: num * (1 + calc(attr.heal) / 100) * (attr.heal.inc / 100)
}

View File

@ -841,4 +841,8 @@ body {
.char-迪奥娜 .main-pic {
margin-left: -180px;
}
.char-可莉 .main-pic {
margin-left: -210px;
}

View File

@ -87,7 +87,14 @@ body {
text-shadow: 1px 1px 1px #000;
margin-bottom: 10px;
}
/* */
/* */
.cons {
display: inline-block;
vertical-align: middle;
padding: 0 5px;
border-radius: 4px;
font-family: Number, YS;
}
.cons-0 {
border-radius: 4px;
background: #666;

View File

@ -106,7 +106,15 @@ body {
margin-bottom: 10px;
}
/* */
/* */
.cons {
display: inline-block;
vertical-align: middle;
padding: 0 5px;
border-radius: 4px;
font-family: Number, YS;
}
.cons(@idx, @bg, @color:#fff) {
.cons-@{idx} {

View File

@ -6,19 +6,25 @@
}
.item-card .badge {
overflow: hidden;
border-radius: 5px;
position: relative;
border-radius: 50%;
display: block;
width: 26px;
height: 26px;
position: absolute;
right: -4px;
top: -4px;
background: #e9e5dc;
box-shadow: 0 2px 6px 0 rgba(132, 93, 90, 0.3);
box-shadow: 0 0 1px 0 rgba(0, 0, 0, 0.8), 2px 2px 2px rgba(50, 50, 50, 0.5);
z-index: 10;
}
.item-card .badge img {
width: 100%;
width: 140%;
left: -27%;
top: -45%;
overflow: hidden;
background-size: 100%;
background-repeat: no-repeat;
position: absolute;
top: 0;
/*filter: contrast(95%);*/
}
.item-card .item-bg {
width: 100%;
@ -29,30 +35,28 @@
}
.item-card .bg1 {
background-image: url("./item/bg1.png");
border-radius: 5px 5px 15px 0;
}
.item-card .bg2 {
background-image: url("./item/bg2.png");
border-radius: 5px 5px 15px 0;
}
.item-card .bg3 {
background-image: url("./item/bg3.png");
border-radius: 5px 5px 15px 0;
}
.item-card .bg4 {
background-image: url("./item/bg4.png");
border-radius: 5px 5px 15px 0;
}
.item-card .bg5 {
background-image: url("./item/bg5.png");
border-radius: 5px 5px 15px 0;
}
.item-card .box {
border-radius: 5px;
overflow: hidden;
}
.item-card .box:after {
content: "";
display: block;
position: absolute;
width: 15px;
right: 0;
bottom: 15px;
background: #e9e5dc;
}
.item-card .box .item-desc {
display: block;
@ -163,6 +167,7 @@
.profile .attr {
border-radius: 4px;
overflow: hidden;
background: rgba(0, 0, 0, 0.3);
}
.profile .detail li {
width: 300px;

View File

@ -4,7 +4,7 @@
<div class="item-card">
<span class="badge">
<img src="{{_sys_res_path}}/genshin/logo/side/{{ds.avatar==`旅行者`?`荧`:ds.avatar}}.png"/>
</span>
</span>
<div class="box">
{{ if ds.affix_level>1}}
<span class="item-life life{{ds.affix_level}}">

View File

@ -9,7 +9,7 @@
<div class="char-name">{{ds.name}}</div>
<div class="char-lv">
{{if uid}}UID {{uid}} - {{/if}}
{{if ds.lv}} Lv.{{ds.lv}}{{/if}}
<span class="cons cons-{{ds.cons}}">{{ds.cons}}命</span> {{if ds.lv}} Lv.{{ds.lv}}{{/if}}
</div>
<div class="char-talents">
{{each ds.talentMap tName key}}

View File

@ -51,6 +51,7 @@
.attr {
border-radius: 4px;
overflow: hidden;
background: rgba(0, 0, 0, .3);
}
.detail li {

View File

@ -8,20 +8,27 @@
.badge {
overflow: hidden;
border-radius: 5px;
position: relative;
background: #e9e5dc;
box-shadow: 0 2px 6px 0 rgb(132 93 90 / 30%);
}
.badge img {
width: 100%;
overflow: hidden;
background-size: 100%;
background-repeat: no-repeat;
border-radius: 50%;
display: block;
width: 26px;
height: 26px;
position: absolute;
top: 0;
/*filter: contrast(95%);*/
right: -4px;
top: -4px;
background: #e9e5dc;
box-shadow: 0 0 1px 0 rgba(0, 0, 0, 0.8), 2px 2px 2px rgba(50, 50, 50, .5);
z-index: 10;
img {
width: 140%;
left: -27%;
top: -45%;
overflow: hidden;
background-size: 100%;
background-repeat: no-repeat;
position: absolute;
}
}
.item-bg {
@ -35,23 +42,14 @@
each(range(5), {
.bg@{value} {
background-image: url("./item/bg@{value}.png");
border-radius: 5px 5px 15px 0;
}
})
.box {
border-radius: 5px;
overflow: hidden;
&:after {
content: "";
display: block;
position: absolute;
width: 15px;
right: 0;
bottom: 15px;
}
background: #e9e5dc;
.item-desc {
display: block;

View File

@ -0,0 +1,15 @@
export const details = [{
title: "E每跳治疗",
dmg: ({
talent,
attr,
calc
}, { heal }) => heal(talent.e['持续治疗量2'][0] * calc(attr.atk) / 100 + talent.e['持续治疗量2'][1] * 1)
}, {
title: "度厄真符每次治疗",
dmg: ({ talent, attr, calc }, { heal }) => heal(talent.q['治疗量2'][0] * calc(attr.atk) / 100 + talent.q['治疗量2'][1] * 1)
}];
export const mainAttr = "atk,cpct,cdmg";
export const buffs = []

View File

@ -0,0 +1,19 @@
export const details = [{
title: "重击伤害",
dmg: ({ talent }, dmg) => dmg(talent.a['重击伤害'], 'a2')
}, {
title: "璇玑屏伤害",
dmg: ({ talent }, dmg) => dmg(talent.e['技能伤害'], 'e')
}, {
title: "Q单颗宝石伤害",
dmg: ({ talent }, dmg) => dmg(talent.q['宝石伤害'], 'q')
}];
export const mainAttr = "atk,cpct,cdmg";
export const buffs = [{
title: "凝光被动穿过璇玑屏获得12%岩伤加成",
data: {
dmg: 12
}
}]

View File

@ -0,0 +1,36 @@
export const details = [{
title: "E后带火花重击",
params: { q: false },
dmg: ({ talent }, dmg) => dmg(talent.a['重击伤害'], 'a2')
}, {
title: "E后带火花重击蒸发",
params: { q: false },
dmg: ({ talent }, dmg) => dmg(talent.a['重击伤害'], 'a2', 'zf')
}, {
title: "单次轰轰火花伤害",
dmg: ({ talent }, dmg) => dmg(talent.q['轰轰火花伤害'], 'q')
}];
export const mainAttr = "atk,cpct,cdmg,mastery";
export const buffs = [{
title: "可莉天赋爆裂火花使重击伤害提升50%",
data: {
a2Dmg: 50
}
}, {
title: "可莉2命蹦蹦炸弹的诡雷会使敌人的防御力降低23%",
cons: 2,
data: {
enemyDef: 23
}
}, {
title: "可莉6命释放轰轰火花后获得10%火元素伤害加成",
cons: 6,
data: {
dmg: ({ params }) => params.q === false ? 0 : 10
}
}, {
title: "元素精通:蒸发融化伤害提高[zf]%",
mastery: "zf,rh"
}]

View File

@ -566,9 +566,9 @@ let sword = {
}
}],
"风鹰剑": {
title: "攻击力提高[atkPct]%",
title: "攻击力提高[_atkPct]%",
refine: {
atkPct: step(20)
_atkPct: step(20)
}
},