diff --git a/enkaToData/enkaToData.py b/enkaToData/enkaToData.py index 865ef62f..56e7d5e5 100644 --- a/enkaToData/enkaToData.py +++ b/enkaToData/enkaToData.py @@ -89,23 +89,22 @@ async def enkaToData(uid: str, enka_data: Optional[dict] = None) -> dict: try: char_data['avatarElement'] = avatarName2Element[char_data['avatarName']] except KeyError: - check = skillId2Name['Name'][str(list(char['skillLevelMap'].keys())[0])] - if '风' in check : + check = skillId2Name['Name'][str(list(char['skillLevelMap'].keys())[2])] + if '风' in check: char_data['avatarElement'] = 'Anemo' - elif '雷' in check : + elif '雷' in check: char_data['avatarElement'] = 'Electro' - elif '岩' in check : + elif '岩' in check: char_data['avatarElement'] = 'Geo' - elif '草' in check : + elif '草' in check: char_data['avatarElement'] = 'Dendro' - elif '冰' in check : + elif '冰' in check: char_data['avatarElement'] = 'Cryo' - elif '水' in check : + elif '水' in check: char_data['avatarElement'] = 'Hydro' else: char_data['avatarElement'] = 'Pyro' - char_data['dataTime'] = now char_data['avatarSkill'] = [] @@ -119,9 +118,17 @@ async def enkaToData(uid: str, enka_data: Optional[dict] = None) -> dict: char_data['avatarSkill'].append(skill_temp) if char_data['avatarName'] in ['神里绫华', '安柏']: - char_data['avatarSkill'][0], char_data['avatarSkill'][-1] = char_data['avatarSkill'][-1], char_data['avatarSkill'][0] - char_data['avatarSkill'][2], char_data['avatarSkill'][-1] = char_data['avatarSkill'][-1], char_data['avatarSkill'][2] + char_data['avatarSkill'][0], char_data['avatarSkill'][-1] = char_data['avatarSkill'][-1], \ + char_data['avatarSkill'][0] + char_data['avatarSkill'][2], char_data['avatarSkill'][-1] = char_data['avatarSkill'][-1], \ + char_data['avatarSkill'][2] char_data['avatarEnName'] = char_data['avatarSkill'][1]['skillIcon'].split('_')[-2] + elif char_data['avatarName'] in ['旅行者']: + char_data['avatarSkill'][0], char_data['avatarSkill'][-1] = char_data['avatarSkill'][-1], \ + char_data['avatarSkill'][0] + char_data['avatarSkill'][1], char_data['avatarSkill'][-1] = char_data['avatarSkill'][-1], \ + char_data['avatarSkill'][1] + char_data['avatarEnName'] = str(avatarId) else: char_data['avatarEnName'] = char_data['avatarSkill'][-1]['skillIcon'].split('_')[-2] diff --git a/enkaToData/etc/avatarOffsetMap.json b/enkaToData/etc/avatarOffsetMap.json index 27b84562..b07d3aa5 100644 --- a/enkaToData/etc/avatarOffsetMap.json +++ b/enkaToData/etc/avatarOffsetMap.json @@ -1 +1 @@ -{"凯特": [200, 0], "神里绫华": [0, 0], "琴": [100, 0], "旅行者": [200, 0], "丽莎": [200, -100], "芭芭拉": [200, 0], "凯亚": [150, -150], "迪卢克": [300, 0], "雷泽": [400, 0], "安柏": [0, 200], "温迪": [100, 0], "香菱": [-100, -250], "北斗": [200, 0], "行秋": [250, -100], "魈": [200, 200], "凝光": [500, 0], "可莉": [0, 0], "钟离": [100, 0], "菲谢尔": [300, 0], "班尼特": [150, 150], "达达利亚": [0, 0], "诺艾尔": [300, -80], "七七": [200, 100], "重云": [200, 0], "甘雨": [100, 0], "阿贝多": [200, 0], "迪奥娜": [-300, 0], "莫娜": [200, 0], "刻晴": [400, 250], "砂糖": [50, 0], "辛焱": [250, 0], "罗莎莉亚": [200, 0], "胡桃": [560, 0], "枫原万叶": [150, -200], "烟绯": [-400, 0], "宵宫": [250, 0], "托马": [200, 0], "优菈": [-200, 0], "雷电将军": [100, 0], "早柚": [500, 0], "珊瑚宫心海": [200, 0], "五郎": [60, 0], "九条裟罗": [100, 0], "荒泷一斗": [100, 0], "八重神子": [300, 0], "夜兰": [80, 0], "埃洛伊": [60, 0], "申鹤": [360, 0], "云堇": [100, 0], "久岐忍": [200, 0], "神里绫人": [50, 0], "队伍测试4号": [200, 0], "场景测试": [200, 0], "裸模1号": [200, 0], "裸男": [200, 0], "联机测试": [200, 0], "成男体型测试": [200, 0], "成女体型测试": [200, 0], "少女体型测试": [200, 0], "阿葵丽雅": [200, 0], "瑶瑶": [200, 0], "少女体型测试-二号机": [200, 0], "白盒少女": [200, 0], "大剑少女": [200, 0], "后武器测试A": [200, 0], "后武器测试B": [200, 0], "后武器测试C": [200, 0], "后武器测试D": [200, 0], "长枪成女": [200, 0], "单手剑成女测试": [200, 0], "Rx白盒": [200, 0], "少男体型测试": [200, 0], "女主新普攻": [200, 0], "男主新普攻": [200, 0], "重云（测试）": [200, 0], "测试角色": [200, 0], "七七（测试）": [200, 0], "迪奥娜(测试)": [200, 0]} \ No newline at end of file +{"凯特": [200, 0], "神里绫华": [0, 0], "琴": [100, 0], "旅行者": [0, -160], "丽莎": [200, -100], "芭芭拉": [200, 0], "凯亚": [150, -150], "迪卢克": [300, 0], "雷泽": [400, 0], "安柏": [0, 200], "温迪": [100, 0], "香菱": [-100, -250], "北斗": [200, 0], "行秋": [250, -100], "魈": [200, 200], "凝光": [500, 0], "可莉": [0, 0], "钟离": [100, 0], "菲谢尔": [300, 0], "班尼特": [150, 150], "达达利亚": [0, 0], "诺艾尔": [300, -80], "七七": [200, 100], "重云": [200, 0], "甘雨": [100, 0], "阿贝多": [200, 0], "迪奥娜": [-300, 0], "莫娜": [200, 0], "刻晴": [400, 250], "砂糖": [50, 0], "辛焱": [250, 0], "罗莎莉亚": [200, 0], "胡桃": [560, 0], "枫原万叶": [150, -200], "烟绯": [-400, 0], "宵宫": [250, 0], "托马": [200, 0], "优菈": [-200, 0], "雷电将军": [100, 0], "早柚": [500, 0], "珊瑚宫心海": [200, 0], "五郎": [60, 0], "九条裟罗": [100, 0], "荒泷一斗": [100, 0], "八重神子": [300, 0], "夜兰": [80, 0], "埃洛伊": [60, 0], "申鹤": [360, 0], "云堇": [100, 0], "久岐忍": [200, 0], "神里绫人": [50, 0], "队伍测试4号": [200, 0], "场景测试": [200, 0], "裸模1号": [200, 0], "裸男": [200, 0], "联机测试": [200, 0], "成男体型测试": [200, 0], "成女体型测试": [200, 0], "少女体型测试": [200, 0], "阿葵丽雅": [200, 0], "瑶瑶": [200, 0], "少女体型测试-二号机": [200, 0], "白盒少女": [200, 0], "大剑少女": [200, 0], "后武器测试A": [200, 0], "后武器测试B": [200, 0], "后武器测试C": [200, 0], "后武器测试D": [200, 0], "长枪成女": [200, 0], "单手剑成女测试": [200, 0], "Rx白盒": [200, 0], "少男体型测试": [200, 0], "女主新普攻": [200, 0], "男主新普攻": [200, 0], "重云（测试）": [200, 0], "测试角色": [200, 0], "七七（测试）": [200, 0], "迪奥娜(测试)": [200, 0]} \ No newline at end of file diff --git a/enkaToData/gachaImg/UI_Gacha_AvatarImg_10000005.png b/enkaToData/gachaImg/UI_Gacha_AvatarImg_10000005.png new file mode 100644 index 00000000..2bc92d4f Binary files /dev/null and b/enkaToData/gachaImg/UI_Gacha_AvatarImg_10000005.png differ diff --git a/enkaToData/gachaImg/UI_Gacha_AvatarImg_10000007.png b/enkaToData/gachaImg/UI_Gacha_AvatarImg_10000007.png new file mode 100644 index 00000000..2766d043 Binary files /dev/null and b/enkaToData/gachaImg/UI_Gacha_AvatarImg_10000007.png differ diff --git a/genshinuid.py b/genshinuid.py index b4347084..f1e92e70 100644 --- a/genshinuid.py +++ b/genshinuid.py @@ -949,7 +949,8 @@ async def send_uid_info(bot: HoshinoBot, ev: CQEvent): for k in char_data[i]: if char_name in k: char_name = i - + if '旅行者' in char_name: + char_name = '旅行者' with open(R_PATH / 'enkaToData' / 'player' / str(uid) / f'{char_name}.json', 'r', encoding='utf8') as fp: @@ -1156,7 +1157,8 @@ async def get_info(bot, ev): for k in char_data[i]: if char_name in k: char_name = i - + if '旅行者' in char_name: + char_name = '旅行者' with open(R_PATH / 'enkaToData' / 'player' / str(uid) / f'{char_name}.json', 'r', encoding='utf8') as fp: