Reset Extension

Author: Mikkel Sørensen

Runtime/Client/LootLockerServerApi.cs

@@ -32,7 +32,7 @@ public static void Instantiate()
             }
         }
 
-        public static void Reset()
+        public static void ResetInstance()
         {
             if (_instance == null) return;
 #if UNITY_EDITOR
@@ -47,7 +47,7 @@ public static void Reset()
         [InitializeOnEnterPlayMode]
         static void OnEnterPlaymodeInEditor(EnterPlayModeOptions options)
         {
-            Reset();
+            ResetInstance();
         }
 #endif
 

Runtime/Editor/Editor UI/LootLockerAdminExtension.cs

@@ -590,9 +590,21 @@ public void GameButtonTemplate(LootLocker.Extension.DataTypes.Game game, string
             gameSelectorList.Add(button);
         }
 
+        bool AtTarget(EventBase eventBase)
+        {
+#if UNITY_2023_1_OR_NEWER
+            if(eventBase.propagationPhase == PropagationPhase.BubbleUp) 
+                return true;
+#else
+            if(eventBase.propagationPhase == PropagationPhase.AtTarget) 
+                return true;
+#endif
+            return false;
+        }
+
         void OnGameSelected(EventBase e)
         {
-            if (e.propagationPhase != PropagationPhase.AtTarget)
+            if (!AtTarget(e))
                 return;
 
             var target = e.target as Button;
@@ -707,7 +719,6 @@ void APIKeyTemplate(KeyResponse key)
             if (button.name == LootLockerConfig.current.apiKey)
             {
                 button.style.borderRightColor = button.style.borderLeftColor = button.style.borderTopColor = button.style.borderBottomColor = stage;
-                keyName.style.color = stage;
             }
 
             button.AddToClassList("apikey");
@@ -725,7 +736,7 @@ void APIKeyTemplate(KeyResponse key)
 
         void OnAPIKeySelected(EventBase e)
         {
-            if (e.propagationPhase != PropagationPhase.AtTarget)
+            if (!AtTarget(e))
                 return;
 
             var target = e.target as Button;
@@ -744,16 +755,14 @@ void SwapNewSelectedKey()
 
                 if (key.name == LootLockerConfig.current.apiKey)
                 {
-                    key.style.backgroundColor = stage;
-
+                    key.style.borderRightColor = key.style.borderLeftColor = key.style.borderTopColor = key.style.borderBottomColor = stage;
                 }
                 else
                 {
                     key.style.backgroundColor = defaultButton;
                 }
             }
         }
-
         void Logout()
         {
             loadingPage.style.display = DisplayStyle.Flex;
@@ -765,6 +774,10 @@ void Logout()
             loadingPage.style.display = DisplayStyle.None;
             SwapFlows(activeFlow, loginFlow);
         }
+        private void OnDestroy()
+        {
+            LootLockerServerApi.ResetInstance();
+        }
 
     }
 }