解决英文下没有盾图标的问题,十字心合并错误的问题

This commit is contained in:
枫谷剑仙 2021-08-15 07:12:35 +08:00
parent 6f2bfb2790
commit 585ed28938
5 changed files with 8 additions and 13 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 52 KiB

After

Width:  |  Height:  |  Size: 53 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 158 KiB

After

Width:  |  Height:  |  Size: 160 KiB

View File

@ -82,7 +82,7 @@
rate_multiply_drop: tp`${'icon'}Drop rate`,
rate_multiply_coin: tp`${'icon'}Coins`,
rate_multiply_exp: tp`${'icon'}Rank EXP`,
reduce_damage: tp`${'condition'}Reduces${'attrs'} damage taken by ${'value'}`,
reduce_damage: tp`${'condition'}${'icon'}Reduces${'attrs'} damage taken by ${'value'}`,
power_up: tp`${'condition'}${'targets'}${'value'}${'reduceDamage'}${'addCombo'}${'followAttack'}`,
power_up_targets: tp`${'attrs'}${'types'}'s `,
henshin: tp`Transforms into ${'card'}`,

View File

@ -27,6 +27,10 @@
{
background-position-x: -20px;
}
.icon-skill[data-icon-type="mass-attack"] {
.icon-skill[data-icon-type="mass-attack"],
.icon-skill[data-icon-type="reduce-damage"],
.icon-skill[data-icon-type="damage-absorb"],
.icon-skill[data-icon-type="damage-void"]
{
background-position-x: calc(-36px * 1);
}

View File

@ -1130,7 +1130,7 @@ const parsers = {
[150](_, mul) { return powerUp(null, null, p.mul({ atk: mul }), c.exact('match-length', 5, 'enhanced')); },
[151](mul1, mul2, percent) {
return [
powerUp(null, null, p.scaleCross([{ single: true, attr: Attributes.Heart, atk: mul1, rcv: mul2 }]), null, v.percent(percent)),
powerUp(null, null, p.scaleCross([{ single: true, attr: [Attributes.Heart], atk: mul1 || 100, rcv: mul2 || 100 }]), null, v.percent(percent)),
];
},
[152](attrs, count) { return setOrbState(flags(attrs), 'locked', {count: v.constant(count)}); },
@ -1155,15 +1155,6 @@ const parsers = {
{ single: false, attr: [attr2], atk: mul2 },
{ single: false, attr: [attr3], atk: mul3 }
].filter(cross => cross.atk);
/*if (crosses.length >= 2 && crosses.every(cross => cross.atk === crosses[0].atk)) {
//所有值一样
crosses.reduce((pre,cur)=>{
pre.attr = pre.attr.concat(cur.attr);
return pre
});
crosses = [crosses[0]];
}*/
return powerUp(null, null, p.scaleCross(crosses));
},
[158](len, attrs, types, atk, hp, rcv) {
@ -1328,7 +1319,7 @@ const parsers = {
];
},
[209](combo) {
return powerUp(null, null, p.scaleCross([{ single: true, attr: Attributes.Heart, atk: 100, rcv: 100}]), null, null, [addCombo(combo)]);
return powerUp(null, null, p.scaleCross([{ single: true, attr: [Attributes.Heart], atk: 100, rcv: 100}]), null, null, [addCombo(combo)]);
},
[210](attrs, _, combo) {
return powerUp(null, null, p.scaleCross([{ single: false, attr: flags(attrs), atk: 100, rcv: 100}]), null, null, [addCombo(combo)]);