diff --git a/Assets/Scripts/Dev/PlayFab/PlayFabUserData.cs b/Assets/Scripts/Dev/PlayFab/PlayFabUserData.cs index 830c1d96..3b53871a 100644 --- a/Assets/Scripts/Dev/PlayFab/PlayFabUserData.cs +++ b/Assets/Scripts/Dev/PlayFab/PlayFabUserData.cs @@ -35,18 +35,43 @@ public class PlayFabUserData : MonoBehaviour GetUserData = true // This will include User Data like AvatarID in the response } }; - PlayFabClientAPI.GetPlayerCombinedInfo(request, result => { - if (result.InfoResultPayload.UserData != null && result.InfoResultPayload.UserData.ContainsKey("AvatarID")) + if (result.InfoResultPayload.UserData != null && + result.InfoResultPayload.UserData.ContainsKey("AvatarID")) { - Sprite dp = PlayFabManager.Instance.avatarImages[ - int.Parse(result.InfoResultPayload.UserData["AvatarID"].Value)]; - onCallback(dp); + string avatarIdStr = result.InfoResultPayload.UserData["AvatarID"].Value; + int avatarIndex; + + if (int.TryParse(avatarIdStr, out avatarIndex) && + avatarIndex >= 0 && avatarIndex < PlayFabManager.Instance.avatarImages.Count) + { + Sprite dp = PlayFabManager.Instance.avatarImages[avatarIndex]; + onCallback(dp); + } + else + { + Debug.LogWarning($"Invalid AvatarID value: {avatarIdStr}, falling back to default."); + onCallback(PlayFabManager.Instance.avatarImages[0]); + } } else + { onCallback(PlayFabManager.Instance.avatarImages[0]); - }, result=>onFallback(result.ErrorMessage)); + } + }, result => onFallback(result.ErrorMessage)); + + //PlayFabClientAPI.GetPlayerCombinedInfo(request, result => + //{ + // if (result.InfoResultPayload.UserData != null && result.InfoResultPayload.UserData.ContainsKey("AvatarID")) + // { + // Sprite dp = PlayFabManager.Instance.avatarImages[ + // int.Parse(result.InfoResultPayload.UserData["AvatarID"].Value)]; + // onCallback(dp); + // } + // else + // onCallback(PlayFabManager.Instance.avatarImages[0]); + //}, result=>onFallback(result.ErrorMessage)); } - + } diff --git a/Assets/Scripts/GamePlayManager.cs b/Assets/Scripts/GamePlayManager.cs index 7f6cdb2a..664b12d5 100644 --- a/Assets/Scripts/GamePlayManager.cs +++ b/Assets/Scripts/GamePlayManager.cs @@ -79,7 +79,6 @@ public class GamePlayManager : MonoBehaviour private bool isRotating; [SerializeField] private Button levelLeaderBtn; - [SerializeField] private Button statsButton; [SerializeField] private TimerManager TimerManager; // Adding the isTimerLevel flag @@ -189,7 +188,6 @@ public class GamePlayManager : MonoBehaviour }); CheckGameOver(); levelLeaderBtn.gameObject.SetActive(isTimerLevel); - statsButton.gameObject.SetActive(isTimerLevel); TimerManager.ResetTimer(); TimerManager.StartTimer(); } diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 7ad6311d..ee974f60 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -140,7 +140,7 @@ PlayerSettings: loadStoreDebugModeEnabled: 0 visionOSBundleVersion: 1.0 tvOSBundleVersion: 1.0 - bundleVersion: 2.9 + bundleVersion: 3.0 preloadedAssets: [] metroInputSource: 0 wsaTransparentSwapchain: 0 @@ -170,7 +170,7 @@ PlayerSettings: iPhone: 0 tvOS: 0 overrideDefaultApplicationIdentifier: 1 - AndroidBundleVersionCode: 19 + AndroidBundleVersionCode: 20 AndroidMinSdkVersion: 22 AndroidTargetSdkVersion: 34 AndroidPreferredInstallLocation: 1