diff --git a/GenshinUID/genshinuid_enka/effect/artifact_effect.json b/GenshinUID/genshinuid_enka/effect/artifact_effect.json index 5cc68563..b063c600 100644 --- a/GenshinUID/genshinuid_enka/effect/artifact_effect.json +++ b/GenshinUID/genshinuid_enka/effect/artifact_effect.json @@ -1,4 +1,32 @@ { + "黄金剧团": { + "normal_effect": { + "2": "", + "4": "" + }, + "fight_effect": { + "2": "E:dmgBonus+20", + "4": "E:dmgBonus+40" + }, + "group_effect": { + "2": "", + "4": "" + } + }, + "逐影猎人": { + "normal_effect": { + "2": "", + "4": "" + }, + "fight_effect": { + "2": "AB:dmgBonus+15", + "4": "critRate+33" + }, + "group_effect": { + "2": "", + "4": "" + } + }, "乐园遗落之花": { "normal_effect": { "2": "elementalMastery+80", diff --git a/GenshinUID/genshinuid_enka/effect/char_effect.json b/GenshinUID/genshinuid_enka/effect/char_effect.json index 3c073eb5..eec9428a 100644 --- a/GenshinUID/genshinuid_enka/effect/char_effect.json +++ b/GenshinUID/genshinuid_enka/effect/char_effect.json @@ -1,4 +1,130 @@ { + "琳妮特": { + "normal": { + "normal_skill": { + "50": "", + "70": "" + }, + "normal_talent": { + "1": "", + "2": "", + "3": "", + "4": "", + "5": "", + "6": "" + } + }, + "fight": { + "fight_skill": { + "50": "addAtk+20", + "70": "Q:dmgBonus+15" + }, + "fight_talent": { + "1": "", + "2": "", + "3": "", + "4": "", + "5": "", + "6": "AnemoDmgBonus+20" + }, + "group_skill": { + "50": "addAtk+20", + "70": "" + }, + "group_talent": { + "1": "", + "2": "", + "3": "", + "4": "", + "5": "", + "6": "" + } + } + }, + "林尼": { + "normal": { + "normal_skill": { + "50": "", + "70": "" + }, + "normal_talent": { + "1": "", + "2": "", + "3": "", + "4": "", + "5": "", + "6": "" + } + }, + "fight": { + "fight_skill": { + "50": "B:addDmg+80%atk", + "70": "PyroDmgBonus+100" + }, + "fight_talent": { + "1": "", + "2": "", + "3": "critDmg+60", + "4": "PyroResist+-25", + "5": "", + "6": "礼花术弹:addDmg+100%atk" + }, + "group_skill": { + "50": "", + "70": "" + }, + "group_talent": { + "1": "", + "2": "", + "3": "", + "4": "", + "5": "", + "6": "" + } + } + }, + "菲米尼": { + "normal": { + "normal_skill": { + "50": "", + "70": "" + }, + "normal_talent": { + "1": "", + "2": "", + "3": "", + "4": "", + "5": "", + "6": "" + } + }, + "fight": { + "fight_skill": { + "50": "", + "70": "B:dmgBonus+40" + }, + "fight_talent": { + "1": "E:critRate+15", + "2": "", + "3": "", + "4": "addAtk+18", + "5": "", + "6": "critDmg+36" + }, + "group_skill": { + "50": "", + "70": "" + }, + "group_talent": { + "1": "", + "2": "", + "3": "", + "4": "", + "5": "", + "6": "" + } + } + }, "神里绫华": { "normal": { "normal_skill": { diff --git a/GenshinUID/genshinuid_enka/effect/weapon_effect.json b/GenshinUID/genshinuid_enka/effect/weapon_effect.json index 4976ade0..b5df5e4f 100644 --- a/GenshinUID/genshinuid_enka/effect/weapon_effect.json +++ b/GenshinUID/genshinuid_enka/effect/weapon_effect.json @@ -1,4 +1,376 @@ { + "狼牙": { + "normal": { + "normal_effect": { + "1": "", + "2": "", + "3": "", + "4": "", + "5": "" + } + }, + "fight": { + "fight_effect": { + "1": "EQ:dmgBonus+16;EQ:critRate+8", + "2": "EQ:dmgBonus+20;EQ:critRate+10", + "3": "EQ:dmgBonus+24;EQ:critRate+12", + "4": "EQ:dmgBonus+28;EQ:critRate+14", + "5": "EQ:dmgBonus+32;EQ:critRate+16" + }, + "group_effect": { + "1": "", + "2": "", + "3": "", + "4": "", + "5": "" + }, + "time": 10, + "extra": { + + } + } + }, + "海渊终曲": { + "normal": { + "normal_effect": { + "1": "", + "2": "", + "3": "", + "4": "", + "5": "" + } + }, + "fight": { + "fight_effect": { + "1": "addAtk+12;atk+150", + "2": "addAtk+15;atk+187.5", + "3": "addAtk+18;atk+225", + "4": "addAtk+21;atk+262.5", + "5": "addAtk+24;atk+300" + }, + "group_effect": { + "1": "", + "2": "", + "3": "", + "4": "", + "5": "" + }, + "time": 12, + "extra": { + + } + } + }, + "灰河渡手": { + "normal": { + "normal_effect": { + "1": "", + "2": "", + "3": "", + "4": "", + "5": "" + } + }, + "fight": { + "fight_effect": { + "1": "E:critRate+8;energyRecharge+16", + "2": "E:critRate+10;energyRecharge+20", + "3": "E:critRate+12;energyRecharge+24", + "4": "E:critRate+14;energyRecharge+28", + "5": "E:critRate+16;energyRecharge+32" + }, + "group_effect": { + "1": "", + "2": "", + "3": "", + "4": "", + "5": "" + }, + "time": 12, + "extra": { + + } + } + }, + "聊聊棒": { + "normal": { + "normal_effect": { + "1": "", + "2": "", + "3": "", + "4": "", + "5": "" + } + }, + "fight": { + "fight_effect": { + "1": "addAtk+16;dmgBonus+12", + "2": "addAtk+20;dmgBonus+15", + "3": "addAtk+24;dmgBonus+18", + "4": "addAtk+28;dmgBonus+21", + "5": "addAtk+32;dmgBonus+24" + }, + "group_effect": { + "1": "", + "2": "", + "3": "", + "4": "", + "5": "" + }, + "time": 10, + "extra": { + + } + } + }, + "浪影阔剑": { + "normal": { + "normal_effect": { + "1": "", + "2": "", + "3": "", + "4": "", + "5": "" + } + }, + "fight": { + "fight_effect": { + "1": "addAtk+24", + "2": "addAtk+30", + "3": "addAtk+36", + "4": "addAtk+42", + "5": "addAtk+48" + }, + "group_effect": { + "1": "", + "2": "", + "3": "", + "4": "", + "5": "" + }, + "time": 8, + "extra": { + + } + } + }, + "峡湾长歌": { + "normal": { + "normal_effect": { + "1": "", + "2": "", + "3": "", + "4": "", + "5": "" + } + }, + "fight": { + "fight_effect": { + "1": "elementalMastery+120", + "2": "elementalMastery+150", + "3": "elementalMastery+180", + "4": "elementalMastery+210", + "5": "elementalMastery+240" + }, + "group_effect": { + "1": "", + "2": "", + "3": "", + "4": "", + "5": "" + }, + "time": 0, + "extra": { + + } + } + }, + "公义的酬报": { + "normal": { + "normal_effect": { + "1": "", + "2": "", + "3": "", + "4": "", + "5": "" + } + }, + "fight": { + "fight_effect": { + "1": "", + "2": "", + "3": "", + "4": "", + "5": "" + }, + "group_effect": { + "1": "", + "2": "", + "3": "", + "4": "", + "5": "" + }, + "time": 0, + "extra": { + + } + } + }, + "遗祀玉珑": { + "normal": { + "normal_effect": { + "1": "", + "2": "", + "3": "", + "4": "", + "5": "" + } + }, + "fight": { + "fight_effect": { + "1": "addHp+20;elementalMastery+80", + "2": "addHp+25;elementalMastery+100", + "3": "addHp+30;elementalMastery+120", + "4": "addHp+35;elementalMastery+140", + "5": "addHp+40;elementalMastery+160" + }, + "group_effect": { + "1": "", + "2": "", + "3": "", + "4": "", + "5": "" + }, + "time": 0, + "extra": { + + } + } + }, + "纯水流华": { + "normal": { + "normal_effect": { + "1": "", + "2": "", + "3": "", + "4": "", + "5": "" + } + }, + "fight": { + "fight_effect": { + "1": "dmgBonus+20", + "2": "dmgBonus+25", + "3": "dmgBonus+30", + "4": "dmgBonus+35", + "5": "dmgBonus+40" + }, + "group_effect": { + "1": "", + "2": "", + "3": "", + "4": "", + "5": "" + }, + "time": 12, + "extra": { + + } + } + }, + "烈阳之嗣": { + "normal": { + "normal_effect": { + "1": "", + "2": "", + "3": "", + "4": "", + "5": "" + } + }, + "fight": { + "fight_effect": { + "1": "B:dmgBonus+28", + "2": "B:dmgBonus+35", + "3": "B:dmgBonus+42", + "4": "B:dmgBonus+49", + "5": "B:dmgBonus+56" + }, + "group_effect": { + "1": "", + "2": "", + "3": "", + "4": "", + "5": "" + }, + "time": 12, + "extra": { + + } + } + }, + "静谧之曲": { + "normal": { + "normal_effect": { + "1": "", + "2": "", + "3": "", + "4": "", + "5": "" + } + }, + "fight": { + "fight_effect": { + "1": "dmgBonus+16", + "2": "dmgBonus+20", + "3": "dmgBonus+24", + "4": "dmgBonus+28", + "5": "dmgBonus+32" + }, + "group_effect": { + "1": "", + "2": "", + "3": "", + "4": "", + "5": "" + }, + "time": 8, + "extra": { + + } + } + }, + "最初的大魔术": { + "normal": { + "normal_effect": { + "1": "", + "2": "", + "3": "", + "4": "", + "5": "" + } + }, + "fight": { + "fight_effect": { + "1": "addAtk+52", + "2": "addAtk+65", + "3": "addAtk+78", + "4": "addAtk+91", + "5": "addAtk+104" + }, + "group_effect": { + "1": "", + "2": "", + "3": "", + "4": "", + "5": "" + }, + "time": 0, + "extra": { + + } + } + }, "恶王丸": { "normal": { "normal_effect": { diff --git a/GenshinUID/genshinuid_enka/etc/beta_weapon.py b/GenshinUID/genshinuid_enka/etc/beta_weapon.py index 5bdb72eb..1a0a829f 100644 --- a/GenshinUID/genshinuid_enka/etc/beta_weapon.py +++ b/GenshinUID/genshinuid_enka/etc/beta_weapon.py @@ -1,3 +1,16 @@ from typing import Dict -beta_weapons: Dict[str, int] = {'鹮穿之喙': 15419} +beta_weapons: Dict[str, int] = { + '狼牙': 11424, + '海渊终曲': 11425, + '灰河渡手': 11426, + '聊聊棒': 12424, + '浪影阔剑': 12425, + '峡湾长歌': 13424, + '公义的酬报': 13425, + '遗祀玉珑': 14424, + '纯水流华': 14425, + '烈阳之嗣': 15424, + '静谧之曲': 15425, + '最初的大魔术': 15512, +} diff --git a/GenshinUID/tools/data_to_map.py b/GenshinUID/tools/data_to_map.py index 80e835a4..a2155142 100644 --- a/GenshinUID/tools/data_to_map.py +++ b/GenshinUID/tools/data_to_map.py @@ -51,6 +51,9 @@ BETA_CHAR = { '10000081': '卡维', '10000082': '白术', '10000061': '绮良良', + '10000083': '琳妮特', + '10000084': '林尼', + '10000085': '菲米尼', } diff --git a/GenshinUID/tools/download_icon.py b/GenshinUID/tools/download_icon.py index 6ef2b90d..5cf51828 100644 --- a/GenshinUID/tools/download_icon.py +++ b/GenshinUID/tools/download_icon.py @@ -2,7 +2,7 @@ from pathlib import Path import httpx -char_list = ['Momoka'] +char_list = ['Linette', 'Liney', 'Freminet'] title = 'https://api.ambr.top/assets/UI/{}' # title = 'https://enka.network/ui/{}' icon_list = [ diff --git a/GenshinUID/utils/map/data/avatarId2Name_mapping_3.7.0.json b/GenshinUID/utils/map/data/avatarId2Name_mapping_3.7.0.json index fb7d24eb..602fa5a8 100644 --- a/GenshinUID/utils/map/data/avatarId2Name_mapping_3.7.0.json +++ b/GenshinUID/utils/map/data/avatarId2Name_mapping_3.7.0.json @@ -1 +1 @@ -{"10000001": "凯特", "10000002": "神里绫华", "10000003": "琴", "10000005": "旅行者", "10000006": "丽莎", "10000007": "旅行者", "10000014": "芭芭拉", "10000015": "凯亚", "10000016": "迪卢克", "10000020": "雷泽", "10000021": "安柏", "10000022": "温迪", "10000023": "香菱", "10000024": "北斗", "10000025": "行秋", "10000026": "魈", "10000027": "凝光", "10000029": "可莉", "10000030": "钟离", "10000031": "菲谢尔", "10000032": "班尼特", "10000033": "达达利亚", "10000034": "诺艾尔", "10000035": "七七", "10000036": "重云", "10000037": "甘雨", "10000038": "阿贝多", "10000039": "迪奥娜", "10000041": "莫娜", "10000042": "刻晴", "10000043": "砂糖", "10000044": "辛焱", "10000045": "罗莎莉亚", "10000046": "胡桃", "10000047": "枫原万叶", "10000048": "烟绯", "10000049": "宵宫", "10000050": "托马", "10000051": "优菈", "10000052": "雷电将军", "10000053": "早柚", "10000054": "珊瑚宫心海", "10000055": "五郎", "10000056": "九条裟罗", "10000057": "荒泷一斗", "10000058": "八重神子", "10000059": "鹿野院平藏", "10000060": "夜兰", "10000061": "绮良良", "10000062": "埃洛伊", "10000063": "申鹤", "10000064": "云堇", "10000065": "久岐忍", "10000066": "神里绫人", "10000067": "柯莱", "10000068": "多莉", "10000069": "提纳里", "10000070": "妮露", "10000071": "赛诺", "10000072": "坎蒂丝", "10000073": "纳西妲", "10000074": "莱依拉", "10000075": "流浪者", "10000076": "珐露珊", "10000077": "瑶瑶", "10000078": "艾尔海森", "10000079": "迪希雅", "10000080": "米卡", "10000081": "卡维", "10000082": "白术"} \ No newline at end of file +{"10000001": "凯特", "10000002": "神里绫华", "10000003": "琴", "10000005": "旅行者", "10000006": "丽莎", "10000007": "旅行者", "10000014": "芭芭拉", "10000015": "凯亚", "10000016": "迪卢克", "10000020": "雷泽", "10000021": "安柏", "10000022": "温迪", "10000023": "香菱", "10000024": "北斗", "10000025": "行秋", "10000026": "魈", "10000027": "凝光", "10000029": "可莉", "10000030": "钟离", "10000031": "菲谢尔", "10000032": "班尼特", "10000033": "达达利亚", "10000034": "诺艾尔", "10000035": "七七", "10000036": "重云", "10000037": "甘雨", "10000038": "阿贝多", "10000039": "迪奥娜", "10000041": "莫娜", "10000042": "刻晴", "10000043": "砂糖", "10000044": "辛焱", "10000045": "罗莎莉亚", "10000046": "胡桃", "10000047": "枫原万叶", "10000048": "烟绯", "10000049": "宵宫", "10000050": "托马", "10000051": "优菈", "10000052": "雷电将军", "10000053": "早柚", "10000054": "珊瑚宫心海", "10000055": "五郎", "10000056": "九条裟罗", "10000057": "荒泷一斗", "10000058": "八重神子", "10000059": "鹿野院平藏", "10000060": "夜兰", "10000061": "绮良良", "10000062": "埃洛伊", "10000063": "申鹤", "10000064": "云堇", "10000065": "久岐忍", "10000066": "神里绫人", "10000067": "柯莱", "10000068": "多莉", "10000069": "提纳里", "10000070": "妮露", "10000071": "赛诺", "10000072": "坎蒂丝", "10000073": "纳西妲", "10000074": "莱依拉", "10000075": "流浪者", "10000076": "珐露珊", "10000077": "瑶瑶", "10000078": "艾尔海森", "10000079": "迪希雅", "10000080": "米卡", "10000081": "卡维", "10000082": "白术", "10000083": "琳妮特", "10000084": "林尼", "10000085": "菲米尼"} \ No newline at end of file diff --git a/GenshinUID/utils/map/data/avatarId2Star_mapping_3.7.0.json b/GenshinUID/utils/map/data/avatarId2Star_mapping_3.7.0.json index 6d7ebbf6..91fe44ea 100644 --- a/GenshinUID/utils/map/data/avatarId2Star_mapping_3.7.0.json +++ b/GenshinUID/utils/map/data/avatarId2Star_mapping_3.7.0.json @@ -1 +1 @@ -{"10000002": "5", "10000003": "5", "10000006": "4", "10000014": "4", "10000015": "4", "10000016": "5", "10000020": "4", "10000021": "4", "10000022": "5", "10000023": "4", "10000024": "4", "10000025": "4", "10000026": "5", "10000027": "4", "10000029": "5", "10000030": "5", "10000031": "4", "10000032": "4", "10000033": "5", "10000034": "4", "10000035": "5", "10000036": "4", "10000037": "5", "10000038": "5", "10000039": "4", "10000041": "5", "10000042": "5", "10000043": "4", "10000044": "4", "10000045": "4", "10000046": "5", "10000047": "5", "10000048": "4", "10000049": "5", "10000050": "4", "10000051": "5", "10000052": "5", "10000053": "4", "10000054": "5", "10000055": "4", "10000056": "4", "10000057": "5", "10000058": "5", "10000059": "4", "10000060": "5", "10000061": "4", "10000062": "5", "10000063": "5", "10000064": "4", "10000065": "4", "10000066": "5", "10000067": "4", "10000068": "4", "10000069": "5", "10000070": "5", "10000071": "5", "10000072": "4", "10000073": "5", "10000074": "4", "10000075": "5", "10000076": "4", "10000077": "4", "10000078": "5", "10000079": "5", "10000080": "4", "10000081": "4", "10000082": "5", "10000005": "5", "10000007": "5"} \ No newline at end of file +{"10000002": "5", "10000003": "5", "10000006": "4", "10000014": "4", "10000015": "4", "10000016": "5", "10000020": "4", "10000021": "4", "10000022": "5", "10000023": "4", "10000024": "4", "10000025": "4", "10000026": "5", "10000027": "4", "10000029": "5", "10000030": "5", "10000031": "4", "10000032": "4", "10000033": "5", "10000034": "4", "10000035": "5", "10000036": "4", "10000037": "5", "10000038": "5", "10000039": "4", "10000041": "5", "10000042": "5", "10000043": "4", "10000044": "4", "10000045": "4", "10000046": "5", "10000047": "5", "10000048": "4", "10000049": "5", "10000050": "4", "10000051": "5", "10000052": "5", "10000053": "4", "10000054": "5", "10000055": "4", "10000056": "4", "10000057": "5", "10000058": "5", "10000059": "4", "10000060": "5", "10000061": "4", "10000062": "5", "10000063": "5", "10000064": "4", "10000065": "4", "10000066": "5", "10000067": "4", "10000068": "4", "10000069": "5", "10000070": "5", "10000071": "5", "10000072": "4", "10000073": "5", "10000074": "4", "10000075": "5", "10000076": "4", "10000077": "4", "10000078": "5", "10000079": "5", "10000080": "4", "10000081": "4", "10000082": "5", "10000083": "4", "10000084": "5", "10000085": "4", "10000005": "5", "10000007": "5"} \ No newline at end of file diff --git a/GenshinUID/utils/map/data/avatarName2Element_mapping_3.7.0.json b/GenshinUID/utils/map/data/avatarName2Element_mapping_3.7.0.json index 6719fae3..8351b3f5 100644 --- a/GenshinUID/utils/map/data/avatarName2Element_mapping_3.7.0.json +++ b/GenshinUID/utils/map/data/avatarName2Element_mapping_3.7.0.json @@ -1 +1 @@ -{"神里绫华": "Cryo", "琴": "Anemo", "丽莎": "Electro", "芭芭拉": "Hydro", "凯亚": "Cryo", "迪卢克": "Pyro", "雷泽": "Electro", "安柏": "Pyro", "温迪": "Anemo", "香菱": "Pyro", "北斗": "Electro", "行秋": "Hydro", "魈": "Anemo", "凝光": "Geo", "可莉": "Pyro", "钟离": "Geo", "菲谢尔": "Electro", "班尼特": "Pyro", "达达利亚": "Hydro", "诺艾尔": "Geo", "七七": "Cryo", "重云": "Cryo", "甘雨": "Cryo", "阿贝多": "Geo", "迪奥娜": "Cryo", "莫娜": "Hydro", "刻晴": "Electro", "砂糖": "Anemo", "辛焱": "Pyro", "罗莎莉亚": "Cryo", "胡桃": "Pyro", "枫原万叶": "Anemo", "烟绯": "Pyro", "宵宫": "Pyro", "托马": "Pyro", "优菈": "Cryo", "雷电将军": "Electro", "早柚": "Anemo", "珊瑚宫心海": "Hydro", "五郎": "Geo", "九条裟罗": "Electro", "荒泷一斗": "Geo", "八重神子": "Electro", "鹿野院平藏": "Anemo", "夜兰": "Hydro", "绮良良": "Dendro", "埃洛伊": "Cryo", "申鹤": "Cryo", "云堇": "Geo", "久岐忍": "Electro", "神里绫人": "Hydro", "柯莱": "Dendro", "多莉": "Electro", "提纳里": "Dendro", "妮露": "Hydro", "赛诺": "Electro", "坎蒂丝": "Hydro", "纳西妲": "Dendro", "莱依拉": "Cryo", "流浪者": "Anemo", "珐露珊": "Anemo", "瑶瑶": "Dendro", "艾尔海森": "Dendro", "迪希雅": "Pyro", "米卡": "Cryo", "卡维": "Dendro", "白术": "Dendro"} \ No newline at end of file +{"神里绫华": "Cryo", "琴": "Anemo", "丽莎": "Electro", "芭芭拉": "Hydro", "凯亚": "Cryo", "迪卢克": "Pyro", "雷泽": "Electro", "安柏": "Pyro", "温迪": "Anemo", "香菱": "Pyro", "北斗": "Electro", "行秋": "Hydro", "魈": "Anemo", "凝光": "Geo", "可莉": "Pyro", "钟离": "Geo", "菲谢尔": "Electro", "班尼特": "Pyro", "达达利亚": "Hydro", "诺艾尔": "Geo", "七七": "Cryo", "重云": "Cryo", "甘雨": "Cryo", "阿贝多": "Geo", "迪奥娜": "Cryo", "莫娜": "Hydro", "刻晴": "Electro", "砂糖": "Anemo", "辛焱": "Pyro", "罗莎莉亚": "Cryo", "胡桃": "Pyro", "枫原万叶": "Anemo", "烟绯": "Pyro", "宵宫": "Pyro", "托马": "Pyro", "优菈": "Cryo", "雷电将军": "Electro", "早柚": "Anemo", "珊瑚宫心海": "Hydro", "五郎": "Geo", "九条裟罗": "Electro", "荒泷一斗": "Geo", "八重神子": "Electro", "鹿野院平藏": "Anemo", "夜兰": "Hydro", "绮良良": "Dendro", "埃洛伊": "Cryo", "申鹤": "Cryo", "云堇": "Geo", "久岐忍": "Electro", "神里绫人": "Hydro", "柯莱": "Dendro", "多莉": "Electro", "提纳里": "Dendro", "妮露": "Hydro", "赛诺": "Electro", "坎蒂丝": "Hydro", "纳西妲": "Dendro", "莱依拉": "Cryo", "流浪者": "Anemo", "珐露珊": "Anemo", "瑶瑶": "Dendro", "艾尔海森": "Dendro", "迪希雅": "Pyro", "米卡": "Cryo", "卡维": "Dendro", "白术": "Dendro", "琳妮特": "Anemo", "林尼": "Pyro", "菲米尼": "Cryo"} \ No newline at end of file diff --git a/GenshinUID/utils/map/data/avatarName2Weapon_mapping_3.7.0.json b/GenshinUID/utils/map/data/avatarName2Weapon_mapping_3.7.0.json index 803434f1..d3b1e5d9 100644 --- a/GenshinUID/utils/map/data/avatarName2Weapon_mapping_3.7.0.json +++ b/GenshinUID/utils/map/data/avatarName2Weapon_mapping_3.7.0.json @@ -1 +1 @@ -{"神里绫华": "单手剑", "琴": "单手剑", "丽莎": "法器", "芭芭拉": "法器", "凯亚": "单手剑", "迪卢克": "双手剑", "雷泽": "双手剑", "安柏": "弓", "温迪": "弓", "香菱": "长柄武器", "北斗": "双手剑", "行秋": "单手剑", "魈": "长柄武器", "凝光": "法器", "可莉": "法器", "钟离": "长柄武器", "菲谢尔": "弓", "班尼特": "单手剑", "达达利亚": "弓", "诺艾尔": "双手剑", "七七": "单手剑", "重云": "双手剑", "甘雨": "弓", "阿贝多": "单手剑", "迪奥娜": "弓", "莫娜": "法器", "刻晴": "单手剑", "砂糖": "法器", "辛焱": "双手剑", "罗莎莉亚": "长柄武器", "胡桃": "长柄武器", "枫原万叶": "单手剑", "烟绯": "法器", "宵宫": "弓", "托马": "长柄武器", "优菈": "双手剑", "雷电将军": "长柄武器", "早柚": "双手剑", "珊瑚宫心海": "法器", "五郎": "弓", "九条裟罗": "弓", "荒泷一斗": "双手剑", "八重神子": "法器", "鹿野院平藏": "法器", "夜兰": "弓", "绮良良": "单手剑", "埃洛伊": "弓", "申鹤": "长柄武器", "云堇": "长柄武器", "久岐忍": "单手剑", "神里绫人": "单手剑", "柯莱": "弓", "多莉": "双手剑", "提纳里": "弓", "妮露": "单手剑", "赛诺": "长柄武器", "坎蒂丝": "长柄武器", "纳西妲": "法器", "莱依拉": "单手剑", "流浪者": "法器", "珐露珊": "弓", "瑶瑶": "长柄武器", "艾尔海森": "单手剑", "迪希雅": "双手剑", "米卡": "长柄武器", "卡维": "双手剑", "白术": "法器", "旅行者": "单手剑"} \ No newline at end of file +{"神里绫华": "单手剑", "琴": "单手剑", "丽莎": "法器", "芭芭拉": "法器", "凯亚": "单手剑", "迪卢克": "双手剑", "雷泽": "双手剑", "安柏": "弓", "温迪": "弓", "香菱": "长柄武器", "北斗": "双手剑", "行秋": "单手剑", "魈": "长柄武器", "凝光": "法器", "可莉": "法器", "钟离": "长柄武器", "菲谢尔": "弓", "班尼特": "单手剑", "达达利亚": "弓", "诺艾尔": "双手剑", "七七": "单手剑", "重云": "双手剑", "甘雨": "弓", "阿贝多": "单手剑", "迪奥娜": "弓", "莫娜": "法器", "刻晴": "单手剑", "砂糖": "法器", "辛焱": "双手剑", "罗莎莉亚": "长柄武器", "胡桃": "长柄武器", "枫原万叶": "单手剑", "烟绯": "法器", "宵宫": "弓", "托马": "长柄武器", "优菈": "双手剑", "雷电将军": "长柄武器", "早柚": "双手剑", "珊瑚宫心海": "法器", "五郎": "弓", "九条裟罗": "弓", "荒泷一斗": "双手剑", "八重神子": "法器", "鹿野院平藏": "法器", "夜兰": "弓", "绮良良": "单手剑", "埃洛伊": "弓", "申鹤": "长柄武器", "云堇": "长柄武器", "久岐忍": "单手剑", "神里绫人": "单手剑", "柯莱": "弓", "多莉": "双手剑", "提纳里": "弓", "妮露": "单手剑", "赛诺": "长柄武器", "坎蒂丝": "长柄武器", "纳西妲": "法器", "莱依拉": "单手剑", "流浪者": "法器", "珐露珊": "弓", "瑶瑶": "长柄武器", "艾尔海森": "单手剑", "迪希雅": "双手剑", "米卡": "长柄武器", "卡维": "双手剑", "白术": "法器", "琳妮特": "单手剑", "林尼": "弓", "菲米尼": "双手剑", "旅行者": "单手剑"} \ No newline at end of file diff --git a/GenshinUID/utils/map/data/char_alias.json b/GenshinUID/utils/map/data/char_alias.json index ae5c8757..c74148d5 100644 --- a/GenshinUID/utils/map/data/char_alias.json +++ b/GenshinUID/utils/map/data/char_alias.json @@ -754,5 +754,15 @@ "良良", "凉凉", "猫女" + ], + "琳妮特": [ + "林尼特" + ], + "林尼": [ + "林妮" + ], + "菲米尼": [ + "费米尼", + "菲米妮" ] } \ No newline at end of file diff --git a/GenshinUID/utils/map/data/enName2AvatarID_mapping_3.7.0.json b/GenshinUID/utils/map/data/enName2AvatarID_mapping_3.7.0.json index fac2e42c..7a8dcdff 100644 --- a/GenshinUID/utils/map/data/enName2AvatarID_mapping_3.7.0.json +++ b/GenshinUID/utils/map/data/enName2AvatarID_mapping_3.7.0.json @@ -1 +1 @@ -{"Ayaka": "10000002", "Qin": "10000003", "Lisa": "10000006", "Barbara": "10000014", "Kaeya": "10000015", "Diluc": "10000016", "Razor": "10000020", "Ambor": "10000021", "Venti": "10000022", "Xiangling": "10000023", "Beidou": "10000024", "Xingqiu": "10000025", "Xiao": "10000026", "Ningguang": "10000027", "Klee": "10000029", "Zhongli": "10000030", "Fischl": "10000031", "Bennett": "10000032", "Tartaglia": "10000033", "Noel": "10000034", "Qiqi": "10000035", "Chongyun": "10000036", "Ganyu": "10000037", "Albedo": "10000038", "Diona": "10000039", "Mona": "10000041", "Keqing": "10000042", "Sucrose": "10000043", "Xinyan": "10000044", "Rosaria": "10000045", "Hutao": "10000046", "Kazuha": "10000047", "Feiyan": "10000048", "Yoimiya": "10000049", "Tohma": "10000050", "Eula": "10000051", "Shougun": "10000052", "Sayu": "10000053", "Kokomi": "10000054", "Gorou": "10000055", "Sara": "10000056", "Itto": "10000057", "Yae": "10000058", "Heizo": "10000059", "Yelan": "10000060", "Momoka": "10000061", "Aloy": "10000062", "Shenhe": "10000063", "Yunjin": "10000064", "Shinobu": "10000065", "Ayato": "10000066", "Collei": "10000067", "Dori": "10000068", "Tighnari": "10000069", "Nilou": "10000070", "Cyno": "10000071", "Candace": "10000072", "Nahida": "10000073", "Layla": "10000074", "Wanderer": "10000075", "Faruzan": "10000076", "Yaoyao": "10000077", "Alhatham": "10000078", "Dehya": "10000079", "Mika": "10000080", "Kaveh": "10000081", "Baizhuer": "10000082"} \ No newline at end of file +{"Ayaka": "10000002", "Qin": "10000003", "Lisa": "10000006", "Barbara": "10000014", "Kaeya": "10000015", "Diluc": "10000016", "Razor": "10000020", "Ambor": "10000021", "Venti": "10000022", "Xiangling": "10000023", "Beidou": "10000024", "Xingqiu": "10000025", "Xiao": "10000026", "Ningguang": "10000027", "Klee": "10000029", "Zhongli": "10000030", "Fischl": "10000031", "Bennett": "10000032", "Tartaglia": "10000033", "Noel": "10000034", "Qiqi": "10000035", "Chongyun": "10000036", "Ganyu": "10000037", "Albedo": "10000038", "Diona": "10000039", "Mona": "10000041", "Keqing": "10000042", "Sucrose": "10000043", "Xinyan": "10000044", "Rosaria": "10000045", "Hutao": "10000046", "Kazuha": "10000047", "Feiyan": "10000048", "Yoimiya": "10000049", "Tohma": "10000050", "Eula": "10000051", "Shougun": "10000052", "Sayu": "10000053", "Kokomi": "10000054", "Gorou": "10000055", "Sara": "10000056", "Itto": "10000057", "Yae": "10000058", "Heizo": "10000059", "Yelan": "10000060", "Momoka": "10000061", "Aloy": "10000062", "Shenhe": "10000063", "Yunjin": "10000064", "Shinobu": "10000065", "Ayato": "10000066", "Collei": "10000067", "Dori": "10000068", "Tighnari": "10000069", "Nilou": "10000070", "Cyno": "10000071", "Candace": "10000072", "Nahida": "10000073", "Layla": "10000074", "Wanderer": "10000075", "Faruzan": "10000076", "Yaoyao": "10000077", "Alhatham": "10000078", "Dehya": "10000079", "Mika": "10000080", "Kaveh": "10000081", "Baizhuer": "10000082", "Linette": "10000083", "Liney": "10000084", "Freminet": "10000085"} \ No newline at end of file