🎨 添加警告

KimigaiiWuyi · May 15, 2024 · 11b53e5 · 11b53e5
1 parent d5586e4
commit 11b53e5
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/GenshinUID/genshinuid_enka/mono/Character.py b/GenshinUID/genshinuid_enka/mono/Character.py
@@ -645,7 +645,7 @@ async def get_fight_prop(self) -> Dict:
                         zf = self.power_list['A霜华矢·霜华绽发伤害']
                         v2 = int(zf['value'][index][:-1])
                         v1 = int(i[:-1])
-                        val.append(f'{v1 +v2}%')
+                        val.append(f'{v1 + v2}%')
 
                     self.power_list[power_name] = {
                         'name': power_name,

diff --git a/GenshinUID/genshinuid_gachalog/export_and_import.py b/GenshinUID/genshinuid_gachalog/export_and_import.py
@@ -31,6 +31,8 @@ async def import_gachalogs(history_url: str, type: str, uid: str) -> str:
             history_data = json.loads(data_bytes.decode())
         except UnicodeDecodeError:
             history_data = json.loads(data_bytes.decode('gbk'))
+        except json.decoder.JSONDecodeError:
+            return '请传入正确的JSON格式文件!'
     if 'info' in history_data and 'uid' in history_data['info']:
         data_uid = history_data['info']['uid']
         if data_uid != uid: