Merge remote-tracking branch 'origin/master'

This commit is contained in:
yoimiya-kokomi 2022-07-14 00:39:29 +08:00
commit fc2a704238
3 changed files with 617 additions and 595 deletions

View File

@ -134,7 +134,8 @@ let Calc = {
let talentData = profile.talent || {}; let talentData = profile.talent || {};
lodash.forEach(['a', 'e', 'q'], (key) => { lodash.forEach(['a', 'e', 'q'], (key) => {
let lv = talentData[key].level_current * 1 || 1, let td = talentData[key] || {};
let lv = td.level_current * 1 || 1,
lvKey = `Lv${lv}`; lvKey = `Lv${lv}`;
let map = {}; let map = {};

File diff suppressed because it is too large Load Diff

View File

@ -43,11 +43,13 @@ export default {
577103787: "能量沐浴", 577103787: "能量沐浴",
578575283: "流月针", 578575283: "流月针",
597991835: "白夜皓月", 597991835: "白夜皓月",
607067963: "澄澄一心传",
613846163: "降世", 613846163: "降世",
618786571: "钺矛", 618786571: "钺矛",
623494555: "摧坚", 623494555: "摧坚",
623534363: "西风秘典", 623534363: "西风秘典",
630452219: "樱之斋宫", 630452219: "樱之斋宫",
646032090: "鹿野院平藏",
646100491: "千岩诀·同心", 646100491: "千岩诀·同心",
650049651: "风花之颂", 650049651: "风花之颂",
655825874: "云堇", 655825874: "云堇",
@ -79,6 +81,7 @@ export default {
968893378: "班尼特", 968893378: "班尼特",
991968139: "非时之梦·常世灶食", 991968139: "非时之梦·常世灶食",
1006042610: "神里绫华", 1006042610: "神里绫华",
1012170803: "笼钓瓶一心",
1021898539: "弹弓", 1021898539: "弹弓",
1021947690: "魈", 1021947690: "魈",
1028735635: "抗争的践行之歌", 1028735635: "抗争的践行之歌",
@ -103,6 +106,7 @@ export default {
1212345779: "角斗士的终幕礼", 1212345779: "角斗士的终幕礼",
1217552947: "白刃流转", 1217552947: "白刃流转",
1240067179: "西风猎弓", 1240067179: "西风猎弓",
1307222899: "徊徊切舍刀",
1319974859: "激励", 1319974859: "激励",
1321135667: "匣里龙吟", 1321135667: "匣里龙吟",
1337666507: "千岩牢固", 1337666507: "千岩牢固",
@ -123,11 +127,13 @@ export default {
1485303435: "注能之刺", 1485303435: "注能之刺",
1492752155: "气定神闲", 1492752155: "气定神闲",
1499235563: "乘胜追击", 1499235563: "乘胜追击",
1499745907: "「一心传」名刀",
1499817443: "苍翠之风", 1499817443: "苍翠之风",
1516554699: "石英大剑", 1516554699: "石英大剑",
1522029867: "踏火息雷", 1522029867: "踏火息雷",
1524173875: "炽烈的炎之魔女", 1524173875: "炽烈的炎之魔女",
1533656818: "旅行者", 1533656818: "旅行者",
1538092267: "「一心传」名刀",
1541919827: "染血的骑士道", 1541919827: "染血的骑士道",
1545992315: "「正义」", 1545992315: "「正义」",
1558036915: "辰砂往生录", 1558036915: "辰砂往生录",
@ -263,6 +269,7 @@ export default {
3112448011: "决心", 3112448011: "决心",
3112679155: "终末嗟叹之诗", 3112679155: "终末嗟叹之诗",
3156385731: "昭心", 3156385731: "昭心",
3159145923: "徊徊切舍刀",
3169209451: "弓藏", 3169209451: "弓藏",
3192689683: "霜葬", 3192689683: "霜葬",
3221566250: "琴", 3221566250: "琴",
@ -289,6 +296,7 @@ export default {
3443142923: "龙脊长枪", 3443142923: "龙脊长枪",
3447737235: "黑岩战弓", 3447737235: "黑岩战弓",
3456986819: "嘟嘟可故事集", 3456986819: "嘟嘟可故事集",
3464027035: "「一心传」名刀",
3465493459: "精准", 3465493459: "精准",
3500935003: "讨龙英杰谭", 3500935003: "讨龙英杰谭",
3535784755: "勇士之心", 3535784755: "勇士之心",
@ -304,6 +312,7 @@ export default {
3626268211: "来歆余响", 3626268211: "来歆余响",
3673792067: "旅行剑", 3673792067: "旅行剑",
3684723963: "雨裁", 3684723963: "雨裁",
3685735523: "徊徊切舍刀",
3689108098: "埃洛伊", 3689108098: "埃洛伊",
3717667418: "优菈", 3717667418: "优菈",
3717849275: "薙草之稻光", 3717849275: "薙草之稻光",