diff --git a/hoshino/__init__.py b/hoshino/__init__.py index 700bc64..42228f3 100644 --- a/hoshino/__init__.py +++ b/hoshino/__init__.py @@ -9,7 +9,7 @@ HoshinoBot = nonebot.NoneBot from . import log, config, util from .service import Service, sucmd -__version__ = 'v1.0.3' +__version__ = 'v1.0.0' _bot = None os.makedirs(os.path.expanduser('~/.hoshino'), exist_ok=True) diff --git a/hoshino/modules/Genshin_Paimon/gacha/gacha_wish.py b/hoshino/modules/Genshin_Paimon/gacha/gacha_wish.py index b8d12c5..c999187 100644 --- a/hoshino/modules/Genshin_Paimon/gacha/gacha_wish.py +++ b/hoshino/modules/Genshin_Paimon/gacha/gacha_wish.py @@ -206,8 +206,6 @@ async def create_item(rank, item_type, name, element, count, dg_time): async def ten(uid, gacha_data, sd) -> PngImagePlugin.PngImageFile: gacha_list = [] - curr_time = datetime.datetime.now() - time_str = datetime.datetime.strftime(curr_time,'%m-%d %H:%M') for i in range(0,10): if gacha_data['gacha_type'] == 'all_star': role = random.choice(gacha_data['list']) @@ -237,11 +235,10 @@ async def ten(uid, gacha_data, sd) -> PngImagePlugin.PngImageFile: img.thumbnail((1024, 768)) img2 = Image.new("RGB", img.size, (255, 255, 255)) img2.paste(img, mask=img.split()[3]) - draw = ImageDraw.Draw(img2) - draw.text((27,545),('@%s %s Created By 频道·尘世闲游' % (str(sd['nickname']),time_str)), font=timefont, fill="#8E8E8E") return img2 async def more_ten(uid, gacha_data, num, sd): + time_str = datetime.datetime.strftime(datetime.datetime.now(),'%m-%d %H:%M') if num == 1: img = await ten(uid,gacha_data, sd) else: @@ -249,5 +246,7 @@ async def more_ten(uid, gacha_data, num, sd): for i in range(0, num): item_img = await ten(uid, gacha_data, sd) img.paste(item_img, (0, 575 * i)) + draw = ImageDraw.Draw(img) + draw.text((27,575 * num - 30),('@%s %s Created By 惜月の小派蒙' % (str(sd['nickname']),time_str)), font=timefont, fill="#8E8E8E") return pil2b64(img, 75) diff --git a/hoshino/modules/Genshin_Paimon/res/reliquaries/72544.png b/hoshino/modules/Genshin_Paimon/res/reliquaries/72544.png new file mode 100644 index 0000000..31129c7 Binary files /dev/null and b/hoshino/modules/Genshin_Paimon/res/reliquaries/72544.png differ diff --git a/hoshino/modules/Genshin_Paimon/res/reliquaries/88543.png b/hoshino/modules/Genshin_Paimon/res/reliquaries/88543.png new file mode 100644 index 0000000..a3e981d Binary files /dev/null and b/hoshino/modules/Genshin_Paimon/res/reliquaries/88543.png differ diff --git a/hoshino/modules/Genshin_Paimon/res/reliquaries/88554.png b/hoshino/modules/Genshin_Paimon/res/reliquaries/88554.png new file mode 100644 index 0000000..0ef8ed2 Binary files /dev/null and b/hoshino/modules/Genshin_Paimon/res/reliquaries/88554.png differ diff --git a/hoshino/modules/Genshin_Paimon/res/reliquaries/96543.png b/hoshino/modules/Genshin_Paimon/res/reliquaries/96543.png new file mode 100644 index 0000000..9207b67 Binary files /dev/null and b/hoshino/modules/Genshin_Paimon/res/reliquaries/96543.png differ diff --git a/hoshino/modules/Genshin_Paimon/res/role_side_card/10000043.png b/hoshino/modules/Genshin_Paimon/res/role_side_card/10000043.png new file mode 100644 index 0000000..2b2224b Binary files /dev/null and b/hoshino/modules/Genshin_Paimon/res/role_side_card/10000043.png differ diff --git a/hoshino/modules/Genshin_Paimon/user_data/__init__.py b/hoshino/modules/Genshin_Paimon/user_data/__init__.py index c441601..c46f33d 100644 --- a/hoshino/modules/Genshin_Paimon/user_data/__init__.py +++ b/hoshino/modules/Genshin_Paimon/user_data/__init__.py @@ -16,7 +16,7 @@ async def bind(bot,ev): else: cookie_info = await get_bind_game(cookie) if not cookie_info or cookie_info['retcode'] != 0: - msg = f'这cookie没有用哦,检查一下是不是复制错了或者过期了(试试重新登录米游社再获取),错误信息:{cookie_info["message"]}' + msg = '这cookie没有用哦,检查一下是不是复制错了或者过期了(试试重新登录米游社再获取)' if ev.detail_type != 'private': msg += '\n当前是在群聊里绑定,建议旅行者添加派蒙好友私聊绑定!' await bot.send(ev,msg,at_sender=True) diff --git a/readme/myzj.jpg b/readme/myzj.jpg new file mode 100644 index 0000000..ad5d577 Binary files /dev/null and b/readme/myzj.jpg differ diff --git a/readme/ssbq.jpg b/readme/ssbq.jpg new file mode 100644 index 0000000..4f8f527 Binary files /dev/null and b/readme/ssbq.jpg differ diff --git a/readme/sy12.jpg b/readme/sy12.jpg new file mode 100644 index 0000000..d3ad087 Binary files /dev/null and b/readme/sy12.jpg differ diff --git a/readme/ys.jpg b/readme/ys.jpg new file mode 100644 index 0000000..6e683dc Binary files /dev/null and b/readme/ys.jpg differ diff --git a/readme/ysa.jpg b/readme/ysa.jpg new file mode 100644 index 0000000..32f5b01 Binary files /dev/null and b/readme/ysa.jpg differ diff --git a/readme/ysc.jpg b/readme/ysc.jpg new file mode 100644 index 0000000..f6d5572 Binary files /dev/null and b/readme/ysc.jpg differ diff --git a/readme/十连.jpg b/readme/十连.jpg new file mode 100644 index 0000000..e86b041 Binary files /dev/null and b/readme/十连.jpg differ