Adding load scene signal to load a location from timeline

3 年前 · b472d7a2
--- a/UOP1_Project/Assets/Cutscenes/SweetDishCutscene.playable
+++ b/UOP1_Project/Assets/Cutscenes/SweetDishCutscene.playable
--- a/UOP1_Project/Assets/Prefabs/Cutscenes/SweetDishCutscene.prefab
+++ b/UOP1_Project/Assets/Prefabs/Cutscenes/SweetDishCutscene.prefab
    ModeOverride: 0
    LensShift: {x: 0, y: 0}
    GateFit: 2
-    m_SensorSize: {x: 2.6006272, y: 1}
+    m_SensorSize: {x: 2.3706896, y: 1}
  m_Transitions:
    m_BlendHint: 0
    m_InheritPosition: 0
    ModeOverride: 0
    LensShift: {x: 0, y: 0}
    GateFit: 2
-    m_SensorSize: {x: 2.6006272, y: 1}
+    m_SensorSize: {x: 2.3706896, y: 1}
  m_Transitions:
    m_BlendHint: 0
    m_InheritPosition: 0
    ModeOverride: 0
    LensShift: {x: 0, y: 0}
    GateFit: 2
-    m_SensorSize: {x: 2.6006272, y: 1}
+    m_SensorSize: {x: 2.3706896, y: 1}
  m_Transitions:
    m_BlendHint: 0
    m_InheritPosition: 0
    ModeOverride: 0
    LensShift: {x: 0, y: 0}
    GateFit: 2
-    m_SensorSize: {x: 2.6006272, y: 1}
+    m_SensorSize: {x: 2.3706896, y: 1}
  m_Transitions:
    m_BlendHint: 0
    m_InheritPosition: 0
    ModeOverride: 0
    LensShift: {x: 0, y: 0}
    GateFit: 2
-    m_SensorSize: {x: 2.6006272, y: 1}
+    m_SensorSize: {x: 2.3706896, y: 1}
  m_Transitions:
    m_BlendHint: 0
    m_InheritPosition: 0
    ModeOverride: 0
    LensShift: {x: 0, y: 0}
    GateFit: 2
-    m_SensorSize: {x: 2.6006272, y: 1}
+    m_SensorSize: {x: 2.3706896, y: 1}
  m_Transitions:
    m_BlendHint: 0
    m_InheritPosition: 0
  serializedVersion: 6
  m_Component:
  - component: {fileID: 2021596533}
+  - component: {fileID: 7955707696585730547}
+  - component: {fileID: 52669666117061954}
  m_Layer: 0
  m_Name: WinSceneLoader
  m_TagString: Untagged
  m_Father: {fileID: 3336172139464101627}
  m_RootOrder: 17
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &7955707696585730547
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2021596532}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 02e6b73898a4a52438d630a7ba29da77, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  _locationToLoad: {fileID: 11400000, guid: 7f8ed3292b055484c81ecef146e54693, type: 2}
+  _leadsToPath: {fileID: 0}
+  _pathStorage: {fileID: 11400000, guid: a9ec09853cba047a8a58f5881053cfc6, type: 2}
+  _locationExitLoadChannel: {fileID: 11400000, guid: 00e3063edc5902e40832ea618644c597,
+    type: 2}
+--- !u!114 &52669666117061954
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2021596532}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: e52de21a22b6dd44c9cc19f810c65059, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Events:
+    m_Signals:
+    - {fileID: 11400000, guid: 1550c0b25c64f074fab55878318a887c, type: 2}
+    m_Events:
+    - m_PersistentCalls:
+        m_Calls:
+        - m_Target: {fileID: 7955707696585730547}
+          m_TargetAssemblyTypeName: LocationExit, Assembly-CSharp
+          m_MethodName: LoadScene
+          m_Mode: 1
+          m_Arguments:
+            m_ObjectArgument: {fileID: 0}
+            m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+            m_IntArgument: 0
+            m_FloatArgument: 0
+            m_StringArgument: 
+            m_BoolArgument: 0
+          m_CallState: 2
 --- !u!1 &1202229953018614154
 GameObject:
  m_ObjectHideFlags: 0
    ModeOverride: 0
    LensShift: {x: 0, y: 0}
    GateFit: 2
