diff --git a/LittlePaimon/config/data/alias.json b/LittlePaimon/config/data/alias.json index 9807a01..40aaa6b 100644 --- a/LittlePaimon/config/data/alias.json +++ b/LittlePaimon/config/data/alias.json @@ -843,8 +843,21 @@ "深林", "草套" ], - "礼冠": [ - "礼冠" + "祭冰之人": [ + "祭冰之人", + "冰礼冠" + ], + "祭火之人": [ + "祭火之人", + "火礼冠" + ], + "祭水之人": [ + "祭水之人", + "水礼冠" + ], + "祭雷之人": [ + "祭雷之人", + "雷礼冠" ], "沙上楼阁史话": [ "沙上楼阁史话", diff --git a/LittlePaimon/config/data/类型.json b/LittlePaimon/config/data/类型.json index 44cd86b..3059486 100644 --- a/LittlePaimon/config/data/类型.json +++ b/LittlePaimon/config/data/类型.json @@ -15,7 +15,11 @@ "神里绫人", "妮露", "莱依拉", - "艾尔海森" + "艾尔海森", + "旅行者风", + "旅行者岩", + "旅行者雷", + "旅行者草" ], "法器": [ "丽莎", @@ -97,7 +101,8 @@ "早柚", "鹿野院平藏", "流浪者", - "珐露珊" + "珐露珊", + "旅行者风" ], "雷": [ "丽莎", @@ -110,7 +115,8 @@ "八重神子", "久岐忍", "多莉", - "赛诺" + "赛诺", + "旅行者雷" ], "水": [ "芭芭拉", @@ -142,14 +148,16 @@ "阿贝多", "五郎", "荒泷一斗", - "云堇" + "云堇", + "旅行者岩" ], "草": [ "柯莱", "提纳里", "纳西妲", "瑶瑶", - "艾尔海森" + "艾尔海森", + "旅行者草" ] } }, diff --git a/LittlePaimon/plugins/Paimon_Wiki/wiki_api.py b/LittlePaimon/plugins/Paimon_Wiki/wiki_api.py index 7f4756b..2308d84 100644 --- a/LittlePaimon/plugins/Paimon_Wiki/wiki_api.py +++ b/LittlePaimon/plugins/Paimon_Wiki/wiki_api.py @@ -5,7 +5,7 @@ API: Dict[str, str] = { '角色图鉴': '{proxy}https://raw.githubusercontent.com/CMHopeSunshine/GenshinWikiMap/master/results/character_map/{name}.jpg', '角色攻略': '{proxy}https://raw.githubusercontent.com/CMHopeSunshine/LittlePaimonRes/main/genshin_guide/guide/{name}.jpg', '角色材料': '{proxy}https://raw.githubusercontent.com/Nwflower/genshin-atlas/master/material%20for%20role/{name}.png', - '收益曲线': 'https://static.cherishmoon.fun/LittlePaimon/blue/{name}.jpg', + '收益曲线': '{proxy}https://raw.githubusercontent.com/CMHopeSunshine/LittlePaimonRes/main/genshin_guide/curve/{name}.jpg', '参考面板': '{proxy}https://raw.githubusercontent.com/CMHopeSunshine/LittlePaimonRes/main/genshin_guide/panel/{name}.jpg', '武器图鉴': '{proxy}https://raw.githubusercontent.com/Nwflower/genshin-atlas/master/weapon/{name}.png', '圣遗物图鉴': '{proxy}https://raw.githubusercontent.com/Nwflower/genshin-atlas/master/artifact/{name}.png', diff --git a/LittlePaimon/utils/alias.py b/LittlePaimon/utils/alias.py index 337a2e2..e61af3e 100644 --- a/LittlePaimon/utils/alias.py +++ b/LittlePaimon/utils/alias.py @@ -84,8 +84,10 @@ def get_match_alias(name: str, types: Union[List[ALIAS_TYPE], ALIAS_TYPE] = None matches[type] = [] if type == '角色': if name.startswith(('风', '岩', '雷', '草', '水', '火', '冰')) and name.endswith( - ('主', '主角', '空', '荧', '旅行者')): - matches[type].append(name if name.endswith(('空', '荧')) else f'{name[0]}荧') + ('主', '主角', '旅行者')): + matches[type].append(f'旅行者{name[0]}') + elif name.startswith('旅行者') and name.endswith(('风', '岩', '雷', '草', '水', '火', '冰')): + matches[type].append(name) else: for alias in alias_list.values(): if name in alias: