新增武器攻略，修改部分文字

Guess_voice/__init__.py

@@ -15,7 +15,6 @@ from ..utils.config import config
 setting_time = config.paimon_guess_voice  # 游戏持续时间
 
 dir_name = Path() / 'LittlePaimon' / 'LittlePaimon' / 'Guess_voice' / 'voice'
-dir_name.mkdir(parents=True, exist_ok=True)
 
 
 guess_game = on_command('原神猜语音', priority=12, block=True)

Paimon_Gacha/__init__.py

@@ -83,7 +83,7 @@ async def show_log_handler(event: MessageEvent):
     gacha_list = user_info[uid]['gacha_list']
     if user_info[uid]['gacha_list']['wish_total'] == 0:
         await show_log.finish('你此前并没有抽过卡哦', at_sender=True)
-    msg = event.message.extract_plain_text().strip()
+    msg = event.message.extract_plain_text().replace('模拟抽卡记录').strip()
     if msg == '角色' or msg == '武器':
         res = get_rw_record(msg, uid)
     else:

Paimon_Gacha/gacha_res.py

@@ -244,6 +244,6 @@ async def more_ten(uid, gacha_data, num, sd):
             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=time_font,
+    draw.text((27, 575 * num - 30), ('@%s %s  Created By LittlePaimon' % (str(sd.nickname), time_str)), font=time_font,
               fill="#8E8E8E")
     return pil2b64(img, 75)

Paimon_Gacha_Log/get_img.py

@@ -138,7 +138,7 @@ async def get_gacha_log_img(gacha_data, pool):
             now_height += (i.size)[1]
     img_draw = ImageDraw.Draw(img)
     img_draw.text((595, 44), f'UID:{gacha_data["uid"]}', font=get_font(16), fill='black')
-    img_draw.text((530, total_height - 45), 'Created by 惜月の小派蒙', font=get_font(16), fill='black')
+    img_draw.text((530, total_height - 45), 'Created by LittlePaimon', font=get_font(16), fill='black')
 
     img = pil2b64(img, 95)
     img = MessageSegment.image(img)

Paimon_Info/__init__.py

@@ -3,11 +3,10 @@ import re
 import random
 from collections import defaultdict
 from asyncio import sleep
-from typing import Union
 from nonebot import on_command, require, logger, get_bot
 from nonebot.params import CommandArg
 from nonebot.permission import SUPERUSER
-from nonebot.adapters.onebot.v11 import MessageEvent, GroupMessageEvent, Message, Bot
+from nonebot.adapters.onebot.v11 import MessageEvent, Message, Bot
 from .get_data import get_bind_game, get_sign_info, sign, get_sign_list, get_abyss_data, get_daily_note_data
 from .get_data import get_monthinfo_data, get_player_card_data, get_chara_detail_data, get_chara_skill_data
 from .draw_abyss_info import draw_abyss_card
@@ -89,7 +88,7 @@ async def sy_handler(event: MessageEvent, msg: Message = CommandArg()):
 
 @ssbq.handle()
 @exception_handler()
-async def ssbq_handler(event: Union[MessageEvent, GroupMessageEvent], msg: Message = CommandArg()):
+async def ssbq_handler(event: MessageEvent, msg: Message = CommandArg()):
     if event.message_type == 'group':
         gid = str(event.group_id)
     else:
@@ -148,7 +147,7 @@ async def myzj_handler(event: MessageEvent, msg: Message = CommandArg()):
 
 @ys.handle()
 @exception_handler()
-async def ys_handler(bot: Bot, event: Union[MessageEvent, GroupMessageEvent], msg: Message = CommandArg()):
+async def ys_handler(bot: Bot, event: MessageEvent, msg: Message = CommandArg()):
     uid, msg, user_id, use_cache = await get_uid_in_msg(event, msg)
     if not uid:
         await ys.finish('请把正确的uid给派蒙哦,例如ys100123456!', at_sender=True)
@@ -284,7 +283,7 @@ async def mys_sign_handler(event: MessageEvent, msg: Message = CommandArg()):
 
 @mys_sign_auto.handle()
 @exception_handler()
-async def mys_sign_auto_handler(event: Union[MessageEvent, GroupMessageEvent], msg: Message = CommandArg()):
+async def mys_sign_auto_handler(event: MessageEvent, msg: Message = CommandArg()):
     if event.message_type != 'group':
         await mys_sign_auto.finish('自动签到功能暂时只限Q群内使用哦')
     msg = str(msg).strip()

Paimon_Info/draw_month_info.py

@@ -110,7 +110,7 @@ async def draw_monthinfo_card(data):
         mlstr = f'多了{data["month_data"]["mora_rate"]}%'
     bg_img.alpha_composite(line, (64, 840))
     bg_draw.text((49, 857), f'本月相比上个月，原石{ysstr}，摩拉{mlstr}', font=get_font(23), fill='#27384C')
-    bg_draw.text((165, 900), 'Created by 惜月の小派蒙', font=get_font(21), fill='#27384C')
+    bg_draw.text((167, 900), 'Created by LittlePaimon', font=get_font(21), fill='#27384C')
 
     bg_img = pil2b64(bg_img, 70)
     bg_img = MessageSegment.image(bg_img)

Paimon_Info/draw_player_card.py

@@ -516,7 +516,7 @@ async def draw_chara_card(data, skill_data, chara_name, uid):
         bg_img.alpha_composite(const_icon, const_p[i])
         i += 1
 
-    bg_draw.text((330, 371), 'Created by 惜月の小派蒙', font=get_font(20), fill='white')
+    bg_draw.text((330, 371), 'Created by LittlePaimon', font=get_font(20), fill='white')
     bg_img = pil2b64(bg_img, 70)
     bg_img = MessageSegment.image(bg_img)
     return bg_img

Paimon_Wiki/__init__.py

@@ -31,6 +31,7 @@ attribute2 = on_endswith('收益曲线', priority=6, block=True)
 daily_material = on_endswith(('材料', '天赋材料', '突破材料'), priority=6, block=True)
 abyss_rate = on_command('syrate', aliases={'深渊登场率', '深境螺旋登场率', '深渊登场率排行', '深渊排行'}, priority=6, block=True)
 abyss_team = on_regex(r'^(深渊|深境螺旋)(?P<floor>上半|下半)阵容(排行|出场率)?$', priority=5, block=True)
+weapon_guide = on_endswith('武器攻略', priority=6, block=True)
 
 
 @guide.handle()
@@ -40,7 +41,7 @@ async def genshin_guide(event: MessageEvent):
     realname = get_id_by_alias(name)
     if name in ['风主', '岩主', '雷主'] or realname:
         name = realname[1][0] if name not in ['风主', '岩主', '雷主'] else name
-        img = MessageSegment.image(file=f'https://cherishmoon.oss-cn-shenzhen.aliyuncs.com/LittlePaimon/XFGuide/{name}.jpg')
+        img = MessageSegment.image(file=f'https://static.cherishmoon.fun/LittlePaimon/XFGuide/{name}.jpg')
         await guide.finish(img)
     else:
         await guide.finish(f'没有找到{name}的攻略', at_sender=True)
@@ -55,7 +56,7 @@ async def genshin_material(event: MessageEvent):
         name = realname[1][0] if realname else name
         print(name)
         img = MessageSegment.image(
-            file=f'https://cherishmoon.oss-cn-shenzhen.aliyuncs.com/LittlePaimon/RoleMaterials/{name}材料.jpg')
+            file=f'https://static.cherishmoon.fun/LittlePaimon/RoleMaterials/{name}材料.jpg')
         await material.finish(img)
     else:
         await material.finish(f'没有找到{name}的材料', at_sender=True)
@@ -81,7 +82,7 @@ async def genshinAttribute2(event: MessageEvent):
     realname = get_id_by_alias(name)
     if name in ['风主', '岩主', '雷主'] or realname:
         name = realname[1][0] if name not in ['风主', '岩主', '雷主'] else name
-        img = MessageSegment.image(file=f'https://cherishmoon.oss-cn-shenzhen.aliyuncs.com/LittlePaimon/blue/{name}.jpg')
+        img = MessageSegment.image(file=f'https://static.cherishmoon.fun/LittlePaimon/blue/{name}.jpg')
         await attribute2.finish(img)
     else:
         await attribute2.finish(f'没有找到{name}的收益曲线', at_sender=True)
@@ -111,13 +112,13 @@ async def daily_material_handle(event: MessageEvent):
             if week == "0":
                 await daily_material.finish('周日所有材料都可以刷哦!', at_sender=True)
             elif week in ['1', '4']:
-                img = MessageSegment.image(file='https://cherishmoon.oss-cn-shenzhen.aliyuncs.com/LittlePaimon'
+                img = MessageSegment.image(file='https://static.cherishmoon.fun/LittlePaimon'
                                                 '/DailyMaterials/周一周四.jpg')
             elif week in ['2', '5']:
-                img = MessageSegment.image(file='https://cherishmoon.oss-cn-shenzhen.aliyuncs.com/LittlePaimon'
+                img = MessageSegment.image(file='https://static.cherishmoon.fun/LittlePaimon'
                                                 '/DailyMaterials/周二周五.jpg')
             else:
-                img = MessageSegment.image(file='https://cherishmoon.oss-cn-shenzhen.aliyuncs.com/LittlePaimon'
+                img = MessageSegment.image(file='https://static.cherishmoon.fun/LittlePaimon'
                                                 '/DailyMaterials/周三周六.jpg')
             await daily_material.finish(img)
 
@@ -134,3 +135,10 @@ async def abyss_rate_handler(event: MessageEvent):
 async def abyss_team_handler(event: MessageEvent, reGroup=RegexDict()):
     abyss_img = await draw_teams_rate(reGroup['floor'])
     await abyss_team.finish(abyss_img)
+
+
+@weapon_guide.handle()
+@exception_handler()
+async def weapon_guide_handler(event: MessageEvent):
+    name: str = event.message.extract_plain_text().replace('武器攻略', '').strip()
+    await weapon_guide.finish(MessageSegment.image(file=f'https://static.cherishmoon.fun/LittlePaimon/WeaponGuild/{name}.png'))

Paimon_Wiki/blue.py

@@ -59,7 +59,7 @@ blue = {
 async def get_blue_pic(name):
     for c in blue.items():
         if c[0] == name:
-            img = await get_pic(f'https://cherishmoon.oss-cn-shenzhen.aliyuncs.com/LittlePaimon/blue/{c[1][0]}.jpg')
+            img = await get_pic(f'https://static.cherishmoon.fun/LittlePaimon/blue/{c[1][0]}.jpg')
             img = img.crop((0, c[1][1][0], 1080, c[1][1][1]))
             img = pil2b64(img, 100)
             return img