Refactored the whole cold startup mechanism

3 年前 · 0509be25
--- a/UOP1_Project/Assets/Prefabs/Gameplay/EditorInitializer.prefab
+++ b/UOP1_Project/Assets/Prefabs/Gameplay/EditorInitializer.prefab
  _thisSceneSO: {fileID: 0}
  _persistentManagersSO: {fileID: 11400000, guid: c2119785ce96367428081d6eee0d932b,
    type: 2}
-  _loadSceneEventChannel:
-    m_AssetGUID: 00e3063edc5902e40832ea618644c597
+  _notifyColdStartupChannel:
+    m_AssetGUID: 8ebfc71cf11d0ed48b2207c447690115
+    m_EditorAssetChanged: 0
--- a/UOP1_Project/Assets/Scenes/Managers/PersistentManagers.unity
+++ b/UOP1_Project/Assets/Scenes/Managers/PersistentManagers.unity
 --- !u!157 &3
 LightmapSettings:
  m_ObjectHideFlags: 0
-  serializedVersion: 11
+  serializedVersion: 12
  m_GIWorkflowMode: 1
  m_GISettings:
    serializedVersion: 2
    m_TrainingDataDestination: TrainingData
    m_LightProbeSampleCountMultiplier: 4
  m_LightingDataAsset: {fileID: 0}
-  m_UseShadowmask: 1
+  m_LightingSettings: {fileID: 0}
 --- !u!196 &4
 NavMeshSettings:
  serializedVersion: 2
    manualTileSize: 0
    tileSize: 256
    accuratePlacement: 0
+    maxJobWorkers: 0
+    preserveTilesOutsideBounds: 0
    debug:
      m_Flags: 0
  m_NavMeshData: {fileID: 0}
    m_PersistentCalls:
      m_Calls:
      - m_Target: {fileID: 0}
+        m_TargetAssemblyTypeName: 
        m_MethodName: ExitGame
        m_Mode: 1
        m_Arguments:
  m_Material: {fileID: 0}
  m_Color: {r: 0, g: 0, b: 0, a: 1}
  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
  m_Maskable: 1
  m_OnCullStateChanged:
    m_PersistentCalls:
  m_Material: {fileID: 0}
  m_Color: {r: 1, g: 1, b: 1, a: 1}
  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
  m_Maskable: 1
  m_OnCullStateChanged:
    m_PersistentCalls:
  m_Material: {fileID: 0}
  m_Color: {r: 0.4528302, g: 0.4528302, b: 0.4528302, a: 1}
  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
  m_Maskable: 1
  m_OnCullStateChanged:
    m_PersistentCalls:
  m_Material: {fileID: 0}
  m_Color: {r: 1, g: 1, b: 1, a: 1}
  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
  m_Maskable: 1
  m_OnCullStateChanged:
    m_PersistentCalls:
  m_FallbackScreenDPI: 96
  m_DefaultSpriteDPI: 96
  m_DynamicPixelsPerUnit: 1
+  m_PresetInfoIsWorld: 0
 --- !u!223 &1387982342
 Canvas:
  m_ObjectHideFlags: 0
  _gameplayScene: {fileID: 11400000, guid: a9c92d087d242344388972b3d1c4aaae, type: 2}
  _loadLocation: {fileID: 11400000, guid: 00e3063edc5902e40832ea618644c597, type: 2}
  _loadMenu: {fileID: 11400000, guid: 33cec85652903d245b99985f9cec9841, type: 2}
+  _coldStartupLocation: {fileID: 11400000, guid: 8ebfc71cf11d0ed48b2207c447690115,
+    type: 2}
  _toggleLoadingScreen: {fileID: 11400000, guid: ce8db9fc090944349ba225edb81028d4,
    type: 2}
  _onSceneReady: {fileID: 11400000, guid: b729e40fc41dd8b4ea7aaf5c857f7186, type: 2}
  m_Material: {fileID: 0}
  m_Color: {r: 1, g: 1, b: 1, a: 1}
  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
  m_Maskable: 1
  m_OnCullStateChanged:
    m_PersistentCalls:
  m_Material: {fileID: 0}
  m_Color: {r: 0, g: 0, b: 0, a: 0}
  m_RaycastTarget: 0
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
  m_Maskable: 0
  m_OnCullStateChanged:
    m_PersistentCalls:
--- a/UOP1_Project/Assets/Scenes/Menus/MainMenu.unity
+++ b/UOP1_Project/Assets/Scenes/Menus/MainMenu.unity
 --- !u!157 &3
 LightmapSettings:
  m_ObjectHideFlags: 0
-  serializedVersion: 11
+  serializedVersion: 12
  m_GIWorkflowMode: 1
  m_GISettings:
    serializedVersion: 2
    m_TrainingDataDestination: TrainingData
    m_LightProbeSampleCountMultiplier: 4
  m_LightingDataAsset: {fileID: 0}
-  m_UseShadowmask: 0
+  m_LightingSettings: {fileID: 0}
 --- !u!196 &4
 NavMeshSettings:
  serializedVersion: 2
    manualTileSize: 0
    tileSize: 256
    accuratePlacement: 0
+    maxJobWorkers: 0
+    preserveTilesOutsideBounds: 0
    debug:
      m_Flags: 0
  m_NavMeshData: {fileID: 0}
  m_EditorClassIdentifier: 
  m_Navigation:
    m_Mode: 3
+    m_WrapAround: 0
    m_SelectOnUp: {fileID: 0}
    m_SelectOnDown: {fileID: 0}
    m_SelectOnLeft: {fileID: 0}
    m_PersistentCalls:
      m_Calls:
      - m_Target: {fileID: 11400000, guid: d570e16f713770a4a94310999866e0e0, type: 2}
+        m_TargetAssemblyTypeName: 
        m_MethodName: RaiseEvent
        m_Mode: 1
        m_Arguments:
  m_Material: {fileID: 0}
  m_Color: {r: 1, g: 1, b: 1, a: 1}
  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
  m_Maskable: 1
  m_OnCullStateChanged:
    m_PersistentCalls:
  m_Material: {fileID: 0}
  m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
  m_Maskable: 1
  m_OnCullStateChanged:
    m_PersistentCalls:
  m_Material: {fileID: 0}
  m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
  m_Maskable: 1
  m_OnCullStateChanged:
    m_PersistentCalls:
  m_Material: {fileID: 0}
  m_Color: {r: 1, g: 1, b: 1, a: 1}
  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
  m_Maskable: 1
  m_OnCullStateChanged:
    m_PersistentCalls:
  m_EditorClassIdentifier: 
  m_Navigation:
    m_Mode: 3
+    m_WrapAround: 0
    m_SelectOnUp: {fileID: 0}
    m_SelectOnDown: {fileID: 0}
    m_SelectOnLeft: {fileID: 0}
    m_PersistentCalls:
      m_Calls:
      - m_Target: {fileID: 1967191115}
+        m_TargetAssemblyTypeName: 
        m_MethodName: OnResetSaveDataPress
        m_Mode: 1
        m_Arguments:
          m_BoolArgument: 0
        m_CallState: 2
      - m_Target: {fileID: 0}
+        m_TargetAssemblyTypeName: 
        m_MethodName: SetActive
        m_Mode: 6
        m_Arguments:
  m_Material: {fileID: 0}
  m_Color: {r: 1, g: 1, b: 1, a: 1}
  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
  m_Maskable: 1
  m_OnCullStateChanged:
    m_PersistentCalls:
  m_Material: {fileID: 0}
  m_Color: {r: 1, g: 1, b: 1, a: 1}
  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
  m_Maskable: 1
  m_OnCullStateChanged:
    m_PersistentCalls:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 821853654}
  m_CullTransparentMesh: 0
