better fix for Multi Scene Example

Author: jackbrookes

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

@@ -129,22 +129,34 @@ void AddScenesToBuildIndex()
 			var scenes = new List<UnityEditor.EditorBuildSettingsScene>(UnityEditor.EditorBuildSettings.scenes);
 
 			var alreadyAddedScenes = scenes
-				.Where(ebss => ebss.enabled && newSceneNames.Contains(ebss.path));
+				.Where(ebss => newSceneNames.Contains(ebss.path));
 
-			if (alreadyAddedScenes.Count() == newSceneNames.Count) return;
-
-			foreach (string newScene in newSceneNames)
+			foreach (var newScene in newSceneNames)
 			{
-				if (!scenes.Where(s => s.enabled).Select(s => s.path).Contains(newScene))
+				var newSceneAdded = scenes
+					.Where(s => s.path == newScene);
+
+				if (newSceneAdded.Count() == 0)
+				{
+					scenes.Add(new UnityEditor.EditorBuildSettingsScene(newScene, true));
+				}
+				else if (newSceneAdded.Count() == 1)
+				{
+					newSceneAdded.Single().enabled = true;			
+				}
+				else
 				{
+					scenes = scenes
+						.Where(s => s.path != newScene)
+						.ToList();
 					scenes.Add(new UnityEditor.EditorBuildSettingsScene(newScene, true));
 				}
 			}			
 
 			UnityEditor.EditorBuildSettings.scenes = scenes.ToArray();
 			UnityEditor.EditorApplication.isPlaying = false;
 
-			Debug.Log("Added scenes to build settings for Multi Scene Example.");
+			Debug.Log("Added scenes to build settings for Multi Scene Example. Try playing again.");
 		}
 # endif
 

ProjectSettings/EditorBuildSettings.asset

@@ -5,12 +5,6 @@ EditorBuildSettings:
   m_ObjectHideFlags: 0
   serializedVersion: 2
   m_Scenes:
-  - enabled: 0
-    path: Assets/UXF/Examples/3_MultiScene_FootballAndRT/OtherScenes/ShootingExample.unity
-    guid: 1d5a4e0513b6be0428267c45d923520b
-  - enabled: 0
-    path: Assets/UXF/Examples/3_MultiScene_FootballAndRT/OtherScenes/ReactionExample.unity
-    guid: 7a79c722962e7d74eb856ff31b309b87
   - enabled: 0
     path: Assets/DevelopmentScene.unity
     guid: 2209ad5e36a6fc7488290f2faee97cfe
@@ -23,4 +17,10 @@ EditorBuildSettings:
   - enabled: 1
     path: Assets/UXF/Examples/4_CorsiBlock/CorsiBlockExample.unity
     guid: d79ca1b5241496f4fba7622d23d6fa08
+  - enabled: 1
+    path: Assets/UXF/Examples/3_MultiScene_FootballAndRT/OtherScenes/ShootingExample.unity
+    guid: 1d5a4e0513b6be0428267c45d923520b
+  - enabled: 1
+    path: Assets/UXF/Examples/3_MultiScene_FootballAndRT/OtherScenes/ReactionExample.unity
+    guid: 7a79c722962e7d74eb856ff31b309b87
   m_configObjects: {}