✨ 2.6 资源更新、增加快捷键盘

assets/gacha/type.json

@@ -103,11 +103,6 @@
   "申鹤": "冰",
   "云堇": "岩",
   "魈": "风",
-  "贯虹之槊": "枪",
+  "神里绫人": "水",
-  "千岩古剑": "双手剑",
+  "波乱月白经津": "单手剑"
-  "钟离": "岩",
-  "甘雨": "冰",
-  "证誓之明瞳": "法器",
-  "神乐之真意": "法器",
-  "八重神子": "雷"
 }

defs/log.py

@@ -11,7 +11,7 @@ channel_id = config.get("basic", "channel_id", fallback=channel_id)
 
 
 async def log(client: Client, message: Message, mode):
-    if not channel_id == 0:
+    if not channel_id:
         chat = message.chat
         cid = chat.id
         uid = message.from_user.id

defs/mys2.py

@@ -367,6 +367,9 @@ async def draw_pic(uid, message: Message, nickname="1", mode=2, role_level=None)
 
     # 记录数据
     raw_data = raw_data['data']
+    # 临时修复 璃月层岩巨渊
+    raw_data["world_explorations"] = raw_data["world_explorations"][-6:]
+
     char_data = raw_data["avatars"]
 
     char_datas = []

plugins/mys2.py

@@ -100,6 +100,19 @@ async def mys2_msg(client: Client, message: Message):
             traceback.print_exc()
             im = "没有找到绑定信息。"
         await message.reply(im, quote=True)
+    elif "当前信息" in text:
+        try:
+            uid = await selectDB(message.from_user.id, mode="uid")
+            uid = uid[0]
+            im = await draw_info_pic(uid)
+            if not im:
+                await message.reply("未查找到该用户的当前信息。", quote=True)
+            else:
+                await message.reply_photo(im, quote=True)
+        except Exception as e:
+            traceback.print_exc()
+            im = "没有找到绑定信息。"
+            await message.reply(im)
     elif "绑定uid" in text:
         uid = text.replace("绑定uid", "")  # str
         if is_chinese(uid):

plugins/process.py

@@ -13,7 +13,7 @@ from plugins.gacha import gacha_msg
 from plugins.guess_voice import guess_voice, process_guess
 from plugins.mys2 import mys2_msg, mys2_qun_msg
 from plugins.mihoyo import mihoyo_msg, mihoyo_qun_msg
-from plugins.start import welcome_command, ping_command, help_command, leave_command, help_callback
+from plugins.start import welcome_command, ping_command, help_command, leave_command, help_callback, cancel_command
 from plugins.almanac import almanac_msg
 from plugins.challenge import tf_msg, wq_msg, zb_msg
 from plugins.character import character_msg, mz_msg
@@ -45,6 +45,9 @@ async def process_private_msg(client: Client, message: Message):
         await ping_command(client, message)
     if msg_list[0] == '/leave':
         await leave_command(client, message)
+    # 清空状态
+    if msg_list[0] == '/cancel':
+        await cancel_command(client, message)
     # 黄历
     if '黄历' in message.text:
         await almanac_msg(client, message)

plugins/start.py

@@ -1,9 +1,10 @@
 from ci import admin_id
 from pyrogram import Client
-from pyrogram.types import Message, CallbackQuery, InlineKeyboardMarkup, InlineKeyboardButton
+from pyrogram.types import Message, CallbackQuery, InlineKeyboardMarkup, InlineKeyboardButton, ReplyKeyboardMarkup, \
+    ReplyKeyboardRemove
 
 HELP_MSG_PRE = '<a href="https://gitlab.com/Xtao-Labs/Telegram_PaimonBot">PaimonBot</a> ' \
-               '0.4.1beta By Xtao-Labs\n\n' \
+               '0.4.2beta By Xtao-Labs\n\n' \
                '🔅 以下是小派蒙我学会了的功能（部分）：\n'
 HELP_MSG = """① [武器/今日武器] 查看今日武器材料和武器
 ② [天赋/今日天赋] 查看今日天赋材料和角色
@@ -43,9 +44,22 @@ HELP_MSG = """① [武器/今日武器] 查看今日武器材料和武器
    💠 <a href="https://telegra.ph/PaimonBot-02-18">点击查看</a>"""
 
 
-async def welcome_command(client: Client, message: Message):
+async def welcome_command(_: Client, message: Message):
     # 发送欢迎消息
-    await message.reply('你好！我是原神小助手 - 派蒙 。', quote=True)
+    await message.reply("你好！我是原神小助手 - 派蒙 。\n\n"
+                        "以下是我认识的部分关键词哦，您也可以发送 /help 命令查看完整列表 ~", quote=True,
+                        reply_markup=ReplyKeyboardMarkup(
+                            [["今日武器", "今日天赋", "活动列表"],
+                             ["周本", "运势", "黄历"],
+                             ["米游社签到", "米游社当前信息", "米游社每月统计"],
+                             ["hoyolab签到", "hoyolab当前状态", "hoyolab每月统计"]]
+                        ))
+
+
+async def cancel_command(_: Client, message: Message):
+    # 发送清空状态信息
+    await message.reply("已清空所有玄学状态 ~", quote=True,
+                        reply_markup=ReplyKeyboardRemove())
 
 
 async def ping_command(client: Client, message: Message):