Merge branch 'main' into ciro

3 年前 · 3e67c187
--- a/UOP1_Project/Assets/AddressableAssetsData/AssetGroups/Default
+++ b/UOP1_Project/Assets/AddressableAssetsData/AssetGroups/Default
  m_Data:
    m_SerializedData: []
  m_GUID: a7bae5f88e2e24365bdf768f42df85c5
-  m_SerializeEntries: []
+  m_SerializeEntries:
+  - m_GUID: 54b0379f81d0e8b479ad9405fe862f25
+    m_Address: Assets/Scenes/Examples/CutsceneExample.unity
+    m_ReadOnly: 0
+    m_SerializedLabels: []
  m_ReadOnly: 0
  m_Settings: {fileID: 11400000, guid: bffab80dc16c4464b92b2e97b6a1964c, type: 2}
  m_SchemaSet:
--- a/UOP1_Project/Assets/Cutscenes/ExampleCutscene.playable
+++ b/UOP1_Project/Assets/Cutscenes/ExampleCutscene.playable
  _template:
    _dialogueLine:
      m_TableReference:
-        m_TableCollectionName: GUID:3023456eb4be043f1a0c6ede7f88d892
+        m_TableCollectionName: GUID:f81a49615d56c1a4fbbd14b4569b06f3
-        m_KeyId: 104386781184
+        m_KeyId: 21415600320274432
-    _actor: {fileID: 11400000, guid: 027d026cf519df04eb8b7bf251472e13, type: 2}
+      m_FallbackState: 0
+      m_WaitForCompletion: 1
+    _actor: {fileID: 11400000, guid: 5e7bd0eed8324794fad1bc460c565ecb, type: 2}
    _pauseWhenClipEnds: 1
    PlayDialogueEvent: {fileID: 11400000, guid: d987db4881d794f2da0013a89588d890,
      type: 2}
  m_Children: []
  m_Clips:
  - m_Version: 1
-    m_Start: 0
+    m_Start: 0.06666666666666667
-    m_Asset: {fileID: 9211983919050520405}
-    m_Duration: 1.1
+    m_Asset: {fileID: -7104271872717664822}
+    m_Duration: 6.716666666666667
-    m_BlendOutDuration: 0.7333333333333334
+    m_BlendOutDuration: 1.0499999999999998
    m_MixInCurve:
      serializedVersion: 2
      m_Curve:
    m_PreExtrapolationMode: 0
    m_PostExtrapolationTime: 0
    m_PreExtrapolationTime: 0
-    m_DisplayName: CM vcam1
+    m_DisplayName: CM vcam Dialogue
-    m_Start: 0.36666666666666664
-    m_ClipIn: 0
-    m_Asset: {fileID: -7104271872717664822}
-    m_Duration: 3.433333333333333
-    m_TimeScale: 1
-    m_ParentTrack: {fileID: -7243414920591819180}
-    m_EaseInDuration: 0
-    m_EaseOutDuration: 0
-    m_BlendInDuration: 0.7333333333333334
-    m_BlendOutDuration: 0.5333333333333332
-    m_MixInCurve:
-      serializedVersion: 2
-      m_Curve: []
-      m_PreInfinity: 2
-      m_PostInfinity: 2
-      m_RotationOrder: 4
-    m_MixOutCurve:
-      serializedVersion: 2
-      m_Curve: []
-      m_PreInfinity: 2
-      m_PostInfinity: 2
-      m_RotationOrder: 4
-    m_BlendInCurveMode: 0
-    m_BlendOutCurveMode: 0
-    m_ExposedParameterNames: []
-    m_AnimationCurves: {fileID: 0}
-    m_Recordable: 0
-    m_PostExtrapolationMode: 0
-    m_PreExtrapolationMode: 0
-    m_PostExtrapolationTime: 0
-    m_PreExtrapolationTime: 0
-    m_DisplayName: CM vcam1 (1)
-  - m_Version: 1
-    m_Start: 3.2666666666666666
+    m_Start: 5.733333333333333
-    m_Duration: 1.8000000000000003
+    m_Duration: 7.133333333333333
-    m_BlendInDuration: 0.5333333333333332
+    m_BlendInDuration: 1.0499999999999998
    m_BlendOutDuration: -1
    m_MixInCurve:
      serializedVersion: 2
    m_PreExtrapolationMode: 0
    m_PostExtrapolationTime: 0
    m_PreExtrapolationTime: 0
