diff --git a/enkaToData/drawCharCard.py b/enkaToData/drawCharCard.py index ec919659..36fd77c7 100644 --- a/enkaToData/drawCharCard.py +++ b/enkaToData/drawCharCard.py @@ -51,31 +51,34 @@ async def draw_char_card(raw_data: dict, charUrl: str = None) -> str: char_info_1 = Image.open(TEXT_PATH / 'char_info_1.png') char_imfo_mask = Image.open(TEXT_PATH / 'char_info_mask.png') - based_w, based_h = 320, 1024 + #based_w, based_h = 320, 1024 + based_w, based_h = 600, 1200 if charUrl: char_img = Image.open(BytesIO(get(charUrl).content)).convert('RGBA') else: - char_img = Image.open(GACHA_PATH / 'UI_Gacha_AvatarIcon_{}.png'.format(raw_data['avatarEnName'])) #角色图像 + char_img = Image.open(GACHA_PATH / 'UI_Gacha_AvatarImg_{}.png'.format(raw_data['avatarEnName'])) #角色图像 # 确定图片的长宽 w, h = char_img.size - if (w, h) != (320, 1024): - based_scale = '%.3f' % (based_w / based_h) + if (w, h) != (based_w, based_h): + offset = 200 + based_new_w, based_new_h = based_w + offset, based_h + offset + based_scale = '%.3f' % (based_new_w / based_new_h) scale_f = '%.3f' % (w / h) - new_w = math.ceil(based_h * float(scale_f)) - new_h = math.ceil(based_w / float(scale_f)) + new_w = math.ceil(based_new_h * float(scale_f)) + new_h = math.ceil(based_new_w / float(scale_f)) if scale_f > based_scale: - bg_img2 = char_img.resize((new_w, based_h), Image.Resampling.LANCZOS) - char_img = bg_img2.crop((new_w/2 - 160, 0, new_w/2 + 160, based_h)) + bg_img2 = char_img.resize((new_w, based_new_h), Image.Resampling.LANCZOS) + char_img = bg_img2.crop((new_w/2 - based_new_w /2 + offset, 0, new_w/2 + based_new_w /2 , based_new_h - offset)) else: - bg_img2 = char_img.resize((based_w, new_h), Image.Resampling.LANCZOS) - char_img = bg_img2.crop((0, new_h/2 - 512, based_w, new_h/2 + 512)) + bg_img2 = char_img.resize((based_new_w , new_h), Image.Resampling.LANCZOS) + char_img = bg_img2.crop((0 + offset , new_h/2 - based_new_h/2, based_new_w , new_h/2 + based_new_h/2 - offset)) else: pass - img_temp = Image.new('RGBA', (320, 1024), (0,0,0,0)) + img_temp = Image.new('RGBA', (based_w, based_h), (0,0,0,0)) img_temp.paste(char_img,(0,0),char_imfo_mask) - img.paste(img_temp, (41, 29), img_temp) + img.paste(img_temp, (0, 0), img_temp) img.paste(char_info_1, (0, 0), char_info_1) #holo_img = Image.open(TEXT_PATH / 'icon_holo.png') diff --git a/enkaToData/gachaImg/UI_Gacha_AvatarIcon_Albedo.png b/enkaToData/gachaImg/UI_Gacha_AvatarIcon_Albedo.png deleted file mode 100644 index dd1b2a3e..00000000 Binary files a/enkaToData/gachaImg/UI_Gacha_AvatarIcon_Albedo.png and /dev/null differ diff --git a/enkaToData/gachaImg/UI_Gacha_AvatarIcon_Aloy.png b/enkaToData/gachaImg/UI_Gacha_AvatarIcon_Aloy.png deleted file mode 100644 index 30c5394f..00000000 Binary files a/enkaToData/gachaImg/UI_Gacha_AvatarIcon_Aloy.png and /dev/null differ diff --git a/enkaToData/gachaImg/UI_Gacha_AvatarIcon_Ambor.png b/enkaToData/gachaImg/UI_Gacha_AvatarIcon_Ambor.png deleted file mode 100644 index 7280be79..00000000 Binary files a/enkaToData/gachaImg/UI_Gacha_AvatarIcon_Ambor.png and /dev/null differ diff --git a/enkaToData/gachaImg/UI_Gacha_AvatarIcon_AmborCostumeWic.png b/enkaToData/gachaImg/UI_Gacha_AvatarIcon_AmborCostumeWic.png deleted file mode 100644 index 53ba4cf1..00000000 Binary files a/enkaToData/gachaImg/UI_Gacha_AvatarIcon_AmborCostumeWic.png and /dev/null differ diff --git a/enkaToData/gachaImg/UI_Gacha_AvatarIcon_Ambor_TT.png b/enkaToData/gachaImg/UI_Gacha_AvatarIcon_Ambor_TT.png deleted file mode 100644 index 53ba4cf1..00000000 Binary files a/enkaToData/gachaImg/UI_Gacha_AvatarIcon_Ambor_TT.png and /dev/null differ diff --git a/enkaToData/gachaImg/UI_Gacha_AvatarIcon_Ayaka.png b/enkaToData/gachaImg/UI_Gacha_AvatarIcon_Ayaka.png deleted file mode 100644 index 773c9f39..00000000 Binary files a/enkaToData/gachaImg/UI_Gacha_AvatarIcon_Ayaka.png and /dev/null differ diff --git a/enkaToData/gachaImg/UI_Gacha_AvatarIcon_Ayato.png b/enkaToData/gachaImg/UI_Gacha_AvatarIcon_Ayato.png deleted file mode 100644 index 630cd5e1..00000000 Binary files a/enkaToData/gachaImg/UI_Gacha_AvatarIcon_Ayato.png and /dev/null differ diff --git a/enkaToData/gachaImg/UI_Gacha_AvatarIcon_Barbara.png b/enkaToData/gachaImg/UI_Gacha_AvatarIcon_Barbara.png deleted file mode 100644 index c9fdc18d..00000000 Binary files a/enkaToData/gachaImg/UI_Gacha_AvatarIcon_Barbara.png and /dev/null differ diff --git a/enkaToData/gachaImg/UI_Gacha_AvatarIcon_Beidou.png b/enkaToData/gachaImg/UI_Gacha_AvatarIcon_Beidou.png deleted file mode 100644 index 2d051b4b..00000000 Binary files a/enkaToData/gachaImg/UI_Gacha_AvatarIcon_Beidou.png and /dev/null differ diff --git a/enkaToData/gachaImg/UI_Gacha_AvatarIcon_Bennett.png b/enkaToData/gachaImg/UI_Gacha_AvatarIcon_Bennett.png deleted file mode 100644 index 5e4541de..00000000 Binary files a/enkaToData/gachaImg/UI_Gacha_AvatarIcon_Bennett.png and /dev/null differ diff --git a/enkaToData/gachaImg/UI_Gacha_AvatarIcon_Chongyun.png b/enkaToData/gachaImg/UI_Gacha_AvatarIcon_Chongyun.png deleted file mode 100644 index 434fda7a..00000000 Binary files a/enkaToData/gachaImg/UI_Gacha_AvatarIcon_Chongyun.png and /dev/null differ diff --git a/enkaToData/gachaImg/UI_Gacha_AvatarIcon_Diluc.png b/enkaToData/gachaImg/UI_Gacha_AvatarIcon_Diluc.png deleted file mode 100644 index 0fe56bfc..00000000 Binary files a/enkaToData/gachaImg/UI_Gacha_AvatarIcon_Diluc.png and /dev/null differ diff --git a/enkaToData/gachaImg/UI_Gacha_AvatarIcon_Diona.png b/enkaToData/gachaImg/UI_Gacha_AvatarIcon_Diona.png deleted file mode 100644 index 4991fcb2..00000000 Binary files a/enkaToData/gachaImg/UI_Gacha_AvatarIcon_Diona.png and /dev/null differ diff --git a/enkaToData/gachaImg/UI_Gacha_AvatarIcon_Eula.png b/enkaToData/gachaImg/UI_Gacha_AvatarIcon_Eula.png deleted file mode 100644 index 5d993e69..00000000 Binary files a/enkaToData/gachaImg/UI_Gacha_AvatarIcon_Eula.png and /dev/null differ diff --git a/enkaToData/gachaImg/UI_Gacha_AvatarIcon_Feiyan.png b/enkaToData/gachaImg/UI_Gacha_AvatarIcon_Feiyan.png deleted file mode 100644 index 029b262c..00000000 Binary files a/enkaToData/gachaImg/UI_Gacha_AvatarIcon_Feiyan.png and /dev/null differ diff --git a/enkaToData/gachaImg/UI_Gacha_AvatarIcon_Fischl.png b/enkaToData/gachaImg/UI_Gacha_AvatarIcon_Fischl.png deleted file mode 100644 index ff595b66..00000000 Binary files a/enkaToData/gachaImg/UI_Gacha_AvatarIcon_Fischl.png and /dev/null differ diff --git a/enkaToData/gachaImg/UI_Gacha_AvatarIcon_Ganyu.png b/enkaToData/gachaImg/UI_Gacha_AvatarIcon_Ganyu.png deleted file mode 100644 index 54536323..00000000 Binary files a/enkaToData/gachaImg/UI_Gacha_AvatarIcon_Ganyu.png and /dev/null differ diff --git a/enkaToData/gachaImg/UI_Gacha_AvatarIcon_Gorou.png b/enkaToData/gachaImg/UI_Gacha_AvatarIcon_Gorou.png deleted file mode 100644 index 9b9f5278..00000000 Binary files a/enkaToData/gachaImg/UI_Gacha_AvatarIcon_Gorou.png and /dev/null differ diff --git a/enkaToData/gachaImg/UI_Gacha_AvatarIcon_Hutao.png b/enkaToData/gachaImg/UI_Gacha_AvatarIcon_Hutao.png deleted file mode 100644 index d918f6fd..00000000 Binary files a/enkaToData/gachaImg/UI_Gacha_AvatarIcon_Hutao.png and /dev/null differ diff --git a/enkaToData/gachaImg/UI_Gacha_AvatarIcon_Itto.png b/enkaToData/gachaImg/UI_Gacha_AvatarIcon_Itto.png deleted file mode 100644 index ab58cf70..00000000 Binary files a/enkaToData/gachaImg/UI_Gacha_AvatarIcon_Itto.png and /dev/null differ diff --git a/enkaToData/gachaImg/UI_Gacha_AvatarIcon_Kaeya.png b/enkaToData/gachaImg/UI_Gacha_AvatarIcon_Kaeya.png deleted file mode 100644 index 50b37247..00000000 Binary files a/enkaToData/gachaImg/UI_Gacha_AvatarIcon_Kaeya.png and /dev/null differ diff --git a/enkaToData/gachaImg/UI_Gacha_AvatarIcon_Kazuha.png b/enkaToData/gachaImg/UI_Gacha_AvatarIcon_Kazuha.png deleted file mode 100644 index 05b09d4c..00000000 Binary files a/enkaToData/gachaImg/UI_Gacha_AvatarIcon_Kazuha.png and /dev/null differ diff --git a/enkaToData/gachaImg/UI_Gacha_AvatarIcon_Keqing.png b/enkaToData/gachaImg/UI_Gacha_AvatarIcon_Keqing.png deleted file mode 100644 index dbefa3cc..00000000 Binary files a/enkaToData/gachaImg/UI_Gacha_AvatarIcon_Keqing.png and /dev/null differ diff --git a/enkaToData/gachaImg/UI_Gacha_AvatarIcon_Klee.png b/enkaToData/gachaImg/UI_Gacha_AvatarIcon_Klee.png deleted file mode 100644 index 6e7c5cb2..00000000 Binary files a/enkaToData/gachaImg/UI_Gacha_AvatarIcon_Klee.png and /dev/null differ diff --git a/enkaToData/gachaImg/UI_Gacha_AvatarIcon_Kokomi.png b/enkaToData/gachaImg/UI_Gacha_AvatarIcon_Kokomi.png deleted file mode 100644 index 1921bbc3..00000000 Binary files a/enkaToData/gachaImg/UI_Gacha_AvatarIcon_Kokomi.png and /dev/null differ diff --git a/enkaToData/gachaImg/UI_Gacha_AvatarIcon_Lisa.png b/enkaToData/gachaImg/UI_Gacha_AvatarIcon_Lisa.png deleted file mode 100644 index 33c1f364..00000000 Binary files a/enkaToData/gachaImg/UI_Gacha_AvatarIcon_Lisa.png and /dev/null differ diff --git a/enkaToData/gachaImg/UI_Gacha_AvatarIcon_Mona.png b/enkaToData/gachaImg/UI_Gacha_AvatarIcon_Mona.png deleted file mode 100644 index 47a05c9a..00000000 Binary files a/enkaToData/gachaImg/UI_Gacha_AvatarIcon_Mona.png and /dev/null differ diff --git a/enkaToData/gachaImg/UI_Gacha_AvatarIcon_MonaCostumeWic.png b/enkaToData/gachaImg/UI_Gacha_AvatarIcon_MonaCostumeWic.png deleted file mode 100644 index b042c357..00000000 Binary files a/enkaToData/gachaImg/UI_Gacha_AvatarIcon_MonaCostumeWic.png and /dev/null differ diff --git a/enkaToData/gachaImg/UI_Gacha_AvatarIcon_Mona_TT.png b/enkaToData/gachaImg/UI_Gacha_AvatarIcon_Mona_TT.png deleted file mode 100644 index b042c357..00000000 Binary files a/enkaToData/gachaImg/UI_Gacha_AvatarIcon_Mona_TT.png and /dev/null differ diff --git a/enkaToData/gachaImg/UI_Gacha_AvatarIcon_Ningguang.png b/enkaToData/gachaImg/UI_Gacha_AvatarIcon_Ningguang.png deleted file mode 100644 index 82ad0519..00000000 Binary files a/enkaToData/gachaImg/UI_Gacha_AvatarIcon_Ningguang.png and /dev/null differ diff --git a/enkaToData/gachaImg/UI_Gacha_AvatarIcon_Noel.png b/enkaToData/gachaImg/UI_Gacha_AvatarIcon_Noel.png deleted file mode 100644 index 5affce25..00000000 Binary files a/enkaToData/gachaImg/UI_Gacha_AvatarIcon_Noel.png and /dev/null differ diff --git a/enkaToData/gachaImg/UI_Gacha_AvatarIcon_Qin.png b/enkaToData/gachaImg/UI_Gacha_AvatarIcon_Qin.png deleted file mode 100644 index 08565bfa..00000000 Binary files a/enkaToData/gachaImg/UI_Gacha_AvatarIcon_Qin.png and /dev/null differ diff --git a/enkaToData/gachaImg/UI_Gacha_AvatarIcon_QinCostumeWic.png b/enkaToData/gachaImg/UI_Gacha_AvatarIcon_QinCostumeWic.png deleted file mode 100644 index 7339c2bb..00000000 Binary files a/enkaToData/gachaImg/UI_Gacha_AvatarIcon_QinCostumeWic.png and /dev/null differ diff --git a/enkaToData/gachaImg/UI_Gacha_AvatarIcon_Qin_TT.png b/enkaToData/gachaImg/UI_Gacha_AvatarIcon_Qin_TT.png deleted file mode 100644 index 7339c2bb..00000000 Binary files a/enkaToData/gachaImg/UI_Gacha_AvatarIcon_Qin_TT.png and /dev/null differ diff --git a/enkaToData/gachaImg/UI_Gacha_AvatarIcon_Qiqi.png b/enkaToData/gachaImg/UI_Gacha_AvatarIcon_Qiqi.png deleted file mode 100644 index b8dab31a..00000000 Binary files a/enkaToData/gachaImg/UI_Gacha_AvatarIcon_Qiqi.png and /dev/null differ diff --git a/enkaToData/gachaImg/UI_Gacha_AvatarIcon_Razor.png b/enkaToData/gachaImg/UI_Gacha_AvatarIcon_Razor.png deleted file mode 100644 index f4cbc5c4..00000000 Binary files a/enkaToData/gachaImg/UI_Gacha_AvatarIcon_Razor.png and /dev/null differ diff --git a/enkaToData/gachaImg/UI_Gacha_AvatarIcon_Rosaria.png b/enkaToData/gachaImg/UI_Gacha_AvatarIcon_Rosaria.png deleted file mode 100644 index d57e9fce..00000000 Binary files a/enkaToData/gachaImg/UI_Gacha_AvatarIcon_Rosaria.png and /dev/null differ diff --git a/enkaToData/gachaImg/UI_Gacha_AvatarIcon_RosariaCostumeWic.png b/enkaToData/gachaImg/UI_Gacha_AvatarIcon_RosariaCostumeWic.png deleted file mode 100644 index fc9c70ea..00000000 Binary files a/enkaToData/gachaImg/UI_Gacha_AvatarIcon_RosariaCostumeWic.png and /dev/null differ diff --git a/enkaToData/gachaImg/UI_Gacha_AvatarIcon_Rosaria_TT.png b/enkaToData/gachaImg/UI_Gacha_AvatarIcon_Rosaria_TT.png deleted file mode 100644 index fc9c70ea..00000000 Binary files a/enkaToData/gachaImg/UI_Gacha_AvatarIcon_Rosaria_TT.png and /dev/null differ diff --git a/enkaToData/gachaImg/UI_Gacha_AvatarIcon_Sara.png b/enkaToData/gachaImg/UI_Gacha_AvatarIcon_Sara.png deleted file mode 100644 index c227801d..00000000 Binary files a/enkaToData/gachaImg/UI_Gacha_AvatarIcon_Sara.png and /dev/null differ diff --git a/enkaToData/gachaImg/UI_Gacha_AvatarIcon_Sayu.png b/enkaToData/gachaImg/UI_Gacha_AvatarIcon_Sayu.png deleted file mode 100644 index cbd0cb62..00000000 Binary files a/enkaToData/gachaImg/UI_Gacha_AvatarIcon_Sayu.png and /dev/null differ diff --git a/enkaToData/gachaImg/UI_Gacha_AvatarIcon_Shenhe.png b/enkaToData/gachaImg/UI_Gacha_AvatarIcon_Shenhe.png deleted file mode 100644 index ed7d39aa..00000000 Binary files a/enkaToData/gachaImg/UI_Gacha_AvatarIcon_Shenhe.png and /dev/null differ diff --git a/enkaToData/gachaImg/UI_Gacha_AvatarIcon_Shinobu.png b/enkaToData/gachaImg/UI_Gacha_AvatarIcon_Shinobu.png deleted file mode 100644 index 5027dd7f..00000000 Binary files a/enkaToData/gachaImg/UI_Gacha_AvatarIcon_Shinobu.png and /dev/null differ diff --git a/enkaToData/gachaImg/UI_Gacha_AvatarIcon_Shougun.png b/enkaToData/gachaImg/UI_Gacha_AvatarIcon_Shougun.png deleted file mode 100644 index c03bc8b3..00000000 Binary files a/enkaToData/gachaImg/UI_Gacha_AvatarIcon_Shougun.png and /dev/null differ diff --git a/enkaToData/gachaImg/UI_Gacha_AvatarIcon_Sucrose.png b/enkaToData/gachaImg/UI_Gacha_AvatarIcon_Sucrose.png deleted file mode 100644 index ffd336c5..00000000 Binary files a/enkaToData/gachaImg/UI_Gacha_AvatarIcon_Sucrose.png and /dev/null differ diff --git a/enkaToData/gachaImg/UI_Gacha_AvatarIcon_Tartaglia.png b/enkaToData/gachaImg/UI_Gacha_AvatarIcon_Tartaglia.png deleted file mode 100644 index 94a82a71..00000000 Binary files a/enkaToData/gachaImg/UI_Gacha_AvatarIcon_Tartaglia.png and /dev/null differ diff --git a/enkaToData/gachaImg/UI_Gacha_AvatarIcon_Tohma.png b/enkaToData/gachaImg/UI_Gacha_AvatarIcon_Tohma.png deleted file mode 100644 index 5789795e..00000000 Binary files a/enkaToData/gachaImg/UI_Gacha_AvatarIcon_Tohma.png and /dev/null differ diff --git a/enkaToData/gachaImg/UI_Gacha_AvatarIcon_Venti.png b/enkaToData/gachaImg/UI_Gacha_AvatarIcon_Venti.png deleted file mode 100644 index 503e98ef..00000000 Binary files a/enkaToData/gachaImg/UI_Gacha_AvatarIcon_Venti.png and /dev/null differ diff --git a/enkaToData/gachaImg/UI_Gacha_AvatarIcon_Xiangling.png b/enkaToData/gachaImg/UI_Gacha_AvatarIcon_Xiangling.png deleted file mode 100644 index 325377d1..00000000 Binary files a/enkaToData/gachaImg/UI_Gacha_AvatarIcon_Xiangling.png and /dev/null differ diff --git a/enkaToData/gachaImg/UI_Gacha_AvatarIcon_Xiao.png b/enkaToData/gachaImg/UI_Gacha_AvatarIcon_Xiao.png deleted file mode 100644 index 214a0c71..00000000 Binary files a/enkaToData/gachaImg/UI_Gacha_AvatarIcon_Xiao.png and /dev/null differ diff --git a/enkaToData/gachaImg/UI_Gacha_AvatarIcon_Xingqiu.png b/enkaToData/gachaImg/UI_Gacha_AvatarIcon_Xingqiu.png deleted file mode 100644 index 1eace7ab..00000000 Binary files a/enkaToData/gachaImg/UI_Gacha_AvatarIcon_Xingqiu.png and /dev/null differ diff --git a/enkaToData/gachaImg/UI_Gacha_AvatarIcon_Xinyan.png b/enkaToData/gachaImg/UI_Gacha_AvatarIcon_Xinyan.png deleted file mode 100644 index 29ede31c..00000000 Binary files a/enkaToData/gachaImg/UI_Gacha_AvatarIcon_Xinyan.png and /dev/null differ diff --git a/enkaToData/gachaImg/UI_Gacha_AvatarIcon_Yae.png b/enkaToData/gachaImg/UI_Gacha_AvatarIcon_Yae.png deleted file mode 100644 index 373aa6da..00000000 Binary files a/enkaToData/gachaImg/UI_Gacha_AvatarIcon_Yae.png and /dev/null differ diff --git a/enkaToData/gachaImg/UI_Gacha_AvatarIcon_Yelan.png b/enkaToData/gachaImg/UI_Gacha_AvatarIcon_Yelan.png deleted file mode 100644 index ad301f50..00000000 Binary files a/enkaToData/gachaImg/UI_Gacha_AvatarIcon_Yelan.png and /dev/null differ diff --git a/enkaToData/gachaImg/UI_Gacha_AvatarIcon_Yoimiya.png b/enkaToData/gachaImg/UI_Gacha_AvatarIcon_Yoimiya.png deleted file mode 100644 index 0b07edb9..00000000 Binary files a/enkaToData/gachaImg/UI_Gacha_AvatarIcon_Yoimiya.png and /dev/null differ diff --git a/enkaToData/gachaImg/UI_Gacha_AvatarIcon_Yunjin.png b/enkaToData/gachaImg/UI_Gacha_AvatarIcon_Yunjin.png deleted file mode 100644 index 633da371..00000000 Binary files a/enkaToData/gachaImg/UI_Gacha_AvatarIcon_Yunjin.png and /dev/null differ diff --git a/enkaToData/gachaImg/UI_Gacha_AvatarIcon_Zhongli.png b/enkaToData/gachaImg/UI_Gacha_AvatarIcon_Zhongli.png deleted file mode 100644 index 4b4282f5..00000000 Binary files a/enkaToData/gachaImg/UI_Gacha_AvatarIcon_Zhongli.png and /dev/null differ diff --git a/enkaToData/gachaImg/UI_Gacha_AvatarImg_Albedo.png b/enkaToData/gachaImg/UI_Gacha_AvatarImg_Albedo.png new file mode 100644 index 00000000..21aede2e Binary files /dev/null and b/enkaToData/gachaImg/UI_Gacha_AvatarImg_Albedo.png differ diff --git a/enkaToData/gachaImg/UI_Gacha_AvatarImg_Aloy.png b/enkaToData/gachaImg/UI_Gacha_AvatarImg_Aloy.png new file mode 100644 index 00000000..62432a16 Binary files /dev/null and b/enkaToData/gachaImg/UI_Gacha_AvatarImg_Aloy.png differ diff --git a/enkaToData/gachaImg/UI_Gacha_AvatarImg_Ambor.png b/enkaToData/gachaImg/UI_Gacha_AvatarImg_Ambor.png new file mode 100644 index 00000000..21543121 Binary files /dev/null and b/enkaToData/gachaImg/UI_Gacha_AvatarImg_Ambor.png differ diff --git a/enkaToData/gachaImg/UI_Gacha_AvatarImg_Ambor_TT.png b/enkaToData/gachaImg/UI_Gacha_AvatarImg_Ambor_TT.png new file mode 100644 index 00000000..789461b1 Binary files /dev/null and b/enkaToData/gachaImg/UI_Gacha_AvatarImg_Ambor_TT.png differ diff --git a/enkaToData/gachaImg/UI_Gacha_AvatarImg_Ayaka.png b/enkaToData/gachaImg/UI_Gacha_AvatarImg_Ayaka.png new file mode 100644 index 00000000..ea5f3b4f Binary files /dev/null and b/enkaToData/gachaImg/UI_Gacha_AvatarImg_Ayaka.png differ diff --git a/enkaToData/gachaImg/UI_Gacha_AvatarImg_Ayato.png b/enkaToData/gachaImg/UI_Gacha_AvatarImg_Ayato.png new file mode 100644 index 00000000..f5ace121 Binary files /dev/null and b/enkaToData/gachaImg/UI_Gacha_AvatarImg_Ayato.png differ diff --git a/enkaToData/gachaImg/UI_Gacha_AvatarImg_Barbara.png b/enkaToData/gachaImg/UI_Gacha_AvatarImg_Barbara.png new file mode 100644 index 00000000..86786a98 Binary files /dev/null and b/enkaToData/gachaImg/UI_Gacha_AvatarImg_Barbara.png differ diff --git a/enkaToData/gachaImg/UI_Gacha_AvatarImg_Beidou.png b/enkaToData/gachaImg/UI_Gacha_AvatarImg_Beidou.png new file mode 100644 index 00000000..c186c457 Binary files /dev/null and b/enkaToData/gachaImg/UI_Gacha_AvatarImg_Beidou.png differ diff --git a/enkaToData/gachaImg/UI_Gacha_AvatarImg_Bennett.png b/enkaToData/gachaImg/UI_Gacha_AvatarImg_Bennett.png new file mode 100644 index 00000000..cdffb674 Binary files /dev/null and b/enkaToData/gachaImg/UI_Gacha_AvatarImg_Bennett.png differ diff --git a/enkaToData/gachaImg/UI_Gacha_AvatarImg_Chongyun.png b/enkaToData/gachaImg/UI_Gacha_AvatarImg_Chongyun.png new file mode 100644 index 00000000..751c0384 Binary files /dev/null and b/enkaToData/gachaImg/UI_Gacha_AvatarImg_Chongyun.png differ diff --git a/enkaToData/gachaImg/UI_Gacha_AvatarImg_Diluc.png b/enkaToData/gachaImg/UI_Gacha_AvatarImg_Diluc.png new file mode 100644 index 00000000..f50ba4d9 Binary files /dev/null and b/enkaToData/gachaImg/UI_Gacha_AvatarImg_Diluc.png differ diff --git a/enkaToData/gachaImg/UI_Gacha_AvatarImg_Diona.png b/enkaToData/gachaImg/UI_Gacha_AvatarImg_Diona.png new file mode 100644 index 00000000..d55415d6 Binary files /dev/null and b/enkaToData/gachaImg/UI_Gacha_AvatarImg_Diona.png differ diff --git a/enkaToData/gachaImg/UI_Gacha_AvatarImg_Eula.png b/enkaToData/gachaImg/UI_Gacha_AvatarImg_Eula.png new file mode 100644 index 00000000..f016cc34 Binary files /dev/null and b/enkaToData/gachaImg/UI_Gacha_AvatarImg_Eula.png differ diff --git a/enkaToData/gachaImg/UI_Gacha_AvatarImg_Feiyan.png b/enkaToData/gachaImg/UI_Gacha_AvatarImg_Feiyan.png new file mode 100644 index 00000000..6bf91b17 Binary files /dev/null and b/enkaToData/gachaImg/UI_Gacha_AvatarImg_Feiyan.png differ diff --git a/enkaToData/gachaImg/UI_Gacha_AvatarImg_Fischl.png b/enkaToData/gachaImg/UI_Gacha_AvatarImg_Fischl.png new file mode 100644 index 00000000..fda2d702 Binary files /dev/null and b/enkaToData/gachaImg/UI_Gacha_AvatarImg_Fischl.png differ diff --git a/enkaToData/gachaImg/UI_Gacha_AvatarImg_Ganyu.png b/enkaToData/gachaImg/UI_Gacha_AvatarImg_Ganyu.png new file mode 100644 index 00000000..d0d42d3f Binary files /dev/null and b/enkaToData/gachaImg/UI_Gacha_AvatarImg_Ganyu.png differ diff --git a/enkaToData/gachaImg/UI_Gacha_AvatarImg_Gorou.png b/enkaToData/gachaImg/UI_Gacha_AvatarImg_Gorou.png new file mode 100644 index 00000000..09b0632e Binary files /dev/null and b/enkaToData/gachaImg/UI_Gacha_AvatarImg_Gorou.png differ diff --git a/enkaToData/gachaImg/UI_Gacha_AvatarImg_Hutao.png b/enkaToData/gachaImg/UI_Gacha_AvatarImg_Hutao.png new file mode 100644 index 00000000..14afc6c9 Binary files /dev/null and b/enkaToData/gachaImg/UI_Gacha_AvatarImg_Hutao.png differ diff --git a/enkaToData/gachaImg/UI_Gacha_AvatarImg_Itto.png b/enkaToData/gachaImg/UI_Gacha_AvatarImg_Itto.png new file mode 100644 index 00000000..bede17ae Binary files /dev/null and b/enkaToData/gachaImg/UI_Gacha_AvatarImg_Itto.png differ diff --git a/enkaToData/gachaImg/UI_Gacha_AvatarImg_Kaeya.png b/enkaToData/gachaImg/UI_Gacha_AvatarImg_Kaeya.png new file mode 100644 index 00000000..15581ade Binary files /dev/null and b/enkaToData/gachaImg/UI_Gacha_AvatarImg_Kaeya.png differ diff --git a/enkaToData/gachaImg/UI_Gacha_AvatarImg_Kazuha.png b/enkaToData/gachaImg/UI_Gacha_AvatarImg_Kazuha.png new file mode 100644 index 00000000..c1430010 Binary files /dev/null and b/enkaToData/gachaImg/UI_Gacha_AvatarImg_Kazuha.png differ diff --git a/enkaToData/gachaImg/UI_Gacha_AvatarImg_Keqing.png b/enkaToData/gachaImg/UI_Gacha_AvatarImg_Keqing.png new file mode 100644 index 00000000..6f417659 Binary files /dev/null and b/enkaToData/gachaImg/UI_Gacha_AvatarImg_Keqing.png differ diff --git a/enkaToData/gachaImg/UI_Gacha_AvatarImg_Klee.png b/enkaToData/gachaImg/UI_Gacha_AvatarImg_Klee.png new file mode 100644 index 00000000..edb798a2 Binary files /dev/null and b/enkaToData/gachaImg/UI_Gacha_AvatarImg_Klee.png differ diff --git a/enkaToData/gachaImg/UI_Gacha_AvatarImg_Kokomi.png b/enkaToData/gachaImg/UI_Gacha_AvatarImg_Kokomi.png new file mode 100644 index 00000000..10fba184 Binary files /dev/null and b/enkaToData/gachaImg/UI_Gacha_AvatarImg_Kokomi.png differ diff --git a/enkaToData/gachaImg/UI_Gacha_AvatarImg_Lisa.png b/enkaToData/gachaImg/UI_Gacha_AvatarImg_Lisa.png new file mode 100644 index 00000000..802f3674 Binary files /dev/null and b/enkaToData/gachaImg/UI_Gacha_AvatarImg_Lisa.png differ diff --git a/enkaToData/gachaImg/UI_Gacha_AvatarImg_Mona.png b/enkaToData/gachaImg/UI_Gacha_AvatarImg_Mona.png new file mode 100644 index 00000000..686515a5 Binary files /dev/null and b/enkaToData/gachaImg/UI_Gacha_AvatarImg_Mona.png differ diff --git a/enkaToData/gachaImg/UI_Gacha_AvatarImg_Mona_TT.png b/enkaToData/gachaImg/UI_Gacha_AvatarImg_Mona_TT.png new file mode 100644 index 00000000..a1124820 Binary files /dev/null and b/enkaToData/gachaImg/UI_Gacha_AvatarImg_Mona_TT.png differ diff --git a/enkaToData/gachaImg/UI_Gacha_AvatarImg_Ningguang.png b/enkaToData/gachaImg/UI_Gacha_AvatarImg_Ningguang.png new file mode 100644 index 00000000..f95a69fc Binary files /dev/null and b/enkaToData/gachaImg/UI_Gacha_AvatarImg_Ningguang.png differ diff --git a/enkaToData/gachaImg/UI_Gacha_AvatarImg_Noel.png b/enkaToData/gachaImg/UI_Gacha_AvatarImg_Noel.png new file mode 100644 index 00000000..d15bb4da Binary files /dev/null and b/enkaToData/gachaImg/UI_Gacha_AvatarImg_Noel.png differ diff --git a/enkaToData/gachaImg/UI_Gacha_AvatarImg_Qin.png b/enkaToData/gachaImg/UI_Gacha_AvatarImg_Qin.png new file mode 100644 index 00000000..0ae3b971 Binary files /dev/null and b/enkaToData/gachaImg/UI_Gacha_AvatarImg_Qin.png differ diff --git a/enkaToData/gachaImg/UI_Gacha_AvatarImg_Qin_TT.png b/enkaToData/gachaImg/UI_Gacha_AvatarImg_Qin_TT.png new file mode 100644 index 00000000..756c1c89 Binary files /dev/null and b/enkaToData/gachaImg/UI_Gacha_AvatarImg_Qin_TT.png differ diff --git a/enkaToData/gachaImg/UI_Gacha_AvatarImg_Qiqi.png b/enkaToData/gachaImg/UI_Gacha_AvatarImg_Qiqi.png new file mode 100644 index 00000000..192e42c0 Binary files /dev/null and b/enkaToData/gachaImg/UI_Gacha_AvatarImg_Qiqi.png differ diff --git a/enkaToData/gachaImg/UI_Gacha_AvatarImg_Razor.png b/enkaToData/gachaImg/UI_Gacha_AvatarImg_Razor.png new file mode 100644 index 00000000..ebdb48fa Binary files /dev/null and b/enkaToData/gachaImg/UI_Gacha_AvatarImg_Razor.png differ diff --git a/enkaToData/gachaImg/UI_Gacha_AvatarImg_Rosaria #2526820.png b/enkaToData/gachaImg/UI_Gacha_AvatarImg_Rosaria #2526820.png new file mode 100644 index 00000000..1412bb8e Binary files /dev/null and b/enkaToData/gachaImg/UI_Gacha_AvatarImg_Rosaria #2526820.png differ diff --git a/enkaToData/gachaImg/UI_Gacha_AvatarImg_Rosaria.png b/enkaToData/gachaImg/UI_Gacha_AvatarImg_Rosaria.png new file mode 100644 index 00000000..7693a1b0 Binary files /dev/null and b/enkaToData/gachaImg/UI_Gacha_AvatarImg_Rosaria.png differ diff --git a/enkaToData/gachaImg/UI_Gacha_AvatarImg_Rosaria_TT.png b/enkaToData/gachaImg/UI_Gacha_AvatarImg_Rosaria_TT.png new file mode 100644 index 00000000..bd8823fd Binary files /dev/null and b/enkaToData/gachaImg/UI_Gacha_AvatarImg_Rosaria_TT.png differ diff --git a/enkaToData/gachaImg/UI_Gacha_AvatarImg_Sara.png b/enkaToData/gachaImg/UI_Gacha_AvatarImg_Sara.png new file mode 100644 index 00000000..035ae160 Binary files /dev/null and b/enkaToData/gachaImg/UI_Gacha_AvatarImg_Sara.png differ diff --git a/enkaToData/gachaImg/UI_Gacha_AvatarImg_Sayu.png b/enkaToData/gachaImg/UI_Gacha_AvatarImg_Sayu.png new file mode 100644 index 00000000..0ab41d6c Binary files /dev/null and b/enkaToData/gachaImg/UI_Gacha_AvatarImg_Sayu.png differ diff --git a/enkaToData/gachaImg/UI_Gacha_AvatarImg_Shenhe.png b/enkaToData/gachaImg/UI_Gacha_AvatarImg_Shenhe.png new file mode 100644 index 00000000..4af296d2 Binary files /dev/null and b/enkaToData/gachaImg/UI_Gacha_AvatarImg_Shenhe.png differ diff --git a/enkaToData/gachaImg/UI_Gacha_AvatarImg_Shinobu.png b/enkaToData/gachaImg/UI_Gacha_AvatarImg_Shinobu.png new file mode 100644 index 00000000..8a7fcfa6 Binary files /dev/null and b/enkaToData/gachaImg/UI_Gacha_AvatarImg_Shinobu.png differ diff --git a/enkaToData/gachaImg/UI_Gacha_AvatarImg_Shougun.png b/enkaToData/gachaImg/UI_Gacha_AvatarImg_Shougun.png new file mode 100644 index 00000000..80c9c731 Binary files /dev/null and b/enkaToData/gachaImg/UI_Gacha_AvatarImg_Shougun.png differ diff --git a/enkaToData/gachaImg/UI_Gacha_AvatarImg_Sucrose.png b/enkaToData/gachaImg/UI_Gacha_AvatarImg_Sucrose.png new file mode 100644 index 00000000..2cd609d3 Binary files /dev/null and b/enkaToData/gachaImg/UI_Gacha_AvatarImg_Sucrose.png differ diff --git a/enkaToData/gachaImg/UI_Gacha_AvatarImg_Tartaglia.png b/enkaToData/gachaImg/UI_Gacha_AvatarImg_Tartaglia.png new file mode 100644 index 00000000..1ca366e8 Binary files /dev/null and b/enkaToData/gachaImg/UI_Gacha_AvatarImg_Tartaglia.png differ diff --git a/enkaToData/gachaImg/UI_Gacha_AvatarImg_Tohma.png b/enkaToData/gachaImg/UI_Gacha_AvatarImg_Tohma.png new file mode 100644 index 00000000..b7901447 Binary files /dev/null and b/enkaToData/gachaImg/UI_Gacha_AvatarImg_Tohma.png differ diff --git a/enkaToData/gachaImg/UI_Gacha_AvatarImg_Venti.png b/enkaToData/gachaImg/UI_Gacha_AvatarImg_Venti.png new file mode 100644 index 00000000..5e059627 Binary files /dev/null and b/enkaToData/gachaImg/UI_Gacha_AvatarImg_Venti.png differ diff --git a/enkaToData/gachaImg/UI_Gacha_AvatarImg_Xiangling.png b/enkaToData/gachaImg/UI_Gacha_AvatarImg_Xiangling.png new file mode 100644 index 00000000..dc9bca1f Binary files /dev/null and b/enkaToData/gachaImg/UI_Gacha_AvatarImg_Xiangling.png differ diff --git a/enkaToData/gachaImg/UI_Gacha_AvatarImg_Xiao.png b/enkaToData/gachaImg/UI_Gacha_AvatarImg_Xiao.png new file mode 100644 index 00000000..53aaa899 Binary files /dev/null and b/enkaToData/gachaImg/UI_Gacha_AvatarImg_Xiao.png differ diff --git a/enkaToData/gachaImg/UI_Gacha_AvatarImg_Xingqiu.png b/enkaToData/gachaImg/UI_Gacha_AvatarImg_Xingqiu.png new file mode 100644 index 00000000..cb6c5776 Binary files /dev/null and b/enkaToData/gachaImg/UI_Gacha_AvatarImg_Xingqiu.png differ diff --git a/enkaToData/gachaImg/UI_Gacha_AvatarImg_Xinyan.png b/enkaToData/gachaImg/UI_Gacha_AvatarImg_Xinyan.png new file mode 100644 index 00000000..5b7a5381 Binary files /dev/null and b/enkaToData/gachaImg/UI_Gacha_AvatarImg_Xinyan.png differ diff --git a/enkaToData/gachaImg/UI_Gacha_AvatarImg_Yae.png b/enkaToData/gachaImg/UI_Gacha_AvatarImg_Yae.png new file mode 100644 index 00000000..c020bf47 Binary files /dev/null and b/enkaToData/gachaImg/UI_Gacha_AvatarImg_Yae.png differ diff --git a/enkaToData/gachaImg/UI_Gacha_AvatarImg_Yelan.png b/enkaToData/gachaImg/UI_Gacha_AvatarImg_Yelan.png new file mode 100644 index 00000000..e4b006b3 Binary files /dev/null and b/enkaToData/gachaImg/UI_Gacha_AvatarImg_Yelan.png differ diff --git a/enkaToData/gachaImg/UI_Gacha_AvatarImg_Yoimiya.png b/enkaToData/gachaImg/UI_Gacha_AvatarImg_Yoimiya.png new file mode 100644 index 00000000..a3a5a74b Binary files /dev/null and b/enkaToData/gachaImg/UI_Gacha_AvatarImg_Yoimiya.png differ diff --git a/enkaToData/gachaImg/UI_Gacha_AvatarImg_Yunjin.png b/enkaToData/gachaImg/UI_Gacha_AvatarImg_Yunjin.png new file mode 100644 index 00000000..c2a56c1d Binary files /dev/null and b/enkaToData/gachaImg/UI_Gacha_AvatarImg_Yunjin.png differ diff --git a/enkaToData/gachaImg/UI_Gacha_AvatarImg_Zhongli.png b/enkaToData/gachaImg/UI_Gacha_AvatarImg_Zhongli.png new file mode 100644 index 00000000..a4d0fdea Binary files /dev/null and b/enkaToData/gachaImg/UI_Gacha_AvatarImg_Zhongli.png differ diff --git a/enkaToData/texture2D/char_info_1.png b/enkaToData/texture2D/char_info_1.png index ce914edf..87651a60 100644 Binary files a/enkaToData/texture2D/char_info_1.png and b/enkaToData/texture2D/char_info_1.png differ diff --git a/enkaToData/texture2D/char_info_mask.png b/enkaToData/texture2D/char_info_mask.png index 89fad166..0a1e40c7 100644 Binary files a/enkaToData/texture2D/char_info_mask.png and b/enkaToData/texture2D/char_info_mask.png differ