diff --git a/mihoyo_libs/Genshin All Char.xlsx b/mihoyo_libs/Genshin All Char.xlsx index 056897bf..d323d6d5 100644 Binary files a/mihoyo_libs/Genshin All Char.xlsx and b/mihoyo_libs/Genshin All Char.xlsx differ diff --git a/mihoyo_libs/char_adv_list.json b/mihoyo_libs/char_adv_list.json new file mode 100644 index 00000000..a2b7060d --- /dev/null +++ b/mihoyo_libs/char_adv_list.json @@ -0,0 +1,1556 @@ +{ + "安柏": { + "weapon": { + "5": [ + "阿莫斯之弓", + "天空之翼", + "终末嗟叹之诗" + ], + "4": [ + "绝弦" + ], + "3": [] + }, + "artifact": [ + [ + "昔日宗室之仪" + ] + ], + "remark": [] + }, + "凯亚": { + "weapon": { + "5": [ + "天空之刃", + "风鹰剑" + ], + "4": [ + "天目影打刀", + "西风剑", + "黑剑" + ], + "3": [] + }, + "artifact": [ + [ + "绝缘之旗印" + ], + [ + "冰风迷途的勇士" + ], + [ + "苍白之火" + ] + ], + "remark": [] + }, + "丽莎": { + "weapon": { + "5": [ + "神乐之真意", + "天空之卷", + "四风原典" + ], + "4": [ + "流浪乐章", + "匣里日月", + "万国诸海图谱" + ], + "3": [] + }, + "artifact": [ + [ + "如雷的盛怒" + ], + [ + "如雷的盛怒", + "昔日宗室之仪" + ], + [ + "战狂" + ] + ], + "remark": [] + }, + "诺艾尔": { + "weapon": { + "5": [ + "赤角石溃杵" + ], + "4": [ + "白影剑", + "螭骨剑" + ], + "3": [] + }, + "artifact": [ + [ + "华馆梦醒形骸记" + ], + [ + "逆飞的流星" + ], + [ + "角斗士的终幕礼" + ] + ], + "remark": [] + }, + "芭芭拉": { + "weapon": { + "5": [ + "不灭月华" + ], + "4": [ + "试做金珀" + ], + "3": [] + }, + "artifact": [ + [ + "被怜爱的少女" + ] + ], + "remark": [] + }, + "砂糖": { + "weapon": { + "5": [], + "4": [ + "祭礼残章" + ], + "3": [] + }, + "artifact": [ + [ + "翠绿之影" + ] + ], + "remark": [] + }, + "行秋": { + "weapon": { + "5": [ + "磐岩结绿" + ], + "4": [ + "祭礼剑", + "匣里龙吟" + ], + "3": [] + }, + "artifact": [ + [ + "绝缘之旗印" + ], + [ + "沉沦之心", + "昔日宗室之仪" + ] + ], + "remark": [] + }, + "凝光": { + "weapon": { + "5": [ + "尘世之锁", + "四风原典", + "天空之卷" + ], + "4": [ + "试做金珀", + "流浪乐章", + "匣里日月" + ], + "3": [] + }, + "artifact": [ + [ + "悠古的磐岩", + "角斗士的终幕礼/追忆之注连/辰砂往生录/来歆余响" + ] + ], + "remark": [] + }, + "重云": { + "weapon": { + "5": [ + "狼的末路" + ], + "4": [ + "螭骨剑", + "祭礼大剑" + ], + "3": [] + }, + "artifact": [ + [ + "冰风迷途的勇士" + ], + [ + "渡过烈火的贤人" + ] + ], + "remark": [] + }, + "雷泽": { + "weapon": { + "5": [ + "松籁响起之时", + "狼的末路", + "无工之剑", + "天空之傲" + ], + "4": [ + "螭骨剑", + "雪葬的星银", + "衔珠海皇", + "试做古华" + ], + "3": [] + }, + "artifact": [ + [ + "苍白之火" + ], + [ + "苍白之火", + "染血的骑士" + ], + [ + "苍白之火", + "角斗士的终幕礼/追忆之注连/辰砂往生录/来歆余响" + ], + [ + "逆飞的流星" + ], + [ + "角斗士的终幕礼" + ] + ], + "remark": [] + }, + "旅行者(风)": { + "weapon": { + "5": [ + "磐岩结绿" + ], + "4": [ + "黑剑" + ], + "3": [] + }, + "artifact": [ + [ + "翠绿之影", + "角斗士的终幕礼/追忆之注连/辰砂往生录/来歆余响" + ] + ], + "remark": [] + }, + "旅行者(岩)": { + "weapon": { + "5": [ + "磐岩结绿" + ], + "4": [ + "黑剑" + ], + "3": [] + }, + "artifact": [ + [ + "悠古的磐岩", + "角斗士的终幕礼/追忆之注连/辰砂往生录/来歆余响" + ] + ], + "remark": [] + }, + "北斗": { + "weapon": { + "5": [ + "狼的末路", + "无工之剑" + ], + "4": [ + "螭骨剑", + "衔珠海皇" + ], + "3": [] + }, + "artifact": [ + [ + "绝缘之旗印" + ], + [ + "昔日宗室之仪", + "如雷的盛怒" + ] + ], + "remark": [] + }, + "香菱": { + "weapon": { + "5": [ + "拿来吧你(五星都能带)" + ], + "4": [ + "「渔获」", + "决斗之枪", + "西风长枪" + ], + "3": [] + }, + "artifact": [ + [ + "炽烈的炎之魔女" + ], + [ + "绝缘之旗印" + ], + [ + "炽烈的炎之魔女", + "昔日宗室之仪" + ] + ], + "remark": [ + "角色机制优秀,长柄武器基本都适用" + ] + }, + "菲谢尔": { + "weapon": { + "5": [ + "天空之翼" + ], + "4": [ + "幽夜华尔兹", + "绝弦", + "暗巷猎手" + ], + "3": [] + }, + "artifact": [ + [ + "如雷的盛怒", + "流浪大地的乐团" + ], + [ + "如雷的盛怒/流浪大地的乐团", + "角斗士的终幕礼/追忆之注连/辰砂往生录/来歆余响" + ] + ], + "remark": [] + }, + "班尼特": { + "weapon": { + "5": [ + "风鹰剑", + "雾切之回光", + "天空之刃" + ], + "4": [ + "腐殖之剑", + "西风剑", + "暗巷闪光" + ], + "3": [] + }, + "artifact": [ + [ + "昔日宗室之仪" + ], + [ + "被怜爱的少女" + ], + [ + "教官" + ] + ], + "remark": [] + }, + "迪卢克": { + "weapon": { + "5": [ + "狼的末路", + "无工之剑", + "天空之傲" + ], + "4": [ + "螭骨剑", + "衔珠海皇", + "试作古华", + "雨裁" + ], + "3": [] + }, + "artifact": [ + [ + "炽烈的炎之魔女" + ], + [ + "炽烈的炎之魔女", + "角斗士的终幕礼/追忆之注连/辰砂往生录/来歆余响" + ], + [ + "角斗士的终幕礼" + ] + ], + "remark": [] + }, + "琴": { + "weapon": { + "5": [ + "风鹰剑", + "天空之刃", + "磐岩结绿", + "苍古自由之誓" + ], + "4": [ + "腐殖之剑", + "天目影打刀", + "黑剑", + "笛剑", + "西风剑" + ], + "3": [] + }, + "artifact": [ + [ + "翠绿之影" + ], + [ + "角斗士的终幕礼/追忆之注连/辰砂往生录/来歆余响", + "被怜爱的少女" + ], + [ + "苍白之火" + ] + ], + "remark": [] + }, + "七七": { + "weapon": { + "5": [ + "磐岩结绿", + "风鹰剑", + "雾切之回光", + "天空之刃" + ], + "4": [ + "祭礼剑", + "黑剑", + "试作斩岩", + "笛剑" + ], + "3": [] + }, + "artifact": [ + [ + "海染砗蟝" + ], + [ + "千岩牢固" + ], + [ + "被怜爱的少女" + ], + [ + "被怜爱的少女", + "角斗士的终幕礼/追忆之注连/辰砂往生录/来歆余响" + ] + ], + "remark": [] + }, + "莫娜": { + "weapon": { + "5": [ + "天空之卷", + "四风原典" + ], + "4": [ + "流浪乐章", + "匣里日月", + "证誓之明瞳", + "试作金珀" + ], + "3": [] + }, + "artifact": [ + [ + "绝缘之旗印" + ], + [ + "昔日宗室之仪" + ], + [ + "千岩牢固" + ], + [ + "沉沦之心", + "角斗士的终幕礼/追忆之注连/辰砂往生录/来歆余响" + ], + [ + "沉沦之心", + "流浪大地的乐团" + ] + ], + "remark": [] + }, + "刻晴": { + "weapon": { + "5": [ + "雾切之回光", + "磐岩结绿", + "风鹰剑" + ], + "4": [ + "黑剑", + "匣里龙吟" + ], + "3": [] + }, + "artifact": [ + [ + "平息鸣雷的尊者" + ], + [ + "如雷的盛怒", + "角斗士的终幕礼/追忆之注连/辰砂往生录/来歆余响" + ], + [ + "染血的骑士道", + "角斗士的终幕礼/追忆之注连/辰砂往生录/来歆余响" + ], + [ + "染血的骑士道" + ] + ], + "remark": [] + }, + "温迪": { + "weapon": { + "5": [ + "天空之翼", + "终末嗟叹之诗", + "冬极白星", + "阿莫斯之弓" + ], + "4": [ + "绝弦", + "西风猎弓", + "风花之颂", + "苍翠猎弓" + ], + "3": [] + }, + "artifact": [ + [ + "翠绿之影" + ], + [ + "翠绿之影", + "昔日宗室之仪" + ], + [ + "绝缘之旗印" + ] + ], + "remark": [] + }, + "可莉": { + "weapon": { + "5": [ + "天空之卷", + "四风原典", + "尘世之锁", + "神乐之真意" + ], + "4": [ + "流浪乐章", + "嘟嘟可故事集", + "匣里日月" + ], + "3": [] + }, + "artifact": [ + [ + "炽烈的炎之魔女" + ], + [ + "渡过烈火的贤人" + ], + [ + "流浪大地的乐团" + ], + [ + "逆飞的流星" + ] + ], + "remark": [] + }, + "达达利亚": { + "weapon": { + "5": [ + "冬极白星", + "飞雷之弦振", + "天空之翼", + "阿莫斯之弓", + "终末嗟叹之诗" + ], + "4": [ + "弓藏", + "破魔之弓", + "绝弦", + "西风猎弓" + ], + "3": [] + }, + "artifact": [ + [ + "沉沦之心", + "角斗士的终幕礼/追忆之注连/辰砂往生录/来歆余响" + ], + [ + "沉沦之心" + ] + ], + "remark": [] + }, + "迪奥娜": { + "weapon": { + "5": [ + "终末嗟叹之诗" + ], + "4": [ + "祭礼弓", + "西风猎弓" + ], + "3": [] + }, + "artifact": [ + [ + "昔日宗室之仪" + ], + [ + "被怜爱的少女", + "千岩牢固" + ], + [ + "被怜爱的少女" + ] + ], + "remark": [] + }, + "钟离": { + "weapon": { + "5": [ + "护摩之杖", + "和璞鸢", + "贯虹之槊" + ], + "4": [ + "决斗之枪", + "西风长枪" + ], + "3": [] + }, + "artifact": [ + [ + "千岩牢固" + ], + [ + "千岩牢固", + "昔日宗室之仪" + ], + [ + "悠古的磐岩", + "昔日宗室之仪" + ] + ], + "remark": [] + }, + "辛焱": { + "weapon": { + "5": [ + "松籁响起之时", + "狼的末路", + "无工之剑", + "赤角石溃杵", + "天空之傲" + ], + "4": [ + "螭骨剑", + "雪葬的星银", + "衔珠海皇", + "试做古华", + "白影剑" + ], + "3": [] + }, + "artifact": [ + [ + "苍白之火" + ], + [ + "苍白之火", + "染血的骑士" + ], + [ + "苍白之火", + "角斗士的终幕礼/追忆之注连/辰砂往生录/来歆余响" + ], + [ + "逆飞的流星" + ], + [ + "角斗士的终幕礼" + ] + ], + "remark": [] + }, + "阿贝多": { + "weapon": { + "5": [ + "苍古自由之誓", + "磐岩结绿" + ], + "4": [ + "辰砂之纺锤", + "腐殖之剑" + ], + "3": [] + }, + "artifact": [ + [ + "千岩牢固" + ], + [ + "华馆梦醒形骸记" + ], + [ + "悠古的磐岩", + "华馆梦醒形骸记" + ] + ], + "remark": [] + }, + "甘雨": { + "weapon": { + "5": [ + "阿莫斯之弓", + "冬极白星", + "飞雷之振弦", + "天空之翼" + ], + "4": [ + "破魔之弓", + "试做澹月", + "黑岩战弓" + ], + "3": [] + }, + "artifact": [ + [ + "流浪大地的乐团" + ], + [ + "冰风迷途的勇士" + ] + ], + "remark": [] + }, + "魈": { + "weapon": { + "5": [ + "护摩之杖", + "和璞鸢", + "贯虹之槊", + "息灾", + "天空之脊" + ], + "4": [ + "决斗之枪", + "黑岩长枪", + "千岩长枪" + ], + "3": [] + }, + "artifact": [ + [ + "辰砂往生录" + ], + [ + "翠绿之影", + "角斗士的终幕礼/追忆之注连/辰砂往生录/来歆余响" + ] + ], + "remark": [ + "相比原2+2提升10%左右" + ] + }, + "胡桃": { + "weapon": { + "5": [ + "护摩之杖", + "和璞鸢", + "贯虹之槊" + ], + "4": [ + "匣里灭辰", + "决斗之枪", + "黑岩长枪" + ], + "3": [] + }, + "artifact": [ + [ + "炽烈的炎之魔女" + ], + [ + "追忆之注连" + ] + ], + "remark": [] + }, + "罗莎莉亚": { + "weapon": { + "5": [ + "和璞鸢", + "护摩之杖" + ], + "4": [ + "西风长枪", + "决斗之枪", + "龙脊长枪" + ], + "3": [] + }, + "artifact": [ + [ + "昔日宗室之仪" + ] + ], + "remark": [] + }, + "烟绯": { + "weapon": { + "5": [ + "天空之卷", + "四风原典", + "尘世之锁" + ], + "4": [ + "流浪乐章", + "匣里日月", + "黑岩绯玉", + "嘟嘟可故事集", + "万国诸海图谱" + ], + "3": [] + }, + "artifact": [ + [ + "炽烈的炎之魔女" + ], + [ + "流浪大地的乐团" + ] + ], + "remark": [] + }, + "优菈": { + "weapon": { + "5": [ + "松籁响起之时", + "无工之剑", + "狼的末路", + "天空之傲" + ], + "4": [ + "螭骨剑", + "雪葬的星银", + "恶王丸" + ], + "3": [] + }, + "artifact": [ + [ + "苍白之火" + ], + [ + "苍白之火", + "染血的骑士" + ], + [ + "苍白之火", + "角斗士的终幕礼/追忆之注连/辰砂往生录/来歆余响" + ], + [ + "角斗士的终幕礼" + ] + ], + "remark": [] + }, + "枫原万叶": { + "weapon": { + "5": [ + "苍古自由之誓" + ], + "4": [ + "铁蜂刺", + "祭礼剑", + "西风剑" + ], + "3": [] + }, + "artifact": [ + [ + "翠绿之影" + ] + ], + "remark": [] + }, + "旅行者(雷)": { + "weapon": { + "5": [ + "天空之刃" + ], + "4": [ + "西风剑", + "祭礼剑" + ], + "3": [] + }, + "artifact": [ + [ + "绝缘之旗印", + "昔日宗室之仪" + ] + ], + "remark": [ + "充能词条比套装效果重要" + ] + }, + "神里绫华": { + "weapon": { + "5": [ + "雾切之回光", + "斫峰之刃", + "磐岩结绿", + "天空之刃" + ], + "4": [ + "天目影打刀", + "黑剑", + "黑岩长剑" + ], + "3": [] + }, + "artifact": [ + [ + "冰风迷途的勇士" + ], + [ + "冰风迷途的勇士", + "昔日宗室之仪" + ] + ], + "remark": [] + }, + "宵宫": { + "weapon": { + "5": [ + "飞雷之弦振", + "阿莫斯之弓", + "天空之翼" + ], + "4": [ + "弓藏", + "破魔之弓", + "苍翠猎弓", + "黑岩战弓" + ], + "3": [] + }, + "artifact": [ + [ + "追忆之注连" + ], + [ + "炽烈的炎之魔女" + ], + [ + "炽烈的炎之魔女", + "角斗士的终幕礼/追忆之注连/辰砂往生录/来歆余响" + ] + ], + "remark": [] + }, + "早柚": { + "weapon": { + "5": [ + "狼的末路", + "天空之傲" + ], + "4": [ + "桂木斩长正", + "雨裁", + "祭礼大剑", + "西风大剑" + ], + "3": [] + }, + "artifact": [ + [ + "翠绿之影" + ], + [ + "翠绿之影", + "被怜爱的少女" + ], + [ + "被怜爱的少女" + ] + ], + "remark": [] + }, + "埃洛伊": { + "weapon": { + "5": [ + "飞雷之弦振", + "天空之翼", + "阿莫斯之弓" + ], + "4": [ + "掠食者", + "弓藏", + "破魔之弓", + "黑岩战弓" + ], + "3": [] + }, + "artifact": [ + [ + "冰风迷途的勇士" + ], + [ + "冰风迷途的勇士", + "昔日宗室之仪/流浪大地的乐团" + ], + [ + "追忆之注连" + ] + ], + "remark": [] + }, + "雷电将军": { + "weapon": { + "5": [ + "薙草之稻光", + "天空之脊", + "和璞鸢", + "护摩之杖" + ], + "4": [ + "断浪长鳍", + "「渔获」", + "决斗之枪", + "西风长枪" + ], + "3": [] + }, + "artifact": [ + [ + "绝缘之旗印" + ], + [ + "千岩牢固" + ] + ], + "remark": [] + }, + "九条裟罗": { + "weapon": { + "5": [ + "终末嗟叹之诗", + "天空之翼" + ], + "4": [ + "祭礼弓", + "绝弦", + "暗巷猎手", + "黑岩战弓" + ], + "3": [] + }, + "artifact": [ + [ + "绝缘之旗印" + ], + [ + "昔日宗室之仪" + ], + [ + "昔日宗室之仪", + "如雷的盛怒" + ] + ], + "remark": [] + }, + "珊瑚宫心海": { + "weapon": { + "5": [ + "不灭月华" + ], + "4": [ + "试作金珀", + "证誓之明瞳", + "白辰之环" + ], + "3": [] + }, + "artifact": [ + [ + "海染砗蟝" + ], + [ + "千岩牢固", + "被怜爱的少女" + ], + [ + "千岩牢固" + ] + ], + "remark": [ + "仅在心海输出队伍推荐不灭月华", + "永冻队辅助首选" + ] + }, + "托马": { + "weapon": { + "5": [ + "护摩之杖", + "薙草之稻光", + "天空之脊" + ], + "4": [ + "西风长枪", + "喜多院十文字" + ], + "3": [] + }, + "artifact": [ + [ + "昔日宗室之仪" + ], + [ + "千岩牢固", + "绝缘之旗印" + ] + ], + "remark": [] + }, + "荒泷一斗": { + "weapon": { + "5": [ + "赤角石溃杵", + "无工之剑" + ], + "4": [ + "白影剑", + "螭骨剑" + ], + "3": [] + }, + "artifact": [ + [ + "华馆梦醒形骸记" + ] + ], + "remark": [] + }, + "五郎": { + "weapon": { + "5": [ + "终末嗟叹之诗" + ], + "4": [ + "祭礼弓", + "西风猎弓" + ], + "3": [] + }, + "artifact": [ + [ + "华馆梦醒形骸记" + ], + [ + "绝缘之旗印", + "充能/防御散件" + ] + ], + "remark": [] + }, + "申鹤": { + "weapon": { + "5": [ + "息灾", + "贯虹之槊", + "天空之脊", + "和璞鸢" + ], + "4": [ + "千岩长枪", + "断浪长鳍", + "西风长枪" + ], + "3": [] + }, + "artifact": [ + [ + "昔日宗室之仪" + ], + [ + "角斗士的终幕礼/辰砂往生录", + "追忆之注连/来歆余响" + ] + ], + "remark": [] + }, + "云堇": { + "weapon": { + "5": [ + "天空之脊" + ], + "4": [ + "西风长枪", + "喜多院十文字", + "试作星镰" + ], + "3": [] + }, + "artifact": [ + [ + "华馆梦醒形骸记" + ], + [ + "华馆梦醒形骸记", + "绝缘之旗印" + ] + ], + "remark": [] + }, + "八重神子": { + "weapon": { + "5": [ + "神乐之真意", + "天空之卷", + "尘世之锁", + "四风原典" + ], + "4": [ + "流浪乐章", + "匣里日月", + "证誓之明瞳" + ], + "3": [] + }, + "artifact": [ + [ + "如雷的盛怒", + "角斗士的终幕礼/追忆之注连/辰砂往生录/来歆余响" + ], + [ + "如雷的盛怒", + "流浪大地的乐团" + ], + [ + "流浪大地的乐团", + "角斗士的终幕礼/追忆之注连/辰砂往生录/来歆余响" + ], + [ + "平息鸣雷的尊者" + ] + ], + "remark": [] + }, + "神里绫人": { + "weapon": { + "5": [ + "波乱月白经津", + "雾切之回光", + "磐岩结绿" + ], + "4": [ + "黑剑", + "天目影打刀", + "黑岩长剑" + ], + "3": [] + }, + "artifact": [ + [ + "来歆余响" + ], + [ + "沉沦之心" + ], + [ + "角斗士的终幕礼" + ] + ], + "remark": [] + }, + "夜兰": { + "weapon": { + "5": [ + "若水", + "终末嗟叹之诗" + ], + "4": [ + "绝弦", + "曚云之月", + "落霞", + "西风猎弓", + "祭礼弓" + ], + "3": [] + }, + "artifact": [ + [ + "绝缘之旗印" + ], + [ + "绝缘之旗印/沉沦之心", + "千岩牢固/昔日宗室之仪" + ] + ], + "remark": [ + "按伤害最优原则,除开专武选精5曚云/绝弦,平民推荐精5弹弓", + "岩上茶室现任老板,璃月天权星直属特别情报官;因为机缘巧合差点当上璃月天枢星(误)" + ] + }, + "久岐忍": { + "weapon": { + "5": [ + "风鹰剑", + "天空之刃" + ], + "4": [ + "祭礼剑", + "黑剑", + "试作斩岩", + "笛剑" + ], + "3": [] + }, + "artifact": [ + [ + "海染砗磲" + ], + [ + "千岩牢固" + ], + [ + "被怜爱的少女" + ] + ], + "remark": [ + "隶属于稻妻荒泷派,为斗子哥收拾烂摊子的老妈子(误)" + ] + }, + "鹿野院平藏(待测试)": { + "weapon": { + "5": [ + "天空之卷", + "四风原典", + "尘世之锁" + ], + "4": [ + "流浪乐章", + "嘟嘟可故事集", + "匣里日月" + ], + "3": [] + }, + "artifact": [ + [ + "翠绿之影", + "角斗士的终幕礼/追忆之注连/辰砂往生录/来歆余响" + ] + ], + "remark": [ + "英文名Shikanoin Heizou,男性", + "天领奉行少年侦探,提瓦特第一个实装的男法器角色,人送外号“鹿野院符华”(大误)" + ] + }, + "白术(待实装)": { + "weapon": { + "5": [], + "4": [], + "3": [] + }, + "artifact": [], + "remark": [ + "英文名Baizhu,男性", + "璃月布卜庐药房掌柜,曾在主线任务和活动中登场;颈上所挂白蛇名为“长生”" + ] + }, + "瑶瑶(待实装)": { + "weapon": { + "5": [], + "4": [], + "3": [] + }, + "artifact": [], + "remark": [ + "英文名Yaoyao,女性", + "原神CBT八骏图角色之一,大概是现在唯一一个早早公开了建模却未实装游戏的角色" + ] + }, + "提纳里(待证实)": { + "weapon": { + "5": [], + "4": [], + "3": [] + }, + "artifact": [], + "remark": [ + "英文名Tighnari,男性", + "可能的须弥在途卫星角色之一" + ] + }, + "杰吉特(待证实)": { + "weapon": { + "5": [], + "4": [], + "3": [] + }, + "artifact": [], + "remark": [ + "英文名Djajeet,男性", + "可能的须弥在途卫星角色之一" + ] + }, + "柯莱(待证实)": { + "weapon": { + "5": [], + "4": [], + "3": [] + }, + "artifact": [], + "remark": [ + "英文名Collei,女性", + "原神官方漫画登场角色", + "可能的须弥在途卫星角色之一" + ] + }, + "雷电国崩/「散兵」(待证实)": { + "weapon": { + "5": [], + "4": [], + "3": [] + }, + "artifact": [], + "remark": [ + "英文名Scaramouche,男性", + "雷电将军试做机暨愚人众执行官之一,曾在主线任务和活动中登场" + ] + }, + "纳西妲(待证实)": { + "weapon": { + "5": [], + "4": [], + "3": [] + }, + "artifact": [], + "remark": [ + "英文名Nahida,女性", + "可能的须弥在途卫星角色之一" + ] + }, + "纳芙丝(待证实)": { + "weapon": { + "5": [], + "4": [], + "3": [] + }, + "artifact": [], + "remark": [ + "英文名Nafs,女性", + "可能的须弥在途卫星角色之一" + ] + }, + "妮露(待证实)": { + "weapon": { + "5": [], + "4": [], + "3": [] + }, + "artifact": [], + "remark": [ + "英文名Nilou,女性", + "可能的须弥在途卫星角色之一", + "【存疑】有传言为五星火枪,3.0落地" + ] + }, + "琅珐(待证实)": { + "weapon": { + "5": [], + "4": [], + "3": [] + }, + "artifact": [], + "remark": [ + "英文名Ikhfa,女性", + "可能的须弥在途卫星角色之一" + ] + }, + "蕾拉(待证实)": { + "weapon": { + "5": [], + "4": [], + "3": [] + }, + "artifact": [], + "remark": [ + "英文名Lyala,女性", + "可能的须弥在途卫星角色之一" + ] + }, + "苏蒂恩(待证实)": { + "weapon": { + "5": [], + "4": [], + "3": [] + }, + "artifact": [], + "remark": [ + "英文名Soutine,男性", + "可能的须弥在途卫星角色之一" + ] + }, + "小吉祥草王(待证实)": { + "weapon": { + "5": [], + "4": [], + "3": [] + }, + "artifact": [], + "remark": [ + "【存疑】多莉,英文名Dori(现用名)/Kusanali(魔神名),女性;现用中文名布尔,二测曾用名帕尔", + "【存疑】此为须弥现任草神,前任草神英文名Solas,男性" + ] + }, + "赛诺(待实装)": { + "weapon": { + "5": [], + "4": [], + "3": [] + }, + "artifact": [], + "remark": [ + "英文名Cyno,原神足迹PV立绘公开角色之一" + ] + } +} \ No newline at end of file diff --git a/mihoyo_libs/get_mihoyo_bbs_data.py b/mihoyo_libs/get_mihoyo_bbs_data.py index fdc962f8..f7ea1f5c 100644 --- a/mihoyo_libs/get_mihoyo_bbs_data.py +++ b/mihoyo_libs/get_mihoyo_bbs_data.py @@ -5,6 +5,8 @@ from base64 import b64encode from io import BytesIO from typing import List +import aiofiles + from openpyxl import load_workbook sys.path.append(os.path.dirname(os.path.abspath(__file__))) @@ -161,88 +163,58 @@ char_adv_im = """【{}】 async def weapon_adv(name): - char_adv_path = os.path.join(FILE_PATH, 'Genshin All Char.xlsx') - wb = load_workbook(char_adv_path) - ws = wb.active + async with aiofiles.open(os.path.join(FILE_PATH, 'mihoyo_libs/char_adv_list.json'), encoding='utf-8') as f: + adv_li = json.loads(await f.read()) + weapons = {} + for char, info in adv_li.items(): + char_weapons = [] + for i in info['weapon'].values(): # 3 stars, 4 stars, 5 stars + char_weapons.extend(i) - weapons={} - for c in range(2, 5): - for r in range(2, 300): - if ws.cell(r, c).value: - # if all(i in ws.cell(r,c).value for i in name): - if name in ws.cell(r, c).value: - weapon_name = ws.cell(r, c).value - weapon=weapons.get(weapon_name,[]) - weapon.append(ws.cell(2 + ((r - 2) // 5) * 5, 1).value) - weapons[weapon_name]=weapon + for weapon_name in char_weapons: + if name in weapon_name: # fuzzy search + char_weapon = weapons.get(weapon_name, []) + char_weapon.append(char) + weapons[weapon_name] = char_weapon if weapons: im = [] for k, v in weapons.items(): - im.append(f'{"、".join(v)}可能会用到【{k}】') + im.append(f'{"、".join(v)} 可能会用到【{k}】') im = '\n'.join(im) else: - im = '没有角色能使用【{}】'.format(weapon_name) + im = '没有角色能使用【{}】'.format(name) + # print(im) return im async def char_adv(name): - char_name = None - char_adv_path = os.path.join(FILE_PATH, 'Genshin All Char.xlsx') - # char_adv_path = FILE_PATH - wb = load_workbook(char_adv_path) - ws = wb.active - char_list = ws['A'] - index = None - for i in char_list: - if i.value: - if all(g in i.value for g in name): - # if name in i.value: - index = i.row - char_name = i.value - if index: - weapon_5star = '' - for i in range(index, index + 5): - if ws.cell(i, 2).value: - weapon_5star += ws.cell(i, 2).value + '>' - if weapon_5star != '': - weapon_5star = weapon_5star[:-1] - else: - weapon_5star = '无推荐' + async with aiofiles.open(os.path.join(FILE_PATH, 'mihoyo_libs/char_adv_list.json'), encoding='utf-8') as f: + adv_li = json.loads(await f.read()) + for char, info in adv_li.items(): + if name in char: + im = [f'「{char}」', '-=-=-=-=-=-=-=-=-=-'] + if weapon_5 := info['weapon']['5']: + im.append(f'推荐5★武器:{"、".join(weapon_5)}') + if weapon_4 := info['weapon']['4']: + im.append(f'推荐4★武器:{"、".join(weapon_4)}') + if weapon_3 := info['weapon']['3']: + im.append(f'推荐3★武器:{"、".join(weapon_3)}') + if artifacts := info['artifact']: + im.append('推荐圣遗物搭配:') + for arti in artifacts: + if len(arti) > 1: + im.append(f'[{arti[0]}]两件套 + [{arti[1]}]两件套') + else: + im.append(f'[{arti[0]}]四件套') + if remark := info['remark']: + im.append('-=-=-=-=-=-=-=-=-=-') + im.append('备注:') + mark = "\n".join(remark) + im.append(f'{mark}') + return '\n'.join(im) - weapon_4star = '' - for i in range(index, index + 5): - if ws.cell(i, 3).value: - weapon_4star += ws.cell(i, 3).value + '>' - if weapon_4star != '': - weapon_4star = weapon_4star[:-1] - else: - weapon_4star = '无推荐' - - weapon_3star = '' - for i in range(index, index + 5): - if ws.cell(i, 4).value: - weapon_3star += ws.cell(i, 4).value + '>' - if weapon_3star != '': - weapon_3star = weapon_3star[:-1] - else: - weapon_3star = '无推荐' - - artifacts = '' - for i in range(index, index + 5): - if ws.cell(i, 5).value: - if ws.cell(i, 6).value: - artifacts += ws.cell(i, 5).value + '*2' + ws.cell(i, 6).value + '*2' + '\n' - else: - artifacts += ws.cell(i, 5).value + '*4' + '\n' - - if artifacts != '': - artifacts = artifacts[:-1] - else: - artifacts = '无推荐' - - im = char_adv_im.format(char_name, weapon_5star, weapon_4star, weapon_3star, artifacts) - return im + return '没有找到角色信息' async def deal_ck(mes, qid): diff --git a/tools/gen_char_li.py b/tools/gen_char_li.py new file mode 100644 index 00000000..63d8d1e9 --- /dev/null +++ b/tools/gen_char_li.py @@ -0,0 +1,50 @@ +import copy +import json +from typing import Optional +from pathlib import Path + +from openpyxl import load_workbook + +R_PATH = Path(__file__).parents[0] + +sample = { + 'weapon': { + '5': [], + '4': [], + '3': [] + }, + 'artifact': [], # type: list[list[str,Optional[str]]] # 四件套 / 2+2 + 'remark': [] +} + +char_json = {} + +wb = load_workbook('../mihoyo_libs/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', '') + 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) + + 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('../mihoyo_libs/char_adv_list.json', 'w', encoding='utf-8') as f: + json.dump(char_json, f, indent=2, ensure_ascii=False) \ No newline at end of file