This commit is contained in:
Wuyi无疑 2022-03-29 00:30:30 +08:00
parent d652a96f9e
commit 60cb1943fc

View File

@ -22,47 +22,47 @@ INDEX_PATH = os.path.join(FILE2_PATH, 'index')
Texture_PATH = os.path.join(FILE2_PATH, 'texture2d') Texture_PATH = os.path.join(FILE2_PATH, 'texture2d')
avatar_json = { avatar_json = {
"Albedo": "阿贝多", "Albedo" : "阿贝多",
"Ambor": "安柏", "Ambor" : "安柏",
"Barbara": "芭芭拉", "Barbara" : "芭芭拉",
"Beidou": "北斗", "Beidou" : "北斗",
"Bennett": "班尼特", "Bennett" : "班尼特",
"Chongyun": "重云", "Chongyun" : "重云",
"Diluc": "迪卢克", "Diluc" : "迪卢克",
"Diona": "迪奥娜", "Diona" : "迪奥娜",
"Eula": "优菈", "Eula" : "优菈",
"Fischl": "菲谢尔", "Fischl" : "菲谢尔",
"Ganyu": "甘雨", "Ganyu" : "甘雨",
"Hutao": "胡桃", "Hutao" : "胡桃",
"Jean": "", "Jean" : "",
"Kazuha": "枫原万叶", "Kazuha" : "枫原万叶",
"Kaeya": "凯亚", "Kaeya" : "凯亚",
"Ayaka": "神里绫华", "Ayaka" : "神里绫华",
"Keqing": "刻晴", "Keqing" : "刻晴",
"Klee": "可莉", "Klee" : "可莉",
"Lisa": "丽莎", "Lisa" : "丽莎",
"Mona": "莫娜", "Mona" : "莫娜",
"Ningguang": "凝光", "Ningguang": "凝光",
"Noel": "诺艾尔", "Noel" : "诺艾尔",
"Qiqi": "七七", "Qiqi" : "七七",
"Razor": "雷泽", "Razor" : "雷泽",
"Rosaria": "罗莎莉亚", "Rosaria" : "罗莎莉亚",
"Sucrose": "砂糖", "Sucrose" : "砂糖",
"Tartaglia": "达达利亚", "Tartaglia": "达达利亚",
"Venti": "温迪", "Venti" : "温迪",
"Xiangling": "香菱", "Xiangling": "香菱",
"Xiao": "", "Xiao" : "",
"Xingqiu": "行秋", "Xingqiu" : "行秋",
"Xinyan": "辛焱", "Xinyan" : "辛焱",
"Yanfei": "烟绯", "Yanfei" : "烟绯",
"Zhongli": "钟离", "Zhongli" : "钟离",
"Yoimiya": "宵宫", "Yoimiya" : "宵宫",
"Sayu": "早柚", "Sayu" : "早柚",
"Shogun": "雷电将军", "Shogun" : "雷电将军",
"Aloy": "埃洛伊", "Aloy" : "埃洛伊",
"Sara": "九条裟罗", "Sara" : "九条裟罗",
"Kokomi": "珊瑚宫心海", "Kokomi" : "珊瑚宫心海",
"Shenhe": "申鹤" "Shenhe" : "申鹤"
} }
daily_im = ''' daily_im = '''
@ -167,13 +167,13 @@ async def weapon_adv(name):
weapon_name = "" weapon_name = ""
char_list = [] char_list = []
for c in range(2,5): for c in range(2, 5):
for r in range(2,300): for r in range(2, 300):
if ws.cell(r,c).value: if ws.cell(r, c).value:
#if all(i in ws.cell(r,c).value for i in name): # if all(i in ws.cell(r,c).value for i in name):
if name in ws.cell(r,c).value: if name in ws.cell(r, c).value:
weapon_name = ws.cell(r,c).value weapon_name = ws.cell(r, c).value
char_list.append(ws.cell(2+((r-2)//5)*5,1).value) char_list.append(ws.cell(2 + ((r - 2) // 5) * 5, 1).value)
if char_list: if char_list:
im = ','.join(char_list) im = ','.join(char_list)