mirror of
https://github.com/KimigaiiWuyi/GenshinUID.git
synced 2025-06-06 07:29:50 +08:00
🎨 优化强制刷新
This commit is contained in:
parent
2bc6f4280e
commit
d77db758d4
@ -343,7 +343,6 @@ async def send_card_info(bot: Bot, ev: Event):
|
|||||||
im = await enka_to_card(uid)
|
im = await enka_to_card(uid)
|
||||||
else:
|
else:
|
||||||
im = await enka_to_card(uid)
|
im = await enka_to_card(uid)
|
||||||
logger.info(f'UID{uid}获取角色数据成功!')
|
|
||||||
|
|
||||||
if isinstance(im, Tuple):
|
if isinstance(im, Tuple):
|
||||||
buttons = [
|
buttons = [
|
||||||
|
@ -30,6 +30,37 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"柔灯挽歌": {
|
||||||
|
"normal": {
|
||||||
|
"normal_effect": {
|
||||||
|
"1": "addAtk+15",
|
||||||
|
"2": "addAtk+19",
|
||||||
|
"3": "addAtk+23",
|
||||||
|
"4": "addAtk+27",
|
||||||
|
"5": "addAtk+31"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"fight": {
|
||||||
|
"fight_effect": {
|
||||||
|
"1": "dmgBonus+36",
|
||||||
|
"2": "dmgBonus+46",
|
||||||
|
"3": "dmgBonus+56",
|
||||||
|
"4": "dmgBonus+66",
|
||||||
|
"5": "dmgBonus+76"
|
||||||
|
},
|
||||||
|
"group_effect": {
|
||||||
|
"1": "",
|
||||||
|
"2": "",
|
||||||
|
"3": "",
|
||||||
|
"4": "",
|
||||||
|
"5": ""
|
||||||
|
},
|
||||||
|
"time": 8,
|
||||||
|
"extra": {
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
"冷寂迸音": {
|
"冷寂迸音": {
|
||||||
"normal": {
|
"normal": {
|
||||||
"normal_effect": {
|
"normal_effect": {
|
||||||
|
@ -3,6 +3,7 @@ from pathlib import Path
|
|||||||
from typing import Dict, List, Tuple, Union, Optional
|
from typing import Dict, List, Tuple, Union, Optional
|
||||||
|
|
||||||
from PIL import Image, ImageDraw
|
from PIL import Image, ImageDraw
|
||||||
|
from gsuid_core.logger import logger
|
||||||
from gsuid_core.utils.api.enka.models import EnkaData
|
from gsuid_core.utils.api.enka.models import EnkaData
|
||||||
|
|
||||||
from .to_data import enka_to_dict
|
from .to_data import enka_to_dict
|
||||||
@ -42,6 +43,7 @@ async def enka_to_card(
|
|||||||
return await convert_img(pic_500)
|
return await convert_img(pic_500)
|
||||||
|
|
||||||
img = await draw_enka_card(uid=uid, char_data_list=char_data_list)
|
img = await draw_enka_card(uid=uid, char_data_list=char_data_list)
|
||||||
|
logger.info(f'UID{uid}获取角色数据成功!')
|
||||||
return img, char_data_list
|
return img, char_data_list
|
||||||
|
|
||||||
|
|
||||||
@ -72,8 +74,8 @@ async def draw_enka_card(
|
|||||||
if char_num <= 8:
|
if char_num <= 8:
|
||||||
based_w, based_h = 1000, 240 + ((char_num + 3) // 4) * 220
|
based_w, based_h = 1000, 240 + ((char_num + 3) // 4) * 220
|
||||||
else:
|
else:
|
||||||
based_w, based_h = 1200, 660 + (char_num - 5) // 5 * 110
|
based_w, based_h = 1200, 660 + (char_num - 6) // 6 * 110
|
||||||
if (char_num - 5) % 5 >= 4:
|
if (char_num - 6) % 6 >= 1:
|
||||||
based_h += 110
|
based_h += 110
|
||||||
|
|
||||||
img = Image.open(TEXT_PATH / 'shin-w.jpg').resize((based_w, based_h))
|
img = Image.open(TEXT_PATH / 'shin-w.jpg').resize((based_w, based_h))
|
||||||
@ -151,9 +153,9 @@ async def draw_enka_char(index: int, img: Image.Image, char_data: dict):
|
|||||||
else:
|
else:
|
||||||
_i = index - 13
|
_i = index - 13
|
||||||
x, y = 50 + (_i % 9) * 220, 512 + (_i // 9) * 220
|
x, y = 50 + (_i % 9) * 220, 512 + (_i // 9) * 220
|
||||||
if _i % 9 >= 5:
|
if _i % 9 >= 6:
|
||||||
y += 110
|
y += 110
|
||||||
x = 160 + ((_i - 5) % 9) * 220
|
x = 160 + ((_i - 6) % 9) * 220
|
||||||
img.paste(
|
img.paste(
|
||||||
char_card,
|
char_card,
|
||||||
(x, y),
|
(x, y),
|
||||||
|
Loading…
x
Reference in New Issue
Block a user