Skip to content

Commit

Permalink
🚨 修复格式错误
Browse files Browse the repository at this point in the history
  • Loading branch information
@KimigaiiWuyi
KimigaiiWuyi committed May 7, 2024
1 parent dc1c0f0 commit a94cdf9
Show file tree
Hide file tree
Showing 5 changed files with 33 additions and 12 deletions.
17 changes: 9 additions & 8 deletions GenshinUID/genshinuid_enka/mono/Character.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -637,18 +637,19 @@ async def get_fight_prop(self) -> Dict:
'A霜华矢两段伤害',
'A霜华矢两段伤害(融化)',
]:
val = [
f'''{int(i[:-1]) +
int(self.power_list['A霜华矢·霜华绽发伤害']['value'][index][:-1])
}%'''
for index, i in enumerate(
self.power_list['A霜华矢命中伤害']['value']
)
]
self.power_list[power_name] = {
'name': power_name,
'type': '攻击力',
'plus': 1,
'value': [
f'''{int(i[:-1]) +
int(self.power_list["A霜华矢·霜华绽发伤害"]["value"][index][:-1])
}%'''
for index, i in enumerate(
self.power_list['A霜华矢命中伤害']['value']
)
],
'value': val,
}

# 获取值
Expand Down
2 changes: 1 addition & 1 deletion GenshinUID/genshinuid_gachalog/lelaer_tools.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ async def get_gachaurl(uid: str):
f"gacha_id=fecafa7b6560db5f3182222395d88aaa6aaac1bc"
f"&timestamp={str(int(now))}"
f"&lang=zh-cn&device_type=mobile&plat_type=ios&region={server_id}"
f"&authkey={quote(authkey,'utf-8')}"
f"&authkey={quote(authkey, 'utf-8')}"
f"&game_biz=hk4e_cn&gacha_type=301&page=1&size=5&end_id=0"
)
logger.info(url)
Expand Down
2 changes: 1 addition & 1 deletion GenshinUID/utils/map/data/avatarId2Name_mapping_4.6.0.json
View file
Original file line number Diff line number Diff line change
@@ -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": "白术", "10000083": "琳妮特", "10000084": "林尼", "10000085": "菲米尼", "10000086": "莱欧斯利", "10000087": "那维莱特", "10000088": "夏洛蒂", "10000089": "芙宁娜", "10000090": "夏沃蕾", "10000091": "娜维娅", "10000092": "嘉明", "10000093": "闲云", "10000094": "千织", "10000096": "阿蕾奇诺"}
{"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": "菲米尼", "10000086": "莱欧斯利", "10000087": "那维莱特", "10000088": "夏洛蒂", "10000089": "芙宁娜", "10000090": "夏沃蕾", "10000091": "娜维娅", "10000092": "嘉明", "10000093": "闲云", "10000094": "千织", "10000096": "阿蕾奇诺", "10000095": "希格雯", "10000097": "赛索斯", "10000098": "克洛琳德"}
22 changes: 21 additions & 1 deletion GenshinUID/utils/map/data/char_alias.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -830,6 +830,26 @@
"阿雷奇诺",
"啊蕾齐诺",
"啊蕾奇诺",
"啊雷奇诺"
"啊雷奇诺",
"卡布奇诺"
],
"希格雯": [
"洗个稳",
"希格文",
"希葛雯",
"希格文",
"腹黑萝莉",
"护士"
],
"赛索斯": [
"塞索嗣",
"赛索斯"
],
"克洛琳德": [
"柯洛琳的",
"柯洛琳德",
"克罗琳德",
"克洛林德",
"柯洛琳得"
]
}
2 changes: 1 addition & 1 deletion GenshinUID/utils/map/data/enName2AvatarID_mapping_4.6.0.json
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"Kamisato Ayaka": "10000002", "Jean": "10000003", "Lisa": "10000006", "Barbara": "10000014", "Kaeya": "10000015", "Diluc": "10000016", "Razor": "10000020", "Amber": "10000021", "Venti": "10000022", "Xiangling": "10000023", "Beidou": "10000024", "Xingqiu": "10000025", "Xiao": "10000026", "Ningguang": "10000027", "Klee": "10000029", "Zhongli": "10000030", "Fischl": "10000031", "Bennett": "10000032", "Tartaglia": "10000033", "Noelle": "10000034", "Qiqi": "10000035", "Chongyun": "10000036", "Ganyu": "10000037", "Albedo": "10000038", "Diona": "10000039", "Mona": "10000041", "Keqing": "10000042", "Sucrose": "10000043", "Xinyan": "10000044", "Rosaria": "10000045", "Hu Tao": "10000046", "Kaedehara Kazuha": "10000047", "Yanfei": "10000048", "Yoimiya": "10000049", "Thoma": "10000050", "Eula": "10000051", "Raiden Shogun": "10000052", "Sayu": "10000053", "Sangonomiya Kokomi": "10000054", "Gorou": "10000055", "Kujou Sara": "10000056", "Arataki Itto": "10000057", "Yae Miko": "10000058", "Shikanoin Heizou": "10000059", "Yelan": "10000060", "Kirara": "10000061", "Aloy": "10000062", "Shenhe": "10000063", "Yun Jin": "10000064", "Kuki Shinobu": "10000065", "Kamisato Ayato": "10000066", "Collei": "10000067", "Dori": "10000068", "Tighnari": "10000069", "Nilou": "10000070", "Cyno": "10000071", "Candace": "10000072", "Nahida": "10000073", "Layla": "10000074", "Wanderer": "10000075", "Faruzan": "10000076", "Yaoyao": "10000077", "Alhaitham": "10000078", "Dehya": "10000079", "Mika": "10000080", "Kaveh": "10000081", "Baizhu": "10000082", "Lynette": "10000083", "Lyney": "10000084", "Freminet": "10000085", "Wriothesley": "10000086", "Neuvillette": "10000087", "Charlotte": "10000088", "Furina": "10000089", "Chevreuse": "10000090", "Navia": "10000091", "Gaming": "10000092", "Liuyun": "10000093", "Xianyun": "10000093", "Chiori": "10000094", "Arlecchino": "10000096"}
{"Kamisato Ayaka": "10000002", "Jean": "10000003", "Lisa": "10000006", "Barbara": "10000014", "Kaeya": "10000015", "Diluc": "10000016", "Razor": "10000020", "Amber": "10000021", "Venti": "10000022", "Xiangling": "10000023", "Beidou": "10000024", "Xingqiu": "10000025", "Xiao": "10000026", "Ningguang": "10000027", "Klee": "10000029", "Zhongli": "10000030", "Fischl": "10000031", "Bennett": "10000032", "Tartaglia": "10000033", "Noelle": "10000034", "Qiqi": "10000035", "Chongyun": "10000036", "Ganyu": "10000037", "Albedo": "10000038", "Diona": "10000039", "Mona": "10000041", "Keqing": "10000042", "Sucrose": "10000043", "Xinyan": "10000044", "Rosaria": "10000045", "Hu Tao": "10000046", "Kaedehara Kazuha": "10000047", "Yanfei": "10000048", "Yoimiya": "10000049", "Thoma": "10000050", "Eula": "10000051", "Raiden Shogun": "10000052", "Sayu": "10000053", "Sangonomiya Kokomi": "10000054", "Gorou": "10000055", "Kujou Sara": "10000056", "Arataki Itto": "10000057", "Yae Miko": "10000058", "Shikanoin Heizou": "10000059", "Yelan": "10000060", "Kirara": "10000061", "Aloy": "10000062", "Shenhe": "10000063", "Yun Jin": "10000064", "Kuki Shinobu": "10000065", "Kamisato Ayato": "10000066", "Collei": "10000067", "Dori": "10000068", "Tighnari": "10000069", "Nilou": "10000070", "Cyno": "10000071", "Candace": "10000072", "Nahida": "10000073", "Layla": "10000074", "Wanderer": "10000075", "Faruzan": "10000076", "Yaoyao": "10000077", "Alhaitham": "10000078", "Dehya": "10000079", "Mika": "10000080", "Kaveh": "10000081", "Baizhu": "10000082", "Lynette": "10000083", "Lyney": "10000084", "Freminet": "10000085", "Wriothesley": "10000086", "Neuvillette": "10000087", "Charlotte": "10000088", "Furina": "10000089", "Chevreuse": "10000090", "Navia": "10000091", "Gaming": "10000092", "Xianyun": "10000093", "Chiori": "10000094", "Arlecchino": "10000096"}

0 comments on commit a94cdf9

Please sign in to comment.