Merge branch 'main' into v4/main

PaiGramTeam · Mar 6, 2023 · f6cb35f · f6cb35f
2 parents c083b27 + c1e045c
commit f6cb35f
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 3 deletions.
diff --git a/modules/pay_log/log.py b/modules/pay_log/log.py
@@ -39,7 +39,7 @@ def get_file_path(
         user_id: str,
         uid: str,
         bak: bool = False,
-    ):
+    ) -> Path:
         """获取文件路径
         :param user_id: 用户 ID
         :param uid: UID

diff --git a/modules/playercards/metadata/FightPropRule.json b/modules/playercards/metadata/FightPropRule.json
@@ -352,7 +352,6 @@
     "攻击力百分比",
     "暴击率",
     "暴击伤害",
-    "元素精通",
     "元素充能效率"
   ],
   "提纳里": [
@@ -394,10 +393,27 @@
     "攻击力百分比",
     "暴击率",
     "暴击伤害",
-    "元素精通",
     "元素充能效率"
   ],
   "珐露珊": [
+    "攻击力百分比",
+    "暴击率",
+    "暴击伤害",
+    "元素充能效率"
+  ],
+  "艾尔海森": [
+    "攻击力百分比",
+    "暴击率",
+    "暴击伤害",
+    "元素精通",
+    "元素充能效率"
+  ],
+  "瑶瑶": [
+    "生命值百分比",
+    "元素充能效率"
+  ],
+  "迪希雅": [
+    "生命值百分比",
     "攻击力百分比",
     "暴击率",
     "暴击伤害",

diff --git a/plugins/genshin/pay_log.py b/plugins/genshin/pay_log.py
@@ -185,6 +185,8 @@ async def command_start_export(self, update: Update, context: CallbackContext) -
             client = await self.helper.get_genshin_client(user.id, need_cookie=False)
             await message.reply_chat_action(ChatAction.TYPING)
             path = self.pay_log.get_file_path(str(user.id), str(client.uid))
+            if not path.exists():
+                raise PayLogNotFound
             await message.reply_chat_action(ChatAction.UPLOAD_DOCUMENT)
             await message.reply_document(document=open(path, "rb+"), caption="充值记录导出文件")
         except PayLogNotFound: