diff --git a/genshinuid_adv/Genshin All Char.xlsx b/genshinuid_adv/Genshin All Char.xlsx index b3ef9c0f..86a1c405 100644 Binary files a/genshinuid_adv/Genshin All Char.xlsx and b/genshinuid_adv/Genshin All Char.xlsx differ diff --git a/genshinuid_adv/char_adv_list.json b/genshinuid_adv/char_adv_list.json index 44f3af31..c9b5072d 100644 --- a/genshinuid_adv/char_adv_list.json +++ b/genshinuid_adv/char_adv_list.json @@ -109,7 +109,7 @@ "不灭月华" ], "4": [ - "试做金珀" + "试作金珀" ], "3": [ "讨龙英杰谭" @@ -177,7 +177,7 @@ "天空之卷" ], "4": [ - "试做金珀", + "试作金珀", "流浪乐章", "匣里日月" ], @@ -228,7 +228,7 @@ "螭骨剑", "雪葬的星银", "衔珠海皇", - "试做古华" + "试作古华" ], "3": [] }, @@ -255,7 +255,7 @@ "身份「卢皮卡」,安德留斯的收留者,师从丽莎,是可莉的朋友,昔日的四星战神,\n人送外号狼崽" ] }, - "旅行者(风)": { + "旅行者风": { "weapon": { "5": [ "磐岩结绿" @@ -275,7 +275,7 @@ "对初始角色空和荧两兄妹的统称。根据玩家选择,自机一方将踏上寻找血亲之路,另一方将隶属于深渊教团。\n身份:外来的异乡人,小可爱,进化出智商的丘丘人,荣誉骑士,大黄金钓鱼手,臭保底人(误),等等;\n绰号很多,在国内空常称为龙哥,荧常称为爷" ] }, - "旅行者(岩)": { + "旅行者岩": { "weapon": { "5": [ "磐岩结绿" @@ -606,7 +606,7 @@ ] ], "remark": [ - "又名巴巴托斯,尘世七执政之一的风神,\n唯一任次七神暨男神之二,喜食苹果酒,对猫毛过敏,\n身份吟游诗人,四风守护的领导人,米哈游画女硬说男的典范(误),\n人送外号卖唱的,摸鱼神,诶嘿摸鱼真君/不务正业真君,巴巴脱丝" + "又名巴巴托斯,尘世七执政之一的风神,\n唯一任次七神暨男神之二,旅行者在提瓦特遇到的第一位尘世七执政;喜食苹果酒,对猫毛过敏,\n身份吟游诗人,四风守护的领导人,米哈游画女硬说男的典范(误),\n人送外号卖唱的,摸鱼神,诶嘿摸鱼真君/不务正业真君,巴巴脱丝" ] }, "可莉": { @@ -639,7 +639,7 @@ ] ], "remark": [ - "玩家的宝贝心头肉,「蒙德最强战力」传说,\n身份西风骑士团火花骑士,艾莉丝的女儿,羽球节指定羽球(误),西风骑士团禁闭室常客(误),\n人送外号放火烧山真君,火化骑士,小太阳" + "「蒙德最强战力」传说,玩家的宝贝心头肉;\n身份西风骑士团火花骑士,艾莉丝的女儿,羽球节指定羽球(误),西风骑士团禁闭室常客(误),\n人送外号放火烧山真君,火化骑士(误),小太阳" ] }, "达达利亚/「公子」": { @@ -647,9 +647,9 @@ "5": [ "冬极白星", "飞雷之弦振", + "若水", "天空之翼", - "阿莫斯之弓", - "终末嗟叹之诗" + "阿莫斯之弓" ], "4": [ "弓藏", @@ -732,7 +732,7 @@ ] ], "remark": [ - "又名摩拉克斯,尘世七执政之一的岩神,\n唯一任次七神暨男神之二,厌恶水产品,\n身份「往生堂」客卿,岩王帝君/岩王爷,众仙之祖,听书人,\n外号帝君,不带钱包真君" + "又名摩拉克斯,尘世七执政之一的岩神;\n唯一任次七神暨男神之二;厌恶水产品,\n身份岩王帝君/岩王爷,众仙之祖,「往生堂」客卿,听书人;\n外号帝君,不带钱包真君" ] }, "辛焱": { @@ -748,7 +748,7 @@ "螭骨剑", "雪葬的星银", "衔珠海皇", - "试做古华", + "试作古华", "白影剑" ], "3": [] @@ -816,7 +816,7 @@ ], "4": [ "破魔之弓", - "试做澹月", + "试作澹月", "黑岩战弓" ], "3": [ @@ -1002,7 +1002,7 @@ "稻妻出身的浪人武士,现为「南十字」船队成员;\n人送外号叶天帝,稻妻飞行冠军,精神璃月人(误)" ] }, - "旅行者(雷)": { + "旅行者雷": { "weapon": { "5": [ "天空之刃" @@ -1178,7 +1178,7 @@ ] ], "remark": [ - "此身,代表巴尔泽布,尘世七执政之一的雷神;\n身世复杂,可公开身份「御建鸣神主尊大御所大人」;\n似乎对甜食感兴趣;\n人送外号煮饭婆,雷军(误),土妹子" + "此身,代表巴尔泽布,尘世七执政之一的雷神;\n身世复杂,可公开身份「御建鸣神主尊大御所大人」;\n似乎对甜食感兴趣;\n常称呼为雷神,人送外号煮饭婆,雷军(误),土妹子" ] }, "九条裟罗": { @@ -1240,7 +1240,7 @@ "remark": [ "仅在心海输出队伍推荐不灭月华", "永冻队辅助首选", - "海祈岛「现人神巫女」暨军师;\n又名观赏鱼,千花书记" + "海祈岛「现人神巫女」暨军师;\n又名观赏鱼,千花书记(误)" ] }, "托马": { @@ -1368,7 +1368,7 @@ ] ], "remark": [ - "璃月云翰社当家;\n人送外号自走三彩团子(误)" + "璃月云翰社当家少女;\n人送外号自走三彩团子(误)" ] }, "八重神子": { @@ -1401,10 +1401,13 @@ ], [ "平息鸣雷的尊者" + ], + [ + "饰金之梦" ] ], "remark": [ - "身世复杂,可公开身份为鸣神大社宫司和八重堂编辑;\n人送外号尘歌狐,屑狐狸,雷丘丘萨满" + "身世复杂,可公开身份为鸣神大社宫司和八重堂编辑;\n人送外号屑狐狸,雷丘丘萨满,尘歌狐" ] }, "神里绫人": { @@ -1514,7 +1517,7 @@ "流浪乐章", "匣里日月", "嘟嘟可故事集", - "试做金珀" + "试作金珀" ], "3": [ "讨龙英杰谭" @@ -1530,10 +1533,216 @@ ] ], "remark": [ - "天领奉行的少年侦探,提瓦特第一个实装的男法器角色,鹿野奈奈的表弟,人送外号“鹿野符华”(大误)" + "天领奉行的少年侦探,提瓦特第一个实装的男法器角色;\n鸣神大社npc鹿野奈奈的表弟,人送外号“鹿野符华”(大误)" ] }, - "旅行者(草)(待测试)": { + "旅行者草": { + "weapon": { + "5": [ + "苍古自由之誓", + "天空之刃" + ], + "4": [ + "原木刀", + "西风剑", + "祭礼剑" + ], + "3": [ + "暗铁剑", + "飞天御剑" + ] + }, + "artifact": [ + [ + "深林的记忆" + ], + [ + "昔日宗室之仪" + ], + [ + "绝缘之旗印" + ] + ], + "remark": [ + "对初始角色空和荧两兄妹的统称。根据玩家选择,自机一方将踏上寻找血亲之路,另一方将隶属于深渊教团。\n身份:外来的异乡人,小可爱,进化出智商的丘丘人,荣誉骑士,大黄金钓鱼手,臭保底人(误),等等;\n绰号很多,在国内空常称为龙哥,荧常称为爷;", + "充能、精通词条优先选择" + ] + }, + "提纳里": { + "weapon": { + "5": [ + "猎人之径", + "天空之翼", + "若水", + "阿莫斯之弓" + ], + "4": [ + "苍翠绿弓", + "破魔之弓", + "绝弦", + "风花之颂" + ], + "3": [ + "弹弓" + ] + }, + "artifact": [ + [ + "流浪大地的乐团" + ], + [ + "饰金之梦" + ], + [ + "深林的记忆", + "饰金之梦" + ], + [ + "逆飞的流星" + ] + ], + "remark": [ + "精通植物学,须弥教令院「生论派」的学者,现担任道成林巡林官一职,是柯莱的师傅;人送外号提子,无穷小提狐主任,(提纳)驴(大误)" + ] + }, + "柯莱": { + "weapon": { + "5": [ + "终末嗟叹之诗" + ], + "4": [ + "西风猎弓", + "祭礼弓", + "绝弦", + "落霞" + ], + "3": [ + "鸦羽弓" + ] + }, + "artifact": [ + [ + "深林的记忆" + ], + [ + "昔日宗室之仪" + ], + [ + "绝缘之旗印" + ] + ], + "remark": [ + "道成林见习巡林员,跟从提纳里,为人热情但内向,与蒙德西风骑士团(尤其是安柏)存在某种羁绊;", + "原神官方漫画登场角色,「冬夜愚戏」pv出场角色;", + "又称须弥飞行冠军" + ] + }, + "多莉": { + "weapon": { + "5": [], + "4": [ + "西风大剑", + "祭礼大剑", + "森林王剑", + "桂木斩长正", + "钟剑" + ], + "3": [] + }, + "artifact": [ + [ + "昔日宗室之仪" + ], + [ + "绝缘之旗印" + ], + [ + "深林的记忆" + ] + ], + "remark": [ + "请注意,此角色(Dori)与克隆羊多莉(Dolly)没有任何关联;迪奥娜打败蒙德酒业赚了很多很多钱,便成了多莉的模样(大误),\n实际本人是须弥「最有门路」的大商人,似乎艾莉丝为其供货商;", + "外号奸商(误),钟剑拯救者(误),跌丝袜,帕朵菲莉斯(大误)" + ] + }, + "妮露(待测试)": { + "weapon": { + "5": [ + "圣显之钥", + "磐岩结绿" + ], + "4": [], + "3": [] + }, + "artifact": [ + [ + "沉沦之心" + ], + [ + "沉沦之心", + "千岩牢固" + ] + ], + "remark": [ + "英文名Nilou,少女,五星水单手剑;在须弥追求舞蹈,艺术和演出的舞女;", + "3.1版本实装角色;", + "人送外号红牛(误);", + "满命前的圣遗物建议死堆生命" + ] + }, + "赛诺(待测试)": { + "weapon": { + "5": [ + "赤沙之杖" + ], + "4": [], + "3": [] + }, + "artifact": [ + [ + "饰金之梦" + ], + [ + "如雷的盛怒", + "角斗士的终幕礼/追忆之注连/辰砂往生录/来歆余响" + ], + [ + "如雷的盛怒" + ] + ], + "remark": [ + "英文名Cyno,少年,五星雷枪,原神官方漫画登场角色暨原神足迹PV立绘公开角色之一,3.1版本实装;穿着清凉的须弥大风纪官;", + "代称“恋爱循环”(冷笑话):せーの(see no)~", + "仅推荐满命后4如雷" + ] + }, + "坎蒂丝(待测试)": { + "weapon": { + "5": [ + "天空之脊" + ], + "4": [ + "西风长枪", + "喜多院十文字", + "试作星镰" + ], + "3": [] + }, + "artifact": [ + [ + "绝缘之旗印", + "千岩牢固" + ], + [ + "昔日宗室之仪" + ] + ], + "remark": [ + "英文名Candace,曾用代号“Cleo/Kandake”,成女,四星水长枪;", + "3.1版本实装角色" + ] + }, + "纳西妲(待实装)": { "weapon": { "5": [], "4": [], @@ -1541,11 +1750,13 @@ }, "artifact": [], "remark": [ - "对初始角色空和荧两兄妹的统称。根据玩家选择,自机一方将踏上寻找血亲之路,另一方将隶属于深渊教团。\n身份:外来的异乡人,小可爱,进化出智商的丘丘人,荣誉骑士,大黄金钓鱼手,臭保底人(误),等等;\n绰号很多,在国内空常称为龙哥,荧常称为爷", - "3.0版本实装角色" + "英文名Nahida/Kusanali,萝莉,五星草法;\n", + "传言3.2版本实装;", + "官方称其为「神秘少女」,实际作为小吉祥草王本王,早在2.8版本活动中就初次亮相;或许是第一个主动向旅行者伸出援手的尘世七执政;", + "又名草神,须弥羽球(误)" ] }, - "提纳里(待测试)": { + "雷电国崩(流浪者)/斯卡拉姆齐/「散兵」(待实装)": { "weapon": { "5": [], "4": [], @@ -1553,11 +1764,13 @@ }, "artifact": [], "remark": [ - "英文名Tighnari,少年,五星草弓", - "3.0版本实装角色" + "英文名Wanderer/Scaramouche/Kunikuzushi,少年,传言为五星风法;早期曾传言为雷法;", + "身世复杂,可公开身份为愚人众执行官第六席,曾在主线任务和活动剧情中登场;可能在未来剧情发挥重大作用;", + "传言3.2或3.3版本实装", + "外号雷大炮,试作__ __" ] }, - "柯莱(待测试)": { + "迪希雅(待实装)": { "weapon": { "5": [], "4": [], @@ -1565,21 +1778,23 @@ }, "artifact": [], "remark": [ - "英文名Collei,少女,四星草弓", - "原神官方漫画登场角色", - "3.0版本实装角色,【存疑】3.0版本官方赠送角色" + "英文名Dehya,成女,五星火大剑;隶属于镀金旅团,身份为雇佣兵;传言33版本实装", + "在官方须弥前瞻短片登场的须弥卫星角色之一" ] }, - "多莉(待测试)": { + "艾尔海森(待实装)": { "weapon": { "5": [], - "4": [], + "4": [ + " " + ], "3": [] }, "artifact": [], "remark": [ - "英文名Dori (全名Dori Sangemah Bay),萝莉,四星雷大剑", - "3.0版本实装角色" + "英文名Al-Haitam/Haytham/Hatham​,曾用代号“苏”,成男,五星草单手剑,传言3.3版本以后实装;初见于奥摩斯港,其本人出身于须弥教令院的「知论派」,绝对的理性主义者;", + "在官方须弥前瞻短片登场的须弥卫星角色之一;", + "又称海哥" ] }, "白术(待实装)": { @@ -1604,10 +1819,10 @@ "artifact": [], "remark": [ "英文名Yaoyao,萝莉,香菱的师妹;传言草系法器,早期曾有草系长枪的说法;", - "原神CBT八骏图角色之一,璃月在途卫星角色" + "原神CBT八骏图最后一位未实装角色,璃月在途卫星角色" ] }, - "杰吉特(待证实)": { + "Mika(待证实)": { "weapon": { "5": [], "4": [], @@ -1615,93 +1830,7 @@ }, "artifact": [], "remark": [ - "英文名Djajeet,男性", - "可能的须弥在途卫星角色之一" - ] - }, - "雷电国崩(流浪者)/斯卡拉姆齐/「散兵」(待实装)": { - "weapon": { - "5": [], - "4": [], - "3": [] - }, - "artifact": [], - "remark": [ - "英文名Wanderer/Scaramouche/Kunikuzushi,少年,传言为五星雷法", - "身世复杂,可公开身份为愚人众执行官第六席,曾在主线任务和活动剧情中登场", - "【存疑】传言3.2或3.3版本实装" - ] - }, - "纳芙丝(待证实)": { - "weapon": { - "5": [], - "4": [], - "3": [] - }, - "artifact": [], - "remark": [ - "英文名Nafs,女性", - "可能的须弥在途卫星角色之一" - ] - }, - "妮露(待实装)": { - "weapon": { - "5": [], - "4": [], - "3": [] - }, - "artifact": [], - "remark": [ - "英文名Nilou,少女,五星水单手剑", - "解包中发现了建模,须弥卫星角色之一;传言3.1实装" - ] - }, - "伊赫法(待证实)": { - "weapon": { - "5": [], - "4": [], - "3": [] - }, - "artifact": [], - "remark": [ - "英文名Ikhfa,女性,传言为五星,成女", - "可能的须弥在途卫星角色之一,可能在3.6登场" - ] - }, - "莱依拉(待证实)": { - "weapon": { - "5": [], - "4": [], - "3": [] - }, - "artifact": [], - "remark": [ - "英文名Lyala,女性,传言为四星冰单手剑,少女体型", - "可能的须弥在途卫星角色之一" - ] - }, - "坎蒂丝(暂称)(待证实)": { - "weapon": { - "5": [], - "4": [], - "3": [] - }, - "artifact": [], - "remark": [ - "英文名Candace,曾用代号“Cleo/Kandake”,女性,传言为四星水长枪,成女体型", - "可能的须弥在途卫星角色之一" - ] - }, - "Faruzan(待证实)": { - "weapon": { - "5": [], - "4": [], - "3": [] - }, - "artifact": [], - "remark": [ - "英文名Faruzan,女性,传言为风系弓,少女体型", - "可能的须弥在途卫星角色之一" + "英文名Mika,男性,可能的蒙德在途卫星角色" ] } } \ No newline at end of file diff --git a/tools/gen_char_li.py b/tools/gen_char_li.py new file mode 100644 index 00000000..291c4bc3 --- /dev/null +++ b/tools/gen_char_li.py @@ -0,0 +1,48 @@ +import copy +import json +from pathlib import Path +from typing import Optional + +from openpyxl import load_workbook + +sample = { + 'weapon': {'5': [], '4': [], '3': []}, + 'artifact': [], # type: list[list[str,Optional[str]]] # 四件套 / 2+2 + 'remark': [], +} + +char_json = {} + +path = Path(__file__).parents[1] / 'genshinuid_adv' + +wb = load_workbook(str(path / 'Genshin All Char.xlsx')) +ws = wb.active +for char_i in range(2, 336, 5): # 角色行 + char_name = ws.cell(char_i, 1).value.replace('\n', '') # type: ignore + char_sample = copy.deepcopy(sample) + for i in range(5): + row = i + char_i + + if star_5 := ws.cell(row, 2).value: + char_sample['weapon']['5'].append(star_5) + if star_4 := ws.cell(row, 3).value: + char_sample['weapon']['4'].append(star_4) + if star_3 := ws.cell(row, 4).value: + char_sample['weapon']['3'].append(star_3) + + artifact = [] + if arti_1 := ws.cell(row, 5).value: + artifact.append(arti_1) + if arti_2 := ws.cell(row, 6).value: + artifact.append(arti_2) + if artifact: + char_sample['artifact'].append(artifact) + + if remark := ws.cell(row, 7).value: + if row > 7: + char_sample['remark'].append(remark) + + char_json[char_name] = char_sample + +with open(str(path / 'char_adv_list.json'), 'w', encoding='utf-8') as f: + json.dump(char_json, f, indent=2, ensure_ascii=False)