From 29f5c42a64067e80dd5a54ddf3a4d1bb11688168 Mon Sep 17 00:00:00 2001 From: yoimiya-kokomi <592981798@qq.com> Date: Fri, 20 May 2022 03:51:44 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=B8=80=E4=BA=9B=E5=B7=B2?= =?UTF-8?q?=E7=9F=A5=E9=97=AE=E9=A2=98=20*=20=E8=9E=AD=E9=AA=A8=E5=89=91?= =?UTF-8?q?=E5=9C=A8=E4=BC=A4=E5=AE=B3=E8=AE=A1=E7=AE=97=E4=B8=ADBuff?= =?UTF-8?q?=E5=B1=82=E6=95=B0=E7=9A=84=E9=97=AE=E9=A2=98=20*=20=E8=8E=AB?= =?UTF-8?q?=E5=A8=9C=E5=9C=A8=E8=A7=92=E8=89=B2=E5=A4=A9=E8=B5=8B=E8=B5=84?= =?UTF-8?q?=E6=96=99=E4=B8=AD=E7=9A=84=E5=B1=95=E7=A4=BA=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- resources/meta/character/优菈/calc.js | 1 - resources/meta/weapons/calc.js | 15 ++++++++------- resources/wiki/character.css | 16 ++++++++++------ resources/wiki/character.html | 2 +- resources/wiki/character.less | 14 +++++++++----- 5 files changed, 28 insertions(+), 20 deletions(-) diff --git a/resources/meta/character/优菈/calc.js b/resources/meta/character/优菈/calc.js index bc08a755..2a07f860 100644 --- a/resources/meta/character/优菈/calc.js +++ b/resources/meta/character/优菈/calc.js @@ -24,7 +24,6 @@ export const details = [{ } } }, ({ cons, weapon }) => { - let buffCount = 12; if (weapon.name === "松籁响起之时") { buffCount = 13; diff --git a/resources/meta/weapons/calc.js b/resources/meta/weapons/calc.js index 99987f01..bdfbd9ff 100644 --- a/resources/meta/weapons/calc.js +++ b/resources/meta/weapons/calc.js @@ -32,7 +32,7 @@ let polearm = { title: "对于水或或元素影响的敌人造成伤害提高[dmg]%", refine: { dmg: step(20, 4), - phy:step(20, 4), + phy: step(20, 4), } }, "千岩长枪": { @@ -91,7 +91,7 @@ let polearm = { refine: { atkPct: [3.2 * 7, 3.9 * 7, 4.6 * 7, 5.3 * 7, 6 * 7], dmg: step(12), - phy:step(12) + phy: step(12) } }, "护摩之杖": { @@ -453,7 +453,7 @@ let sword = { title: "角色造成的伤害提升[dmg]%", refine: { dmg: step(12), - phy:step(12) + phy: step(12) } }, "宗室长剑": { @@ -476,7 +476,7 @@ let sword = { title: "对处于火元素或雷元素影响下的敌人，造成的伤害提高[dmg]%", refine: { dmg: step(20, 4), - phy:step(20,4) + phy: step(20, 4) } }, "铁蜂刺": { @@ -484,7 +484,7 @@ let sword = { buffCount: 2, refine: { dmg: step(6), - phy:step(6) + phy: step(6) } }, "黑岩长剑": { @@ -518,7 +518,7 @@ let sword = { title: "对处于水或冰元素影响的敌人伤害提高[dmg]%", refine: { dmg: step(12), - phy:step(12) + phy: step(12) } }, "波乱月白经津": [{ @@ -642,6 +642,7 @@ let claymore = { }, "螭骨剑": { title: "满Buff提高伤害[dmg]%", + buffCount: 5, refine: { dmg: step(6, 1), phy: step(6, 1) @@ -707,7 +708,7 @@ let claymore = { } }, "赤角石溃杵": { - title: "普通攻击与重击造成的伤害值提高[aPlus]%", + title: "普通攻击与重击造成的伤害值提高[aPlus]", data: { aPlus: ({ attr, calc, refine }) => calc(attr.def) * step(40)[refine] / 100, a2Plus: ({ attr, calc, refine }) => calc(attr.def) * step(40)[refine] / 100 diff --git a/resources/wiki/character.css b/resources/wiki/character.css index 43edc161..36c8a7d8 100644 --- a/resources/wiki/character.css +++ b/resources/wiki/character.css @@ -141,7 +141,10 @@ body { background: #d3bc8d; } .head-box .data-box { - margin-top: 220px; + position: absolute; + left: 0; + right: 0; + top: 180px; color: #000; text-shadow: none; } @@ -155,7 +158,7 @@ body { border-radius: 15px; margin: 30px 15px; padding: 30px 15px 5px 15px; - background: #f5f5f5; + background: rgba(245, 245, 245, 0.8); box-shadow: 0 5px 10px 0 rgba(0, 0, 0, 0.15); position: relative; background-size: contain; @@ -243,7 +246,7 @@ body { } .talent-name { display: block; - font-size: 32px; + font-size: 30px; margin: 0 0 15px 0; color: #d3bc8e; line-height: 45px; @@ -266,7 +269,7 @@ body { .talent-line { position: relative; min-height: 100px; - margin-top: 50px; + margin-top: 35px; margin-bottom: 25px; } .talent-line:first-child { @@ -350,7 +353,8 @@ body { */ -.passive .talent-table { +.passive-talent .talent-table { + display: none; margin-right: 20px; width: 100%; margin-bottom: -15px; @@ -361,4 +365,4 @@ body { color: #7994a7; margin: 20px 0 10px 0; } -/*# sourceMappingURL=character.less.map */ \ No newline at end of file +/*# sourceMappingURL=character.css.map */ \ No newline at end of file diff --git a/resources/wiki/character.html b/resources/wiki/character.html index 33b24bda..24382eb5 100644 --- a/resources/wiki/character.html +++ b/resources/wiki/character.html @@ -95,7 +95,7 @@ {{/each}}
-
+
{{each passive pass idx}}
diff --git a/resources/wiki/character.less b/resources/wiki/character.less index 6e791e24..dd868f84 100644 --- a/resources/wiki/character.less +++ b/resources/wiki/character.less @@ -165,7 +165,10 @@ body { } .head-box .data-box { - margin-top: 220px; + position: absolute; + left: 0; + right: 0; + top: 180px; color: #000; text-shadow: none; @@ -181,7 +184,7 @@ body { border-radius: 15px; margin: 30px 15px; padding: 30px 15px 5px 15px; - background: #f5f5f5; + background: rgba(245, 245, 245, 0.8); box-shadow: 0 5px 10px 0 rgb(0 0 0 / 15%); position: relative; background-size: contain; @@ -281,7 +284,7 @@ body { .talent-name { display: block; - font-size: 32px; + font-size: 30px; margin: 0 0 15px 0; color: #d3bc8e; line-height: 45px; @@ -307,7 +310,7 @@ body { .talent-line { position: relative; min-height: 100px; - margin-top: 50px; + margin-top: 35px; margin-bottom: 25px; } @@ -403,7 +406,8 @@ body { */ -.passive .talent-table { +.passive-talent .talent-table { + display: none; margin-right: 20px; width: 100%; margin-bottom: -15px;