Merge branch 'main' of https://github.com/UnityTechnologies/open-project-1 into main

3 年前 · 02a13eae
--- a/UOP1_Project/Assets/Art/Characters/PigChef/Animation/PigChef_Talk.fbx.meta
+++ b/UOP1_Project/Assets/Art/Characters/PigChef/Animation/PigChef_Talk.fbx.meta
    animationWrapMode: 0
    extraExposedTransformPaths: []
    extraUserProperties: []
-    clipAnimations: []
+    clipAnimations:
+    - serializedVersion: 16
+      name: talk
+      takeName: talk
+      internalID: 0
+      firstFrame: 0
+      lastFrame: 200
+      wrapMode: 0
+      orientationOffsetY: 0
+      level: 0
+      cycleOffset: 0
+      loop: 0
+      hasAdditiveReferencePose: 0
+      loopTime: 0
+      loopBlend: 0
+      loopBlendOrientation: 0
+      loopBlendPositionY: 0
+      loopBlendPositionXZ: 0
+      keepOriginalOrientation: 0
+      keepOriginalPositionY: 1
+      keepOriginalPositionXZ: 0
+      heightFromFeet: 0
+      mirror: 0
+      bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000
+      curves: []
+      events:
+      - time: 0.059539806
+        functionName: PlayTalk
+        data: 
+        objectReferenceParameter: {instanceID: 0}
+        floatParameter: 0
+        intParameter: 0
+        messageOptions: 0
+      - time: 0.20708075
+        functionName: PlayTalk
+        data: 
+        objectReferenceParameter: {instanceID: 0}
+        floatParameter: 0
+        intParameter: 0
+        messageOptions: 0
+      - time: 0.42347422
+        functionName: PlayTalk
+        data: 
+        objectReferenceParameter: {instanceID: 0}
+        floatParameter: 0
+        intParameter: 0
+        messageOptions: 0
+      - time: 0.60052335
+        functionName: PlayTalk
+        data: 
+        objectReferenceParameter: {instanceID: 0}
+        floatParameter: 0
+        intParameter: 0
+        messageOptions: 0
+      - time: 0.72839224
+        functionName: PlayTalk
+        data: 
+        objectReferenceParameter: {instanceID: 0}
+        floatParameter: 0
+        intParameter: 0
+        messageOptions: 0
+      - time: 0.86609715
+        functionName: PlayTalk
+        data: 
+        objectReferenceParameter: {instanceID: 0}
+        floatParameter: 0
+        intParameter: 0
+        messageOptions: 0
+      transformMask: []
+      maskType: 3
+      maskSource: {instanceID: 0}
+      additiveReferencePoseFrame: 0
    isReadable: 0
  meshes:
    lODScreenPercentages: []
--- a/UOP1_Project/Assets/Art/Characters/PigChef/Animation/PigChef_Talk2.fbx.meta
+++ b/UOP1_Project/Assets/Art/Characters/PigChef/Animation/PigChef_Talk2.fbx.meta
    animationWrapMode: 0
    extraExposedTransformPaths: []
    extraUserProperties: []
-    clipAnimations: []
+    clipAnimations:
+    - serializedVersion: 16
+      name: talk2
+      takeName: talk2
+      internalID: 0
+      firstFrame: 1
+      lastFrame: 250
+      wrapMode: 0
+      orientationOffsetY: 0
+      level: 0
+      cycleOffset: 0
+      loop: 0
+      hasAdditiveReferencePose: 0
+      loopTime: 0
+      loopBlend: 0
+      loopBlendOrientation: 0
+      loopBlendPositionY: 0
+      loopBlendPositionXZ: 0
+      keepOriginalOrientation: 0
+      keepOriginalPositionY: 1
+      keepOriginalPositionXZ: 0
+      heightFromFeet: 0
+      mirror: 0
+      bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000
+      curves: []
+      events:
+      - time: 0
+        functionName: PlayTalk
+        data: 
+        objectReferenceParameter: {instanceID: 0}
+        floatParameter: 0
+        intParameter: 0
+        messageOptions: 0
+      - time: 0.14754094
+        functionName: PlayTalk
+        data: 
+        objectReferenceParameter: {instanceID: 0}
+        floatParameter: 0
+        intParameter: 0
+        messageOptions: 0
+      - time: 0.36393443
+        functionName: PlayTalk
+        data: 
+        objectReferenceParameter: {instanceID: 0}
+        floatParameter: 0
+        intParameter: 0
+        messageOptions: 0
+      - time: 0.54098356
+        functionName: PlayTalk
+        data: 
+        objectReferenceParameter: {instanceID: 0}
+        floatParameter: 0
+        intParameter: 0
+        messageOptions: 0
+      - time: 0.66885245
+        functionName: PlayTalk
+        data: 
+        objectReferenceParameter: {instanceID: 0}
+        floatParameter: 0
+        intParameter: 0
+        messageOptions: 0
+      - time: 0.80655736
+        functionName: PlayTalk
+        data: 
+        objectReferenceParameter: {instanceID: 0}
+        floatParameter: 0
+        intParameter: 0
+        messageOptions: 0
+      - time: 0.9311475
+        functionName: PlayTalk
+        data: 
+        objectReferenceParameter: {instanceID: 0}
+        floatParameter: 0
+        intParameter: 0
+        messageOptions: 0
+      transformMask: []
+      maskType: 3
+      maskSource: {instanceID: 0}
+      additiveReferencePoseFrame: 0
    isReadable: 0
  meshes:
    lODScreenPercentages: []
--- a/UOP1_Project/Assets/Cutscenes/BeachCandyCutscene.playable
+++ b/UOP1_Project/Assets/Cutscenes/BeachCandyCutscene.playable
    m_BlendOutDuration: -1
    m_MixInCurve:
      serializedVersion: 2
-      m_Curve: []
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 0
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      - serializedVersion: 3
+        time: 1
+        value: 1
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
      m_PreInfinity: 2
      m_PostInfinity: 2
      m_RotationOrder: 4
      m_RotationOrder: 4
    m_MixOutCurve:
      serializedVersion: 2
-      m_Curve: []
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 1
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      - serializedVersion: 3
+        time: 1
+        value: 0
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
      m_PreInfinity: 2
      m_PostInfinity: 2
      m_RotationOrder: 4
      m_RotationOrder: 4
    m_MixOutCurve:
      serializedVersion: 2
-      m_Curve: []
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 1
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      - serializedVersion: 3
+        time: 1
+        value: 0
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
      m_PreInfinity: 2
      m_PostInfinity: 2
      m_RotationOrder: 4
    m_BlendOutDuration: 0.13333333333333286
    m_MixInCurve:
      serializedVersion: 2
-      m_Curve: []
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 0
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      - serializedVersion: 3
+        time: 1
+        value: 1
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
-      m_Curve: []
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 1
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      - serializedVersion: 3
+        time: 1
+        value: 0
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
      m_PreInfinity: 2
      m_PostInfinity: 2
      m_RotationOrder: 4
    m_EaseInDuration: 0
    m_EaseOutDuration: 0
    m_BlendInDuration: 0.0724920101463793
-    m_BlendOutDuration: -1
+    m_BlendOutDuration: 0.13333333333333286
    m_MixInCurve:
      serializedVersion: 2
      m_Curve: []
    m_MixOutCurve:
      serializedVersion: 2
-      m_Curve:
-      - serializedVersion: 3
-        time: 0
-        value: 1
-        inSlope: 0
-        outSlope: 0
-        tangentMode: 0
-        weightedMode: 0
-        inWeight: 0
-        outWeight: 0
-      - serializedVersion: 3
-        time: 1
-        value: 0
-        inSlope: 0
-        outSlope: 0
-        tangentMode: 0
-        weightedMode: 0
-        inWeight: 0
-        outWeight: 0
+      m_Curve: []
      m_PreInfinity: 2
      m_PostInfinity: 2
      m_RotationOrder: 4
    m_Recordable: 0
    m_PostExtrapolationMode: 1
    m_PreExtrapolationMode: 1
