diff --git a/GenshinUID/genshinuid_enka/to_card.py b/GenshinUID/genshinuid_enka/to_card.py index d1611790..0aa2b42a 100644 --- a/GenshinUID/genshinuid_enka/to_card.py +++ b/GenshinUID/genshinuid_enka/to_card.py @@ -8,19 +8,16 @@ from .to_data import enka_to_dict from ..utils.image.convert import convert_img from ..gsuid_utils.api.enka.models import EnkaData from ..utils.resource.RESOURCE_PATH import CHAR_PATH -from ..utils.fonts.genshin_fonts import genshin_font_origin +from ..utils.fonts.genshin_fonts import gs_font_18, gs_font_58 from ..utils.map.name_covert import name_to_avatar_id, avatar_id_to_char_star half_color = (255, 255, 255, 120) first_color = (29, 29, 29) second_color = (67, 61, 56) white_color = (247, 247, 247) -gs_font_18 = genshin_font_origin(18) -gs_font_28 = genshin_font_origin(28) -gs_font_58 = genshin_font_origin(58) MAP_PATH = Path(__file__).parent / 'map' -TEXT_PATH = Path(__file__).parent / 'texture2d' +TEXT_PATH = Path(__file__).parent / 'texture2D' char_mask = Image.open(TEXT_PATH / 'char_mask.png') tag = Image.open(TEXT_PATH / 'tag.png') footbar = Image.open(TEXT_PATH / 'footbar.png') diff --git a/poetry.lock b/poetry.lock index 5aea6020..c9c60b39 100644 --- a/poetry.lock +++ b/poetry.lock @@ -171,14 +171,14 @@ trio = ["trio (>=0.16,<0.22)"] [[package]] name = "apscheduler" -version = "3.10.0" +version = "3.10.1" description = "In-process task scheduler with Cron-like capabilities" category = "main" optional = false python-versions = ">=3.6" files = [ - {file = "APScheduler-3.10.0-py3-none-any.whl", hash = "sha256:575299f20073c60a2cc9d4fa5906024cdde33c5c0ce6087c4e3c14be3b50fdd4"}, - {file = "APScheduler-3.10.0.tar.gz", hash = "sha256:a49fc23269218416f0e41890eea7a75ed6b284f10630dcfe866ab659621a3696"}, + {file = "APScheduler-3.10.1-py3-none-any.whl", hash = "sha256:e813ad5ada7aff36fb08cdda746b520531eaac7757832abc204868ba78e0c8f6"}, + {file = "APScheduler-3.10.1.tar.gz", hash = "sha256:0293937d8f6051a0f493359440c1a1b93e882c57daf0197afeff0e727777b96e"}, ] [package.dependencies] @@ -628,14 +628,14 @@ test = ["anyio[trio] (>=3.2.1,<4.0.0)", "black (==22.10.0)", "coverage[toml] (>= [[package]] name = "fastapi-amis-admin" -version = "0.4.3" +version = "0.5.0" description = "FastAPI-Amis-Admin is a high-performance, efficient and easily extensible FastAPI admin framework. Inspired by Django-admin, and has as many powerful functions as Django-admin. " category = "main" optional = false python-versions = ">=3.7" files = [ - {file = "fastapi_amis_admin-0.4.3-py3-none-any.whl", hash = "sha256:0f244020bb79971253054908267c7f59e6fe3ecdfe73d99fecf9d0e99cc2be52"}, - {file = "fastapi_amis_admin-0.4.3.tar.gz", hash = "sha256:914b82abb653d1fda318b59451ed88d9740cce1d5915cc05c06b1d8fee98d9d1"}, + {file = "fastapi_amis_admin-0.5.0-py3-none-any.whl", hash = "sha256:82f232c27b277d83f8829c1be07ec64ebbc94acf6bfd6fadf30c1f9fc9ed2704"}, + {file = "fastapi_amis_admin-0.5.0.tar.gz", hash = "sha256:f17d9cba8e2b32374d5a6f6576b98867d5777668a92885663a01b7a0faf206ff"}, ] [package.dependencies] @@ -654,20 +654,20 @@ test = ["aiosqlite (>=0.15.0)", "fastapi-amis-admin[standard]", "httpx (>=0.23.0 [[package]] name = "fastapi-user-auth" -version = "0.4.3" +version = "0.5.0" description = "FastAPI-User-Auth is a simple and powerful FastAPI user RBAC authentication and authorization library. Based on FastAPI-Amis-Admin and provides a freely extensible visual management interface." category = "main" optional = false python-versions = ">=3.7" files = [ - {file = "fastapi_user_auth-0.4.3-py3-none-any.whl", hash = "sha256:4c8dae90e64e00d9a8b2a5caf47c6174d5313c9fee3b61c17e532049fbca4c9e"}, - {file = "fastapi_user_auth-0.4.3.tar.gz", hash = "sha256:63cd2430b88cc158244206150b313da2fa5a97f8f8cebb3477d93a7e92b5975f"}, + {file = "fastapi_user_auth-0.5.0-py3-none-any.whl", hash = "sha256:de93a520b1c0458887cad796f6d79c9d214ada82e4ffd8312635cca374b1ee0b"}, + {file = "fastapi_user_auth-0.5.0.tar.gz", hash = "sha256:86022bb540e984500e13674379f74ce04db6974fef66de3fb92b57ae876f8bd1"}, ] [package.dependencies] bcrypt = ">=4.0.0" email-validator = "*" -fastapi-amis-admin = ">=0.4.0,<0.5.0" +fastapi-amis-admin = ">=0.5.0,<0.6.0" passlib = ">=1.7.4" pydantic = ">=1.9" sqlmodelx = ">=0.0.2" @@ -1557,14 +1557,14 @@ tests = ["check-manifest", "coverage", "defusedxml", "markdown2", "olefile", "pa [[package]] name = "platformdirs" -version = "3.0.0" +version = "3.1.0" description = "A small Python package for determining appropriate platform-specific dirs, e.g. a \"user data dir\"." category = "dev" optional = false python-versions = ">=3.7" files = [ - {file = "platformdirs-3.0.0-py3-none-any.whl", hash = "sha256:b1d5eb14f221506f50d6604a561f4c5786d9e80355219694a1b244bcd96f4567"}, - {file = "platformdirs-3.0.0.tar.gz", hash = "sha256:8a1228abb1ef82d788f74139988b137e78692984ec7b08eaa6c65f1723af28f9"}, + {file = "platformdirs-3.1.0-py3-none-any.whl", hash = "sha256:13b08a53ed71021350c9e300d4ea8668438fb0046ab3937ac9a29913a1a1350a"}, + {file = "platformdirs-3.1.0.tar.gz", hash = "sha256:accc3665857288317f32c7bebb5a8e482ba717b474f3fc1d18ca7f9214be0cef"}, ] [package.extras] @@ -1729,14 +1729,14 @@ files = [ [[package]] name = "pytest" -version = "7.2.1" +version = "7.2.2" description = "pytest: simple powerful testing with Python" category = "dev" optional = false python-versions = ">=3.7" files = [ - {file = "pytest-7.2.1-py3-none-any.whl", hash = "sha256:c7c6ca206e93355074ae32f7403e8ea12163b1163c976fee7d4d84027c162be5"}, - {file = "pytest-7.2.1.tar.gz", hash = "sha256:d45e0952f3727241918b8fd0f376f5ff6b301cc0777c6f9a556935c92d8a7d42"}, + {file = "pytest-7.2.2-py3-none-any.whl", hash = "sha256:130328f552dcfac0b1cec75c12e3f005619dc5f874f0a06e8ff7263f0ee6225e"}, + {file = "pytest-7.2.2.tar.gz", hash = "sha256:c99ab0c73aceb050f68929bc93af19ab6db0558791c6a0715723abe9d0ade9d4"}, ] [package.dependencies] diff --git a/requirements.txt b/requirements.txt index 718faee9..4f48001a 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,7 +3,7 @@ aiohttp==3.8.4 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0 aiosignal==1.3.1 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0" aiosqlite==0.18.0 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0" anyio==3.6.2 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0" -apscheduler==3.10.0 ; python_full_version >= "3.8.1" and python_version < "4.0" +apscheduler==3.10.1 ; python_full_version >= "3.8.1" and python_version < "4.0" async-timeout==4.0.2 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0" attrs==22.2.0 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0" backports-zoneinfo==0.2.1 ; python_full_version >= "3.8.1" and python_version < "3.9" @@ -15,8 +15,8 @@ colorama==0.4.6 ; python_full_version >= "3.8.1" and python_full_version < "4.0. dnspython==2.3.0 ; python_full_version >= "3.8.1" and python_version < "4.0" email-validator==1.3.1 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0" et-xmlfile==1.1.0 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0" -fastapi-amis-admin==0.4.3 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0" -fastapi-user-auth==0.4.3 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0" +fastapi-amis-admin==0.5.0 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0" +fastapi-user-auth==0.5.0 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0" fastapi==0.92.0 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0" frozenlist==1.3.3 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0" gitdb==4.0.10 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0"