-    m_DisplayName: CM vcam1
+    m_DisplayName: CM vcam Critter Loop
  m_Markers:
    m_Objects: []
 --- !u!114 &-7104271872717664822
  VirtualCamera:
    exposedName: 9c910a5264e9c2a4493346b21c86a486
    defaultValue: {fileID: 0}
+--- !u!114 &-5873350691336052493
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  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: d21dcc2386d650c4597f3633c75a1f98, type: 3}
+  m_Name: Animation Track
+  m_EditorClassIdentifier: 
+  m_Version: 3
+  m_AnimClip: {fileID: 0}
+  m_Locked: 0
+  m_Muted: 0
+  m_CustomPlayableFullTypename: 
+  m_Curves: {fileID: 0}
+  m_Parent: {fileID: 11400000}
+  m_Children: []
+  m_Clips: []
+  m_Markers:
+    m_Objects: []
+  m_InfiniteClipPreExtrapolation: 1
+  m_InfiniteClipPostExtrapolation: 1
+  m_InfiniteClipOffsetPosition: {x: 0, y: 0, z: 0}
+  m_InfiniteClipOffsetEulerAngles: {x: 0, y: 0, z: 0}
+  m_InfiniteClipTimeOffset: 0
+  m_InfiniteClipRemoveOffset: 0
+  m_InfiniteClipApplyFootIK: 1
+  mInfiniteClipLoop: 0
+  m_MatchTargetFields: 63
+  m_Position: {x: 0, y: 0, z: 0}
+  m_EulerAngles: {x: 0, y: 0, z: 0}
+  m_AvatarMask: {fileID: 0}
+  m_ApplyAvatarMask: 1
+  m_TrackOffset: 0
+  m_InfiniteClip: {fileID: -215370580912781752}
+  m_OpenClipOffsetRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_Rotation: {x: 0, y: 0, z: 0, w: 1}
+  m_ApplyOffsets: 0
+--- !u!74 &-215370580912781752
+AnimationClip:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Recorded
+  serializedVersion: 6
+  m_Legacy: 0
+  m_Compressed: 0
+  m_UseHighQualityCurve: 1
+  m_RotationCurves: []
+  m_CompressedRotationCurves: []
+  m_EulerCurves: []
+  m_PositionCurves: []
+  m_ScaleCurves: []
+  m_FloatCurves:
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 6.866667
+        value: 4
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 12.816667
+        value: 0
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_PathPosition
+    path: cm
+    classID: 114
+    script: {fileID: 11500000, guid: 418e42c7d0405cc48a7b83f63ea53bb3, type: 3}
+  m_PPtrCurves: []
+  m_SampleRate: 60
+  m_WrapMode: 0
+  m_Bounds:
+    m_Center: {x: 0, y: 0, z: 0}
+    m_Extent: {x: 0, y: 0, z: 0}
+  m_ClipBindingConstant:
+    genericBindings:
+    - serializedVersion: 2
+      path: 1007302526
+      attribute: 2871404689
+      script: {fileID: 11500000, guid: 418e42c7d0405cc48a7b83f63ea53bb3, type: 3}
+      typeID: 114
+      customType: 0
+      isPPtrCurve: 0
+    pptrCurveMapping: []
+  m_AnimationClipSettings:
+    serializedVersion: 2
+    m_AdditiveReferencePoseClip: {fileID: 0}
+    m_AdditiveReferencePoseTime: 0
+    m_StartTime: 0
+    m_StopTime: 12.816667
+    m_OrientationOffsetY: 0
+    m_Level: 0
+    m_CycleOffset: 0
+    m_HasAdditiveReferencePose: 0
+    m_LoopTime: 0
+    m_LoopBlend: 0
+    m_LoopBlendOrientation: 0
+    m_LoopBlendPositionY: 0
+    m_LoopBlendPositionXZ: 0
+    m_KeepOriginalOrientation: 0
+    m_KeepOriginalPositionY: 1
+    m_KeepOriginalPositionXZ: 0
+    m_HeightFromFeet: 0
+    m_Mirror: 0
+  m_EditorCurves:
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 6.866667
+        value: 4
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 12.816667
+        value: 0
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_PathPosition
+    path: cm
+    classID: 114
+    script: {fileID: 11500000, guid: 418e42c7d0405cc48a7b83f63ea53bb3, type: 3}
+  m_EulerEditorCurves: []
+  m_HasGenericRootTransform: 0
+  m_HasMotionFloatCurves: 0
+  m_Events: []
 --- !u!114 &11400000
 MonoBehaviour:
  m_ObjectHideFlags: 0
  m_Tracks:
  - {fileID: -7243414920591819180}
  - {fileID: 1900134804166205457}
