From e9dbe8b07bc311ce941e197a75623ac7dad2e9e3 Mon Sep 17 00:00:00 2001 From: AzenKain Date: Thu, 14 Aug 2025 19:24:45 +0700 Subject: [PATCH] fix bug endka --- src/components/importBar/enka.tsx | 26 +++++++++++++------------- src/helper/converterToAvatarStore.ts | 10 +++++----- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/components/importBar/enka.tsx b/src/components/importBar/enka.tsx index c9cfc37..d0d4575 100644 --- a/src/components/importBar/enka.tsx +++ b/src/components/importBar/enka.tsx @@ -41,9 +41,9 @@ export default function EnkaImport() { rank: character.rank ?? 0, level: character.level, lightcone: { - level: character.equipment.level, - rank: character.equipment.rank, - item_id: character.equipment.tid, + level: character.equipment?.level ?? 0, + rank: character.equipment?.rank ?? 0, + item_id: character.equipment?.tid ?? "", }, relics: character.relicList.map((relic) => ({ level: relic.level, @@ -80,9 +80,9 @@ export default function EnkaImport() { rank: character.rank ?? 0, level: character.level, lightcone: { - level: character.equipment.level, - rank: character.equipment.rank, - item_id: character.equipment.tid, + level: character.equipment?.level ?? 0, + rank: character.equipment?.rank ?? 0, + item_id: character.equipment?.tid ?? "", }, relics: character.relicList.map((relic) => ({ level: relic.level, @@ -109,8 +109,8 @@ export default function EnkaImport() { filterData.forEach((character) => { const newAvatar = { ...listAvatars[character.avatarId.toString()] } if (Object.keys(newAvatar).length !== 0) { - newAvatar.level = character.level - newAvatar.promotion = character.promotion + newAvatar.level = character.level ?? 0 + newAvatar.promotion = character.promotion ?? 0 newAvatar.data = { rank: character.rank ?? 0, skills: character.skillTreeList.reduce((acc, skill) => { @@ -198,14 +198,14 @@ export default function EnkaImport() { key: character.avatarId, avatar_id: character.avatarId, rank: character.rank ?? 0, - level: character.level, + level: character.level ?? 0, lightcone: { - level: character.equipment.level, - rank: character.equipment.rank, - item_id: character.equipment.tid, + level: character.equipment?.level ?? 0, + rank: character.equipment?.rank ?? 0, + item_id: character.equipment?.tid ?? "", }, relics: character.relicList.map((relic) => ({ - level: relic.level, + level: relic.level ?? 0, relic_id: relic.tid, relic_set_id: parseInt(relic.tid.toString().slice(1, -1), 10), })), diff --git a/src/helper/converterToAvatarStore.ts b/src/helper/converterToAvatarStore.ts index a318d18..271ced9 100644 --- a/src/helper/converterToAvatarStore.ts +++ b/src/helper/converterToAvatarStore.ts @@ -46,13 +46,13 @@ export function converterOneEnkaDataToAvatarStore(data: AvatarEnkaDetail, count: const profile: AvatarProfileStore = { profile_name: `Enka Profile ${count}`, lightcone: { - level: data.equipment.level, - item_id: data.equipment.tid, - rank: data.equipment.rank, - promotion: data.equipment.promotion, + level: data.equipment?.level ?? 0, + item_id: data.equipment?.tid ?? "", + rank: data.equipment?.rank ?? 0, + promotion: data.equipment?.promotion ?? 0, }, relics: Object.fromEntries(data.relicList.map((relic) => [relic.tid.toString()[relic.tid.toString().length - 1], { - level: relic.level, + level: relic.level ?? 0, relic_id: relic.tid, relic_set_id: parseInt(relic.tid.toString().slice(1, -1), 10), main_affix_id: relic.mainAffixId,