From acb77b28ee9913c776c20fe665bd0d23cbac05fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wuyi=E6=97=A0=E7=96=91?= <444835641@qq.com> Date: Mon, 17 Apr 2023 02:22:06 +0800 Subject: [PATCH] =?UTF-8?q?=E2=9A=A1=EF=B8=8F=20=E4=BC=98=E5=8C=96`gs?= =?UTF-8?q?=E5=B8=AE=E5=8A=A9`=E5=9B=BE=E7=9A=84=E4=BF=9D=E5=AD=98?= =?UTF-8?q?=E6=A0=BC=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 2 ++ GenshinUID/genshinuid_help/draw_help_card.py | 6 +++--- poetry.lock | 18 +++++++++--------- requirements.txt | 2 +- 4 files changed, 15 insertions(+), 13 deletions(-) diff --git a/.gitignore b/.gitignore index 765930b7..9503abfa 100644 --- a/.gitignore +++ b/.gitignore @@ -682,6 +682,8 @@ textMap.json event.jpg gacha.jpg help.png +help.jpg +help.webp review.json gs_data *.xlsx diff --git a/GenshinUID/genshinuid_help/draw_help_card.py b/GenshinUID/genshinuid_help/draw_help_card.py index fae09a52..cdabcc6c 100644 --- a/GenshinUID/genshinuid_help/draw_help_card.py +++ b/GenshinUID/genshinuid_help/draw_help_card.py @@ -75,11 +75,11 @@ async def draw_help_img(): ), ) module_temp += 100 + 110 * ((len(help_data[module]['data']) + 2) // 3) - img = Image.alpha_composite(img, alpha_img) + img = Image.alpha_composite(img, alpha_img).convert('RGB') img.save( - Path(__file__).parent / 'help.png', - format='PNG', + Path(__file__).parent / 'help.jpg', + format='JPEG', quality=80, subsampling=0, ) diff --git a/poetry.lock b/poetry.lock index f8698c55..33c8efe4 100644 --- a/poetry.lock +++ b/poetry.lock @@ -243,22 +243,22 @@ files = [ [[package]] name = "attrs" -version = "22.2.0" +version = "23.1.0" description = "Classes Without Boilerplate" category = "main" optional = false -python-versions = ">=3.6" +python-versions = ">=3.7" files = [ - {file = "attrs-22.2.0-py3-none-any.whl", hash = "sha256:29e95c7f6778868dbd49170f98f8818f78f3dc5e0e37c0b1f474e3561b240836"}, - {file = "attrs-22.2.0.tar.gz", hash = "sha256:c9227bfc2f01993c03f68db37d1d15c9690188323c067c641f1a35ca58185f99"}, + {file = "attrs-23.1.0-py3-none-any.whl", hash = "sha256:1f28b4522cdc2fb4256ac1a020c78acf9cba2c6b461ccd2c126f3aa8e8335d04"}, + {file = "attrs-23.1.0.tar.gz", hash = "sha256:6279836d581513a26f1bf235f9acd333bc9115683f14f7e8fae46c98fc50e015"}, ] [package.extras] -cov = ["attrs[tests]", "coverage-enable-subprocess", "coverage[toml] (>=5.3)"] -dev = ["attrs[docs,tests]"] -docs = ["furo", "myst-parser", "sphinx", "sphinx-notfound-page", "sphinxcontrib-towncrier", "towncrier", "zope.interface"] -tests = ["attrs[tests-no-zope]", "zope.interface"] -tests-no-zope = ["cloudpickle", "cloudpickle", "hypothesis", "hypothesis", "mypy (>=0.971,<0.990)", "mypy (>=0.971,<0.990)", "pympler", "pympler", "pytest (>=4.3.0)", "pytest (>=4.3.0)", "pytest-mypy-plugins", "pytest-mypy-plugins", "pytest-xdist[psutil]", "pytest-xdist[psutil]"] +cov = ["attrs[tests]", "coverage[toml] (>=5.3)"] +dev = ["attrs[docs,tests]", "pre-commit"] +docs = ["furo", "myst-parser", "sphinx", "sphinx-notfound-page", "sphinxcontrib-towncrier", "towncrier", "zope-interface"] +tests = ["attrs[tests-no-zope]", "zope-interface"] +tests-no-zope = ["cloudpickle", "hypothesis", "mypy (>=1.1.1)", "pympler", "pytest (>=4.3.0)", "pytest-mypy-plugins", "pytest-xdist[psutil]"] [[package]] name = "backports-zoneinfo" diff --git a/requirements.txt b/requirements.txt index 4415eb06..2302d5d8 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,7 +5,7 @@ aiosqlite==0.18.0 ; python_full_version >= "3.8.1" and python_full_version < "4. anyio==3.6.2 ; python_full_version >= "3.8.1" and python_full_version < "4.0.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" +attrs==23.1.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" bcrypt==4.0.1 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0" beautifulsoup4==4.12.2 ; python_full_version >= "3.8.1" and python_full_version < "4.0.0"