+  - {fileID: -5873350691336052493}
+    m_ScenePreview: 1
  m_DurationMode: 0
  m_MarkerTrack: {fileID: 5472072730035891554}
 --- !u!114 &1900134804166205457
  m_Children: []
  m_Clips:
  - m_Version: 1
-    m_Start: 1.9166666666666667
+    m_Start: 0.43333333333333335
    m_ClipIn: 0
    m_Asset: {fileID: 4587721134825755193}
    m_Duration: 0.8666666666666667
    m_PreExtrapolationTime: 0
    m_DisplayName: FirstLine
  - m_Version: 1
-    m_Start: 3.8
+    m_Start: 3.2333333333333334
    m_ClipIn: 0
    m_Asset: {fileID: -9073006965474109427}
    m_Duration: 1.033333333333334
  _template:
    _dialogueLine:
      m_TableReference:
-        m_TableCollectionName: GUID:3023456eb4be043f1a0c6ede7f88d892
+        m_TableCollectionName: GUID:f81a49615d56c1a4fbbd14b4569b06f3
-        m_KeyId: 9306103808
+        m_KeyId: 9306103809
-    _actor: {fileID: 11400000, guid: 027d026cf519df04eb8b7bf251472e13, type: 2}
+      m_FallbackState: 0
+      m_WaitForCompletion: 1
+    _actor: {fileID: 11400000, guid: 5e7bd0eed8324794fad1bc460c565ecb, type: 2}
    _pauseWhenClipEnds: 1
    PlayDialogueEvent: {fileID: 11400000, guid: d987db4881d794f2da0013a89588d890,
      type: 2}
  m_Clips: []
  m_Markers:
    m_Objects: []
--- !u!114 &9211983919050520405
-MonoBehaviour:
-  m_ObjectHideFlags: 1
-  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: 90fb794a295e73545af71bcdb7375791, type: 3}
-  m_Name: CinemachineShot
-  m_EditorClassIdentifier: 
-  DisplayName: 
-  VirtualCamera:
-    exposedName: 67a8876312de87a438022d114b2278b7
-    defaultValue: {fileID: 0}
--- a/UOP1_Project/Assets/Scenes/Examples/CutsceneExample.unity
+++ b/UOP1_Project/Assets/Scenes/Examples/CutsceneExample.unity
--- a/UOP1_Project/Assets/Scripts/Cutscenes/CutsceneManager.cs
+++ b/UOP1_Project/Assets/Scripts/Cutscenes/CutsceneManager.cs
 			_activePlayableDirector.stopped -= HandleDirectorStopped;

 		_inputReader.EnableGameplayInput();
-		_dialogueManager.DialogueEndedAndCloseDialogueUI();
+		_dialogueManager.CutsceneDialogueEnded();
+	}
+
+	public void LineEnded()
+	{
+		_dialogueManager.CutsceneDialogueEnded();
+
 	}

 	private void HandleDirectorStopped(PlayableDirector director) => CutsceneEnded();
 	private void OnAdvance()
 	{
 		if (_isPaused)
+		{
+			LineEnded();
+		}
 	}

 	/// <summary>
--- a/UOP1_Project/Assets/Scripts/Dialogues/DialogueManager.cs
+++ b/UOP1_Project/Assets/Scripts/Dialogues/DialogueManager.cs


 	}
-	void DialogueEnded()
+
+	public void CutsceneDialogueEnded()
-		if (_endDialogue != null)
-			_endDialogue.RaiseEvent(_currentDialogue);
-
-		_gameState.ResetToPreviousGameState();
+		if (_closeDialogueUIEvent != null)
+			_closeDialogueUIEvent.RaiseEvent();
 	}
 	public void DialogueEndedAndCloseDialogueUI()
 	{
--- a/UOP1_Project/Assets/Scenes/Examples/CutsceneExample.meta
+++ b/UOP1_Project/Assets/Scenes/Examples/CutsceneExample.meta
+fileFormatVersion: 2
+guid: cf2e7156dd774754eaf60d0c9ec46d3a
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/UOP1_Project/Assets/ScriptableObjects/SceneData/WIP/CutsceneExample.asset
+++ b/UOP1_Project/Assets/ScriptableObjects/SceneData/WIP/CutsceneExample.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: CutsceneExample
+  m_EditorClassIdentifier: 
+  _guid: 3285fef18b6d2cf40832b092d8e812f5
+  description: Just a WIP scene, not used in the game
+  sceneType: 0
+  sceneReference:
+    m_AssetGUID: 54b0379f81d0e8b479ad9405fe862f25
+    m_SubObjectName: 
+    m_SubObjectType: 
+    m_EditorAssetChanged: 0
+  musicTrack: {fileID: 11400000, guid: cdd30f7c64c86384dae627b738e83219, 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/WIP/CutsceneExample.asset.meta
+++ b/UOP1_Project/Assets/ScriptableObjects/SceneData/WIP/CutsceneExample.asset.meta
+fileFormatVersion: 2
+guid: 3285fef18b6d2cf40832b092d8e812f5
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/UOP1_Project/Assets/WIP/Materials/Debug_Cutscene.mat
+++ b/UOP1_Project/Assets/WIP/Materials/Debug_Cutscene.mat
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &-3303094881859550400
+MonoBehaviour:
+  m_ObjectHideFlags: 11
+  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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  version: 4
+--- !u!21 &2100000
+Material:
+  serializedVersion: 6
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Debug_Cutscene
+  m_Shader: {fileID: 4800000, guid: 8d2bb70cbf9db8d4da26e15b26e74248, type: 3}
+  m_ShaderKeywords: _RECEIVE_SHADOWS_OFF
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 1
+  m_CustomRenderQueue: 3000
+  stringTagMap:
+    RenderType: Transparent
+  disabledShaderPasses:
+  - SHADOWCASTER
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _BaseMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _BumpMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _EmissionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MainTex:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MetallicGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _OcclusionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _SpecGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Floats:
+    - _AlphaClip: 0
+    - _Blend: 0
+    - _BumpScale: 1
+    - _Cull: 0
+    - _Cutoff: 0.5
+    - _DstBlend: 10
+    - _EnvironmentReflections: 1
+    - _GlossMapScale: 0
+    - _Glossiness: 0
+    - _GlossinessSource: 0
+    - _GlossyReflections: 0
+    - _Metallic: 0
+    - _OcclusionStrength: 1
+    - _QueueOffset: 0
+    - _ReceiveShadows: 0
+    - _SampleGI: 0
+    - _Shininess: 0
+    - _Smoothness: 0.5
+    - _SmoothnessSource: 0
+    - _SmoothnessTextureChannel: 0
+    - _SpecSource: 0
+    - _SpecularHighlights: 1
+    - _SrcBlend: 5
+    - _Surface: 1
+    - _WorkflowMode: 1
+    - _ZWrite: 0
+    m_Colors:
+    - _BaseColor: {r: 0.1727778, g: 0.6295597, b: 0.9811321, a: 0}
+    - _Color: {r: 1, g: 1, b: 1, a: 1}
+    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+    - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
+  m_BuildTextureStacks: []
--- a/UOP1_Project/Assets/WIP/Materials/Debug_Cutscene.mat.meta
+++ b/UOP1_Project/Assets/WIP/Materials/Debug_Cutscene.mat.meta
+fileFormatVersion: 2
+guid: 363cd44285d7aac49b6c14b32223b795
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 2100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/UOP1_Project/Assets/Scenes/Examples/CutsceneExample/NavMesh.asset
+++ b/UOP1_Project/Assets/Scenes/Examples/CutsceneExample/NavMesh.asset
--- a/UOP1_Project/Assets/Scenes/Examples/CutsceneExample/NavMesh.asset.meta
+++ b/UOP1_Project/Assets/Scenes/Examples/CutsceneExample/NavMesh.asset.meta
+fileFormatVersion: 2
+guid: d498a8263bc4c634eb145195303f0af7
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 23800000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: