diff --git a/CHANGELOG.md b/CHANGELOG.md
index fd88acd1..ee2cd465 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,8 +1,11 @@
-# 2.0.5
+# 2.0.6
-* 适配3.2的enka数据获取
+* 增加纳西妲的伤害计算，
+* 注：所有草元素反应伤害计算暂未支持，后续统一添加
+* 增加3.3角色信息及图片，可通过`#散兵天赋`、`#珐露珊命座`查看
+* 一些已知问题修复
-# 2.0.1~2.0.4
+# 2.0.1~2.0.5
* `#日历` 页面样式微调，功能升级
* 日历中会展示角色生日
@@ -15,6 +18,7 @@
* 角色相关命令在V3下会联合V3的角色别名一同查询
* 增加妮露的伤害计算及圣遗物权重设置
* `#面板`会展示角色名命座信息
+* 适配3.2的enka数据获取
* `#深渊组队`使用新版胡桃API进行组队信息获取
# 2.0.0
diff --git a/components/profile-data/enka-data.js b/components/profile-data/enka-data.js
index ce6f7e20..43acab4b 100644
--- a/components/profile-data/enka-data.js
+++ b/components/profile-data/enka-data.js
@@ -188,6 +188,7 @@ let EnkaData = {
return ret
}
let { attr, id, weapon } = ret
+ let count = 0
id = id * 1
switch (id) {
case 10000052:
@@ -198,6 +199,14 @@ let EnkaData = {
// 莫娜被动fix
attr.dmg = Math.max(0, attr.dmg - attr.recharge * 0.2)
break
+ case 10000070:
+ // 妮露满命效果fix
+ if (ret.cons === 6) {
+ count = Math.floor(attr.hp / 1000)
+ attr.cpct = Math.max(5, attr.cpct - Math.min(30, count * 0.6))
+ attr.cdmg = Math.max(50, attr.cdmg - Math.min(60, count * 1.2))
+ }
+ break
}
let wDmg = {
息灾: 12,
diff --git a/models/ProfileArtis.js b/models/ProfileArtis.js
index 146315be..45d71cfc 100644
--- a/models/ProfileArtis.js
+++ b/models/ProfileArtis.js
@@ -34,7 +34,7 @@ export default class ProfileArtis extends Base {
idx = idx.toString().replace('arti', '')
let ret = {}
ret.name = ds.name || ArtifactSet.getArtiNameBySet(ds.set, idx) || ''
- ret.set = ds.set || Artifact.getSetNameByArti(ret.title) || ''
+ ret.set = ds.set || Artifact.getSetNameByArti(ret.name) || ''
ret.level = ds.level || 1
ret.main = ArtisMark.formatAttr(ds.main || {})
ret.attrs = []
diff --git a/models/ProfileDmg.js b/models/ProfileDmg.js
index 841eedcc..588c173a 100644
--- a/models/ProfileDmg.js
+++ b/models/ProfileDmg.js
@@ -44,14 +44,15 @@ export default class ProfileDmg extends Base {
valArr.push(valNum)
})
+ let name = tr.name2 || tr.name
if (isNaN(valArr[0])) {
- map[tr.name] = false
+ map[name] = false
} else if (valArr.length === 1) {
- map[tr.name] = valArr[0]
+ map[name] = valArr[0]
} else {
- map[tr.name] = valArr
+ map[name] = valArr
}
- map[tr.name + '2'] = valArr2
+ map[name + '2'] = valArr2
})
ret[key] = map
})
diff --git a/resources/character-img/珐露珊/01.jpg b/resources/character-img/珐露珊/01.jpg
new file mode 100644
index 00000000..2226e20e
Binary files /dev/null and b/resources/character-img/珐露珊/01.jpg differ
diff --git a/resources/character-img/珐露珊/02.jpg b/resources/character-img/珐露珊/02.jpg
new file mode 100644
index 00000000..4f887ade
Binary files /dev/null and b/resources/character-img/珐露珊/02.jpg differ
diff --git a/resources/character-img/珐露珊/03.jpg b/resources/character-img/珐露珊/03.jpg
new file mode 100644
index 00000000..d0af375e
Binary files /dev/null and b/resources/character-img/珐露珊/03.jpg differ
diff --git a/resources/character-img/珐露珊/04.jpg b/resources/character-img/珐露珊/04.jpg
new file mode 100644
index 00000000..dfec66de
Binary files /dev/null and b/resources/character-img/珐露珊/04.jpg differ
diff --git a/resources/character-img/珐露珊/05.jpg b/resources/character-img/珐露珊/05.jpg
new file mode 100644
index 00000000..df862344
Binary files /dev/null and b/resources/character-img/珐露珊/05.jpg differ
diff --git a/resources/meta/artifact/artis-mark.js b/resources/meta/artifact/artis-mark.js
index 584a8aff..0afd305b 100644
--- a/resources/meta/artifact/artis-mark.js
+++ b/resources/meta/artifact/artis-mark.js
@@ -45,7 +45,7 @@ export const usefulAttr = {
神里绫人: { hp: 50, atk: 75, def: 0, cp: 100, cd: 100, mastery: 0, dmg: 100, phy: 0, recharge: 30, heal: 0 },
八重神子: { hp: 0, atk: 75, def: 0, cp: 100, cd: 100, mastery: 75, dmg: 100, phy: 0, recharge: 55, heal: 0 },
申鹤: { hp: 0, atk: 100, def: 0, cp: 100, cd: 100, mastery: 0, dmg: 100, phy: 0, recharge: 55, heal: 0 },
- 云堇: { hp: 0, atk: 0, def: 100, cp: 50, cd: 50, mastery: 0, dmg: 40, phy: 0, recharge: 90, heal: 0 },
+ 云堇: { hp: 0, atk: 0, def: 100, cp: 80, cd: 80, mastery: 0, dmg: 80, phy: 0, recharge: 80, heal: 0 },
荒泷一斗: { hp: 0, atk: 50, def: 100, cp: 100, cd: 100, mastery: 0, dmg: 100, phy: 0, recharge: 30, heal: 0 },
五郎: { hp: 0, atk: 75, def: 100, cp: 50, cd: 50, mastery: 0, dmg: 100, phy: 0, recharge: 75, heal: 0 },
班尼特: { hp: 100, atk: 50, def: 0, cp: 100, cd: 100, mastery: 0, dmg: 80, phy: 0, recharge: 55, heal: 100 },
@@ -80,11 +80,11 @@ export const usefulAttr = {
七七: { hp: 0, atk: 75, def: 0, cp: 100, cd: 100, mastery: 0, dmg: 100, phy: 100, recharge: 55, heal: 100 },
凯亚: { hp: 0, atk: 75, def: 0, cp: 100, cd: 100, mastery: 0, dmg: 100, phy: 100, recharge: 30, heal: 0 },
烟绯: { hp: 0, atk: 75, def: 0, cp: 100, cd: 100, mastery: 75, dmg: 100, phy: 0, recharge: 30, heal: 0 },
- 早柚: { hp: 0, atk: 50, def: 0, cp: 50, cd: 50, mastery: 100, dmg: 80, phy: 0, recharge: 55, heal: 100 },
+ 早柚: { hp: 0, atk: 75, def: 0, cp: 100, cd: 100, mastery: 100, dmg: 100, phy: 0, recharge: 55, heal: 100 },
安柏: { hp: 0, atk: 75, def: 0, cp: 100, cd: 100, mastery: 75, dmg: 100, phy: 100, recharge: 0, heal: 0 },
丽莎: { hp: 0, atk: 75, def: 0, cp: 100, cd: 100, mastery: 75, dmg: 100, phy: 0, recharge: 0, heal: 0 },
埃洛伊: { hp: 0, atk: 75, def: 0, cp: 100, cd: 100, mastery: 0, dmg: 100, phy: 0, recharge: 0, heal: 0 },
- 辛焱: { hp: 0, atk: 75, def: 0, cp: 100, cd: 100, mastery: 0, dmg: 100, phy: 100, recharge: 0, heal: 0 },
+ 辛焱: { hp: 0, atk: 75, def: 75, cp: 100, cd: 100, mastery: 0, dmg: 100, phy: 100, recharge: 0, heal: 0 },
砂糖: { hp: 0, atk: 75, def: 0, cp: 100, cd: 100, mastery: 100, dmg: 75, phy: 0, recharge: 55, heal: 0 },
雷泽: { hp: 0, atk: 75, def: 0, cp: 100, cd: 100, mastery: 0, dmg: 100, phy: 100, recharge: 0, heal: 0 },
夜兰: { hp: 80, atk: 0, def: 0, cp: 100, cd: 100, mastery: 0, dmg: 100, phy: 0, recharge: 55, heal: 0 },
diff --git a/resources/meta/artifact/data.json b/resources/meta/artifact/data.json
index 7c8e341c..fa8b5e9d 100644
--- a/resources/meta/artifact/data.json
+++ b/resources/meta/artifact/data.json
@@ -2,7 +2,28 @@
"n400003": {
"id": "n400003",
"name": "行者之心",
- "sets": {},
+ "sets": {
+ "1": {
+ "id": "n51440",
+ "name": "故人之心"
+ },
+ "2": {
+ "id": "n51420",
+ "name": "归乡之羽"
+ },
+ "3": {
+ "id": "n51450",
+ "name": "逐光之石"
+ },
+ "4": {
+ "id": "n51410",
+ "name": "异国之盏"
+ },
+ "5": {
+ "id": "n51430",
+ "name": "感别之冠"
+ }
+ },
"effect": {
"2": "攻击力提高18%。",
"4": "重击的暴击率提升30%。"
@@ -11,7 +32,28 @@
"n400008": {
"id": "n400008",
"name": "勇士之心",
- "sets": {},
+ "sets": {
+ "1": {
+ "id": "n52440",
+ "name": "勇士的勋章"
+ },
+ "2": {
+ "id": "n52420",
+ "name": "勇士的期许"
+ },
+ "3": {
+ "id": "n52450",
+ "name": "勇士的坚毅"
+ },
+ "4": {
+ "id": "n52410",
+ "name": "勇士的壮行"
+ },
+ "5": {
+ "id": "n52430",
+ "name": "勇士的冠冕"
+ }
+ },
"effect": {
"2": "攻击力提高18%。",
"4": "对生命值高于50%的敌人，造成的伤害增加30%。"
@@ -20,7 +62,28 @@
"n400013": {
"id": "n400013",
"name": "守护之心",
- "sets": {},
+ "sets": {
+ "1": {
+ "id": "n53440",
+ "name": "守护之花"
+ },
+ "2": {
+ "id": "n53420",
+ "name": "守护徽印"
+ },
+ "3": {
+ "id": "n53450",
+ "name": "守护座钟"
+ },
+ "4": {
+ "id": "n53410",
+ "name": "守护之皿"
+ },
+ "5": {
+ "id": "n53430",
+ "name": "守护束带"
+ }
+ },
"effect": {
"2": "防御力提高30%。",
"4": "队伍里每有不同一种元素类型的自己的角色，自身获得30%相应的元素抗性。"
@@ -29,7 +92,28 @@
"n400018": {
"id": "n400018",
"name": "奇迹",
- "sets": {},
+ "sets": {
+ "1": {
+ "id": "n54440",
+ "name": "奇迹之花"
+ },
+ "2": {
+ "id": "n54420",
+ "name": "奇迹之羽"
+ },
+ "3": {
+ "id": "n54450",
+ "name": "奇迹之沙"
+ },
+ "4": {
+ "id": "n54410",
+ "name": "奇迹之杯"
+ },
+ "5": {
+ "id": "n54430",
+ "name": "奇迹耳坠"
+ }
+ },
"effect": {
"2": "所有元素抗性提高20%。",
"4": "受到某个元素类型的伤害后，相应的抗性提升30%，持续10秒。该效果每10秒只能触发一次。"
@@ -38,7 +122,28 @@
"n400023": {
"id": "n400023",
"name": "战狂",
- "sets": {},
+ "sets": {
+ "1": {
+ "id": "n55440",
+ "name": "战狂的蔷薇"
+ },
+ "2": {
+ "id": "n55420",
+ "name": "战狂的翎羽"
+ },
+ "3": {
+ "id": "n55450",
+ "name": "战狂的时计"
+ },
+ "4": {
+ "id": "n55410",
+ "name": "战狂的骨杯"
+ },
+ "5": {
+ "id": "n55430",
+ "name": "战狂的鬼面"
+ }
+ },
"effect": {
"2": "暴击率提高12%。",
"4": "生命值低于70%时，暴击率额外提升24%。"
@@ -47,7 +152,28 @@
"n400028": {
"id": "n400028",
"name": "武人",
- "sets": {},
+ "sets": {
+ "1": {
+ "id": "n56440",
+ "name": "武人的红花"
+ },
+ "2": {
+ "id": "n56420",
+ "name": "武人的羽饰"
+ },
+ "3": {
+ "id": "n56450",
+ "name": "武人的水漏"
+ },
+ "4": {
+ "id": "n56410",
+ "name": "武人的酒杯"
+ },
+ "5": {
+ "id": "n56430",
+ "name": "武人的头巾"
+ }
+ },
"effect": {
"2": "普通攻击与重击造成的伤害提高15%；",
"4": "施放元素战技后的8秒内，普通攻击和重击造成的伤害提升25%。"
@@ -56,7 +182,28 @@
"n400033": {
"id": "n400033",
"name": "教官",
- "sets": {},
+ "sets": {
+ "1": {
+ "id": "n57440",
+ "name": "教官的胸花"
+ },
+ "2": {
+ "id": "n57420",
+ "name": "教官的羽饰"
+ },
+ "3": {
+ "id": "n57450",
+ "name": "教官的怀表"
+ },
+ "4": {
+ "id": "n57410",
+ "name": "教官的茶杯"
+ },
+ "5": {
+ "id": "n57430",
+ "name": "教官的帽子"
+ }
+ },
"effect": {
"2": "元素精通提高80点。",
"4": "触发元素反应后，队伍中所有角色的元素精通提高120点，持续8秒。"
@@ -65,7 +212,28 @@
"n400038": {
"id": "n400038",
"name": "赌徒",
- "sets": {},
+ "sets": {
+ "1": {
+ "id": "n58440",
+ "name": "赌徒的胸花"
+ },
+ "2": {
+ "id": "n58420",
+ "name": "赌徒的羽饰"
+ },
+ "3": {
+ "id": "n58450",
+ "name": "赌徒的怀表"
+ },
+ "4": {
+ "id": "n58410",
+ "name": "赌徒的骰盅"
+ },
+ "5": {
+ "id": "n58430",
+ "name": "赌徒的耳环"
+ }
+ },
"effect": {
"2": "元素战技造成的伤害提升20%。",
"4": "击败敌人时，有100%概率清除元素战技的冷却时间。该效果每15秒至多触发一次。"
@@ -74,7 +242,28 @@
"n400043": {
"id": "n400043",
"name": "流放者",
- "sets": {},
+ "sets": {
+ "1": {
+ "id": "n59440",
+ "name": "流放者之花"
+ },
+ "2": {
+ "id": "n59420",
+ "name": "流放者之羽"
+ },
+ "3": {
+ "id": "n59450",
+ "name": "流放者怀表"
+ },
+ "4": {
+ "id": "n59410",
+ "name": "流放者之杯"
+ },
+ "5": {
+ "id": "n59430",
+ "name": "流放者头冠"
+ }
+ },
"effect": {
"2": "元素充能效率提高20%。",
"4": "施放元素爆发后，每2秒为队伍中所有角色（不包括自己）恢复2点元素能量。该效果持续6秒，无法叠加。"
@@ -83,7 +272,28 @@
"n400047": {
"id": "n400047",
"name": "冒险家",
- "sets": {},
+ "sets": {
+ "1": {
+ "id": "n60340",
+ "name": "冒险家之花"
+ },
+ "2": {
+ "id": "n60320",
+ "name": "冒险家尾羽"
+ },
+ "3": {
+ "id": "n60350",
+ "name": "冒险家怀表"
+ },
+ "4": {
+ "id": "n60310",
+ "name": "冒险家金杯"
+ },
+ "5": {
+ "id": "n60330",
+ "name": "冒险家头带"
+ }
+ },
"effect": {
"2": "生命值上限提高1000点。",
"4": "开启各类宝箱后的5秒内，持续恢复30%生命值。"
@@ -92,7 +302,28 @@
"n400052": {
"id": "n400052",
"name": "幸运儿",
- "sets": {},
+ "sets": {
+ "1": {
+ "id": "n61340",
+ "name": "幸运儿绿花"
+ },
+ "2": {
+ "id": "n61320",
+ "name": "幸运儿鹰羽"
+ },
+ "3": {
+ "id": "n61350",
+ "name": "幸运儿沙漏"
+ },
+ "4": {
+ "id": "n61310",
+ "name": "幸运儿之杯"
+ },
+ "5": {
+ "id": "n61330",
+ "name": "幸运儿银冠"
+ }
+ },
"effect": {
"2": "防御力提高100点。",
"4": "拾取摩拉时，恢复300点生命值。"
@@ -101,7 +332,28 @@
"n400058": {
"id": "n400058",
"name": "学士",
- "sets": {},
+ "sets": {
+ "1": {
+ "id": "n62440",
+ "name": "学士的书签"
+ },
+ "2": {
+ "id": "n62420",
+ "name": "学士的羽笔"
+ },
+ "3": {
+ "id": "n62450",
+ "name": "学士的时钟"
+ },
+ "4": {
+ "id": "n62410",
+ "name": "学士的墨杯"
+ },
+ "5": {
+ "id": "n62430",
+ "name": "学士的镜片"
+ }
+ },
"effect": {
"2": "元素充能效率提高20%。",
"4": "获得元素微粒或元素晶球时，队伍中所有弓箭和法器角色额外恢复3点元素能量。该效果每3秒只能触发一次。"
@@ -110,7 +362,28 @@
"n400062": {
"id": "n400062",
"name": "游医",
- "sets": {},
+ "sets": {
+ "1": {
+ "id": "n63340",
+ "name": "游医的银莲"
+ },
+ "2": {
+ "id": "n63320",
+ "name": "游医的枭羽"
+ },
+ "3": {
+ "id": "n63350",
+ "name": "游医的怀钟"
+ },
+ "4": {
+ "id": "n63310",
+ "name": "游医的药壶"
+ },
+ "5": {
+ "id": "n63330",
+ "name": "游医的方巾"
+ }
+ },
"effect": {
"2": "角色受到的治疗效果提高20%。",
"4": "施放元素爆发时，恢复20%生命值。"
@@ -119,7 +392,28 @@
"n400069": {
"id": "n400069",
"name": "冰风迷途的勇士",
- "sets": {},
+ "sets": {
+ "1": {
+ "id": "n71540",
+ "name": "历经风雪的思念"
+ },
+ "2": {
+ "id": "n71520",
+ "name": "摧冰而行的执望"
+ },
+ "3": {
+ "id": "n71550",
+ "name": "冰雪故园的终期"
+ },
+ "4": {
+ "id": "n71510",
+ "name": "遍结寒霜的傲骨"
+ },
+ "5": {
+ "id": "n71530",
+ "name": "破冰踏雪的回音"
+ }
+ },
"effect": {
"2": "获得15%冰元素伤害加成。",
"4": "攻击处于冰元素影响下的敌人时，暴击率提高20%；若敌人处于冻结状态下，则暴击率额外提高20%。"
@@ -128,7 +422,28 @@
"n400074": {
"id": "n400074",
"name": "平息鸣雷的尊者",
- "sets": {},
+ "sets": {
+ "1": {
+ "id": "n72540",
+ "name": "平雷之心"
+ },
+ "2": {
+ "id": "n72520",
+ "name": "平雷之羽"
+ },
+ "3": {
+ "id": "n72550",
+ "name": "平雷之刻"
+ },
+ "4": {
+ "id": "n72510",
+ "name": "平雷之器"
+ },
+ "5": {
+ "id": "n72530",
+ "name": "平雷之冠"
+ }
+ },
"effect": {
"2": "雷元素抗性提高40%。",
"4": "对处于雷元素影响下的敌人造成的伤害提升35%。"
@@ -137,7 +452,28 @@
"n400079": {
"id": "n400079",
"name": "渡过烈火的贤人",
- "sets": {},
+ "sets": {
+ "1": {
+ "id": "n73540",
+ "name": "渡火者的决绝"
+ },
+ "2": {
+ "id": "n73520",
+ "name": "渡火者的解脱"
+ },
+ "3": {
+ "id": "n73550",
+ "name": "渡火者的煎熬"
+ },
+ "4": {
+ "id": "n73510",
+ "name": "渡火者的醒悟"
+ },
+ "5": {
+ "id": "n73530",
+ "name": "渡火者的智慧"
+ }
+ },
"effect": {
"2": "火元素抗性提高40%。",
"4": "对处于火元素影响下的敌人造成的伤害提升35%。"
@@ -146,7 +482,28 @@
"n400084": {
"id": "n400084",
"name": "被怜爱的少女",
- "sets": {},
+ "sets": {
+ "1": {
+ "id": "n74540",
+ "name": "远方的少女之心"
+ },
+ "2": {
+ "id": "n74520",
+ "name": "少女飘摇的思念"
+ },
+ "3": {
+ "id": "n74550",
+ "name": "少女苦短的良辰"
+ },
+ "4": {
+ "id": "n74510",
+ "name": "少女片刻的闲暇"
+ },
+ "5": {
+ "id": "n74530",
+ "name": "少女易逝的芳颜"
+ }
+ },
"effect": {
"2": "角色造成的治疗效果提升15%。",
"4": "施放元素战技或元素爆发后的10秒内，队伍中所有角色受治疗效果加成提高20%。"
@@ -155,7 +512,28 @@
"n400089": {
"id": "n400089",
"name": "角斗士的终幕礼",
- "sets": {},
+ "sets": {
+ "1": {
+ "id": "n75540",
+ "name": "角斗士的留恋"
+ },
+ "2": {
+ "id": "n75520",
+ "name": "角斗士的归宿"
+ },
+ "3": {
+ "id": "n75550",
+ "name": "角斗士的希冀"
+ },
+ "4": {
+ "id": "n75510",
+ "name": "角斗士的酣醉"
+ },
+ "5": {
+ "id": "n75530",
+ "name": "角斗士的凯旋"
+ }
+ },
"effect": {
"2": "攻击力提高18%。",
"4": "装备该圣遗物套装的角色为单手剑、双手剑、长柄武器角色时，角色普通攻击造成的伤害提高35%。"
@@ -164,7 +542,28 @@
"n400094": {
"id": "n400094",
"name": "翠绿之影",
- "sets": {},
+ "sets": {
+ "1": {
+ "id": "n76540",
+ "name": "野花记忆的绿野"
+ },
+ "2": {
+ "id": "n76520",
+ "name": "猎人青翠的箭羽"
+ },
+ "3": {
+ "id": "n76550",
+ "name": "翠绿猎人的笃定"
+ },
+ "4": {
+ "id": "n76510",
+ "name": "翠绿猎人的容器"
+ },
+ "5": {
+ "id": "n76530",
+ "name": "翠绿的猎人之冠"
+ }
+ },
"effect": {
"2": "获得15%风元素伤害加成。",
"4": "扩散反应造成的伤害提升60%。根据扩散的元素类型，降低受到影响的敌人40%的对应元素抗性，持续10秒。"
@@ -173,7 +572,28 @@
"n400099": {
"id": "n400099",
"name": "流浪大地的乐团",
- "sets": {},
+ "sets": {
+ "1": {
+ "id": "n77540",
+ "name": "乐团的晨光"
+ },
+ "2": {
+ "id": "n77520",
+ "name": "琴师的箭羽"
+ },
+ "3": {
+ "id": "n77550",
+ "name": "终幕的时计"
+ },
+ "4": {
+ "id": "n77510",
+ "name": "吟游者之壶"
+ },
+ "5": {
+ "id": "n77530",
+ "name": "指挥的礼帽"
+ }
+ },
"effect": {
"2": "元素精通提高80点。",
"4": "装备该圣遗物套装的角色为法器、弓箭角色时，角色重击造成的伤害提高35%。"
@@ -182,7 +602,28 @@
"n400109": {
"id": "n400109",
"name": "如雷的盛怒",
- "sets": {},
+ "sets": {
+ "1": {
+ "id": "n79540",
+ "name": "雷鸟的怜悯"
+ },
+ "2": {
+ "id": "n79520",
+ "name": "雷灾的孑遗"
+ },
+ "3": {
+ "id": "n79550",
+ "name": "雷霆的时计"
+ },
+ "4": {
+ "id": "n79510",
+ "name": "降雷的凶兆"
+ },
+ "5": {
+ "id": "n79530",
+ "name": "唤雷的头冠"
+ }
+ },
"effect": {
"2": "获得15%雷元素伤害加成。",
"4": "超载、感电、超导、超绽放反应造成的伤害提升40%，超激化反应带来的伤害提升提高20%。触发上述元素反应或原激化反应时，元素战技冷却时间减少1秒。该效果每0.8秒最多触发一次。"
@@ -191,7 +632,28 @@
"n400114": {
"id": "n400114",
"name": "炽烈的炎之魔女",
- "sets": {},
+ "sets": {
+ "1": {
+ "id": "n80540",
+ "name": "魔女的炎之花"
+ },
+ "2": {
+ "id": "n80520",
+ "name": "魔女常燃之羽"
+ },
+ "3": {
+ "id": "n80550",
+ "name": "魔女破灭之时"
+ },
+ "4": {
+ "id": "n80510",
+ "name": "魔女的心之火"
+ },
+ "5": {
+ "id": "n80530",
+ "name": "焦灼的魔女帽"
+ }
+ },
"effect": {
"2": "获得15%火元素伤害加成。",
"4": "超载、燃烧、烈绽放反应造成的伤害提升40%，蒸发、融化反应的加成系数提高15%。施放元素战技后的10秒内，2件套的效果提高50%，该效果最多叠加3次。"
@@ -200,7 +662,28 @@
"n400119": {
"id": "n400119",
"name": "昔日宗室之仪",
- "sets": {},
+ "sets": {
+ "1": {
+ "id": "n81540",
+ "name": "宗室之花"
+ },
+ "2": {
+ "id": "n81520",
+ "name": "宗室之翎"
+ },
+ "3": {
+ "id": "n81550",
+ "name": "宗室时计"
+ },
+ "4": {
+ "id": "n81510",
+ "name": "宗室银瓮"
+ },
+ "5": {
+ "id": "n81530",
+ "name": "宗室面具"
+ }
+ },
"effect": {
"2": "元素爆发造成的伤害提升20%。",
"4": "施放元素爆发后，队伍中所有角色攻击力提升20%，持续12秒。该效果不可叠加。"
@@ -209,7 +692,28 @@
"n400124": {
"id": "n400124",
"name": "染血的骑士道",
- "sets": {},
+ "sets": {
+ "1": {
+ "id": "n82540",
+ "name": "染血的铁之心"
+ },
+ "2": {
+ "id": "n82520",
+ "name": "染血的黑之羽"
+ },
+ "3": {
+ "id": "n82550",
+ "name": "骑士染血之时"
+ },
+ "4": {
+ "id": "n82510",
+ "name": "染血骑士之杯"
+ },
+ "5": {
+ "id": "n82530",
+ "name": "染血的铁假面"
+ }
+ },
"effect": {
"2": "造成的物理伤害提高25%。",
"4": "击败敌人后的10秒内，施放重击时不消耗体力，且重击造成的伤害提升50%。"
@@ -218,7 +722,12 @@
"n400128": {
"id": "n400128",
"name": "祭火之人",
- "sets": {},
+ "sets": {
+ "5": {
+ "id": "n83430",
+ "name": "祭火礼冠"
+ }
+ },
"effect": {
"1": "受到的火元素附着效果的持续时间减少40%。"
}
@@ -226,7 +735,12 @@
"n400133": {
"id": "n400133",
"name": "祭水之人",
- "sets": {},
+ "sets": {
+ "5": {
+ "id": "n84430",
+ "name": "祭水礼冠"
+ }
+ },
"effect": {
"1": "受到的水元素附着效果的持续时间减少40%。"
}
@@ -234,7 +748,12 @@
"n400138": {
"id": "n400138",
"name": "祭雷之人",
- "sets": {},
+ "sets": {
+ "5": {
+ "id": "n85430",
+ "name": "祭雷礼冠"
+ }
+ },
"effect": {
"1": "受到的雷元素附着效果的持续时间减少40%。"
}
@@ -242,7 +761,12 @@
"n400148": {
"id": "n400148",
"name": "祭冰之人",
- "sets": {},
+ "sets": {
+ "5": {
+ "id": "n87430",
+ "name": "祭冰礼冠"
+ }
+ },
"effect": {
"1": "受到的冰元素附着效果的持续时间减少40%。"
}
@@ -250,7 +774,28 @@
"n400154": {
"id": "n400154",
"name": "悠古的磐岩",
- "sets": {},
+ "sets": {
+ "1": {
+ "id": "n88540",
+ "name": "磐陀裂生之花"
+ },
+ "2": {
+ "id": "n88520",
+ "name": "嵯峨群峰之翼"
+ },
+ "3": {
+ "id": "n88550",
+ "name": "星罗圭璧之晷"
+ },
+ "4": {
+ "id": "n88510",
+ "name": "巉岩琢塑之樽"
+ },
+ "5": {
+ "id": "n88530",
+ "name": "不动玄石之相"
+ }
+ },
"effect": {
"2": "获得15%岩元素伤害加成。",
"4": "获得结晶反应形成的晶片时，队伍中所有角色获得35%对应元素伤害加成，持续10秒。同时只能通过该效果获得一种元素伤害加成。"
@@ -259,7 +804,28 @@
"n400159": {
"id": "n400159",
"name": "逆飞的流星",
- "sets": {},
+ "sets": {
+ "1": {
+ "id": "n89540",
+ "name": "夏祭之花"
+ },
+ "2": {
+ "id": "n89520",
+ "name": "夏祭终末"
+ },
+ "3": {
+ "id": "n89550",
+ "name": "夏祭之刻"
+ },
+ "4": {
+ "id": "n89510",
+ "name": "夏祭水玉"
+ },
+ "5": {
+ "id": "n89530",
+ "name": "夏祭之面"
+ }
+ },
"effect": {
"2": "护盾强效提高35%。",
"4": "处于护盾庇护下时，额外获得40%普通攻击和重击伤害加成。"
@@ -268,7 +834,28 @@
"n400164": {
"id": "n400164",
"name": "沉沦之心",
- "sets": {},
+ "sets": {
+ "1": {
+ "id": "n90540",
+ "name": "饰金胸花"
+ },
+ "2": {
+ "id": "n90520",
+ "name": "追忆之风"
+ },
+ "3": {
+ "id": "n90550",
+ "name": "坚铜罗盘"
+ },
+ "4": {
+ "id": "n90510",
+ "name": "沉波之盏"
+ },
+ "5": {
+ "id": "n90530",
+ "name": "酒渍船帽"
+ }
+ },
"effect": {
"2": "获得15%水元素伤害加成。",
"4": "施放元素战技后的15秒内，普通攻击与重击造成的伤害提高30%。"
@@ -277,7 +864,28 @@
"n400169": {
"id": "n400169",
"name": "千岩牢固",
- "sets": {},
+ "sets": {
+ "1": {
+ "id": "n91540",
+ "name": "勋绩之花"
+ },
+ "2": {
+ "id": "n91520",
+ "name": "昭武翎羽"
+ },
+ "3": {
+ "id": "n91550",
+ "name": "金铜时晷"
+ },
+ "4": {
+ "id": "n91510",
+ "name": "盟誓金爵"
+ },
+ "5": {
+ "id": "n91530",
+ "name": "将帅兜鍪"
+ }
+ },
"effect": {
"2": "生命值提升20%",
"4": "元素战技命中敌人后，使队伍中附近的所有角色攻击力提升20%，护盾强效提升30%，持续3秒。该效果每0.5秒至多触发一次。装备此圣遗物套装的角色处于队伍后台时，依然能触发该效果。"
@@ -286,7 +894,28 @@
"n400174": {
"id": "n400174",
"name": "苍白之火",
- "sets": {},
+ "sets": {
+ "1": {
+ "id": "n92540",
+ "name": "无垢之花"
+ },
+ "2": {
+ "id": "n92520",
+ "name": "贤医之羽"
+ },
+ "3": {
+ "id": "n92550",
+ "name": "停摆之刻"
+ },
+ "4": {
+ "id": "n92510",
+ "name": "超越之盏"
+ },
+ "5": {
+ "id": "n92530",
+ "name": "嗤笑之面"
+ }
+ },
"effect": {
"2": "造成的物理伤害提高25%。",
"4": "元素战技命中敌人后，攻击力提升9%。该效果持续7秒，至多叠加2层，每0.3秒至多触发一次。叠满2层时，2件套的效果提升100%。"
@@ -295,7 +924,28 @@
"n400179": {
"id": "n400179",
"name": "追忆之注连",
- "sets": {},
+ "sets": {
+ "1": {
+ "id": "n93543",
+ "name": "羁缠之花"
+ },
+ "2": {
+ "id": "n93523",
+ "name": "思忆之矢"
+ },
+ "3": {
+ "id": "n93553",
+ "name": "朝露之时"
+ },
+ "4": {
+ "id": "n93513",
+ "name": "祈望之心"
+ },
+ "5": {
+ "id": "n93533",
+ "name": "无常之面"
+ }
+ },
"effect": {
"2": "攻击力提高18%。",
"4": "施放元素战技时，如果角色的元素能量高于或等于15点，则会流失15点元素能量，使接下来的10秒内，普通攻击、重击、下落攻击造成的伤害提高50%，持续期间内该效果不会再次触发。"
@@ -304,7 +954,28 @@
"n400184": {
"id": "n400184",
"name": "绝缘之旗印",
- "sets": {},
+ "sets": {
+ "1": {
+ "id": "n94543",
+ "name": "明威之镡"
+ },
+ "2": {
+ "id": "n94523",
+ "name": "切落之羽"
+ },
+ "3": {
+ "id": "n94553",
+ "name": "雷云之笼"
+ },
+ "4": {
+ "id": "n94513",
+ "name": "绯花之壶"
+ },
+ "5": {
+ "id": "n94533",
+ "name": "华饰之兜"
+ }
+ },
"effect": {
"2": "元素充能效率提高20%。",
"4": "基于元素充能效率的25%，提高元素爆发造成的伤害。至多通过这种方式获得75%提升。"
@@ -313,7 +984,28 @@
"n400189": {
"id": "n400189",
"name": "华馆梦醒形骸记",
- "sets": {},
+ "sets": {
+ "1": {
+ "id": "n95543",
+ "name": "荣花之期"
+ },
+ "2": {
+ "id": "n95523",
+ "name": "华馆之羽"
+ },
+ "3": {
+ "id": "n95553",
+ "name": "众生之谣"
+ },
+ "4": {
+ "id": "n95513",
+ "name": "梦醒之瓢"
+ },
+ "5": {
+ "id": "n95533",
+ "name": "形骸之笠"
+ }
+ },
"effect": {
"2": "防御力提高30%。",
"4": "装备此圣遗物套装的角色在以下情况下，将获得「问答」效果：在场上用岩元素攻击命中敌人后获得一层，每0.3秒至多触发一次；在队伍后台中，每3秒获得一层。问答至多叠加4层，每层能提供6%防御力与6%岩元素伤害加成。每6秒，若未获得问答效果，将损失一层。"
@@ -322,7 +1014,28 @@
"n400194": {
"id": "n400194",
"name": "海染砗磲",
- "sets": {},
+ "sets": {
+ "1": {
+ "id": "n96543",
+ "name": "海染之花"
+ },
+ "2": {
+ "id": "n96523",
+ "name": "渊宫之羽"
+ },
+ "3": {
+ "id": "n96553",
+ "name": "离别之贝"
+ },
+ "4": {
+ "id": "n96513",
+ "name": "真珠之笼"
+ },
+ "5": {
+ "id": "n96533",
+ "name": "海祇之冠"
+ }
+ },
"effect": {
"2": "治疗加成提高15%。",
"4": "装备此圣遗物套装的角色对队伍中的角色进行治疗时，将产生持续3秒的海染泡沫，记录治疗的生命值回复量（包括溢出值）。持续时间结束时，海染泡沫将会爆炸，对周围的敌人造成90%累计回复量的伤害（该伤害结算方式同感电、超导等元素反应，但不受元素精通、等级或反应伤害加成效果影响）。每3.5秒至多产生一个海染泡沫；海染泡沫至多记录30000点回复量，含溢出部分的治疗量；自己的队伍中同时至多存在一个海染泡沫。装备此圣遗物套装的角色处于队伍后台时，依然能触发该效果。"
@@ -331,7 +1044,28 @@
"n400199": {
"id": "n400199",
"name": "辰砂往生录",
- "sets": {},
+ "sets": {
+ "1": {
+ "id": "n97543",
+ "name": "生灵之华"
+ },
+ "2": {
+ "id": "n97523",
+ "name": "潜光片羽"
+ },
+ "3": {
+ "id": "n97553",
+ "name": "阳辔之遗"
+ },
+ "4": {
+ "id": "n97513",
+ "name": "结契之刻"
+ },
+ "5": {
+ "id": "n97533",
+ "name": "虺雷之姿"
+ }
+ },
"effect": {
"2": "攻击力提高18%。",
"4": "施放元素爆发后，将产生持续16秒的「潜光」效果：攻击力提升8%；并在角色的生命值降低时，攻击力进一步提升10%，至多通过这种方式提升4次，每0.8秒至多触发一次。「潜光」效果将在角色退场时消失；持续期间再次施放元素爆发，将移除原有的「潜光」。"
@@ -340,7 +1074,28 @@
"n400204": {
"id": "n400204",
"name": "来歆余响",
- "sets": {},
+ "sets": {
+ "1": {
+ "id": "n98543",
+ "name": "魂香之花"
+ },
+ "2": {
+ "id": "n98523",
+ "name": "垂玉之叶"
+ },
+ "3": {
+ "id": "n98553",
+ "name": "祝祀之凭"
+ },
+ "4": {
+ "id": "n98513",
+ "name": "涌泉之盏"
+ },
+ "5": {
+ "id": "n98533",
+ "name": "浮溯之珏"
+ }
+ },
"effect": {
"2": "攻击力提高18%。",
"4": "普通攻击命中敌人时，有36%概率触发「幽谷祝祀」：普通攻击造成的伤害提高，伤害提高值为攻击力的70%，该效果将在普通攻击造成伤害后的0.05秒后清除。普通攻击未触发「幽谷祝祀」时，会使下次触发概率提升20%；0.2秒内至多判定1次触发与否。"
@@ -349,7 +1104,28 @@
"n400209": {
"id": "n400209",
"name": "深林的记忆",
- "sets": {},
+ "sets": {
+ "1": {
+ "id": "n20543",
+ "name": "迷宫的游人"
+ },
+ "2": {
+ "id": "n20523",
+ "name": "翠蔓的智者"
+ },
+ "3": {
+ "id": "n20553",
+ "name": "贤智的定期"
+ },
+ "4": {
+ "id": "n20513",
+ "name": "迷误者之灯"
+ },
+ "5": {
+ "id": "n20533",
+ "name": "月桂的宝冠"
+ }
+ },
"effect": {
"2": "获得15%草元素伤害加成。",
"4": "元素战技或元素爆发命中敌人后，使命中目标的草元素抗性降低30%，持续8秒。装备者处于队伍后台时，依然能触发该效果。"
@@ -358,7 +1134,28 @@
"n400214": {
"id": "n400214",
"name": "饰金之梦",
- "sets": {},
+ "sets": {
+ "1": {
+ "id": "n21543",
+ "name": "梦中的铁花"
+ },
+ "2": {
+ "id": "n21523",
+ "name": "裁断的翎羽"
+ },
+ "3": {
+ "id": "n21553",
+ "name": "沉金的岁月"
+ },
+ "4": {
+ "id": "n21513",
+ "name": "如蜜的终宴"
+ },
+ "5": {
+ "id": "n21533",
+ "name": "沙王的投影"
+ }
+ },
"effect": {
"2": "元素精通提高80点。",
"4": "触发元素反应后的8秒内，会根据队伍内其他角色的元素类型，使装备者获得强化：队伍中每存在1个和装备者同类元素的角色，攻击力提升14%；每存在1个和装备者不同元素类型的角色，元素精通提升50点。上述每类效果至多计算3个角色。该效果每8秒至多触发一次。装备者处于队伍后台时，依然能触发该效果。"
@@ -367,7 +1164,28 @@
"n400221": {
"id": "n400221",
"name": "沙上楼阁史话",
- "sets": {},
+ "sets": {
+ "1": {
+ "id": "n27543",
+ "name": "众王之都的开端"
+ },
+ "2": {
+ "id": "n27523",
+ "name": "黄金邦国的结末"
+ },
+ "3": {
+ "id": "n27553",
+ "name": "失落迷途的机芯"
+ },
+ "4": {
+ "id": "n27513",
+ "name": "迷醉长梦的守护"
+ },
+ "5": {
+ "id": "n27533",
+ "name": "流沙贵嗣的遗宝"
+ }
+ },
"effect": {
"2": "获得15%风元素伤害加成。",
"4": "重击命中敌人后，该角色的普通攻击速度提升10%，普通攻击、重击与下落攻击造成的伤害提升30%，持续10秒。"
diff --git a/resources/meta/character/纳西妲/calc.js b/resources/meta/character/纳西妲/calc.js
new file mode 100644
index 00000000..a9fa9d11
--- /dev/null
+++ b/resources/meta/character/纳西妲/calc.js
@@ -0,0 +1,59 @@
+export const details = [{
+ title: 'E长按伤害',
+ params: { e: true, q: false },
+ dmg: ({ talent }, dmg) => dmg(talent.e['长按伤害'], 'e')
+}, {
+ title: '灭净三业伤害',
+ params: { e2: true, q: false },
+ dmg: ({ talent, calc, attr }, { basic }) => {
+ const td = talent.e['灭净三业伤害2']
+ const em = calc(attr.mastery)
+ const atk = calc(attr.atk)
+ return basic(td[0] * atk / 100 + td[1] * em / 100, 'e')
+ }
+}, {
+ title: '开Q灭净三业伤害',
+ params: { e2: true },
+ dmg: ({ talent, calc, attr, cons }, { basic }) => {
+ const td = talent.e['灭净三业伤害2']
+ const em = calc(attr.mastery)
+ const atk = calc(attr.atk)
+ return basic(td[0] * atk / 100 + td[1] * em / 100, 'e')
+ }
+}]
+
+export const mainAttr = 'atk,mastery,cpct,cdmg'
+
+export const buffs = [{
+ title: '草神1命：火元素队友额外计入1位',
+ cons: 1
+}, {
+ title: '草神2命：激化相关反应降低敌人防御力30%',
+ cons: 2,
+ data: {
+ enemyDef: 30
+ }
+}, {
+ title: '草神4命：E4个敌人提升精通160',
+ cons: 4,
+ data: {
+ mastery: 160
+ }
+}, {
+ title: '草神被动：开Q元素精通提升[mastery]',
+ data: {
+ mastery: ({ calc, attr, params }) => (params.q === false ? 0 : 1) * Math.min(250, calc(attr.mastery) * 0.25)
+ }
+}, {
+ title: '草神被动：基于元素精通提升灭净三业伤害[eDmg]%，暴击率[eCpct]%',
+ data: {
+ eDmg: ({ calc, attr, params }) => (params.e ? 0 : 1) * Math.min(80, (calc(attr.mastery) - 200) * 0.1),
+ eCpct: ({ calc, attr, params }) => (params.e ? 0 : 1) * Math.min(24, (calc(attr.mastery) - 200) * 0.03)
+ }
+}, {
+ title: '草神Q：开Q提升灭净三业伤害[eDmg]%',
+ data: {
+ eDmg: ({ cons, talent, params }) => (params.q === false ? 0 : 1) *
+ (cons >= 1 ? talent.q['火2伤害提升'] : talent.q['火1伤害提升'])
+ }
+}]
diff --git a/resources/meta/character/纳西妲/detail.json b/resources/meta/character/纳西妲/detail.json
index 1f8d4dc8..5e8f2ce2 100644
--- a/resources/meta/character/纳西妲/detail.json
+++ b/resources/meta/character/纳西妲/detail.json
@@ -381,6 +381,7 @@
"tables": [
{
"name": "火：伤害提升",
+ "name2": "火1伤害提升",
"unit": "1名角色",
"isSame": false,
"values": [
@@ -403,6 +404,7 @@
},
{
"name": "火：伤害提升",
+ "name2": "火2伤害提升",
"unit": "2名角色",
"isSame": false,
"values": [
diff --git a/resources/meta/character/辛焱/calc.js b/resources/meta/character/辛焱/calc.js
index b11cf741..95556c1c 100644
--- a/resources/meta/character/辛焱/calc.js
+++ b/resources/meta/character/辛焱/calc.js
@@ -13,7 +13,7 @@ export const details = [{
dmg: ({ talent }, dmg) => dmg(talent.a['重击循环伤害'], 'a2', 'phy')
}]
-export const mainAttr = 'atk,cpct,cdmg,def'
+export const mainAttr = 'atk,def,cpct,cdmg'
export const enemyName = '魔偶/女士/雷神/丘丘'
export const buffs = [{
diff --git a/resources/meta/weapon/catalyst/calc.js b/resources/meta/weapon/catalyst/calc.js
index 908f3e5f..6cce986f 100644
--- a/resources/meta/weapon/catalyst/calc.js
+++ b/resources/meta/weapon/catalyst/calc.js
@@ -134,6 +134,13 @@ export default function (step) {
data: {
atkPlus: ({ attr, calc, refine }) => step(24)[refine] * calc(attr.mastery) / 100
}
+ },
+ 千夜浮梦: {
+ title: '3个不同元素队友满层，元素伤害提高[dmg]%',
+ buffCount: 3,
+ refine: {
+ dmg: step(10, 4)
+ }
}
}
}
diff --git a/tools/artis-data-sprider.js b/tools/artis-data-sprider.js
index 885f6ac2..390d2cd8 100644
--- a/tools/artis-data-sprider.js
+++ b/tools/artis-data-sprider.js
@@ -126,4 +126,4 @@ async function down (sets = '') {
})
}
-await down('乐园遗落之花')
+await down()
diff --git a/tools/web.js b/tools/web.js
index a4625b05..a563dd9c 100644
--- a/tools/web.js
+++ b/tools/web.js
@@ -24,38 +24,37 @@ app.use(express.static(_path + '/resources'))
app.use('/plugins', express.static('plugins'))
app.get('/', function (req, res) {
- let fileList = fs.readdirSync(_path + '/data/ViewData/') || []
+ let pluginList = fs.readdirSync(_path + '/data/ViewData/') || []
let html = [
'在npm run web-dev模式下触发截图消息后，可在下方选择页面进行调试',
'如果页面内资源路径不正确请使用{{_res_path}}作为根路径，对应之前的../../../../',
'可直接修改模板html或css刷新查看效果'
]
let li = {}
- for (let idx in fileList) {
- let ret = /(.+)\.json$/.exec(fileList[idx])
- if (ret && ret[1]) {
- let data = JSON.parse(fs.readFileSync(_path + '/data/ViewData/' + ret[1] + '.json', 'utf8'))
- let text = [(data._app || 'genshin'), ret[1]]
- if (data._plugin) {
- text.unshift(data._plugin)
+ for (let pIdx in pluginList) {
+ const plugin = pluginList[pIdx]
+ let fileList = fs.readdirSync(_path + `/data/ViewData/${plugin}/`) || []
+ for (let idx in fileList) {
+ let ret = /(.+)\.json$/.exec(fileList[idx])
+ if (ret && ret[1]) {
+ let text = [plugin, ...ret[1].split('_')]
+ li[text.join('')] = (`${text.join(' / ')}`)
}
- li[text.join('')] = (`${text.join(' / ')}`)
}
}
res.send(html.join('') + '' + lodash.values(li).join('') + '
')
})
-app.get('/:type', function (req, res) {
- let page = req.params.type
+app.get('/:page', function (req, res) {
+ let [plugin, app, page] = req.params.page.split('_')
if (page == 'favicon.ico') {
return res.send('')
}
- let data = JSON.parse(fs.readFileSync(_path + '/data/ViewData/' + page + '.json', 'utf8'))
+ let data = JSON.parse(fs.readFileSync(_path + `/data/ViewData/${plugin}/${app}_${page}.json`, 'utf8'))
data = data || {}
data._res_path = ''
data._sys_res_path = data._res_path
- let app = data._app || 'genshin'
if (data._plugin) {
data._res_path = `/plugins/${data._plugin}/resources/`
data.pluResPath = data._res_path