From 034d18609f3bfadf6438192899a39ef0158c5fdb Mon Sep 17 00:00:00 2001 From: CMHopeSunshine <277073121@qq.com> Date: Thu, 21 Dec 2023 16:33:15 +0800 Subject: [PATCH] =?UTF-8?q?:memo:=20=E6=9B=B4=E6=96=B04.3=E6=95=B0?= =?UTF-8?q?=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- LittlePaimon/config/data/alias.json | 26 +++++++++++++++++++ LittlePaimon/config/data/artifact.json | 24 +++++++++++++++-- LittlePaimon/config/data/genshin_info.json | 26 +++++++++++++++++++ LittlePaimon/config/data/role_skill.json | 12 +++++++++ LittlePaimon/config/data/role_talent.json | 28 ++++++++++++++++++-- LittlePaimon/config/data/roles_data.json | 10 ++++++++ LittlePaimon/config/data/score.json | 28 +++++++++++++++++++- LittlePaimon/config/data/weapon.json | 6 +++++ LittlePaimon/config/data/类型.json | 30 +++++++++++++++------- LittlePaimon/utils/typing.py | 4 +-- 10 files changed, 178 insertions(+), 16 deletions(-) diff --git a/LittlePaimon/config/data/alias.json b/LittlePaimon/config/data/alias.json index 6a8f554..f141281 100644 --- a/LittlePaimon/config/data/alias.json +++ b/LittlePaimon/config/data/alias.json @@ -448,6 +448,18 @@ "芙芙", "水神", "雌小鬼" + ], + "10000090": [ + "夏沃蕾" + ], + "10000091": [ + "娜维娅" + ], + "10000092": [ + "嘉明" + ], + "10000093": [ + "闲云" ] }, "武器": { @@ -1176,6 +1188,20 @@ ], "测距规": [ "测距规" + ], + "「究极霸王超级魔剑」": [ + "「究极霸王超级魔剑」", + "霸王剑", + "超级魔剑", + "极霸剑" + ], + "裁断": [ + "裁断", + "娜维娅专武" + ], + "鹤鸣余音": [ + "鹤鸣余音", + "闲云专武" ] }, "圣遗物": { diff --git a/LittlePaimon/config/data/artifact.json b/LittlePaimon/config/data/artifact.json index c71848a..8566e75 100644 --- a/LittlePaimon/config/data/artifact.json +++ b/LittlePaimon/config/data/artifact.json @@ -231,7 +231,17 @@ "UI_RelicIcon_15032_2": "黄金飞鸟的落羽", "UI_RelicIcon_15032_3": "黄金剧团的奖赏", "UI_RelicIcon_15032_4": "黄金乐曲的变奏", - "UI_RelicIcon_15032_5": "黄金时代的先声" + "UI_RelicIcon_15032_5": "黄金时代的先声", + "UI_RelicIcon_15033_1": "昔时应许之梦", + "UI_RelicIcon_15033_2": "昔时浮想之思", + "UI_RelicIcon_15033_3": "昔时传奏之诗", + "UI_RelicIcon_15033_4": "昔时遗落之誓", + "UI_RelicIcon_15033_5": "昔时回映之音", + "UI_RelicIcon_15034_1": "慷慨的墨水瓶", + "UI_RelicIcon_15034_2": "诚恳的蘸水笔", + "UI_RelicIcon_15034_3": "慈爱的淑女帽", + "UI_RelicIcon_15034_4": "无私的妆饰花", + "UI_RelicIcon_15034_5": "忠实的砂时计" }, "Mapping": { "冒险家之花": "冒险家", @@ -458,7 +468,17 @@ "黄金飞鸟的落羽": "黄金剧团", "黄金剧团的奖赏": "黄金剧团", "黄金乐曲的变奏": "黄金剧团", - "黄金时代的先声": "黄金剧团" + "黄金时代的先声": "黄金剧团", + "昔时应许之梦": "昔时之歌", + "昔时浮想之思": "昔时之歌", + "昔时传奏之诗": "昔时之歌", + "昔时遗落之誓": "昔时之歌", + "昔时回映之音": "昔时之歌", + "慷慨的墨水瓶": "回声之林夜话", + "诚恳的蘸水笔": "回声之林夜话", + "慈爱的淑女帽": "回声之林夜话", + "无私的妆饰花": "回声之林夜话", + "忠实的砂时计": "回声之林夜话" }, "Info": { "冒险家": { diff --git a/LittlePaimon/config/data/genshin_info.json b/LittlePaimon/config/data/genshin_info.json index ba37ede..abdefb1 100644 --- a/LittlePaimon/config/data/genshin_info.json +++ b/LittlePaimon/config/data/genshin_info.json @@ -2169,6 +2169,32 @@ }, "SideIconName": "UI_AvatarIcon_Side_Furina" }, + "10000090": { + "SkillOrder": [ + 10901, + 10902, + 10905 + ], + "Skills": { + "10901": "Skill_A_03", + "10902": "Skill_S_Chevreuse_01", + "10905": "Skill_E_Chevreuse_01" + }, + "SideIconName": "UI_AvatarIcon_Side_Chevreuse" + }, + "10000091": { + "SkillOrder": [ + 10911, + 10912, + 10915 + ], + "Skills": { + "10911": "Skill_A_04", + "10912": "Skill_S_Navia_01", + "10915": "Skill_E_Navia_01" + }, + "SideIconName": "UI_AvatarIcon_Side_Navia" + }, "10000005-501": { "Element": "None", "Consts": [ diff --git a/LittlePaimon/config/data/role_skill.json b/LittlePaimon/config/data/role_skill.json index 26b5a53..a41e2f7 100644 --- a/LittlePaimon/config/data/role_skill.json +++ b/LittlePaimon/config/data/role_skill.json @@ -358,6 +358,12 @@ "10891": "普通攻击·独舞之邀", "10892": "孤心沙龙", "10895": "万众狂欢", + "10901": "普通攻击·线列枪刺·改", + "10902": "近迫式急促拦射", + "10905": "圆阵掷弹爆轰术", + "10911": "普通攻击·直率的辞绝", + "10912": "典仪式晶火", + "10915": "如霰澄天的鸣礼", "20001": "风魔炮", "20002": "风魔炮", "20011": "飞行挑战 - 前冲", @@ -907,6 +913,12 @@ "10891": "Skill_A_01", "10892": "Skill_S_Furina_01", "10895": "Skill_E_Furina_01", + "10901": "Skill_A_03", + "10902": "Skill_S_Chevreuse_01", + "10905": "Skill_E_Chevreuse_01", + "10911": "Skill_A_04", + "10912": "Skill_S_Navia_01", + "10915": "Skill_E_Navia_01", "20001": "Skill_A_Dvalin_AirGun", "20002": "Skill_A_Dvalin_AirGun", "20011": "Btn_FlightSprint", diff --git a/LittlePaimon/config/data/role_talent.json b/LittlePaimon/config/data/role_talent.json index 9ef7bc8..86f46c4 100644 --- a/LittlePaimon/config/data/role_talent.json +++ b/LittlePaimon/config/data/role_talent.json @@ -473,7 +473,19 @@ "893": "「秘密藏心间，无人知我名。」", "894": "「若非处幽冥，怎知生可贵！」", "895": "「我已有觉察，他名即是…！」", - "896": "「诸君听我颂，共举爱之杯！」" + "896": "「诸君听我颂，共举爱之杯！」", + "901": "稳固阵线的魄力", + "902": "诱导殉爆的狙击", + "903": "娴熟复装的技巧", + "904": "多重速射的秘诀", + "905": "增量火力的毁伤", + "906": "终结罪恶的追缉", + "911": "淑女的距离感守则", + "912": "总指挥的乘胜追击", + "913": "经营家的开阔视野", + "914": "铭誓者的绝不姑息", + "915": "协商人的坚决谈判", + "916": "刺玫会长的灵活手腕" }, "Icon": { "21": "UI_Talent_S_Ayaka_01", @@ -949,6 +961,18 @@ "893": "UI_Talent_U_Furina_02", "894": "UI_Talent_S_Furina_03", "895": "UI_Talent_U_Furina_01", - "896": "UI_Talent_S_Furina_02" + "896": "UI_Talent_S_Furina_02", + "901": "UI_Talent_S_Chevreuse_01", + "902": "UI_Talent_S_Chevreuse_02", + "903": "UI_Talent_U_Chevreuse_01", + "904": "UI_Talent_S_Chevreuse_03", + "905": "UI_Talent_U_Chevreuse_02", + "906": "UI_Talent_S_Chevreuse_04", + "911": "UI_Talent_S_Navia_01", + "912": "UI_Talent_S_Navia_02", + "913": "UI_Talent_U_Navia_01", + "914": "UI_Talent_S_Navia_03", + "915": "UI_Talent_U_Navia_02", + "916": "UI_Talent_S_Navia_04" } } \ No newline at end of file diff --git a/LittlePaimon/config/data/roles_data.json b/LittlePaimon/config/data/roles_data.json index 8c48c88..cf0b8ce 100644 --- a/LittlePaimon/config/data/roles_data.json +++ b/LittlePaimon/config/data/roles_data.json @@ -31654,5 +31654,15 @@ "", "" ] + }, + "夏沃蕾": { + "region": "枫丹", + "star": "4", + "element": "火" + }, + "娜维娅": { + "region": "枫丹", + "star": "5", + "element": "岩" } } \ No newline at end of file diff --git a/LittlePaimon/config/data/score.json b/LittlePaimon/config/data/score.json index 04e2b9b..45eb95b 100644 --- a/LittlePaimon/config/data/score.json +++ b/LittlePaimon/config/data/score.json @@ -740,6 +740,23 @@ "暴击伤害": 1, "元素充能效率": 1 } + }, + "夏沃蕾": { + "常规": { + "攻击力": 1, + "生命值": 1, + "暴击率": 1, + "暴击伤害": 1, + "元素充能效率": 1 + } + }, + "娜维娅": { + "常规": { + "攻击力": 1, + "暴击率": 1, + "暴击伤害": 1, + "元素充能效率": 1 + } } }, "Talent": { @@ -1048,7 +1065,8 @@ 2 ], "那维莱特": [ - 0, 2 + 0, + 2 ], "夏洛蒂": [ 2, @@ -1057,6 +1075,14 @@ "芙宁娜": [ 1, 2 + ], + "夏沃蕾": [ + 0, + 1 + ], + "娜维娅": [ + 0, + 1 ] } } \ No newline at end of file diff --git a/LittlePaimon/config/data/weapon.json b/LittlePaimon/config/data/weapon.json index e6bc9b1..bc4d11e 100644 --- a/LittlePaimon/config/data/weapon.json +++ b/LittlePaimon/config/data/weapon.json @@ -72,6 +72,7 @@ "1200948859": "饰铁之花", "3459616011": "聊聊棒", "2077869763": "浪影阔剑", + "933442195": "「究极霸王超级魔剑」", "3693117451": "便携动力锯", "1089950259": "天空之傲", "3995710363": "狼的末路", @@ -79,6 +80,7 @@ "2792766467": "无工之剑", "3914951691": "赤角石溃杵", "2834063555": "苇海信标", + "3812523339": "裁断", "2796697027": "新手长枪", "3070169307": "铁尖枪", "1390797107": "白缨枪", @@ -262,6 +264,7 @@ "饰铁之花": "双手剑", "聊聊棒": "双手剑", "浪影阔剑": "双手剑", + "「究极霸王超级魔剑」": "双手剑", "便携动力锯": "双手剑", "天空之傲": "双手剑", "狼的末路": "双手剑", @@ -269,6 +272,7 @@ "无工之剑": "双手剑", "赤角石溃杵": "双手剑", "苇海信标": "双手剑", + "裁断": "双手剑", "新手长枪": "长柄武器", "铁尖枪": "长柄武器", "白缨枪": "长柄武器", @@ -447,6 +451,7 @@ "饰铁之花": "UI_EquipIcon_Claymore_Fleurfair", "聊聊棒": "UI_EquipIcon_Claymore_BeastTamer", "浪影阔剑": "UI_EquipIcon_Claymore_Vorpal", + "「究极霸王超级魔剑」": "UI_EquipIcon_Claymore_Champion", "便携动力锯": "UI_EquipIcon_Claymore_Mechanic", "天空之傲": "UI_EquipIcon_Claymore_Dvalin", "狼的末路": "UI_EquipIcon_Claymore_Wolfmound", @@ -454,6 +459,7 @@ "无工之剑": "UI_EquipIcon_Claymore_Kunwu", "赤角石溃杵": "UI_EquipIcon_Claymore_Itadorimaru", "苇海信标": "UI_EquipIcon_Claymore_Deshret", + "裁断": "UI_EquipIcon_Claymore_GoldenVerdict", "新手长枪": "UI_EquipIcon_Pole_Gewalt", "铁尖枪": "UI_EquipIcon_Pole_Rod", "白缨枪": "UI_EquipIcon_Pole_Ruby", diff --git a/LittlePaimon/config/data/类型.json b/LittlePaimon/config/data/类型.json index d54def9..5925715 100644 --- a/LittlePaimon/config/data/类型.json +++ b/LittlePaimon/config/data/类型.json @@ -38,7 +38,8 @@ "鹿野院平藏", "纳西妲", "流浪者", - "夏洛蒂" + "夏洛蒂", + "闲云" ], "双手剑": [ "迪卢克", @@ -52,7 +53,9 @@ "荒泷一斗", "多莉", "迪希雅", - "菲米尼" + "菲米尼", + "娜维娅", + "嘉明" ], "弓": [ "安柏", @@ -84,7 +87,8 @@ "赛诺", "坎蒂丝", "瑶瑶", - "米卡" + "米卡", + "夏沃蕾" ] }, "元素类型": { @@ -116,7 +120,8 @@ "流浪者", "珐露珊", "旅行者风", - "琳妮特" + "琳妮特", + "闲云" ], "雷": [ "丽莎", @@ -158,7 +163,9 @@ "宵宫", "托马", "迪希雅", - "林尼" + "林尼", + "夏沃蕾", + "嘉明" ], "岩": [ "凝光", @@ -168,7 +175,8 @@ "五郎", "荒泷一斗", "云堇", - "旅行者岩" + "旅行者岩", + "娜维娅" ], "草": [ "柯莱", @@ -222,7 +230,8 @@ "海渊终曲", "灰河渡手", "船坞长剑", - "水仙十字之剑" + "水仙十字之剑", + "静水流涌之辉" ], "双手剑": [ "训练大剑", @@ -255,7 +264,9 @@ "赤角石溃杵", "聊聊棒", "浪影阔剑", - "便携动力锯" + "便携动力锯", + "「究极霸王超级魔剑」", + "裁断" ], "长柄武器": [ "新手长枪", @@ -323,7 +334,8 @@ "纯水流华", "无垠蔚蓝之歌", "金流监督", - "万世流涌大典" + "万世流涌大典", + "鹤鸣余音" ], "弓": [ "猎弓", diff --git a/LittlePaimon/utils/typing.py b/LittlePaimon/utils/typing.py index 9bf02d6..d403555 100644 --- a/LittlePaimon/utils/typing.py +++ b/LittlePaimon/utils/typing.py @@ -37,7 +37,7 @@ CHARACTERS = ['神里绫华', '琴', '丽莎', '芭芭拉', '凯亚', '迪卢克 '枫原万叶', '烟绯', '宵宫', '托马', '优菈', '雷电将军', '早柚', '珊瑚宫心海', '五郎', '九条裟罗', '荒泷一斗', '八重神子', '夜兰', '埃洛伊', '申鹤', '云堇', '久岐忍', '神里绫人', '鹿野院平藏', '提纳里', '柯莱', '多莉', '赛诺', '坎蒂丝', '妮露', - '纳西妲', '莱依拉', '流浪者', '珐露珊', '艾尔海森', '瑶瑶', '迪希雅', '米卡', '白术', '卡维', '绮良良', '琳妮特', '林尼', '菲米尼', '莱欧斯利', '那维莱特', '夏洛蒂', '芙宁娜'] + '纳西妲', '莱依拉', '流浪者', '珐露珊', '艾尔海森', '瑶瑶', '迪希雅', '米卡', '白术', '卡维', '绮良良', '琳妮特', '林尼', '菲米尼', '莱欧斯利', '那维莱特', '夏洛蒂', '芙宁娜', '夏沃蕾', '娜维娅'] """全角色""" MALE_CHARACTERS = ['凯亚', '迪卢克', '钟离', '达达利亚', '托马', '荒泷一斗', '神里绫人', '艾尔海森', '白术', '卡维', '莱欧斯利', '那维莱特'] """成男角色""" @@ -45,7 +45,7 @@ FEMALE_CHARACTERS = ['琴', '丽莎', '北斗', '凝光', '罗莎莉亚', '优 '申鹤', '坎蒂丝', '迪希雅'] """成女角色""" GIRL_CHARACTERS = ['神里绫华', '芭芭拉', '安柏', '香菱', '菲谢尔', '诺艾尔', '甘雨', '莫娜', '刻晴', '砂糖', '辛焱', - '胡桃', '烟绯', '宵宫', '珊瑚宫心海', '埃洛伊', '云堇', '久岐忍', '柯莱', '妮露', '莱依拉', '珐露珊', '绮良良', '琳妮特', '夏洛蒂', '芙宁娜'] + '胡桃', '烟绯', '宵宫', '珊瑚宫心海', '埃洛伊', '云堇', '久岐忍', '柯莱', '妮露', '莱依拉', '珐露珊', '绮良良', '琳妮特', '夏洛蒂', '芙宁娜', '夏沃蕾', '娜维娅'] """少女角色""" BOY_CHARACTERS = ['雷泽', '温迪', '行秋', '魈', '班尼特', '重云', '阿贝多', '枫原万叶', '五郎', '鹿野院平藏', '提纳里', '赛诺', '流浪者', '米卡', '林尼', '菲米尼']