From b2253078f859f4dfb67032a2b332c386dcfc3d4a Mon Sep 17 00:00:00 2001
From: Kokomi <1379177109@qq.com>
Date: Thu, 2 Nov 2023 03:14:09 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E6=9B=B4=E6=96=B0=E9=9D=A2?=
=?UTF-8?q?=E6=9D=BF=E6=97=B6=E4=BC=A4=E5=AE=B3=E8=AE=A1=E7=AE=97=E6=97=A0?=
=?UTF-8?q?=E6=B3=95=E9=87=8D=E6=96=B0=E8=A7=A6=E5=8F=91=E7=9A=84=E9=97=AE?=
=?UTF-8?q?=E9=A2=98=20=E4=BF=AE=E6=AD=A3=E5=9C=A3=E9=81=97=E7=89=A9?=
=?UTF-8?q?=E8=AF=A6=E6=83=85=E8=A7=92=E8=89=B2=E7=AB=8B=E7=BB=98=E5=81=8F?=
=?UTF-8?q?=E7=A7=BB=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
apps/profile/ProfileArtis.js | 2 +-
models/Avatar.js | 3 ++-
models/ProfileDmg.js | 1 +
resources/character/artis-mark.css | 19 +++++++++++++++---
resources/character/artis-mark.html | 2 +-
resources/character/artis-mark.less | 23 +++++++++++++++++++---
resources/meta-gs/artifact/artis-mark.js | 2 +-
resources/meta-sr/character/桑博/calc.js | 2 ++
resources/meta-sr/character/玲可/calc.js | 2 ++
9 files changed, 46 insertions(+), 10 deletions(-)
diff --git a/apps/profile/ProfileArtis.js b/apps/profile/ProfileArtis.js
index 159a44a4..c927b14b 100644
--- a/apps/profile/ProfileArtis.js
+++ b/apps/profile/ProfileArtis.js
@@ -43,7 +43,7 @@ export async function profileArtis (e) {
charCfg,
game,
changeProfile: e._profileMsg
- }, { e, scale: 1.3 })
+ }, { e, scale: 1.6 / 1.1 })
}
/*
diff --git a/models/Avatar.js b/models/Avatar.js
index 5c4907c1..2590a4df 100644
--- a/models/Avatar.js
+++ b/models/Avatar.js
@@ -338,10 +338,11 @@ export default class Avatar extends Base {
// 计算当前profileData的伤害信息
async calcDmg ({ enemyLv = 91, mode = 'profile', dmgIdx = 0, idxIsInput = false }) {
- if (!this.dmg) {
+ if (!this.dmg || this.dmg._update !== this._update) {
let ds = this.getData('id,level,attr,cons,artis:artis.sets,trees')
ds.talent = lodash.mapValues(this.talent, 'level')
ds.weapon = Data.getData(this.weapon, 'name,affix')
+ ds._update = this._update
this.dmg = new ProfileDmg(ds, this.game)
}
return await this.dmg.calcData({ enemyLv, mode, dmgIdx, idxIsInput })
diff --git a/models/ProfileDmg.js b/models/ProfileDmg.js
index 6f160b9e..8c0778ef 100644
--- a/models/ProfileDmg.js
+++ b/models/ProfileDmg.js
@@ -12,6 +12,7 @@ export default class ProfileDmg extends Base {
super()
this.profile = profile
this.game = game
+ this._update = profile._update
if (profile && profile.id) {
let { id } = profile
this.char = Character.get(id)
diff --git a/resources/character/artis-mark.css b/resources/character/artis-mark.css
index dcdd76f0..a1b3d7f4 100644
--- a/resources/character/artis-mark.css
+++ b/resources/character/artis-mark.css
@@ -1,6 +1,11 @@
body,
.container {
- width: 650px;
+ width: 660px;
+}
+.main-pic {
+ width: 1540px;
+ height: 550px;
+ margin-left: -599.5px;
}
.container > .cont {
margin-left: 15px;
@@ -61,12 +66,20 @@ body,
.artis .no-bg {
opacity: 0;
}
+.artis ul.detail.attr-detail {
+ border-radius: 0;
+}
.artis ul.detail li span {
width: initial;
}
+.artis ul.detail li span.val {
+ padding-right: 8px;
+}
.artis ul.detail li span.mark {
text-align: right;
- padding-right: 10px;
+ padding-left: 5px;
+ padding-right: 6px;
+ background: rgba(0, 0, 0, 0.4);
}
.artis ul.detail li span.mark:after {
content: "分";
@@ -89,6 +102,6 @@ body,
}
.artis .item {
height: inherit;
- width: 200px;
+ width: 205px;
}
/*# sourceMappingURL=artis-mark.css.map */
\ No newline at end of file
diff --git a/resources/character/artis-mark.html b/resources/character/artis-mark.html
index 84f7fd81..dbdfcd5d 100644
--- a/resources/character/artis-mark.html
+++ b/resources/character/artis-mark.html
@@ -50,7 +50,7 @@
{{ds.name}}
{{ds.mark}}分 - {{ds.markClass}}
-
+
-
{{artisKeyTitle[ds.main.key]}}
+{{ds.main.value}}
diff --git a/resources/character/artis-mark.less b/resources/character/artis-mark.less
index 11396e16..553e17a0 100644
--- a/resources/character/artis-mark.less
+++ b/resources/character/artis-mark.less
@@ -1,5 +1,12 @@
body, .container {
- width: 650px;
+ width: 660px;
+}
+
+.main-pic {
+ @n: 1.1;
+ width: 1400px * @n;
+ height: 500px * @n;
+ margin-left: -545px * @n;
}
.container > .cont {
@@ -81,12 +88,22 @@ body, .container {
opacity: 0;
}
+ ul.detail.attr-detail {
+ border-radius: 0;
+ }
+
ul.detail li span {
width: initial;
+ &.val {
+ padding-right: 8px;
+ }
+
&.mark {
text-align: right;
- padding-right: 10px;
+ padding-left: 5px;
+ padding-right: 6px;
+ background: rgba(0, 0, 0, .4);
&:after {
content: "分";
@@ -116,7 +133,7 @@ body, .container {
.item {
height: inherit;
- width: 200px;
+ width: 205px;
}
diff --git a/resources/meta-gs/artifact/artis-mark.js b/resources/meta-gs/artifact/artis-mark.js
index 36481639..77ecbaed 100644
--- a/resources/meta-gs/artifact/artis-mark.js
+++ b/resources/meta-gs/artifact/artis-mark.js
@@ -7,7 +7,7 @@ export const usefulAttr = {
甘雨: { atk: 75, cpct: 100, cdmg: 100, mastery: 75, dmg: 100 },
雷电将军: { atk: 75, cpct: 100, cdmg: 100, mastery: 0, dmg: 75, recharge: 90 },
神里绫人: { hp: 50, atk: 75, def: 0, cpct: 100, cdmg: 100, mastery: 0, dmg: 100, phy: 0, recharge: 30, heal: 0 },
- 八重神子: { hp: 0, atk: 75, def: 0, cpct: 100, cdmg: 100, mastery: 75, dmg: 100, phy: 0, recharge: 55, heal: 0 },
+ 八重神子: { hp: 0, atk: 75, def: 0, cpct: 100, cdmg: 100, mastery: 75, dmg: 75, phy: 0, recharge: 55, heal: 0 },
申鹤: { hp: 0, atk: 100, def: 0, cpct: 100, cdmg: 100, mastery: 0, dmg: 100, phy: 0, recharge: 55, heal: 0 },
云堇: { hp: 0, atk: 75, def: 100, cpct: 80, cdmg: 80, mastery: 0, dmg: 80, phy: 0, recharge: 80, heal: 0 },
荒泷一斗: { hp: 0, atk: 50, def: 100, cpct: 100, cdmg: 100, mastery: 0, dmg: 100, phy: 0, recharge: 30, heal: 0 },
diff --git a/resources/meta-sr/character/桑博/calc.js b/resources/meta-sr/character/桑博/calc.js
index 934cceff..d0793ba5 100644
--- a/resources/meta-sr/character/桑博/calc.js
+++ b/resources/meta-sr/character/桑博/calc.js
@@ -48,3 +48,5 @@ export const buffs = [{
dotEnemyDmg: 30
}
}]
+
+export const createdBy = 'Aluxes'
diff --git a/resources/meta-sr/character/玲可/calc.js b/resources/meta-sr/character/玲可/calc.js
index 4b22cfec..ea544876 100644
--- a/resources/meta-sr/character/玲可/calc.js
+++ b/resources/meta-sr/character/玲可/calc.js
@@ -40,3 +40,5 @@ export const buffs = [{
_hpPlus: ({ calc, attr }) => calc(attr.hp) * 0.06
}
}]
+
+export const createdBy = 'Aluxes'