--- !u!1001 &826448973
-PrefabInstance:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    m_TransformParent: {fileID: 0}
-    m_Modifications:
-    - target: {fileID: 40564194958535835, guid: 54d1f8b93400ea64d97c276fab375df3,
-        type: 3}
-      propertyPath: m_Name
-      value: EditorInitializer
-      objectReference: {fileID: 0}
-    - target: {fileID: 40564194958535909, guid: 54d1f8b93400ea64d97c276fab375df3,
-        type: 3}
-      propertyPath: m_RootOrder
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 40564194958535909, guid: 54d1f8b93400ea64d97c276fab375df3,
-        type: 3}
-      propertyPath: m_LocalPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 40564194958535909, guid: 54d1f8b93400ea64d97c276fab375df3,
-        type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 40564194958535909, guid: 54d1f8b93400ea64d97c276fab375df3,
-        type: 3}
-      propertyPath: m_LocalPosition.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 40564194958535909, guid: 54d1f8b93400ea64d97c276fab375df3,
-        type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 40564194958535909, guid: 54d1f8b93400ea64d97c276fab375df3,
-        type: 3}
-      propertyPath: m_LocalRotation.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 40564194958535909, guid: 54d1f8b93400ea64d97c276fab375df3,
-        type: 3}
-      propertyPath: m_LocalRotation.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 40564194958535909, guid: 54d1f8b93400ea64d97c276fab375df3,
-        type: 3}
-      propertyPath: m_LocalRotation.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 40564194958535909, guid: 54d1f8b93400ea64d97c276fab375df3,
-        type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 40564194958535909, guid: 54d1f8b93400ea64d97c276fab375df3,
-        type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 40564194958535909, guid: 54d1f8b93400ea64d97c276fab375df3,
-        type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 7222522106795826365, guid: 54d1f8b93400ea64d97c276fab375df3,
-        type: 3}
-      propertyPath: _thisSceneSO
-      value: 
-      objectReference: {fileID: 11400000, guid: 431ff81b74b48fb4d9301fb76ca633dd,
-        type: 2}
-    - target: {fileID: 7222522106795826365, guid: 54d1f8b93400ea64d97c276fab375df3,
-        type: 3}
-      propertyPath: _loadSceneEventChannel.m_AssetGUID
-      value: 33cec85652903d245b99985f9cec9841
-      objectReference: {fileID: 0}
-    m_RemovedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: 54d1f8b93400ea64d97c276fab375df3, type: 3}
 --- !u!1 &1228641979
 GameObject:
  m_ObjectHideFlags: 0
  m_Material: {fileID: 0}
  m_Color: {r: 1, g: 1, b: 1, a: 1}
  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
  m_Maskable: 1
  m_OnCullStateChanged:
    m_PersistentCalls:
  m_Material: {fileID: 0}
  m_Color: {r: 1, g: 1, b: 1, a: 1}
  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
  m_Maskable: 1
  m_OnCullStateChanged:
    m_PersistentCalls:
  m_StopNaN: 0
  m_Dithering: 0
  m_ClearDepth: 1
+  m_AllowXRRendering: 1
  m_RequiresDepthTexture: 0
  m_RequiresColorTexture: 0
  m_Version: 2
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children: []
  m_Father: {fileID: 0}
-  m_RootOrder: 4
+  m_RootOrder: 3
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!81 &1419319622
 AudioListener:
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children: []
  m_Father: {fileID: 0}
-  m_RootOrder: 3
+  m_RootOrder: 2
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1806157292
 GameObject:
  m_Material: {fileID: 0}
  m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
  m_Maskable: 1
  m_OnCullStateChanged:
    m_PersistentCalls:
  m_EditorClassIdentifier: 
  m_Navigation:
    m_Mode: 3
+    m_WrapAround: 0
    m_SelectOnUp: {fileID: 0}
    m_SelectOnDown: {fileID: 0}
    m_SelectOnLeft: {fileID: 0}
    m_PersistentCalls:
      m_Calls:
      - m_Target: {fileID: 1967191115}
+        m_TargetAssemblyTypeName: 
        m_MethodName: OnPlayButtonPress
        m_Mode: 1
        m_Arguments:
          m_BoolArgument: 0
        m_CallState: 2
      - m_Target: {fileID: 0}
+        m_TargetAssemblyTypeName: 
        m_MethodName: SetActive
        m_Mode: 6
        m_Arguments:
  m_Material: {fileID: 0}
  m_Color: {r: 1, g: 1, b: 1, a: 1}
  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
  m_Maskable: 1
  m_OnCullStateChanged:
    m_PersistentCalls:
  m_Name: 
  m_EditorClassIdentifier: 
  onPlayButtonPress: {fileID: 11400000, guid: 00e3063edc5902e40832ea618644c597, type: 2}
-  locationsToLoad:
-  - {fileID: 11400000, guid: 2f386bbc670c05145834a0f9c7d55798, type: 2}
+  locationsToLoad: {fileID: 11400000, guid: 2f386bbc670c05145834a0f9c7d55798, type: 2}
  showLoadScreen: 1
  saveSystem: {fileID: 11400000, guid: edc355c4a7d5028408d322b90814e19e, type: 2}
  startText: {fileID: 622178819}
  m_FallbackScreenDPI: 96
  m_DefaultSpriteDPI: 96
  m_DynamicPixelsPerUnit: 1
+  m_PresetInfoIsWorld: 0
 --- !u!223 &2140469182
 Canvas:
  m_ObjectHideFlags: 0
  - {fileID: 684748717}
  - {fileID: 821853655}
  m_Father: {fileID: 0}
-  m_RootOrder: 2
+  m_RootOrder: 1
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0, y: 0}
  m_AnchorMax: {x: 0, y: 0}
--- a/UOP1_Project/Assets/Scripts/SceneManagement/EditorColdStartup.cs
+++ b/UOP1_Project/Assets/Scripts/SceneManagement/EditorColdStartup.cs
 #if UNITY_EDITOR
 	[SerializeField] private GameSceneSO _thisSceneSO = default;
 	[SerializeField] private GameSceneSO _persistentManagersSO = default;
-	[SerializeField] private AssetReference _loadSceneEventChannel = default;
+	[SerializeField] private AssetReference _notifyColdStartupChannel = default;

 	private void Start()
 	{

 	private void LoadEventChannel(AsyncOperationHandle<SceneInstance> obj)
 	{
-		_loadSceneEventChannel.LoadAssetAsync<LoadEventChannelSO>().Completed += ReloadScene;
+		_notifyColdStartupChannel.LoadAssetAsync<LoadEventChannelSO>().Completed += OnNotifyChannelLoaded;
-	private void ReloadScene(AsyncOperationHandle<LoadEventChannelSO> obj)
+	private void OnNotifyChannelLoaded(AsyncOperationHandle<LoadEventChannelSO> obj)
-		LoadEventChannelSO loadEventChannelSO = (LoadEventChannelSO)_loadSceneEventChannel.Asset;
+		LoadEventChannelSO loadEventChannelSO = (LoadEventChannelSO)_notifyColdStartupChannel.Asset;
-
-		SceneManager.UnloadSceneAsync(_thisSceneSO.sceneReference.editorAsset.name);
 	}
 #endif
 }
--- a/UOP1_Project/Assets/Scripts/SceneManagement/SceneLoader.cs
+++ b/UOP1_Project/Assets/Scripts/SceneManagement/SceneLoader.cs
 	[Header("Load Events")]
 	[SerializeField] private LoadEventChannelSO _loadLocation = default;
 	[SerializeField] private LoadEventChannelSO _loadMenu = default;
+	[SerializeField] private LoadEventChannelSO _coldStartupLocation = default;

 	[Header("Broadcasting on")]
 	[SerializeField] private BoolEventChannelSO _toggleLoadingScreen = default;
 	{
 		_loadLocation.OnLoadingRequested += LoadLocation;
 		_loadMenu.OnLoadingRequested += LoadMenu;
+#if UNITY_EDITOR
+		_coldStartupLocation.OnLoadingRequested += LocationColdStartup;
+#endif
 	}

 	private void OnDisable()
+#if UNITY_EDITOR
+		_coldStartupLocation.OnLoadingRequested -= LocationColdStartup;
+#endif
+#if UNITY_EDITOR
+	/// <summary>
+	/// This special loading function is only used in the editor, when the developer presses Play in a Location scene, without passing by Initialisation.
+	/// </summary>
+	private void LocationColdStartup(GameSceneSO currentlyOpenedLocation, bool showLoadingScreen)
+	{
+		_currentlyLoadedScene = currentlyOpenedLocation;
+
+		//Gameplay managers is loaded synchronously
+		_gameplayManagerLoadingOpHandle = _gameplayScene.sceneReference.LoadSceneAsync(LoadSceneMode.Additive, true);
+		_gameplayManagerLoadingOpHandle.WaitForCompletion();
+		_gameplayManagerSceneInstance = _gameplayManagerLoadingOpHandle.Result;
+
+		StartGameplay();
+	}
+#endif
+
 	/// <summary>
 	/// This function loads the location scenes passed as array parameter
 	/// </summary>
 	}

 	/// <summary>
-	/// In both Location and Menu loading, this function takes care of removing previously loaded temporary scenes.
+	/// In both Location and Menu loading, this function takes care of removing previously loaded scenes.
-		if(_currentlyLoadedScene != null)
-			_currentlyLoadedScene.sceneReference.UnLoadScene();
+		if(_currentlyLoadedScene != null) //would be null if the game was started in Initialisation
+		{
+			if(_currentlyLoadedScene.sceneReference.OperationHandle.IsValid())
+			{
+				//Unload the scene through its AssetReference, i.e. through the Addressable system
+				_currentlyLoadedScene.sceneReference.UnLoadScene();
+			}
+#if UNITY_EDITOR
+			else
+			{
+				//Only used when, after a "cold start", the player moves to a new scene
+				//Since the AsyncOperationHandle has not been used (the scene was already open in the editor),
+				//the scene needs to be unloaded using regular SceneManager instead of as an Addressable
+				SceneManager.UnloadSceneAsync(_currentlyLoadedScene.sceneReference.editorAsset.name);
+			}
+#endif
+		}

 		LoadNewScene();
 	}

 		LightProbes.TetrahedralizeAsync();

+		StartGameplay();
+	}
+
+	private void StartGameplay()
+	{
 		_onSceneReady.RaiseEvent(); //Spawn system will spawn the PigChef
 	}

--- a/UOP1_Project/Assets/Scripts/SceneManagement/SceneLoader.cs.meta
+++ b/UOP1_Project/Assets/Scripts/SceneManagement/SceneLoader.cs.meta
  - _gameplayScene: {fileID: 11400000, guid: a9c92d087d242344388972b3d1c4aaae, type: 2}
  - _loadLocation: {fileID: 11400000, guid: 00e3063edc5902e40832ea618644c597, type: 2}
  - _loadMenu: {fileID: 11400000, guid: 33cec85652903d245b99985f9cec9841, type: 2}
+  - _coldStartupLocation: {fileID: 11400000, guid: 8ebfc71cf11d0ed48b2207c447690115,
+      type: 2}
-  - _onFade: {fileID: 11400000, guid: b40bb60f3ca40164e9d7acc6992bae10, type: 2}
  executionOrder: 0
  icon: {instanceID: 0}
  userData: 
--- a/UOP1_Project/ProjectSettings/ProjectSettings.asset
+++ b/UOP1_Project/ProjectSettings/ProjectSettings.asset
 --- !u!129 &1
 PlayerSettings:
  m_ObjectHideFlags: 0
-  serializedVersion: 20
+  serializedVersion: 22
  productGUID: a82b413058b45c84898c272682e257ea
  AndroidProfiler: 0
  AndroidFilterTouchesWhenObscured: 0
  m_StereoRenderingPath: 0
  m_ActiveColorSpace: 1
  m_MTRendering: 1
+  mipStripping: 0
+  numberOfMipsStripped: 0
  m_StackTraceTypes: 010000000100000001000000010000000100000001000000
  iosShowActivityIndicatorOnLoading: -1
  androidShowActivityIndicatorOnLoading: -1
  stadiaTargetFramerate: 0
  vulkanNumSwapchainBuffers: 3
  vulkanEnableSetSRGBWrite: 0
+  vulkanEnablePreTransform: 0
  vulkanEnableLateAcquireNextImage: 0
  m_SupportedAspectRatios:
    4:3: 1
  xboxOneDisableKinectGpuReservation: 1
  xboxOneEnable7thCore: 1
  vrSettings:
