Merge branch 'main' into fs/hiro-inventory

Author: DannyIsYog

UnityHiroChallenges/.gitignore

@@ -0,0 +1,56 @@
+
+# Created by https://www.gitignore.io/api/unity
+# Edit at https://www.gitignore.io/?templates=unity
+
+# Jetbrain Rider Cache
+.idea/
+Assets/Plugins/Editor/JetBrains*
+
+# Visual Studio Code
+.vscode/
+
+
+### Unity ###
+/[Ll]ibrary/
+/[Tt]emp/
+/[Oo]bj/
+/[Bb]uild/
+/[Bb]uilds/
+/[Ll]ogs/
+/[Uu]ser[Ss]ettings/
+Assets/AssetStoreTools*
+# Unity local user project setting
+UserSettings/
+
+# Visual Studio cache directory
+.vs/
+
+# Autogenerated VS/MD/Consulo solution and project files
+ExportedObj/
+.consulo/
+*.csproj
+*.unityproj
+*.sln
+*.suo
+*.tmp
+*.user
+*.userprefs
+*.pidb
+*.booproj
+*.svd
+*.pdb
+*.opendb
+*.VC.db
+
+# Unity3D generated meta files
+*.pidb.meta
+*.pdb.meta
+
+# Unity3D Generated File On Crash Reports
+sysinfo.txt
+
+# Builds
+*.apk
+*.unitypackage
+
+# End of https://www.gitignore.io/api/unity

UnityHiroChallenges/Assets/UnityHiroChallenges.meta

@@ -0,0 +1,205 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using Nakama;
+using Hiro;
+using Hiro.Unity;
+using UnityEditor;
+using UnityEngine;
+using UnityEngine.SceneManagement;
+using UnityEngine.UIElements;
+
+namespace HiroChallenges.Editor
+{
+    public class AccountSwitcherEditor : EditorWindow
+    {
+        [SerializeField] private VisualTreeAsset tree;
+
+        private DropdownField accountDropdown;
+        private Label usernamesLabel;
+
+        private readonly SortedDictionary<string, string> accountUsernames = new();
+
+        private const string AccountUsernamesKey = "AccountSwitcher_Usernames";
+
+        [MenuItem("Tools/Nakama/Account Switcher")]
+        public static void ShowWindow()
+        {
+            var inspectorType = typeof(UnityEditor.Editor).Assembly.GetType("UnityEditor.InspectorWindow");
+            var window = GetWindow<AccountSwitcherEditor>("Account Switcher", inspectorType);
+
+            window.Focus();
+        }
+
+        [MenuItem("Tools/Nakama/Clear Test Accounts")]
+        public static void ClearSavedAccounts()
+        {
+            EditorPrefs.DeleteKey(AccountUsernamesKey);
+            Debug.Log("Cleared all saved account usernames");
+
+            // Refresh any open Account Switcher windows
+            var windows = Resources.FindObjectsOfTypeAll<AccountSwitcherEditor>();
+            foreach (var window in windows)
+            {
+                window.accountUsernames.Clear();
+                window.UpdateUsernameLabels();
+            }
+        }
+
+        private void CreateGUI()
+        {
+            tree.CloneTree(rootVisualElement);
+
+            accountDropdown = rootVisualElement.Q<DropdownField>("account-dropdown");
+            accountDropdown.RegisterValueChangedCallback(SwitchAccount);
+
+            usernamesLabel = rootVisualElement.Q<Label>("usernames");
+
+            // Load saved usernames on startup
+            LoadAccountUsernames();
+            UpdateUsernameLabels();
+
+            if (!EditorApplication.isPlaying) return;
+
+            var rootGameObjects = SceneManager.GetActiveScene().GetRootGameObjects();
+            foreach (var rootGameObject in rootGameObjects)
+            {
+                if (!rootGameObject.TryGetComponent<HiroChallengesController>(out var challengesController)) continue;
+
+                if (HiroCoordinator.Instance.GetSystem<NakamaSystem>().Session is Session session)
+                {
+                    OnControllerInitialized(session);
+                }
+                else
+                {
+                    challengesController.OnInitialized += OnControllerInitialized;
+                }
+            }
+        }
+
+        private void OnControllerInitialized(ISession session, HiroChallengesController challengesController = null)
+        {
+            accountUsernames[accountDropdown.choices[0]] = session.Username;
+            UpdateUsernameLabels();
+
+            if (challengesController != null)
+            {
+                challengesController.OnInitialized -= OnControllerInitialized;
+            }
+        }
+
+        private void LoadAccountUsernames()
+        {
+            var savedUsernames = EditorPrefs.GetString(AccountUsernamesKey, "");
+            if (string.IsNullOrEmpty(savedUsernames)) return;
+
+            try
+            {
+                var usernameData = JsonUtility.FromJson<SerializableStringDictionary>(savedUsernames);
+                accountUsernames.Clear();
+
+                foreach (var item in usernameData.items)
+                {
+                    accountUsernames[item.key] = item.value;
+                }
+            }
+            catch (Exception ex)
+            {
+                Debug.LogWarning($"Failed to load saved account usernames: {ex.Message}");
+            }
+        }
+
+        private void SaveAccountUsernames()
+        {
+            try
+            {
+                var usernameData = new SerializableStringDictionary();
+                foreach (var kvp in accountUsernames)
+                {
+                    usernameData.items.Add(new SerializableKeyValuePair { key = kvp.Key, value = kvp.Value });
+                }
+
+                var json = JsonUtility.ToJson(usernameData);
+                EditorPrefs.SetString(AccountUsernamesKey, json);
+            }
+            catch (Exception ex)
+            {
+                Debug.LogWarning($"Failed to save account usernames: {ex.Message}");
+            }
+        }
+
+        private async void SwitchAccount(ChangeEvent<string> changeEvt)
+        {
+            if (!EditorApplication.isPlaying) return;
+
+            var previousValue = changeEvt.previousValue;
+            var newValue = changeEvt.newValue;
+
+            var rootGameObjects = SceneManager.GetActiveScene().GetRootGameObjects();
+            foreach (var rootGameObject in rootGameObjects)
+            {
+                if (!rootGameObject.TryGetComponent<HiroChallengesController>(out var challengesController)) continue;
+
+                var coordinator = HiroCoordinator.Instance as HiroChallengesCoordinator;
+                if (coordinator == null) return;
+                var nakamaSystem = coordinator.GetSystem<NakamaSystem>();
+
+                // Save username before switching
+                if (!string.IsNullOrEmpty(previousValue))
+                {
+                    accountUsernames[previousValue] = nakamaSystem.Session.Username;
+                }
+
+                try
+                {
+                    var newSession = await HiroChallengesCoordinator.NakamaAuthorizerFunc(accountDropdown.index)
+                        .Invoke(nakamaSystem.Client);
+                    (nakamaSystem.Session as Session)?.Update(newSession.AuthToken, newSession.RefreshToken);
+                    await nakamaSystem.RefreshAsync();
+                    accountUsernames[newValue] = newSession.Username;
+                    challengesController.SwitchComplete();
+
+                    SaveAccountUsernames();
+                    break;
+                }
+                catch (ApiResponseException e)
+                {
+                    Debug.LogWarning($"Error authenticating with Device ID: {e.Message}");
+                    return;
+                }
+            }
+
+            UpdateUsernameLabels();
+        }
+
+        private void UpdateUsernameLabels()
+        {
+            var sb = new StringBuilder();
+            var index = 1;
+
+            foreach (var kvp in accountUsernames)
+            {
+                sb.Append(index);
+                sb.Append(": ");
+                sb.Append(kvp.Value);
+                sb.AppendLine();
+                index++;
+            }
+
+            usernamesLabel.text = sb.ToString();
+        }
+
+        [Serializable]
+        private class SerializableStringDictionary
+        {
+            public List<SerializableKeyValuePair> items = new();
+        }
+
+        [Serializable]
+        private class SerializableKeyValuePair
+        {
+            public string key;
+            public string value;
+        }
+    }
+}