-    m_SensorSize: {x: 2.6006272, y: 1}
+    m_SensorSize: {x: 2.3706896, y: 1}
  m_Transitions:
    m_BlendHint: 0
    m_InheritPosition: 0
    ModeOverride: 0
    LensShift: {x: 0, y: 0}
    GateFit: 2
-    m_SensorSize: {x: 2.6006272, y: 1}
+    m_SensorSize: {x: 2.3706896, y: 1}
  m_Transitions:
    m_BlendHint: 0
    m_InheritPosition: 0
    ModeOverride: 0
    LensShift: {x: 0, y: 0}
    GateFit: 2
-    m_SensorSize: {x: 2.6006272, y: 1}
+    m_SensorSize: {x: 2.3706896, y: 1}
  m_Transitions:
    m_BlendHint: 0
    m_InheritPosition: 0
    ModeOverride: 0
    LensShift: {x: 0, y: 0}
    GateFit: 2
-    m_SensorSize: {x: 2.6006272, y: 1}
+    m_SensorSize: {x: 2.3706896, y: 1}
  m_Transitions:
    m_BlendHint: 0
    m_InheritPosition: 0
    ModeOverride: 0
    LensShift: {x: 0, y: 0}
    GateFit: 2
-    m_SensorSize: {x: 2.6006272, y: 1}
+    m_SensorSize: {x: 2.3706896, y: 1}
  m_Transitions:
    m_BlendHint: 0
    m_InheritPosition: 0
    ModeOverride: 0
    LensShift: {x: 0, y: 0}
    GateFit: 2
-    m_SensorSize: {x: 2.6006272, y: 1}
+    m_SensorSize: {x: 2.3706896, y: 1}
  m_Transitions:
    m_BlendHint: 0
    m_InheritPosition: 0
    - {fileID: 5557640735889932260, guid: 062b3805bf6784e4d9c599ee60eaa002, type: 3}
    - {fileID: 8300318066946783926, guid: 062b3805bf6784e4d9c599ee60eaa002, type: 3}
  m_SourcePrefab: {fileID: 100100000, guid: 062b3805bf6784e4d9c599ee60eaa002, type: 3}
--- !u!1 &309633227168275177 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 309633228405838073, guid: 062b3805bf6784e4d9c599ee60eaa002,
+--- !u!95 &6236864712706564871 stripped
+Animator:
+  m_CorrespondingSourceObject: {fileID: 6236864711762602263, guid: 062b3805bf6784e4d9c599ee60eaa002,
    type: 3}
  m_PrefabInstance: {fileID: 1238125072}
  m_PrefabAsset: {fileID: 0}
    type: 3}
  m_PrefabInstance: {fileID: 1238125072}
  m_PrefabAsset: {fileID: 0}
--- !u!95 &6236864712706564871 stripped
-Animator:
-  m_CorrespondingSourceObject: {fileID: 6236864711762602263, guid: 062b3805bf6784e4d9c599ee60eaa002,
+--- !u!1 &309633227168275177 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 309633228405838073, guid: 062b3805bf6784e4d9c599ee60eaa002,
    type: 3}
  m_PrefabInstance: {fileID: 1238125072}
  m_PrefabAsset: {fileID: 0}
      objectReference: {fileID: 0}
    m_RemovedComponents: []
  m_SourcePrefab: {fileID: 100100000, guid: 65c86d69f88e51447afc335693dfe455, type: 3}
--- !u!95 &6018860556548261513 stripped
-Animator:
-  m_CorrespondingSourceObject: {fileID: 5875841568448061001, guid: 65c86d69f88e51447afc335693dfe455,
-    type: 3}
-  m_PrefabInstance: {fileID: 147606202228496576}
-  m_PrefabAsset: {fileID: 0}
+    type: 3}
+  m_PrefabInstance: {fileID: 147606202228496576}
+  m_PrefabAsset: {fileID: 0}
+--- !u!95 &6018860556548261513 stripped
+Animator:
+  m_CorrespondingSourceObject: {fileID: 5875841568448061001, guid: 65c86d69f88e51447afc335693dfe455,
    type: 3}
  m_PrefabInstance: {fileID: 147606202228496576}
  m_PrefabAsset: {fileID: 0}
      objectReference: {fileID: 0}
    m_RemovedComponents: []
  m_SourcePrefab: {fileID: 100100000, guid: cf7ef849ef0651046adb756161dddde0, type: 3}
--- !u!4 &5592937035813717485 stripped
-Transform:
-  m_CorrespondingSourceObject: {fileID: 8096454886103390463, guid: cf7ef849ef0651046adb756161dddde0,
-    type: 3}
-  m_PrefabInstance: {fileID: 4450251647543057682}
-  m_PrefabAsset: {fileID: 0}
+    type: 3}
+  m_PrefabInstance: {fileID: 4450251647543057682}
+  m_PrefabAsset: {fileID: 0}
+--- !u!4 &5592937035813717485 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 8096454886103390463, guid: cf7ef849ef0651046adb756161dddde0,
    type: 3}
  m_PrefabInstance: {fileID: 4450251647543057682}
  m_PrefabAsset: {fileID: 0}
      objectReference: {fileID: 0}
    m_RemovedComponents: []
  m_SourcePrefab: {fileID: 100100000, guid: de38e4bbfe5a86541bd140156b6a6d75, type: 3}
+--- !u!95 &1604418144886177017 stripped
+Animator:
+  m_CorrespondingSourceObject: {fileID: 5875841568448061001, guid: de38e4bbfe5a86541bd140156b6a6d75,
+    type: 3}
+  m_PrefabInstance: {fileID: 5174397426126267056}
+  m_PrefabAsset: {fileID: 0}
 --- !u!4 &4561043568664879096 stripped
 Transform:
  m_CorrespondingSourceObject: {fileID: 8683841676502515016, guid: de38e4bbfe5a86541bd140156b6a6d75,
--- !u!95 &1604418144886177017 stripped
-Animator:
-  m_CorrespondingSourceObject: {fileID: 5875841568448061001, guid: de38e4bbfe5a86541bd140156b6a6d75,
-    type: 3}
-  m_PrefabInstance: {fileID: 5174397426126267056}
-  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &5230348797615436017
 PrefabInstance:
  m_ObjectHideFlags: 0
      objectReference: {fileID: 0}
    m_RemovedComponents: []
  m_SourcePrefab: {fileID: 100100000, guid: 49742b79daeb15e4984aced2143ad1d9, type: 3}
--- !u!4 &4506450903540477630 stripped
-Transform:
-  m_CorrespondingSourceObject: {fileID: 8096454886103390463, guid: 49742b79daeb15e4984aced2143ad1d9,
-    type: 3}
-  m_PrefabInstance: {fileID: 5680802652367074881}
-  m_PrefabAsset: {fileID: 0}
+    type: 3}
+  m_PrefabInstance: {fileID: 5680802652367074881}
+  m_PrefabAsset: {fileID: 0}
+--- !u!4 &4506450903540477630 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 8096454886103390463, guid: 49742b79daeb15e4984aced2143ad1d9,
    type: 3}
  m_PrefabInstance: {fileID: 5680802652367074881}
  m_PrefabAsset: {fileID: 0}
      objectReference: {fileID: 0}
    m_RemovedComponents: []
  m_SourcePrefab: {fileID: 100100000, guid: b88e9f862f7dd5f4ab74a86145f4adda, type: 3}
+--- !u!4 &2534861946401657022 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 8096454886103390463, guid: b88e9f862f7dd5f4ab74a86145f4adda,
+    type: 3}
+  m_PrefabInstance: {fileID: 6012799531149035585}
+  m_PrefabAsset: {fileID: 0}
 --- !u!95 &4019394805854170393 stripped
 Animator:
  m_CorrespondingSourceObject: {fileID: 7256991247967642968, guid: b88e9f862f7dd5f4ab74a86145f4adda,
--- !u!4 &2534861946401657022 stripped
-Transform:
-  m_CorrespondingSourceObject: {fileID: 8096454886103390463, guid: b88e9f862f7dd5f4ab74a86145f4adda,
-    type: 3}
-  m_PrefabInstance: {fileID: 6012799531149035585}
-  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &6048517935098163255
 PrefabInstance:
  m_ObjectHideFlags: 0
      objectReference: {fileID: 0}
    m_RemovedComponents: []
  m_SourcePrefab: {fileID: 100100000, guid: cf7ef849ef0651046adb756161dddde0, type: 3}
--- !u!4 &2570646991062296776 stripped
-Transform:
-  m_CorrespondingSourceObject: {fileID: 8096454886103390463, guid: cf7ef849ef0651046adb756161dddde0,
-    type: 3}
-  m_PrefabInstance: {fileID: 6048517935098163255}
-  m_PrefabAsset: {fileID: 0}
+    type: 3}
+  m_PrefabInstance: {fileID: 6048517935098163255}
+  m_PrefabAsset: {fileID: 0}
+--- !u!4 &2570646991062296776 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 8096454886103390463, guid: cf7ef849ef0651046adb756161dddde0,
    type: 3}
  m_PrefabInstance: {fileID: 6048517935098163255}
  m_PrefabAsset: {fileID: 0}
    - target: {fileID: 244216481246938342, guid: 254bf66f87892c94985b0720d6497bd3,
        type: 3}
      propertyPath: m_Lens.m_SensorSize.x
-      value: 2.4054055
+      value: 2.3706896
      objectReference: {fileID: 0}
    - target: {fileID: 303239861944462450, guid: 254bf66f87892c94985b0720d6497bd3,
        type: 3}
--- a/UOP1_Project/Assets/Scripts/SceneManagement/LocationExit.cs
+++ b/UOP1_Project/Assets/Scripts/SceneManagement/LocationExit.cs
 		if (other.CompareTag("Player"))
 		{
 			_pathStorage.lastPathTaken = _leadsToPath;
-			_locationExitLoadChannel.RaiseEvent(_locationToLoad, false, true);
+			LoadScene();
+	}
+
+	//Used to load a location from a custscene
+	public void LoadScene()
+	{
+		_locationExitLoadChannel.RaiseEvent(_locationToLoad, false, true);
 	}
 }
--- a/UOP1_Project/Assets/LoadScene.signal
+++ b/UOP1_Project/Assets/LoadScene.signal
+%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: d6fa2d92fc1b3f34da284357edf89c3b, type: 3}
+  m_Name: LoadScene
+  m_EditorClassIdentifier: 
--- a/UOP1_Project/Assets/LoadScene.signal.meta
+++ b/UOP1_Project/Assets/LoadScene.signal.meta
+fileFormatVersion: 2
+guid: 1550c0b25c64f074fab55878318a887c
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/UOP1_Project/Assets/ScriptableObjects/SceneData/Locations/Beach_Night.asset
+++ b/UOP1_Project/Assets/ScriptableObjects/SceneData/Locations/Beach_Night.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: 8db63739a6674d74e8e232347422172f, type: 3}
+  m_Name: Beach_Night
+  m_EditorClassIdentifier: 
+  _guid: 7f8ed3292b055484c81ecef146e54693
+  description: 
+  sceneType: 0
+  sceneReference:
+    m_AssetGUID: 2b208cb05dafb3a4cbeca8c493e4a6e2
+    m_SubObjectName: 
+    m_SubObjectType: 
+    m_EditorAssetChanged: 0
+  musicTrack: {fileID: 11400000, guid: 8581dd3dfa47c5c46b3ddf5a2d6f6e4e, type: 2}
+  locationName:
+    m_TableReference:
+      m_TableCollectionName: 
+    m_TableEntryReference:
+      m_KeyId: 0
+      m_Key: 
+    m_FallbackState: 0
+    m_WaitForCompletion: 1
--- a/UOP1_Project/Assets/ScriptableObjects/SceneData/Locations/Beach_Night.asset.meta
+++ b/UOP1_Project/Assets/ScriptableObjects/SceneData/Locations/Beach_Night.asset.meta
+fileFormatVersion: 2
+guid: 7f8ed3292b055484c81ecef146e54693
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: