Fix for Unity 6 changes, updated version to 2.4.5

Author: govertbuijs

Assets/UXF/Examples/3_MultiScene_FootballAndRT/Scripts/Example_MultiSceneExperimentGenerator.cs

@@ -77,11 +77,19 @@ void SceneSpecificSetup(Trial trial)
 			// there are lots of ways to do this, but this works fine here
 			if (trial.block.number == 1)
 			{
+#if UNITY_6000
+				FindFirstObjectByType<Example_ShootingTask>().StartShootingTaskTrial(trial);
+#else
 				FindObjectOfType<Example_ShootingTask>().StartShootingTaskTrial(trial);
+#endif
 			}
 			else if (trial.block.number == 2)
 			{
+#if UNITY_6000
+				FindFirstObjectByType<Example_ReactionTask>().StartReactionTaskTrial(trial);
+#else
 				FindObjectOfType<Example_ReactionTask>().StartReactionTaskTrial(trial);
+#endif
 			}
 		}
 
@@ -94,11 +102,19 @@ public void CleanupTrial(Trial trial)
 			// there are lots of ways to do this, but this works fine here
 			if (trial.block.number == 1)
 			{
+#if UNITY_6000
+				FindFirstObjectByType<Example_ShootingTask>().EndShootingTaskTrial(trial);
+#else
 				FindObjectOfType<Example_ShootingTask>().EndShootingTaskTrial(trial);
+#endif
 			}
 			else if (trial.block.number == 2)
 			{
+#if UNITY_6000
+				FindFirstObjectByType<Example_ReactionTask>().EndReactionTaskTrial(trial);
+#else
 				FindObjectOfType<Example_ReactionTask>().EndReactionTaskTrial(trial);
+#endif
 			}
 		}
 
@@ -157,4 +173,4 @@ void AddScenesToBuildIndex()
 # endif
 
     }
-}
+}

Assets/UXF/Examples/3_MultiScene_FootballAndRT/Scripts/Example_Shooter.cs

@@ -51,7 +51,11 @@ void Update()
                     // launch when clicked
                     if (Input.GetMouseButtonDown(0))
                     {
+#if UNITY_6000
+                        ball.linearVelocity = launchVelocity;
+#else
                         ball.velocity = launchVelocity;
+#endif
                         canShoot = false;
 
                         // only have a certain time to score, or its classified as a miss!
@@ -82,4 +86,4 @@ public void Timeout()
         }
 
     }
-}
+}

Assets/UXF/Scripts/DataHandling/WebAWSDynamoDB.cs

@@ -466,7 +466,9 @@ public override bool IsIncompatibleWith(UnityEditor.BuildTargetGroup buildTarget
             {
                 case UnityEditor.BuildTargetGroup.Android:
                 case UnityEditor.BuildTargetGroup.iOS:
+#if !UNITY_2022_2_OR_NEWER
                 case UnityEditor.BuildTargetGroup.Lumin:
+#endif
                 case UnityEditor.BuildTargetGroup.PS4:
                 case UnityEditor.BuildTargetGroup.Switch:
                 case UnityEditor.BuildTargetGroup.tvOS:

Assets/UXF/Scripts/Etc/Editor/UXFSessionDisplay.cs

@@ -41,7 +41,11 @@ static void OnPlayModeStateChanged(PlayModeStateChange state)
 
 		static void FetchReferences()
 		{
+#if UNITY_6000
+            session = FindFirstObjectByType<Session>();
+#else
             session = FindObjectOfType<Session>();
+#endif            
             if (!session)
 			{
                 settingsDict = null;
@@ -206,4 +210,4 @@ static string Truncate(string value, int maxChars)
         }
     }
 
-}
+}

Assets/UXF/Scripts/Etc/Editor/UXFWizard.cs

@@ -1,8 +1,7 @@
-using System.Collections;
-using System.IO;
-using System.Collections.Generic;
+using System.IO;
 using UnityEngine;
 using UnityEditor;
+using UnityEditor.Build;
 
 namespace UXF.EditorUtils
 {
@@ -137,7 +136,13 @@ public void OnGUI()
 
             GUILayout.Label("Compatibility", EditorStyles.boldLabel);
 
-            bool compatible = PlayerSettings.GetApiCompatibilityLevel(BuildTargetGroup.Standalone) == targetApiLevel;
+#if UNITY_6000
+            var standalone = NamedBuildTarget.Android;
+#else
+            var standalone = BuildTargetGroup.Standalone;
+#endif            
+            
+            bool compatible = PlayerSettings.GetApiCompatibilityLevel(standalone) == targetApiLevel;
 
             if (compatible)
             {
@@ -148,7 +153,7 @@ public void OnGUI()
                 EditorGUILayout.HelpBox("API Compatibility Level should be set to .NET 2.0 (Older versions of Unity) or .NET 4.x (Unity 2018.3+), expect errors on building", MessageType.Warning);
                 if (GUILayout.Button("Fix"))
                 {
-                    PlayerSettings.SetApiCompatibilityLevel(BuildTargetGroup.Standalone, targetApiLevel);
+                    PlayerSettings.SetApiCompatibilityLevel(standalone, targetApiLevel);
                 }
             }
 

Assets/UXF/Scripts/EventSystemFallback.cs

@@ -28,11 +28,15 @@ void Start()
 
         void CreateEventSystem()
         {
+#if UNITY_6000
+            if (FindFirstObjectByType<EventSystem>() == null)
+#else
             if (FindObjectOfType<EventSystem>() == null)
+#endif
             {
                 var newEventSystem = Instantiate(eventSystemPrefab);
                 newEventSystem.name = "EventSystem";
             }
         }
     }
-}
+}

Assets/UXF/VERSION.txt

@@ -1 +1 @@
-2.4.3
+2.4.5