diff --git a/StarRailUID/sruid_utils/api/lulu/__init__.py b/StarRailUID/sruid_utils/api/mihomo/__init__.py similarity index 87% rename from StarRailUID/sruid_utils/api/lulu/__init__.py rename to StarRailUID/sruid_utils/api/mihomo/__init__.py index c942b9f..280e9ff 100644 --- a/StarRailUID/sruid_utils/api/lulu/__init__.py +++ b/StarRailUID/sruid_utils/api/mihomo/__init__.py @@ -1,4 +1,4 @@ -"""Lulu api 包装 +"""Mihomo.me api 包装 """ # from .models import EnkaData as EnkaData # noqa: F401 from .requests import get_char_card_info as get_char_card_info # noqa: F401 diff --git a/StarRailUID/sruid_utils/api/lulu/models.py b/StarRailUID/sruid_utils/api/mihomo/models.py similarity index 100% rename from StarRailUID/sruid_utils/api/lulu/models.py rename to StarRailUID/sruid_utils/api/mihomo/models.py diff --git a/StarRailUID/sruid_utils/api/lulu/requests.py b/StarRailUID/sruid_utils/api/mihomo/requests.py similarity index 100% rename from StarRailUID/sruid_utils/api/lulu/requests.py rename to StarRailUID/sruid_utils/api/mihomo/requests.py diff --git a/StarRailUID/starrailuid_charinfo/draw_char_img.py b/StarRailUID/starrailuid_charinfo/draw_char_img.py index 3d88d50..9ea491e 100644 --- a/StarRailUID/starrailuid_charinfo/draw_char_img.py +++ b/StarRailUID/starrailuid_charinfo/draw_char_img.py @@ -13,10 +13,10 @@ from gsuid_core.utils.image.image_tools import draw_text_by_line from .to_data import api_to_dict from .mono.Character import Character from ..utils.error_reply import CHAR_HINT +from ..utils.fonts.first_world import fw_font_120 from ..utils.map.SR_MAP_PATH import RelicId2Rarity from ..utils.excel.read_excel import light_cone_ranks from ..utils.map.name_covert import alias_to_char_name -from ..utils.fonts.first_world import fw_font_28, fw_font_120 from ..utils.resource.RESOURCE_PATH import ( RELIC_PATH, SKILL_PATH, @@ -127,7 +127,7 @@ async def draw_char_info_img(raw_mes: str, sr_uid: str, url: Optional[str]): (995, 715), f'uid {sr_uid}', white_color, - fw_font_28, + sr_font_28, 'rm', stroke_width=1, ) @@ -562,6 +562,15 @@ async def draw_char_info_img(raw_mes: str, sr_uid: str, url: Optional[str]): 'mm', ) + # 写底层文字 + char_img_draw.text( + (525, 2020), + '--Created by qwerdvd-Designed By Wuyi-Thank for mihomo.me--', + (255, 255, 255), + fw_font_120, + 'mm', + ) + # 发送图片 res = await convert_img(char_info) logger.info('[sr面板]绘图已完成,等待发送!') diff --git a/StarRailUID/starrailuid_charinfo/to_data.py b/StarRailUID/starrailuid_charinfo/to_data.py index 8e8d755..126ab2e 100644 --- a/StarRailUID/starrailuid_charinfo/to_data.py +++ b/StarRailUID/starrailuid_charinfo/to_data.py @@ -7,7 +7,7 @@ from gsuid_core.utils.api.enka.models import EnkaData from ..utils.error_reply import UID_HINT from ..utils.resource.RESOURCE_PATH import PLAYER_PATH -from ..sruid_utils.api.lulu.requests import get_char_card_info +from ..sruid_utils.api.mihomo.requests import get_char_card_info # from gsuid_core.utils.api.minigg.request import get_weapon_info from .cal_value import cal_relic_sub_affix, cal_relic_main_affix @@ -38,10 +38,10 @@ async def api_to_dict( ) -> Union[List[dict], str]: """ :说明: - 访问luluAPI并转换为StarRailUID的数据Json。 + 访问Mihomo.me API并转换为StarRailUID的数据Json。 :参数: * ``uid: str``: 玩家uid。 - * ``sr_data: Optional[dict] = None``: 来自lulu的dict, 可留空。 + * ``sr_data: Optional[dict] = None``: 来自Mihomo.me的dict, 可留空。 :返回: * ``刷新完成提示语: str``: 包含刷新成功的角色列表。 """ @@ -58,7 +58,7 @@ async def api_to_dict( return [] if isinstance(sr_data, dict): if 'PlayerDetailInfo' not in sr_data: - im = '服务器正在维护或者关闭中...\n检查lulu api是否可以访问\n如可以访问,尝试上报Bug!' + im = '服务器正在维护或者关闭中...\n检查Mihomo.me是否可以访问\n如可以访问,尝试上报Bug!' return im elif sr_data is None: return []