diff --git a/data/avatar.json.br b/data/avatar.json.br index b6dd2ab..d2df780 100644 Binary files a/data/avatar.json.br and b/data/avatar.json.br differ diff --git a/data/lightcone.json.br b/data/lightcone.json.br index 1b1c45f..c956f40 100644 Binary files a/data/lightcone.json.br and b/data/lightcone.json.br differ diff --git a/data/metadata.json.br b/data/metadata.json.br index ab1270f..6b722e2 100644 Binary files a/data/metadata.json.br and b/data/metadata.json.br differ diff --git a/data/relic.json.br b/data/relic.json.br index 9cd63b2..779bd0c 100644 Binary files a/data/relic.json.br and b/data/relic.json.br differ diff --git a/src/components/avatarBar/index.tsx b/src/components/avatarBar/index.tsx index b23e048..0bc63fb 100644 --- a/src/components/avatarBar/index.tsx +++ b/src/components/avatarBar/index.tsx @@ -47,7 +47,7 @@ export default function AvatarBar({ onClose }: { onClose?: () => void }) { list.sort((a, b) => { const r = calcRarity(b.Rarity) - calcRarity(a.Rarity) if (r !== 0) return r - return a.ID - b.ID + return b.ID - a.ID }) return list diff --git a/src/components/lightconeBar/index.tsx b/src/components/lightconeBar/index.tsx index e40c920..cd4bfad 100644 --- a/src/components/lightconeBar/index.tsx +++ b/src/components/lightconeBar/index.tsx @@ -47,7 +47,7 @@ export default function LightconeBar() { list.sort((a, b) => { const r = calcRarity(b.Rarity) - calcRarity(a.Rarity) if (r !== 0) return r - return a.ID - b.ID + return b.ID - a.ID }) return list diff --git a/src/helper/getName.ts b/src/helper/getName.ts index 4982f06..406b43b 100644 --- a/src/helper/getName.ts +++ b/src/helper/getName.ts @@ -3,6 +3,10 @@ import { AvatarDetail } from "@/types"; import { useTranslations } from "next-intl" type TFunc = ReturnType +function cleanText(text: string): string { + if (!text) return "" + return text.replace(/(.*?)<\/unbreak>/g, "$1") +} export function getNameChar( locale: string, @@ -27,7 +31,7 @@ export function getNameChar( text = `${t("trailblazer")} • ${t(data?.BaseType?.toLowerCase() ?? "")}`; } - return text; + return cleanText(text) } export function getLocaleName(locale: string, data: Record | undefined | null): string { @@ -46,7 +50,8 @@ export function getLocaleName(locale: string, data: Record | und if (!text) { text = data["en"] ?? ""; } - return text + + return cleanText(text) } export function parseRuby(text: string): string {