From 6b16ed5db871e87eca9ed252666c6fc9cf64c09e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=A5=BF=E7=93=9C=C2=B0?= <wxh_email@yeah.net>
Date: Thu, 30 Apr 2026 00:41:25 +0800
Subject: [PATCH] dev

Co-authored-by: Copilot <copilot@github.com>
---
 backend/api/routes/info.py   |   3 +--
 backend/core/open/helper.py  |   9 ++++++---
 backend/dataFiles/dcalc_0.db | Bin 860160 -> 860160 bytes
 backend/openapi              |   2 +-
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/backend/api/routes/info.py b/backend/api/routes/info.py
index 5e546875..6efa584a 100644
--- a/backend/api/routes/info.py
+++ b/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)
 
 
diff --git a/backend/core/open/helper.py b/backend/core/open/helper.py
index d41b7f21..2222c446 100644
--- a/backend/core/open/helper.py
+++ b/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': '',
diff --git a/backend/dataFiles/dcalc_0.db b/backend/dataFiles/dcalc_0.db
index 46f6b3baadf1400c2d681309cb381fd224070df5..43e71e0a4ba961533ddfba8b639fe13a9b06016e 100644
GIT binary patch
delta 2005
zcmZvce@q)?7{~9Rz3a8TmI8&=ajwJ8)%F~{>y@rS1I!Q?G#TptGm%YQVsyBWAeklv
z7`pPSRPs)P;x@P8wv0ry5Jq4dWQmEIm<;|<NlcJPTdIGU@sIxLbA7Mx8wr0rm&@nA
z@AE$I^L?M|ThaPfw2$|>9xx2E29bntK)g3DN7x77p8RsASLEJc;-(Fbi#pewQ_gPZ
zF{kKQ<9NrEqucSU!zpfxH^gr9x~Peq{a5>K`}^i;`wMo-wq={P_1KP^du&zKZR?`7
z-};L6pt(W#NBBXQ6gq@P!Dacwa?5ho(qtAb<@`E7&G+y}`AXPqjho`Sp$>+b%{HAh
z+2ne`?esdm2Usr(BqUenqxsC&19BauFAV}6p3Hu>*yP8wfjxw(hJzkVL)p*gGKnQw
zqDxvwB-hqGluO^2t0?Upg+!B+xurR|jMBG~WK#>J3u98RQ3^|_s)Q9a*T0+_IIrXu
zuWb*daRt6mB&y<9I9EmCbo3#|NdhevR<zt#mor~nkL8y>+(wshJ-(0{ZZoz!QdC1j
ze!3vJF>Z=s3`f`M!wOox;6Y^x$F3Gci)+2;IO%0vD=zh-?nKa)ySbDZz9mPf_BLp@
z7KXAHmt>XFRXszYT`>jI7?kvHBH%I_9;VtLcw{vEFs0`PrE*+86MLGbxH1SSKE0Q{
zct0*<+5m}H2ZN1JLB8*b93m++HLMy9Q}u=orSUGlP&C?RY#1bJBo9fA*a!J3LNz5E
zF>(}LE1U|N9&I!3Lx8B!2Sem2hbX-Y)X4lKrQhomU)Y0`{!Qr<l(r5NZ7rppgvJhF
zsyBIJI8e07N3}nK*05<mrH}Ls*rvy62G0nwsfKDhVJ?hQ?4xu-r-f6*9-|qS^$Z1<
zVqQugjRcA=c}Ru`xD?5arE{tAT`p<iX2YdwqDHOy92N#zc2hbrDpg`FjE-DMKP-<D
zQ!5BnVUmnd+%-u`ST!suCu$@n$soBfg+WsFL2@NMs4cmBkeqaBDk)VMmzaq=ii^Ey
zK1oJNr0PH6Z(?|4r_?n@JhEY`yL@Dfcx0v8w?S+4OrUgJ&rs-DoX1q3nT@evagsPn
zD^fu5B$;W3=TjuFiPCpdq`9Sp!hbHZ>py2qi~|3;!mC_D)aY(X;&8?DK7lQpWgnK7
zd8~||v9Aj|wuzEY7(dr<K4(5``9=6{w&wRuQwbA6n@x4xu}ZG`)hN3Bm#4S=bjRyw
zPIt7QJ@aNeT&Mc5rpDWqy(ojua}|7bG|CRtb)AAmdx`d9!gDXTG@oekooGJ#VvDc#
ze-hr<61np;v;EmiEPEF!T&U@P$IVxJz3hNe*a{bkpLWFNXH2!Hy1LLa8~aN_Rp_;c
zeja}l2X^v_ojeOs0#OQKf-pmHcXsl;`)5gnYd#0@4a5}0b%<*aS0T~~|B3}dfUrW?
L?)X>izqS7doc*ez

delta 254
zcmZoTVA62FWP-F{3j+hgB_QqvVgVp7o~UEY*s?KU!TRlD4xEqqw<|bs-sGSB!NFzI
z1r`Ab4h9tlo|~MXxMwg;Wl&*j<ao+?1OzwBJb1{$#Mrj^p+ghn=Ei4p85vJae&}#a
zrZGmCU0hO<v01nzF)1fCH5W+aLP*ZZpI@w>ocm0KO-F=H++K3>yw?%}5UF@W2+c6L
z`P0kxPcIpPm<foPftUq|S%H{s`=^)eqSs{kfv(;H#2bKk2@o#^;zdBb5Qur&RSs|f
RF((jn0WtS>l><C?;sNp=Tzvol

diff --git a/backend/openapi b/backend/openapi
index c7957c50..60d8022f 160000
--- a/backend/openapi
+++ b/backend/openapi
@@ -1 +1 @@
-Subproject commit c7957c50ebe9d7fb7e84123429f61f675a5fa7b0
+Subproject commit 60d8022f367b6f16a63aa6537b65cf260e3d47af