Merge remote-tracking branch 'origin/master'

This commit is contained in:
Kokomi 2023-11-07 03:53:31 +08:00
commit eb4b6c2d00
2 changed files with 12 additions and 2 deletions

View File

@ -15,7 +15,7 @@ export const details = [{
}, { }, {
title: 'E谢贝蕾妲小姐(螃蟹)·蒸发', title: 'E谢贝蕾妲小姐(螃蟹)·蒸发',
dmgKey: 'e', dmgKey: 'e',
dmg: ({ talent, attr, calc }, { basic }) => basic(calc(attr.hp) * talent.e['谢贝蕾妲小姐伤害'] / 100 * 1.4, 'e') dmg: ({ talent, attr, calc }, { basic }) => basic(calc(attr.hp) * talent.e['谢贝蕾妲小姐伤害'] / 100 * 1.4, 'e', '蒸发')
}, { }, {
title: 'Q万众狂欢·伤害', title: 'Q万众狂欢·伤害',
params: { talentQ: true }, params: { talentQ: true },

View File

@ -29,7 +29,8 @@ export const poolName = {
白术: '心珠循琅', 白术: '心珠循琅',
林尼: '光与影的戏术', 林尼: '光与影的戏术',
那维莱特: '渊海界令', 那维莱特: '渊海界令',
莱欧斯利: '劫中泛滥' 莱欧斯利: '劫中泛滥',
芙宁娜: '众水的颂诗'
} }
export const poolDetail = [{ export const poolDetail = [{
@ -527,5 +528,14 @@ export const poolDetail = [{
char4: ['重云', '托马', '多莉'], char4: ['重云', '托马', '多莉'],
weapon5: ['金流监督', '终末嗟叹之诗'], weapon5: ['金流监督', '终末嗟叹之诗'],
weapon4: ['勘探钻机', '测距规', '西风剑', '雨裁', '昭心'] weapon4: ['勘探钻机', '测距规', '西风剑', '雨裁', '昭心']
}, {
version: '4.2',
half: '上半',
from: '2023-11-08 06:00:00',
to: '2023-11-28 17:59:59',
char5: ['芙宁娜', '白术'],
char4: ['夏洛蒂', '柯莱', '北斗'],
weapon5: ['静水流涌之辉', '碧落之珑'],
weapon4: ['祭礼剑', '钟剑', '匣里灭辰', '祭礼残章', '绝弦']
} }
] ]