From 366f9676221eb7d81a62665af07fe346ca14d710 Mon Sep 17 00:00:00 2001 From: xiangwang Date: Sun, 2 Aug 2026 01:00:02 +0800 Subject: [PATCH] fix: display uploaded and ranking avatars --- _Core/managers/AppearanceManager.gd | 2 +- scenes/ui/DatawhaleHonorRankingPanel.gd | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/_Core/managers/AppearanceManager.gd b/_Core/managers/AppearanceManager.gd index d37ff43..565436d 100644 --- a/_Core/managers/AppearanceManager.gd +++ b/_Core/managers/AppearanceManager.gd @@ -376,7 +376,7 @@ func has_custom_skin() -> bool: return _customSkinActive and _customSkinTexture != null func get_custom_avatar_texture() -> Texture2D: - if has_custom_avatar(): + if _customAvatarActive and _customAvatarTexture != null: return _customAvatarTexture return _accountAvatarTexture diff --git a/scenes/ui/DatawhaleHonorRankingPanel.gd b/scenes/ui/DatawhaleHonorRankingPanel.gd index bbe1d45..c6398be 100644 --- a/scenes/ui/DatawhaleHonorRankingPanel.gd +++ b/scenes/ui/DatawhaleHonorRankingPanel.gd @@ -1165,7 +1165,13 @@ func _avatarPrimaryTextureFromData(data: Dictionary) -> Texture2D: return null func _avatarUrlFromData(data: Dictionary) -> String: - return _firstNonEmptyString(data, ["avatarUrl", "avatar_url", "avatar", "avatarURL"]) + var avatarUrl := _firstNonEmptyString(data, ["avatarUrl", "avatar_url", "avatar", "avatarURL"]) + if not avatarUrl.begins_with("/"): + return avatarUrl + var apiBaseUrl := NetworkConfig.get_api_base_url() + if avatarUrl.begins_with("/api/") and apiBaseUrl.ends_with("/api"): + return apiBaseUrl.trim_suffix("/api") + avatarUrl + return apiBaseUrl + avatarUrl func _firstNonEmptyString(data: Dictionary, keys: Array[String]) -> String: for key in keys: