From 95300486fcfb3a9aad0891fa190ee12e2efa1340 Mon Sep 17 00:00:00 2001 From: Kokomi <592981798@qq.com> Date: Wed, 2 Nov 2022 12:18:09 +0800 Subject: [PATCH] =?UTF-8?q?=E9=80=82=E9=85=8D3.2=E7=9A=84enka=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E8=8E=B7=E5=8F=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 12 +++--- components/profile-data/enka-meta.js | 5 +++ resources/meta/character/纳西妲/data.json | 12 ++++-- .../meta/character/纳西妲/detail.json | 2 +- resources/meta/character/莱依拉/data.json | 12 ++++-- resources/meta/material/data.json | 12 ++++++ tools/sprider/TalentId.js | 38 ++++++++++++++++++- 7 files changed, 77 insertions(+), 16 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2883d7a5..fd88acd1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,11 +1,8 @@ -# 2.0.4 +# 2.0.5 -* 增加妮露的伤害计算及圣遗物权重设置 -* `#面板`会展示角色名命座信息 -* `#深渊组队`使用新版胡桃API进行组队信息获取 -* 一些已知问题修复及优化 +* 适配3.2的enka数据获取 -# 2.0.1~2.0.3 +# 2.0.1~2.0.4 * `#日历` 页面样式微调，功能升级 * 日历中会展示角色生日 @@ -16,6 +13,9 @@ * 新角色及新武器暂未支持伤害计算，稍晚会升级 * 优化character的进入判定逻辑，防止一些额外的log触发 * 角色相关命令在V3下会联合V3的角色别名一同查询 +* 增加妮露的伤害计算及圣遗物权重设置 +* `#面板`会展示角色名命座信息 +* `#深渊组队`使用新版胡桃API进行组队信息获取 # 2.0.0 diff --git a/components/profile-data/enka-meta.js b/components/profile-data/enka-meta.js index 8a757853..76501c80 100644 --- a/components/profile-data/enka-meta.js +++ b/components/profile-data/enka-meta.js @@ -35,6 +35,7 @@ export default { 411685275: '钢轮弓', 426363739: '流浪的晚星', 452357939: '贯月矢', + 453444347: '千夜的曙歌', 454086795: '圣显之钥', 479076483: '冷刃', 481755219: '黑岩刺枪', @@ -65,6 +66,7 @@ export default { 688991243: '息灾', 693354267: '尘世之锁', 697277554: '烟绯', + 712501082: '纳西妲', 716252627: '千岩长枪', 729851187: '冰之川与雪之砂', 735056795: '西风大剑', @@ -112,6 +114,7 @@ export default { 1163616891: '霜葬', 1182966603: '佣兵重剑', 1186209435: '赌徒', + 1201790667: '千夜浮梦', 1212345779: '角斗士的终幕礼', 1217552947: '白刃流转', 1240067179: '西风猎弓', @@ -269,6 +272,7 @@ export default { 2853296811: '穿刺高天的利齿', 2871793795: '锐利', 2876340530: '重云', + 2889777514: '莱依拉', 2890909531: '武人', 2893964243: '飞矢传书', 2915865819: '渊中霞彩', @@ -419,6 +423,7 @@ export default { FIGHT_PROP_GRASS_ADD_HURT: '草元素伤害加成', FIGHT_PROP_HEALED_ADD: '受治疗加成', FIGHT_PROP_HEAL_ADD: '治疗加成', + FIGHT_PROP_HP_PERCENT: '生命值', FIGHT_PROP_ICE_ADD_HURT: '冰元素伤害加成', FIGHT_PROP_MAX_HP: '生命值上限', FIGHT_PROP_PHYSICAL_ADD_HURT: '物理伤害加成', diff --git a/resources/meta/character/纳西妲/data.json b/resources/meta/character/纳西妲/data.json index acdd2850..3d8e6dae 100644 --- a/resources/meta/character/纳西妲/data.json +++ b/resources/meta/character/纳西妲/data.json @@ -10,8 +10,8 @@ "birth": "10-27", "astro": "智慧主座", "desc": "深居净善宫的笼中之鸟，只能在梦中将世界尽收眼底。", - "cncv": "？？？", - "jpcv": "？？？", + "cncv": "花玲", + "jpcv": "田村由加莉", "costume": false, "ver": 1, "baseAttr": { @@ -28,7 +28,11 @@ "7332": "e", "7339": "q" }, - "talentId": {}, + "talentId": { + "10731": 7331, + "10732": 7332, + "10735": 7339 + }, "talentCons": { "e": 3, "q": 5 @@ -39,7 +43,7 @@ "specialty": "劫波莲", "normal": "孢囊晶尘", "talent": "「巧思」的哲学", - "weekly": "？？？" + "weekly": "傀儡的悬丝" }, "eta": 1667358000000 } \ No newline at end of file diff --git a/resources/meta/character/纳西妲/detail.json b/resources/meta/character/纳西妲/detail.json index e1468aee..1f8d4dc8 100644 --- a/resources/meta/character/纳西妲/detail.json +++ b/resources/meta/character/纳西妲/detail.json @@ -591,7 +591,7 @@ "name": "正等善见之根", "desc": [ "处于纳西妲自身施加的蕴种印状态下的敌人，将受到以下效果影响：", - "·燃烧、绽放、超绽放、烈绽放反应伤害能够造成暴击，暴击率固定为20%，暴击伤害固定为100%；", + "·受到的燃烧、绽放、超绽放、烈绽放反应伤害能够造成暴击，暴击率固定为20%，暴击伤害固定为100%；", "·受到原激化、超激化、蔓激化反应影响后的8秒内，防御力降低30%。" ] }, diff --git a/resources/meta/character/莱依拉/data.json b/resources/meta/character/莱依拉/data.json index 0a0a2581..a509c791 100644 --- a/resources/meta/character/莱依拉/data.json +++ b/resources/meta/character/莱依拉/data.json @@ -10,8 +10,8 @@ "birth": "12-19", "astro": "夜莺座", "desc": "专攻理论星相学的梨多梵谛学院学生。时常梦游，长期缺觉，饱受睡眠问题困扰。", - "cncv": "？？？", - "jpcv": "？？？", + "cncv": "侯小菲", + "jpcv": "富田美忧", "costume": false, "ver": 1, "baseAttr": { @@ -28,7 +28,11 @@ "7432": "e", "7439": "q" }, - "talentId": {}, + "talentId": { + "10741": 7431, + "10742": 7432, + "10745": 7439 + }, "talentCons": { "e": 3, "q": 5 @@ -39,7 +43,7 @@ "specialty": "月莲", "normal": "禁咒绘卷", "talent": "「巧思」的哲学", - "weekly": "？？？" + "weekly": "无心的渊镜" }, "eta": 1667358000000 } \ No newline at end of file diff --git a/resources/meta/material/data.json b/resources/meta/material/data.json index ffd9bd02..1d6602c6 100644 --- a/resources/meta/material/data.json +++ b/resources/meta/material/data.json @@ -1278,5 +1278,17 @@ "name": "？？？", "type": "weekly", "star": 5 + }, + "傀儡的悬丝": { + "id": "n113041", + "name": "傀儡的悬丝", + "type": "weekly", + "star": 5 + }, + "无心的渊镜": { + "id": "n113042", + "name": "无心的渊镜", + "type": "weekly", + "star": 5 } } \ No newline at end of file diff --git a/tools/sprider/TalentId.js b/tools/sprider/TalentId.js index 88be35aa..5d62e44e 100644 --- a/tools/sprider/TalentId.js +++ b/tools/sprider/TalentId.js @@ -1,4 +1,4 @@ -export default { +export default { 10000002: { Element: "Ice", Consts: ["UI_Talent_S_Ayaka_01", "UI_Talent_S_Ayaka_02", "UI_Talent_U_Ayaka_02", "UI_Talent_S_Ayaka_03", "UI_Talent_U_Ayaka_01", "UI_Talent_S_Ayaka_04"], @@ -1121,6 +1121,42 @@ export default { SideIconName: "UI_AvatarIcon_Side_Candace", QualityType: "QUALITY_PURPLE" }, + 10000073: { + Element: "Grass", + Consts: ["UI_Talent_S_Nahida_01", "UI_Talent_S_Nahida_02", "UI_Talent_U_Nahida_01", "UI_Talent_S_Nahida_03", "UI_Talent_U_Nahida_02", "UI_Talent_S_Nahida_04"], + SkillOrder: [10731, 10732, 10735], + Skills: { + 10731: "Skill_A_Catalyst_MD", + 10732: "Skill_S_Nahida_01", + 10735: "Skill_E_Nahida_01" + }, + ProudMap: { + 10731: 7331, + 10732: 7332, + 10735: 7339 + }, + NameTextMapHash: 712501082, + SideIconName: "UI_AvatarIcon_Side_Nahida", + QualityType: "QUALITY_ORANGE" + }, + 10000074: { + Element: "Ice", + Consts: ["UI_Talent_S_Layla_01", "UI_Talent_S_Layla_02", "UI_Talent_U_Layla_01", "UI_Talent_S_Layla_03", "UI_Talent_U_Layla_02", "UI_Talent_S_Layla_04"], + SkillOrder: [10741, 10742, 10745], + Skills: { + 10741: "Skill_A_01", + 10742: "Skill_S_Layla_01", + 10745: "Skill_E_Layla_01" + }, + ProudMap: { + 10741: 7431, + 10742: 7432, + 10745: 7439 + }, + NameTextMapHash: 2889777514, + SideIconName: "UI_AvatarIcon_Side_Layla", + QualityType: "QUALITY_PURPLE" + }, "10000005-501": { Element: "None", Consts: ["None", "None", "None", "None", "None", "None"],