ANGJustinl/whale-town-front-v2
1
0
Fork 0
forked from xiangwang25/whale-town-front-v2
Code Pull Requests Activity

fix: display uploaded and ranking avatars

Browse Source
This commit is contained in:
xiangwang
2026-08-02 01:00:02 +08:00
parent 6fb135ba71
commit 366f967622
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
_Core/managers/AppearanceManager.gd
View File

@@ -376,7 +376,7 @@ func has_custom_skin() -> bool:
return _customSkinActive and _customSkinTexture != null return _customSkinActive and _customSkinTexture != null
func get_custom_avatar_texture() -> Texture2D: func get_custom_avatar_texture() -> Texture2D:
if has_custom_avatar(): if _customAvatarActive and _customAvatarTexture != null:
return _customAvatarTexture return _customAvatarTexture
return _accountAvatarTexture return _accountAvatarTexture

8
scenes/ui/DatawhaleHonorRankingPanel.gd
View File

@@ -1165,7 +1165,13 @@ func _avatarPrimaryTextureFromData(data: Dictionary) -> Texture2D:
return null return null
func _avatarUrlFromData(data: Dictionary) -> String: 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: func _firstNonEmptyString(data: Dictionary, keys: Array[String]) -> String:
for key in keys: for key in keys: