Add SFX to dialogue, revamp control scheme (broken world map camera)

2022-08-17 22:12:53 -07:00
parent 294b113598
commit bc8092d454
29 changed files with 1413 additions and 485 deletions
--- a/Assets/Singleton/SingletonManager.prefab
+++ b/Assets/Singleton/SingletonManager.prefab
@@ -363,6 +363,7 @@ GameObject:
  m_Component:
  - component: {fileID: 9048025182165106366}
  - component: {fileID: 3584299649216310802}
+  - component: {fileID: 8281504758914613877}
  m_Layer: 0
  m_Name: Dialogue Manager
  m_TagString: Untagged
@@ -404,8 +405,104 @@ MonoBehaviour:
  m_EditorClassIdentifier: 
  _animator: {fileID: 992122626}
  dialogueTextGUI: {fileID: 36671747401237298}
-  _textSpeed: 0.001
+  _textSpeed: 0.1
  IsTalking: 0
+--- !u!82 &8281504758914613877
+AudioSource:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3584299649216310804}
+  m_Enabled: 1
+  serializedVersion: 4
+  OutputAudioMixerGroup: {fileID: 0}
+  m_audioClip: {fileID: 0}
+  m_PlayOnAwake: 0
+  m_Volume: 1
+  m_Pitch: 1
+  Loop: 0
+  Mute: 0
+  Spatialize: 0
+  SpatializePostEffects: 0
+  Priority: 128
+  DopplerLevel: 1
+  MinDistance: 1
+  MaxDistance: 500
+  Pan2D: 0
+  rolloffMode: 0
+  BypassEffects: 0
+  BypassListenerEffects: 0
+  BypassReverbZones: 0
+  rolloffCustomCurve:
+    serializedVersion: 2
+    m_Curve:
+    - serializedVersion: 3
+      time: 0
+      value: 1
+      inSlope: 0
+      outSlope: 0
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    - serializedVersion: 3
+      time: 1
+      value: 0
+      inSlope: 0
+      outSlope: 0
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    m_PreInfinity: 2
+    m_PostInfinity: 2
+    m_RotationOrder: 4
+  panLevelCustomCurve:
+    serializedVersion: 2
+    m_Curve:
+    - serializedVersion: 3
+      time: 0
+      value: 0
+      inSlope: 0
+      outSlope: 0
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    m_PreInfinity: 2
+    m_PostInfinity: 2
+    m_RotationOrder: 4
+  spreadCustomCurve:
+    serializedVersion: 2
+    m_Curve:
+    - serializedVersion: 3
+      time: 0
+      value: 0
+      inSlope: 0
+      outSlope: 0
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    m_PreInfinity: 2
+    m_PostInfinity: 2
+    m_RotationOrder: 4
+  reverbZoneMixCustomCurve:
+    serializedVersion: 2
+    m_Curve:
+    - serializedVersion: 3
+      time: 0
+      value: 1
+      inSlope: 0
+      outSlope: 0
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    m_PreInfinity: 2
+    m_PostInfinity: 2
+    m_RotationOrder: 4
 --- !u!1 &3584299649380910130
 GameObject:
  m_ObjectHideFlags: 0
@@ -415,6 +512,9 @@ GameObject:
  serializedVersion: 6
  m_Component:
  - component: {fileID: 3584299649380910131}
+  - component: {fileID: 8987024055188857006}
+  - component: {fileID: 3909244205962771672}
+  - component: {fileID: 9023342236769253106}
  m_Layer: 0
  m_Name: SFX Manager
  m_TagString: Untagged
@@ -437,6 +537,139 @@ Transform:
  m_Father: {fileID: 3584299649024768172}
  m_RootOrder: 2
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &8987024055188857006
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3584299649380910130}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d4470fbab6987df4baea8aa8b9b42f6b, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  SoundEffects:
+  - {fileID: 8300000, guid: cde99aa876cd4a948a9f0ab587d8254f, type: 3}
+  - {fileID: 8300000, guid: 034b9a0779610324c9d164e622d2bfb0, type: 3}
+  - {fileID: 8300000, guid: 539d0bf64e3207c43bbdcd75fa6f271d, type: 3}
+  - {fileID: 8300000, guid: c4e14adc30aa1644ca9e1175664eeba0, type: 3}
+  - {fileID: 8300000, guid: d417abc938514394dbd3f2113088cd00, type: 3}
+  - {fileID: 8300000, guid: 0a8ee7ebd629afd4383b127484ae68b3, type: 3}
+  - {fileID: 8300000, guid: 3a1e37eb1e8731343a4d2cda276be5c8, type: 3}
+  - {fileID: 8300000, guid: fb2c6dc162e24d94ebb3c3dba7cdb911, type: 3}
+  - {fileID: 8300000, guid: 86c52bd1f805a814d89d60ef7f85d86b, type: 3}
+  - {fileID: 8300000, guid: b4cbe01d1f5ccab4bbfbc780613fc59e, type: 3}
+--- !u!114 &3909244205962771672
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3584299649380910130}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d1081614305b95943acf23b2a69bbc20, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  _soundEffects: {fileID: 8987024055188857006}
+  _audioSource: {fileID: 9023342236769253106}
+--- !u!82 &9023342236769253106
+AudioSource:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3584299649380910130}
+  m_Enabled: 1
+  serializedVersion: 4
+  OutputAudioMixerGroup: {fileID: 0}
+  m_audioClip: {fileID: 0}
+  m_PlayOnAwake: 0
+  m_Volume: 1
+  m_Pitch: 1
+  Loop: 0
+  Mute: 0
+  Spatialize: 0
+  SpatializePostEffects: 0
+  Priority: 128
+  DopplerLevel: 1
+  MinDistance: 1
+  MaxDistance: 500
+  Pan2D: 0
+  rolloffMode: 0
+  BypassEffects: 0
+  BypassListenerEffects: 0
+  BypassReverbZones: 0
+  rolloffCustomCurve:
+    serializedVersion: 2
+    m_Curve:
+    - serializedVersion: 3
+      time: 0
+      value: 1
+      inSlope: 0
+      outSlope: 0
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    - serializedVersion: 3
+      time: 1
+      value: 0
+      inSlope: 0
+      outSlope: 0
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    m_PreInfinity: 2
+    m_PostInfinity: 2
+    m_RotationOrder: 4
+  panLevelCustomCurve:
+    serializedVersion: 2
+    m_Curve:
+    - serializedVersion: 3
+      time: 0
+      value: 0
+      inSlope: 0
+      outSlope: 0
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    m_PreInfinity: 2
+    m_PostInfinity: 2
+    m_RotationOrder: 4
+  spreadCustomCurve:
+    serializedVersion: 2
+    m_Curve:
+    - serializedVersion: 3
+      time: 0
+      value: 0
+      inSlope: 0
+      outSlope: 0
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    m_PreInfinity: 2
+    m_PostInfinity: 2
+    m_RotationOrder: 4
+  reverbZoneMixCustomCurve:
+    serializedVersion: 2
+    m_Curve:
+    - serializedVersion: 3
+      time: 0
+      value: 1
+      inSlope: 0
+      outSlope: 0
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    m_PreInfinity: 2
+    m_PostInfinity: 2
+    m_RotationOrder: 4
 --- !u!1 &8847259146616550776
 GameObject:
  m_ObjectHideFlags: 0
@@ -448,7 +681,6 @@ GameObject:
  - component: {fileID: 8787990294269674328}
  - component: {fileID: 7439917131541758172}
  - component: {fileID: 2842432627539923551}
-  - component: {fileID: 1458490333140853827}
  m_Layer: 5
  m_Name: Text Bubble
  m_TagString: Untagged
@@ -511,18 +743,6 @@ MonoBehaviour:
    y: 0
    width: 1
    height: 1
--- !u!114 &1458490333140853827
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8847259146616550776}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: bd3e63ea94a97734bbe89a8d50059585, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
 --- !u!1 &9106198387064842738
 GameObject:
  m_ObjectHideFlags: 0