-    m_PostExtrapolationTime: 0.06666666666666643
+    m_PostExtrapolationTime: 0
    m_PreExtrapolationTime: 0
    m_DisplayName: talk2
  - m_Version: 1
    m_PreExtrapolationTime: 0
    m_DisplayName: Listening
  - m_Version: 1
-    m_Start: 9.966666666666667
-    m_ClipIn: 0
+    m_Start: 9.766666666666667
+    m_ClipIn: 0.16666666666666785
-    m_Duration: 1.1891586768130455
+    m_Duration: 1.3333333333333321
-    m_BlendInDuration: -1
+    m_BlendInDuration: 0.13333333333333286
    m_BlendOutDuration: -1
    m_MixInCurve:
      serializedVersion: 2
    m_Recordable: 0
    m_PostExtrapolationMode: 1
    m_PreExtrapolationMode: 1
-    m_PostExtrapolationTime: 5.5108413231869555
+    m_PostExtrapolationTime: 5.566666666666668
    m_PreExtrapolationTime: 0
    m_DisplayName: idle
  - m_Version: 1
    m_EaseInDuration: 0
    m_EaseOutDuration: 0
    m_BlendInDuration: -1
-    m_BlendOutDuration: -1
+    m_BlendOutDuration: 0.18333333333333712
    m_MixInCurve:
      serializedVersion: 2
      m_Curve: []
    m_PreExtrapolationTime: 0
    m_DisplayName: talk2
  - m_Version: 1
-    m_Start: 39.216666666666676
+    m_Start: 39.03333333333333
-    m_Duration: 1.1891586768130455
+    m_Duration: 1.372492010146381
-    m_BlendInDuration: -1
+    m_BlendInDuration: 0.18333333333333712
    m_BlendOutDuration: -1
    m_MixInCurve:
      serializedVersion: 2
    m_Recordable: 0
    m_PostExtrapolationMode: 1
    m_PreExtrapolationMode: 1
-    m_PostExtrapolationTime: 18.41084132318695
+    m_PostExtrapolationTime: 18.410841323186958
    m_PreExtrapolationTime: 0
    m_DisplayName: idle
  - m_Version: 1
    m_EaseInDuration: 0
    m_EaseOutDuration: 0
    m_BlendInDuration: -1
-    m_BlendOutDuration: 0
+    m_BlendOutDuration: 0.20000000000001705
    m_MixInCurve:
      serializedVersion: 2
      m_Curve: []
    m_PreExtrapolationTime: 0
    m_DisplayName: talk2
  - m_Version: 1
-    m_Start: 62.15
+    m_Start: 61.95
-    m_Duration: 1.1891586768130455
+    m_Duration: 1.3891586768130324
-    m_BlendInDuration: 0
-    m_BlendOutDuration: 0.08915867681304945
+    m_BlendInDuration: 0.20000000000001705
+    m_BlendOutDuration: 0.08915867681304235
    m_MixInCurve:
      serializedVersion: 2
      m_Curve: []
    m_ParentTrack: {fileID: 773694970127727041}
    m_EaseInDuration: 0
    m_EaseOutDuration: 0
-    m_BlendInDuration: 0.08915867681304945
-    m_BlendOutDuration: -1
+    m_BlendInDuration: 0.08915867681304235
+    m_BlendOutDuration: 0.1666666666666572
    m_MixInCurve:
      serializedVersion: 2
      m_Curve: []
    m_PreExtrapolationTime: 0
    m_DisplayName: talk2
  - m_Version: 1
-    m_Start: 66.63333333333333
+    m_Start: 66.46666666666667
-    m_Duration: 1.1891586768130455
+    m_Duration: 1.3166666666666629
-    m_BlendInDuration: -1
+    m_BlendInDuration: 0.1666666666666572
    m_BlendOutDuration: -1
    m_MixInCurve:
      serializedVersion: 2
    m_Recordable: 0
    m_PostExtrapolationMode: 1
    m_PreExtrapolationMode: 1
