dev

Co-authored-by: Copilot <copilot@github.com>

backend/api/routes/info.py

@@ -121,8 +121,7 @@ async def get_info_by_dnfhelper(uid: str, state: AltersDep, redis: RedisDep):
         result = await get_user_info_by_id(uid, state)
         return response(data=result)
     except Exception as e:
-        if isinstance(e, ResponseException):
+        return response(code=500, message=str(e), data=None)
-            return response(code=500, message=str(e), data=None)
         return response(code=500, message='Failed to fetch DNFHelper info', data=None)
 
 

backend/core/open/helper.py

@@ -83,6 +83,7 @@ async def get_user_info_by_id(user_id: str, alter: AltersDep):
     name = next((k for k, v in job_mapping.items() if v == alter.origin), '')
     # 通过OCR助手获取用户信息
     helper_info = await get_main_user_info_by_id(user_id, name)
+    print(helper_info)
     if helper_info is None:
         raise ResponseException('当前助手ID不存在或已隐藏，请确认后重试')
     else:
@@ -97,8 +98,11 @@ def trans_to_dcalc_set(detail, alter: AltersDep):
     basic = get_equipment('0')
     basicAvatars = basic.funs.get_dress_list([])
     equs = detail.get('equs', [])
+    avatars = detail.get('avatars', [])
+    emblems = detail.get('emblems', [])
     equips = {}
     avatar = {}
+    emblem = {}
     for equ in equs:
         info = {
             'id': '0',
@@ -117,13 +121,12 @@ def trans_to_dcalc_set(detail, alter: AltersDep):
             # 锻造等级
             'refine': equ.get('enhance', {}).get('refine', 0),
             # 调试等级
-            'adaptation': 3,
+            'adaptation': equ.get('adaptation', 0),
             # 精度
             'precision': 100,
         }
         # 装备
         dcalcEqu = next((item for item in basic.equs if item.name == equ['name'].replace('(黑雨) ', '')), None)
-        # 贴膜
         if dcalcEqu:
             info['id'] = dcalcEqu.id
         # dcalcEquFusion = next((item for item in basic.stones if item.name == equ.get('upgrade', '')), None)
@@ -134,7 +137,7 @@ def trans_to_dcalc_set(detail, alter: AltersDep):
         # info['emblem_0'] = emblems[0] if len(emblems) > 0 else 0
         # info['emblem_1'] = emblems[1] if len(emblems) > 1 else 0
         equips[equ['posName']] = info
-    avatars = detail.get('avatars', [])
+
     for item in avatars:
         info = {
             'id': '',