From bac5727c015518b8260b9a095108daf48545b400 Mon Sep 17 00:00:00 2001 From: CMHopeSunshine <277073121@qq.com> Date: Fri, 18 Mar 2022 22:47:05 +0800 Subject: [PATCH] fix bug --- hoshino/config_example/__bot__.py | 3 +-- .../modules/Genshin_Paimon/gacha/gacha_role.py | 4 ++-- .../Genshin_Paimon/res/reliquaries/72554.png | Bin 0 -> 9022 bytes requirements.txt | 3 +-- 4 files changed, 4 insertions(+), 6 deletions(-) create mode 100644 hoshino/modules/Genshin_Paimon/res/reliquaries/72554.png diff --git a/hoshino/config_example/__bot__.py b/hoshino/config_example/__bot__.py index f96b4e3..ac7d59f 100644 --- a/hoshino/config_example/__bot__.py +++ b/hoshino/config_example/__bot__.py @@ -38,6 +38,5 @@ MODULES_ON = { 'codeonline', 'Paimonchat', 'Genshin_Paimon', - 'myb_exchange', - 'check_status', + 'myb_exchange' } diff --git a/hoshino/modules/Genshin_Paimon/gacha/gacha_role.py b/hoshino/modules/Genshin_Paimon/gacha/gacha_role.py index f4e09be..893d46a 100644 --- a/hoshino/modules/Genshin_Paimon/gacha/gacha_role.py +++ b/hoshino/modules/Genshin_Paimon/gacha/gacha_role.py @@ -9,7 +9,7 @@ ROLE_2_PATH = os.path.join(RES_PATH,"DIY_gacha_pool","role_2.json") WEAPON_PATH = os.path.join(RES_PATH,"DIY_gacha_pool","weapon.json") All_STAR_PATH = os.path.join(RES_PATH,"DIY_gacha_pool","all_star.json") - +user_info={} role_1_pool = {} role_2_pool = {} weapon_pool = {} @@ -40,7 +40,7 @@ with open(All_STAR_PATH,'r',encoding='UTF-8') as f: def init_user_info(uid:str): - if not (uid in user_info): + if uid not in user_info: user_info[uid] = {} user_info[uid]["fate"] = 200 user_info[uid]["gacha_list"] = {} diff --git a/hoshino/modules/Genshin_Paimon/res/reliquaries/72554.png b/hoshino/modules/Genshin_Paimon/res/reliquaries/72554.png new file mode 100644 index 0000000000000000000000000000000000000000..9ec0d337b7cc85737e78b9f95ae253a721366c70 GIT binary patch literal 9022 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 literal 0 HcmV?d00001 diff --git a/requirements.txt b/requirements.txt index d654b6e..e943d3e 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,7 +5,7 @@ pytz>=2021.3 requests>=2.22.0 zhconv>=1.4.0 Pillow>=8.4.0 -matplotlib>=3.2.0 +matplotlib==3.2.0 numpy>=1.18.0 beautifulsoup4>=4.9.0 pygtrie>=2.0 @@ -14,7 +14,6 @@ aiohttp>=3.6 openpyxl>=3.0.9 psutil>=5.4.3 PyYAML>=5.4.1 -functools>=0.5 uuid>=1.30 filetype imageio