-    m_PostExtrapolationTime: 0.9775079898536347
+    m_PostExtrapolationTime: 1.01666666666668
    m_PreExtrapolationTime: 0
    m_DisplayName: Listening
  m_Markers:
    m_BlendOutDuration: -1
    m_MixInCurve:
      serializedVersion: 2
-      m_Curve:
-      - serializedVersion: 3
-        time: 0
-        value: 0
-        inSlope: 0
-        outSlope: 0
-        tangentMode: 0
-        weightedMode: 0
-        inWeight: 0
-        outWeight: 0
-      - serializedVersion: 3
-        time: 1
-        value: 1
-        inSlope: 0
-        outSlope: 0
-        tangentMode: 0
-        weightedMode: 0
-        inWeight: 0
-        outWeight: 0
+      m_Curve: []
      m_PreInfinity: 2
      m_PostInfinity: 2
      m_RotationOrder: 4
    m_BlendOutDuration: 0.4499999999999993
    m_MixInCurve:
      serializedVersion: 2
-      m_Curve:
-      - serializedVersion: 3
-        time: 0
-        value: 0
-        inSlope: 0
-        outSlope: 0
-        tangentMode: 0
-        weightedMode: 0
-        inWeight: 0
-        outWeight: 0
-      - serializedVersion: 3
-        time: 1
-        value: 1
-        inSlope: 0
-        outSlope: 0
-        tangentMode: 0
-        weightedMode: 0
-        inWeight: 0
-        outWeight: 0
+      m_Curve: []
-      m_Curve:
-      - serializedVersion: 3
-        time: 0
-        value: 1
-        inSlope: 0
-        outSlope: 0
-        tangentMode: 0
-        weightedMode: 0
-        inWeight: 0
-        outWeight: 0
-      - serializedVersion: 3
-        time: 1
-        value: 0
-        inSlope: 0
-        outSlope: 0
-        tangentMode: 0
-        weightedMode: 0
-        inWeight: 0
-        outWeight: 0
+      m_Curve: []
      m_PreInfinity: 2
      m_PostInfinity: 2
      m_RotationOrder: 4
    m_Start: 41.38915867681304
    m_ClipIn: 2.460841323186955
    m_Asset: {fileID: -7702104329539321804}
-    m_Duration: 5.367964441111937
+    m_Duration: 5.1775079898536305
-    m_BlendOutDuration: -1
+    m_BlendOutDuration: 0.6666666666666714
    m_MixInCurve:
      serializedVersion: 2
      m_Curve: []
    m_MixOutCurve:
      serializedVersion: 2
-      m_Curve:
-      - serializedVersion: 3
-        time: 0
-        value: 1
-        inSlope: 0
-        outSlope: 0
-        tangentMode: 0
-        weightedMode: 0
-        inWeight: 0
-        outWeight: 0
-      - serializedVersion: 3
-        time: 1
-        value: 0
-        inSlope: 0
-        outSlope: 0
-        tangentMode: 0
-        weightedMode: 0
-        inWeight: 0
-        outWeight: 0
+      m_Curve: []
      m_PreInfinity: 2
      m_PostInfinity: 2
      m_RotationOrder: 4
    m_PreExtrapolationTime: 0
    m_DisplayName: talk2
  - m_Version: 1
-    m_Start: 46.757123117924976
+    m_Start: 45.9
-    m_Duration: 0.8666666666666671
+    m_Duration: 1.9166666666666714
-    m_BlendInDuration: -1
-    m_BlendOutDuration: 0.033333333333338544
+    m_BlendInDuration: 0.6666666666666714
+    m_BlendOutDuration: 0.3499999999999943
    m_MixInCurve:
      serializedVersion: 2
      m_Curve: []
    m_PreExtrapolationTime: 0
    m_DisplayName: idle2
  - m_Version: 1
-    m_Start: 47.590456451258305
-    m_ClipIn: 2.460841323186955
+    m_Start: 47.466666666666676
+    m_ClipIn: 2.3370515385953254
-    m_Duration: 6.183333333333358
+    m_Duration: 6.307123117924988
-    m_BlendInDuration: 0.033333333333338544
+    m_BlendInDuration: 0.3499999999999943
    m_BlendOutDuration: -1
    m_MixInCurve:
      serializedVersion: 2
    m_BlendOutDuration: 0.3333333333333357
    m_MixInCurve:
      serializedVersion: 2
-      m_Curve:
-      - serializedVersion: 3
-        time: 0
-        value: 0
-        inSlope: 0
-        outSlope: 0
-        tangentMode: 0
-        weightedMode: 0
-        inWeight: 0
-        outWeight: 0
-      - serializedVersion: 3
-        time: 1
-        value: 1
-        inSlope: 0
-        outSlope: 0
-        tangentMode: 0
-        weightedMode: 0
-        inWeight: 0
-        outWeight: 0
+      m_Curve: []
-      m_Curve:
-      - serializedVersion: 3
-        time: 0
-        value: 1
-        inSlope: 0
-        outSlope: 0
-        tangentMode: 0
-        weightedMode: 0
-        inWeight: 0
-        outWeight: 0
-      - serializedVersion: 3
-        time: 1
-        value: 0
-        inSlope: 0
-        outSlope: 0
-        tangentMode: 0
-        weightedMode: 0
-        inWeight: 0
-        outWeight: 0
+      m_Curve: []
      m_PreInfinity: 2
      m_PostInfinity: 2
      m_RotationOrder: 4
    m_BlendOutDuration: 3.033333333333335
    m_MixInCurve:
      serializedVersion: 2
-      m_Curve:
-      - serializedVersion: 3
-        time: 0
-        value: 0
-        inSlope: 0
-        outSlope: 0
-        tangentMode: 0
-        weightedMode: 0
-        inWeight: 0
-        outWeight: 0
-      - serializedVersion: 3
-        time: 1
-        value: 1
-        inSlope: 0
-        outSlope: 0
-        tangentMode: 0
-        weightedMode: 0
-        inWeight: 0
-        outWeight: 0
+      m_Curve: []
-      m_Curve:
-      - serializedVersion: 3
-        time: 0
-        value: 1
-        inSlope: 0
-        outSlope: 0
-        tangentMode: 0
-        weightedMode: 0
-        inWeight: 0
-        outWeight: 0
-      - serializedVersion: 3
-        time: 1
-        value: 0
-        inSlope: 0
-        outSlope: 0
-        tangentMode: 0
-        weightedMode: 0
-        inWeight: 0
-        outWeight: 0
+      m_Curve: []
      m_PreInfinity: 2
      m_PostInfinity: 2
      m_RotationOrder: 4
      m_RotationOrder: 4
    m_MixOutCurve:
      serializedVersion: 2
-      m_Curve:
-      - serializedVersion: 3
-        time: 0
-        value: 1
-        inSlope: 0
-        outSlope: 0
-        tangentMode: 0
-        weightedMode: 0
-        inWeight: 0
-        outWeight: 0
-      - serializedVersion: 3
-        time: 1
-        value: 0
-        inSlope: 0
-        outSlope: 0
-        tangentMode: 0
-        weightedMode: 0
-        inWeight: 0
-        outWeight: 0
+      m_Curve: []
      m_PreInfinity: 2
      m_PostInfinity: 2
      m_RotationOrder: 4
--- a/UOP1_Project/Assets/Prefabs/Characters/PigChef.prefab
+++ b/UOP1_Project/Assets/Prefabs/Characters/PigChef.prefab
  footstep: {fileID: 11400000, guid: 412141fe54999534a8d2800c2a567b55, type: 2}
  getHit: {fileID: 11400000, guid: ff7bca3fec8a0d94f868719ec4d09492, type: 2}
  die: {fileID: 11400000, guid: f6bff02f672df724b932fad0c85c18c5, type: 2}
+  talk: {fileID: 11400000, guid: 91724ce47d3ff5a4399664ebc35c1083, type: 2}
 --- !u!114 &5557640735889932260
 MonoBehaviour:
  m_ObjectHideFlags: 0
--- a/UOP1_Project/Assets/Scenes/Locations/Beach.unity
+++ b/UOP1_Project/Assets/Scenes/Locations/Beach.unity
--- a/UOP1_Project/Assets/Scripts/Characters/ProtagonistAudio.cs
+++ b/UOP1_Project/Assets/Scripts/Characters/ProtagonistAudio.cs
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
+using UnityEngine;
-	[SerializeField] private AudioCueSO caneSwing, liftoff, land, objectPickup, footstep, getHit, die;
+	[SerializeField] private AudioCueSO caneSwing, liftoff, land, objectPickup, footstep, getHit, die, talk;

 	public void PlayFootstep() => _sfxEventChannel.RaisePlayEvent(footstep, _audioConfig, transform.position);
 	public void PlayJumpLiftoff() => _sfxEventChannel.RaisePlayEvent(liftoff, _audioConfig, transform.position);
 	public void PlayGetHit() => _sfxEventChannel.RaisePlayEvent(getHit, _audioConfig, transform.position);
 	public void PlayDie() => _sfxEventChannel.RaisePlayEvent(die, _audioConfig, transform.position);
-
+	public void PlayTalk() => _sfxEventChannel.RaisePlayEvent(talk, _audioConfig, transform.position);
 }
--- a/UOP1_Project/Assets/ScriptableObjects/Audio/AudioCues/SFX/Protagonist/SFX_Talk.asset
+++ b/UOP1_Project/Assets/ScriptableObjects/Audio/AudioCues/SFX/Protagonist/SFX_Talk.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: 08e854ccd8588da4694c3ae040c10c5e, type: 3}
+  m_Name: SFX_Talk
+  m_EditorClassIdentifier: 
+  looping: 0
+  _audioClipGroups:
+  - sequenceMode: 0
+    audioClips:
+    - {fileID: 8300000, guid: c57b34905d2f289429e471b7015b450c, type: 3}
+    - {fileID: 8300000, guid: 02452d505903591489f0ad0f80be7ac6, type: 3}
+    - {fileID: 8300000, guid: a8b2763465042954faa66f5370ea288b, type: 3}
+    - {fileID: 8300000, guid: 2afe870baca4739448626bc19143c422, type: 3}
+    - {fileID: 8300000, guid: 77049037aea6ea04289a902baf264ffc, type: 3}
+    - {fileID: 8300000, guid: b7d3f0e632eb08d42b66eb575b39ec6c, type: 3}
+    - {fileID: 8300000, guid: eb409a44d8961b94eb22943399eec59c, type: 3}
+    - {fileID: 8300000, guid: 250ef5fa19374344584ae0a5f77846a0, type: 3}
+    - {fileID: 8300000, guid: 15bac80e585390e44b6f00a50a79c0dd, type: 3}
+    - {fileID: 8300000, guid: e254e4ae0aa8bfb45bc402b3ed72bfb6, type: 3}
+    - {fileID: 8300000, guid: a9596cf534c2abd40b7216a4bb3a0578, type: 3}
+    - {fileID: 8300000, guid: 7a36d256849e7054a8517f690ab9e591, type: 3}
--- a/UOP1_Project/Assets/ScriptableObjects/Audio/AudioCues/SFX/Protagonist/SFX_Talk.asset.meta
+++ b/UOP1_Project/Assets/ScriptableObjects/Audio/AudioCues/SFX/Protagonist/SFX_Talk.asset.meta
+fileFormatVersion: 2
+guid: 91724ce47d3ff5a4399664ebc35c1083
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: