diff --git a/StarRailUID/starrailuid_charinfo/draw_char_img.py b/StarRailUID/starrailuid_charinfo/draw_char_img.py index 52101d4..c32ed1e 100644 --- a/StarRailUID/starrailuid_charinfo/draw_char_img.py +++ b/StarRailUID/starrailuid_charinfo/draw_char_img.py @@ -115,7 +115,7 @@ async def draw_char_info_img(raw_mes: str, sr_uid: str, url: Optional[str]): rank_img = Image.open(TEXT_PATH / 'ImgNewBg.png') rank_img_draw = ImageDraw.Draw(rank_img) rank_img_draw.text( - (70, 44), f'{NUM_MAP[char.char_rank]} 命', white_color, sr_font_28, 'mm' + (70, 44), f'{NUM_MAP[char.char_rank]}命', white_color, sr_font_28, 'mm' ) char_info.paste(rank_img, (722, 225), rank_img) @@ -356,12 +356,12 @@ async def draw_char_info_img(raw_mes: str, sr_uid: str, url: Optional[str]): weapon_bg = Image.open(TEXT_PATH / 'weapon_bg.png') weapon_id = char.equipment['equipmentID'] weapon_img = Image.open(WEAPON_PATH / f'{weapon_id}.png').resize( - (260, 240) + (270, 240) ) - weapon_bg.paste(weapon_img, (-10, 50), weapon_img) + weapon_bg.paste(weapon_img, (20, 50), weapon_img) weapon_bg_draw = ImageDraw.Draw(weapon_bg) weapon_bg_draw.text( - (310, 47), + (345, 47), f'{char.equipment["equipmentName"]}', white_color, sr_font_34, @@ -375,20 +375,20 @@ async def draw_char_info_img(raw_mes: str, sr_uid: str, url: Optional[str]): rank_img_draw = ImageDraw.Draw(rank_img) rank_img_draw.text( (70, 44), - f'{NUM_MAP[char.equipment["equipmentRank"]]} 阶', + f'{NUM_MAP[char.equipment["equipmentRank"]]}阶', white_color, sr_font_28, 'mm', ) - weapon_bg.paste(rank_img, (weapon_name_len + 300, 2), rank_img) + weapon_bg.paste(rank_img, (weapon_name_len + 330, 2), rank_img) rarity_img = Image.open( TEXT_PATH / f'LightCore_Rarity{char.equipment["equipmentRarity"]}.png' ).resize((306, 72)) - weapon_bg.paste(rarity_img, (180, 55), rarity_img) + weapon_bg.paste(rarity_img, (223, 55), rarity_img) weapon_bg_draw.text( - (455, 90), + (498, 90), f'Lv.{char.equipment["equipmentLevel"]}', white_color, sr_font_28, @@ -406,9 +406,9 @@ async def draw_char_info_img(raw_mes: str, sr_uid: str, url: Optional[str]): for i in range(0, len(desc_params)): desc = desc.replace(f'#{i + 1}[i]', str(desc_params[i])) draw_text_by_line( - weapon_bg, (243, 115), desc, sr_font_24, '#F9F9F9', 372 + weapon_bg, (286, 115), desc, sr_font_24, '#F9F9F9', 372 ) - char_info.paste(weapon_bg, (22, 870), weapon_bg) + char_info.paste(weapon_bg, (-10, 870), weapon_bg) else: char_img_draw.text( (525, 1005), @@ -554,7 +554,6 @@ async def draw_char_info_img(raw_mes: str, sr_uid: str, url: Optional[str]): ) # 发送图片 - # char_info.show() res = await convert_img(char_info) logger.info('[sr面板]绘图已完成,等待发送!') return res diff --git a/StarRailUID/starrailuid_charinfo/texture2D/weapon_bg.png b/StarRailUID/starrailuid_charinfo/texture2D/weapon_bg.png index 85cf549..be0e2e9 100644 Binary files a/StarRailUID/starrailuid_charinfo/texture2D/weapon_bg.png and b/StarRailUID/starrailuid_charinfo/texture2D/weapon_bg.png differ diff --git a/StarRailUID/starrailuid_charinfo/texture2D/yq_bg1.png b/StarRailUID/starrailuid_charinfo/texture2D/yq_bg1.png new file mode 100644 index 0000000..cc5b0e2 Binary files /dev/null and b/StarRailUID/starrailuid_charinfo/texture2D/yq_bg1.png differ diff --git a/StarRailUID/starrailuid_charinfo/texture2D/yq_bg2.png b/StarRailUID/starrailuid_charinfo/texture2D/yq_bg2.png index 59ceff2..d1aa639 100644 Binary files a/StarRailUID/starrailuid_charinfo/texture2D/yq_bg2.png and b/StarRailUID/starrailuid_charinfo/texture2D/yq_bg2.png differ diff --git a/StarRailUID/starrailuid_charinfo/texture2D/yq_bg3.png b/StarRailUID/starrailuid_charinfo/texture2D/yq_bg3.png index 3466135..59ceff2 100644 Binary files a/StarRailUID/starrailuid_charinfo/texture2D/yq_bg3.png and b/StarRailUID/starrailuid_charinfo/texture2D/yq_bg3.png differ diff --git a/StarRailUID/starrailuid_charinfo/texture2D/yq_bg4.png b/StarRailUID/starrailuid_charinfo/texture2D/yq_bg4.png index f16d141..3466135 100644 Binary files a/StarRailUID/starrailuid_charinfo/texture2D/yq_bg4.png and b/StarRailUID/starrailuid_charinfo/texture2D/yq_bg4.png differ diff --git a/StarRailUID/starrailuid_charinfo/texture2D/yq_bg6.png b/StarRailUID/starrailuid_charinfo/texture2D/yq_bg6.png new file mode 100644 index 0000000..f16d141 Binary files /dev/null and b/StarRailUID/starrailuid_charinfo/texture2D/yq_bg6.png differ