UnityHiroChallenges/Assets/UnityHiroChallenges/Editor.meta

@@ -0,0 +1,12 @@
+<ui:UXML xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ui="UnityEngine.UIElements" xmlns:uie="UnityEditor.UIElements" noNamespaceSchemaLocation="../../UIElementsSchema/UIElements.xsd" editor-extension-mode="True">
+    <ui:VisualElement style="flex-grow: 1; padding-top: 8px; padding-right: 8px; padding-bottom: 0; padding-left: 8px; align-items: stretch; justify-content: flex-start;">
+        <ui:Label text="Nakama Account Switcher" style="-unity-text-align: upper-center; -unity-font-style: normal; font-size: 24px; margin-bottom: 4px; margin-top: 8px; -unity-font-definition: url(&quot;project://database/Assets/UnityNakamaFriends/HeroicUI/Fonts/Plus_Jakarta_Sans/static/PlusJakartaSans-Bold.ttf?fileID=12800000&amp;guid=b0eab255566194e3c923ef0f1d4571da&amp;type=3#PlusJakartaSans-Bold&quot;); white-space: normal;" />
+        <ui:Label text="The Account Switcher lets you explore the project as different users without managing multiple builds.&#10;&#10;Use the dropdown to switch between up to four different test accounts. An account will be automatically created the first time you select it.&#10;&#10;Note: Account switching only works during play mode." style="white-space: normal; -unity-font-definition: url(&quot;project://database/Assets/UnityNakamaFriends/HeroicUI/Fonts/Plus_Jakarta_Sans/PlusJakartaSans-VariableFont_wght.ttf?fileID=12800000&amp;guid=fbe3b99011ddc4d419b127c34c0e03ab&amp;type=3#PlusJakartaSans-VariableFont_wght&quot;);" />
+        <ui:VisualElement style="margin-top: 8px;" />
+        <ui:DropdownField label="Choose account:" name="account-dropdown" index="0" choices="ACCOUNT 1,ACCOUNT 2,ACCOUNT 3,ACCOUNT 4" style="-unity-font-definition: url(&quot;project://database/Assets/UnityNakamaFriends/HeroicUI/Fonts/Plus_Jakarta_Sans/PlusJakartaSans-VariableFont_wght.ttf?fileID=12800000&amp;guid=fbe3b99011ddc4d419b127c34c0e03ab&amp;type=3#PlusJakartaSans-VariableFont_wght&quot;);" />
+        <ui:VisualElement name="VisualElement" style="flex-grow: 1; height: 8px; align-items: center; justify-content: flex-start; align-self: flex-start; align-content: flex-start; margin-top: 8px;">
+            <ui:Label text="Account Usernames" style="-unity-text-align: upper-center; -unity-font-style: bold; white-space: pre; -unity-font-definition: url(&quot;project://database/Assets/UnityNakamaFriends/HeroicUI/Fonts/Plus_Jakarta_Sans/PlusJakartaSans-VariableFont_wght.ttf?fileID=12800000&amp;guid=fbe3b99011ddc4d419b127c34c0e03ab&amp;type=3#PlusJakartaSans-VariableFont_wght&quot;);" />
+            <ui:Label name="usernames" selectable="true" style="align-self: flex-start;" />
+        </ui:VisualElement>
+    </ui:VisualElement>
+</ui:UXML>