UXF rig can destroy itself if another instance exists

Author: jackbrookes

Assets/UXF/Examples/3_MultiScene_FootballAndRT/OtherScenes/ReactionExample.unity

@@ -545,7 +545,7 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_FontData:
-    m_Font: {fileID: 12800000, guid: 6858712ab402a3d43a59ba46412d9aad, type: 3}
+    m_Font: {fileID: 12800000, guid: 8e3115908ec235d438039dbac1d40964, type: 3}
     m_FontSize: 50
     m_FontStyle: 0
     m_BestFit: 0
@@ -715,7 +715,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 1, y: 1}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: -200, y: 80}
+  m_SizeDelta: {x: -100, y: 80}
   m_Pivot: {x: 0.5, y: 1}
 --- !u!114 &2014450706
 MonoBehaviour:
@@ -736,7 +736,7 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_FontData:
-    m_Font: {fileID: 12800000, guid: 6858712ab402a3d43a59ba46412d9aad, type: 3}
+    m_Font: {fileID: 12800000, guid: 8e3115908ec235d438039dbac1d40964, type: 3}
     m_FontSize: 24
     m_FontStyle: 0
     m_BestFit: 0

Assets/UXF/Scripts/Session.cs

@@ -35,9 +35,9 @@ public class Session : MonoBehaviour, ISettingsContainer, IDataAssociatable
         public bool endAfterLastTrial = false;
 
         /// <summary>
-        /// If enabled, you do not need to reference this session component in a public field, you can simply call "Session.instance".
+        /// If enabled, you do not need to reference this session component in a public field, you can simply call "Session.instance". This object will be destroyed if another session component is the main instance.
         /// </summary>
-        [Tooltip("If enabled, you do not need to reference this session component in a public field, you can simply call \"Session.instance\".")]
+        [Tooltip("If enabled, you do not need to reference this session component in a public field, you can simply call \"Session.instance\". This object will be destroyed if another session component is the main instance.")]
         public bool setAsMainInstance = true;
 
         /// <summary>
@@ -257,7 +257,15 @@ public class Session : MonoBehaviour, ISettingsContainer, IDataAssociatable
         /// </summary>
         void Awake()
         {
-            if (setAsMainInstance) instance = this;
+            if (setAsMainInstance)
+            {
+                if (instance != null && !ReferenceEquals(instance, this))
+                {
+                    Destroy(this.gameObject);
+                    return;
+                }
+                instance = this;
+            }
             if (dontDestroyOnLoadNewScene && Application.isPlaying) DontDestroyOnLoad(gameObject);            
             if (endAfterLastTrial) onTrialEnd.AddListener(EndIfLastTrial);
         }

Assets/UXF/VERSION.txt

@@ -1 +1 @@
-2.2.4
+2.2.5

ProjectSettings/EditorBuildSettings.asset

@@ -17,10 +17,10 @@ EditorBuildSettings:
   - enabled: 0
     path: Assets/UXF/Examples/4_CorsiBlock/CorsiBlockExample.unity
     guid: d79ca1b5241496f4fba7622d23d6fa08
-  - enabled: 0
+  - enabled: 1
     path: Assets/UXF/Examples/3_MultiScene_FootballAndRT/OtherScenes/ShootingExample.unity
     guid: 1d5a4e0513b6be0428267c45d923520b
-  - enabled: 0
+  - enabled: 1
     path: Assets/UXF/Examples/3_MultiScene_FootballAndRT/OtherScenes/ReactionExample.unity
     guid: 7a79c722962e7d74eb856ff31b309b87
   - enabled: 0