diff --git a/backend/core/open/helper.py b/backend/core/open/helper.py index a8f11c55..87c432cd 100644 --- a/backend/core/open/helper.py +++ b/backend/core/open/helper.py @@ -120,6 +120,7 @@ def trans_to_dcalc_set(detail, alter: AltersDep): basicAvatars = basic.funs.get_dress_list([]) equips = {} avatar = {} + avatarDisplay = {} emblems = {} oaths = {} for equ in detail.get('equs', []): @@ -156,7 +157,6 @@ 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 - for item in detail.get('avatars', []): info = { 'id': '', @@ -217,23 +217,7 @@ def trans_to_dcalc_set(detail, alter: AltersDep): if rarity in rarities: lv += rarities.index(rarity) * 5 - 1 emblems[pos] = {'lv': lv, 'items': [getEmblemIdByAttr(i.get('attr', ''), i.get('rarity', ''), i.get('type', ''), basic.emblems) for i in item.get('items', [])]} - return { - 'job': job, - 'equips': equips, - 'avatars': avatar, - 'emblems': emblems, - 'avatarLink': detail.get('avatarLink', ''), - 'fogOathLv': detail.get('fogOathLv', 0), - 'oaths': oaths, - 'dressInfo': [ - { - 'dress': i.get('name', ''), - 'clone': i.get('clone', ''), - 'part': i.get('posName', ''), - } - for i in detail.get('avatars', []) - ], - } + return {'job': job, 'equips': equips, 'avatars': avatar, 'emblems': emblems, 'avatarLink': detail.get('avatarLink', ''), 'fogOathLv': detail.get('fogOathLv', 0), 'oaths': oaths, 'dressInfo': detail.get('dressInfo', [])} def getEnchatIdByName(name: str, position: str, items: list): diff --git a/backend/openapi b/backend/openapi index 0c65d37e..26bd2db6 160000 --- a/backend/openapi +++ b/backend/openapi @@ -1 +1 @@ -Subproject commit 0c65d37e637b864d7d0f76ace989a788742b3619 +Subproject commit 26bd2db642050bbc4336aaf070e0c48a1fbbf2e1