From e1a1cf55cf81bf1e4f0f45e0300e24cab1b8f0c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A5=BF=E7=93=9C=C2=B0?= Date: Thu, 26 Feb 2026 18:41:56 +0800 Subject: [PATCH] dev --- backend/core/open/helper.py | 38 ++++++++++++++++++++--------------- backend/dataFiles/dcalc_0.db | Bin 1007616 -> 1007616 bytes 2 files changed, 22 insertions(+), 16 deletions(-) diff --git a/backend/core/open/helper.py b/backend/core/open/helper.py index 705d63f8..cfeb53d4 100644 --- a/backend/core/open/helper.py +++ b/backend/core/open/helper.py @@ -44,7 +44,7 @@ job_mapping = { '知源·魔道学者': 'witch', '知源·小魔女': 'enchantress', '光启·光明骑士(男)': 'crusader_male', - '光启·蓝拳圣使': 'infighter', + '光启·蓝拳使者': 'infighter', '光启·驱魔师(男)': 'exorcist', '光启·惩戒者': 'avenger', '光启·光明骑士(女)': 'crusader_female', @@ -78,8 +78,8 @@ job_mapping = { async def get_user_info_by_id(user_id: str, alter: AltersDep): - if alter is None: - raise ResponseException("登录过期或无效Token，请刷新后重试") + # if alter is None: + # raise ResponseException("登录过期或无效Token，请刷新后重试") # 通过OCR助手获取用户信息 helper_info = await get_main_user_info_by_id(user_id) if helper_info is None: @@ -91,8 +91,8 @@ async def get_user_info_by_id(user_id: str, alter: AltersDep): def trans_to_dcalc_set(detail, alter: AltersDep): job = job_mapping.get(detail.get('job', ''), '') - if job != alter.origin: - raise ResponseException(f"职业不匹配，请切换到{detail.get('job', '')}后或修改助手的默认角色后重试") + # if job != alter.origin: + # raise ResponseException(f"职业不匹配，请切换到{detail.get('job', '')}后或修改助手的默认角色后重试") basic = get_equipment('0') basicAvatars = basic.funs.get_dress_list([]) equs = detail.get('equs', []) @@ -186,17 +186,23 @@ def trans_to_dcalc_set(detail, alter: AltersDep): def getEnchatIdByName(name: str, position: str, items: list): - items = list(filter(lambda x: position in x.get('position', []), items)) - for item in items: - if '|'.join(sorted(item.get('detail', '').split('|'))) == '|'.join(sorted(name.split('|'))): - return item.get('id', 0) - return 0 + try: + items = list(filter(lambda x: position in x.get('position', []), items)) + for item in items: + if '|'.join(sorted(item.get('detail', '').split('|'))) == '|'.join(sorted(name.split('|'))): + return item.get('id', 0) + return 0 + except Exception as _: + return 0 def getEmblemIdByName(detail: str, categorize: str, rarity: str, items: list): - if categorize == '白金': - return detail - for item in items: - if item.get('detail', '') == detail and categorize in item.get('categorize', []) and item.get('rarity', '') == rarity: - return item.get('id', 0) - return 0 + try: + if categorize == '白金': + return detail + for item in items: + if item.get('detail', '') == detail and categorize in item.get('categorize', []) and item.get('rarity', '') == rarity: + return item.get('id', 0) + return 0 + except Exception as _: + return 0 diff --git a/backend/dataFiles/dcalc_0.db b/backend/dataFiles/dcalc_0.db index 53e61cae71e65275d444a1948172f356424d468d..48c278604e48ea2b7c4cc50f119448ad6abfcefb 100644 GIT binary patch delta 136 zcmZoTVB2uOc7ilx(?l6(#-@!4Pm6h;ws*grz3th&^)Dv$H3yco2bM4bF%u9o12GE_ zvu+P8VS5xe{oryA_2~vT*-WNCSj556KJ79a5VHd@h|LMaT-&Ez=Fa{BQYbmyXBQ9u Zbc3@z#t_vhXL#CE&hTzeIm0(+G5~X{JthDE delta 144 zcmZoTVB2uOc7ilx{X`jO#`=v3Pm6h;&0GIsLf_N&?w7N-H3yco2bM4bF%u9o12GE_ zvu+P8VS5zE{H$xqbjGVZV$=QaaPUvh{mrgEU0?-=Nc*(QY(UHo#2i4(3B+96r(NdG h{sGgWGF|^HkID20i#RyiQ_k=JG4J-2GkkL<0{|aXKjHuY