-    cardboard:
-      depthFormat: 0
-      enableTransitionView: 0
-    daydream:
-      depthFormat: 0
-      useSustainedPerformanceMode: 0
-      enableVideoLayer: 0
-      useProtectedVideoMemory: 0
-      minimumSupportedHeadTracking: 0
-      maximumSupportedHeadTracking: 1
-    hololens:
-      depthFormat: 1
-      depthBufferSharingEnabled: 1
-    lumin:
-      depthFormat: 0
-      frameTiming: 2
-      enableGLCache: 0
-      glCacheMaxBlobSize: 524288
-      glCacheMaxFileSize: 8388608
-    oculus:
-      sharedDepthBuffer: 1
-      dashSupport: 1
-      lowOverheadMode: 0
-      protectedContext: 0
-      v2Signing: 1
    enable360StereoCapture: 0
  isWsaHolographicRemotingEnabled: 0
  enableFrameTimingStats: 0
  androidMaxAspectRatio: 2.1
  applicationIdentifier:
    Standalone: com.openprojects.chopchop
-  buildNumber: {}
+  buildNumber:
+    Standalone: 0
+    iPhone: 0
+    tvOS: 0
+  overrideDefaultApplicationIdentifier: 0
  AndroidBundleVersionCode: 1
  AndroidMinSdkVersion: 19
  AndroidTargetSdkVersion: 0
  StripUnusedMeshComponents: 0
  VertexChannelCompressionMask: 4054
  iPhoneSdkVersion: 988
-  iOSTargetOSVersionString: 10.0
+  iOSTargetOSVersionString: 11.0
-  tvOSTargetOSVersionString: 10.0
+  tvOSTargetOSVersionString: 11.0
  uIPrerenderedIcon: 0
  uIRequiresPersistentWiFi: 0
  uIRequiresFullScreen: 1
  iOSLaunchScreeniPadFillPct: 100
  iOSLaunchScreeniPadSize: 100
  iOSLaunchScreeniPadCustomXibPath: 
-  iOSUseLaunchScreenStoryboard: 0
+  iOSLaunchScreeniPadCustomStoryboardPath: 
  iOSDeviceRequirements: []
  iOSURLSchemes: []
  iOSBackgroundModes: 0
  iOSRequireARKit: 0
  iOSAutomaticallyDetectAndAddCapabilities: 1
  appleEnableProMotion: 0
+  shaderPrecisionModel: 0
+  useCustomMainManifest: 0
+  useCustomLauncherManifest: 0
+  useCustomMainGradleTemplate: 0
+  useCustomLauncherGradleManifest: 0
+  useCustomBaseGradleTemplate: 0
+  useCustomGradlePropertiesTemplate: 0
+  useCustomProguardFile: 0
  AndroidTargetArchitectures: 1
  AndroidSplashScreenScale: 0
  androidSplashScreen: {fileID: 0}
    height: 180
    banner: {fileID: 0}
  androidGamepadSupportLevel: 0
+  AndroidMinifyWithR8: 0
+  AndroidMinifyRelease: 0
+  AndroidMinifyDebug: 0
  AndroidValidateAppBundleSize: 1
  AndroidAppBundleSizeToValidate: 100
  m_BuildTargetIcons: []
  m_BuildTargetGraphicsAPIs:
  - m_BuildTarget: iOSSupport
    m_APIs: 10000000
-    m_Automatic: 0
+    m_Automatic: 1
-    m_Automatic: 0
+    m_Automatic: 1
  - m_BuildTarget: AndroidPlayer
    m_APIs: 150000000b000000
    m_Automatic: 0
  - m_BuildTarget: Standalone
    m_EncodingQuality: 1
  m_BuildTargetGroupLightmapSettings: []
+  m_BuildTargetNormalMapEncoding: []
  playModeTestRunnerEnabled: 0
  runPlayModeTestAsEditModeTest: 0
  actionOnDotNetUnhandledException: 1
  cameraUsageDescription: 
  locationUsageDescription: 
  microphoneUsageDescription: 
+  switchNMETAOverride: 
  switchNetLibKey: 
  switchSocketMemoryPoolSize: 6144
  switchSocketAllocatorPoolSize: 128
+  switchUseGOLDLinker: 0
  switchApplicationID: 0x01004b9000490000
  switchNSODependencies: 
  switchTitleNames_0: 
  switchTitleNames_12: 
  switchTitleNames_13: 
  switchTitleNames_14: 
+  switchTitleNames_15: 
  switchPublisherNames_0: 
  switchPublisherNames_1: 
  switchPublisherNames_2: 
  switchPublisherNames_12: 
  switchPublisherNames_13: 
  switchPublisherNames_14: 
+  switchPublisherNames_15: 
  switchIcons_0: {fileID: 0}
  switchIcons_1: {fileID: 0}
  switchIcons_2: {fileID: 0}
  switchIcons_12: {fileID: 0}
  switchIcons_13: {fileID: 0}
  switchIcons_14: {fileID: 0}
+  switchIcons_15: {fileID: 0}
  switchSmallIcons_0: {fileID: 0}
  switchSmallIcons_1: {fileID: 0}
  switchSmallIcons_2: {fileID: 0}
  switchSmallIcons_12: {fileID: 0}
  switchSmallIcons_13: {fileID: 0}
  switchSmallIcons_14: {fileID: 0}
+  switchSmallIcons_15: {fileID: 0}
  switchManualHTML: 
  switchAccessibleURLs: 
  switchLegalInformation: 
  switchSocketInitializeEnabled: 1
  switchNetworkInterfaceManagerInitializeEnabled: 1
  switchPlayerConnectionEnabled: 1
+  switchUseNewStyleFilepaths: 0
  ps4NPAgeRating: 12
  ps4NPTitleSecret: 
  ps4NPTrophyPackPath: 
  webGLAnalyzeBuildSize: 0
  webGLUseEmbeddedResources: 0
  webGLCompressionFormat: 1
+  webGLWasmArithmeticExceptions: 0
-  webGLWasmStreaming: 0
+  webGLDecompressionFallback: 0
+  additionalCompilerArguments: {}
  platformArchitecture: {}
  scriptingBackend:
    Standalone: 1
+  suppressCommonWarnings: 1
+  useDeterministicCompilation: 1
+  useReferenceAssemblies: 1
+  enableRoslynAnalyzers: 1
  additionalIl2CppArgs: 
  scriptingRuntimeVersion: 1
  gcIncremental: 0
  XboxOneXTitleMemory: 8
  XboxOneOverrideIdentityName: 
  XboxOneOverrideIdentityPublisher: 
-  vrEditorSettings:
-    daydream:
-      daydreamIconForeground: {fileID: 0}
-      daydreamIconBackground: {fileID: 0}
+  vrEditorSettings: {}
  cloudServicesEnabled:
    UNet: 1
  luminIcon:
    m_VersionCode: 1
    m_VersionName: 
  apiCompatibilityLevel: 6
+  activeInputHandler: 1
+  qualitySettingsNames: []
-  enableNativePlatformBackendsForNewInputSystem: 1
-  disableOldInputManagerSupport: 1
+  virtualTexturingSupportEnabled: 0
--- a/UOP1_Project/Assets/ScriptableObjects/EventChannels/ColdStartup_Channel.asset
+++ b/UOP1_Project/Assets/ScriptableObjects/EventChannels/ColdStartup_Channel.asset
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 82df99cd4c7564d4ca44d50a1dce516b, type: 3}
+  m_Name: ColdStartup_Channel
+  m_EditorClassIdentifier: 
+  description: Raised to notify the SceneLoader that the user has pressed Play in
+    the editor from a Location scene.
--- a/UOP1_Project/Assets/ScriptableObjects/EventChannels/ColdStartup_Channel.asset.meta
+++ b/UOP1_Project/Assets/ScriptableObjects/EventChannels/ColdStartup_Channel.asset.meta
+fileFormatVersion: 2
+guid: 8ebfc71cf11d0ed48b2207c447690115
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: