Merge branch 'feature/audio-integration' into 'main'

added new dialogue for freeze See merge request kernel-panic/revival!68
2021-04-16 13:21:29 +00:00 · 2021-04-16 13:21:29 +00:00 · 1ef827968c
parent e9bcb45b41 116b1140df
commit 1ef827968c
11 changed files with 147 additions and 18 deletions
--- a/game/Assets/Audio/VO/PA_FREEZE.wav
+++ b/game/Assets/Audio/VO/PA_FREEZE.wav
--- a/game/Assets/Audio/VO/PA_FREEZE.wav.meta
+++ b/game/Assets/Audio/VO/PA_FREEZE.wav.meta
@ -0,0 +1,36 @@
+fileFormatVersion: 2
+guid: 89da168396ef88843849d85390995b19
+AudioImporter:
+  externalObjects: {}
+  serializedVersion: 6
+  defaultSettings:
+    loadType: 0
+    sampleRateSetting: 0
+    sampleRateOverride: 44100
+    compressionFormat: 0
+    quality: 1
+    conversionMode: 0
+  platformSettingOverrides:
+    4:
+      loadType: 0
+      sampleRateSetting: 0
+      sampleRateOverride: 44100
+      compressionFormat: 3
+      quality: 1
+      conversionMode: 0
+    7:
+      loadType: 0
+      sampleRateSetting: 0
+      sampleRateOverride: 44100
+      compressionFormat: 1
+      quality: 1
+      conversionMode: 0
+  forceToMono: 0
+  normalize: 1
+  preloadAudioData: 1
+  loadInBackground: 0
+  ambisonic: 0
+  3D: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/game/Assets/Audio/VO/SD_BETA_COMPLETE.wav
+++ b/game/Assets/Audio/VO/SD_BETA_COMPLETE.wav
--- a/game/Assets/Audio/VO/SD_BETA_COMPLETE.wav.meta
+++ b/game/Assets/Audio/VO/SD_BETA_COMPLETE.wav.meta
@ -0,0 +1,36 @@
+fileFormatVersion: 2
+guid: 1260162221e18434dbb75e07fdfd3453
+AudioImporter:
+  externalObjects: {}
+  serializedVersion: 6
+  defaultSettings:
+    loadType: 0
+    sampleRateSetting: 0
+    sampleRateOverride: 44100
+    compressionFormat: 0
+    quality: 1
+    conversionMode: 0
+  platformSettingOverrides:
+    4:
+      loadType: 0
+      sampleRateSetting: 0
+      sampleRateOverride: 44100
+      compressionFormat: 3
+      quality: 1
+      conversionMode: 0
+    7:
+      loadType: 0
+      sampleRateSetting: 0
+      sampleRateOverride: 44100
+      compressionFormat: 1
+      quality: 1
+      conversionMode: 0
+  forceToMono: 0
+  normalize: 1
+  preloadAudioData: 1
+  loadInBackground: 0
+  ambisonic: 0
+  3D: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/game/Assets/Audio/VO/SD_FREEZE_0.wav
+++ b/game/Assets/Audio/VO/SD_FREEZE_0.wav
--- a/game/Assets/Audio/VO/SD_FREEZE_0.wav.meta
+++ b/game/Assets/Audio/VO/SD_FREEZE_0.wav.meta
@ -0,0 +1,36 @@
+fileFormatVersion: 2
+guid: b779bb3dbd9efc5428eb6e7f5a8f1366
+AudioImporter:
+  externalObjects: {}
+  serializedVersion: 6
+  defaultSettings:
+    loadType: 0
+    sampleRateSetting: 0
+    sampleRateOverride: 44100
+    compressionFormat: 0
+    quality: 1
+    conversionMode: 0
+  platformSettingOverrides:
+    4:
+      loadType: 0
+      sampleRateSetting: 0
+      sampleRateOverride: 44100
+      compressionFormat: 3
+      quality: 1
+      conversionMode: 0
+    7:
+      loadType: 0
+      sampleRateSetting: 0
+      sampleRateOverride: 44100
+      compressionFormat: 1
+      quality: 1
+      conversionMode: 0
+  forceToMono: 0
+  normalize: 1
+  preloadAudioData: 1
+  loadInBackground: 0
+  ambisonic: 0
+  3D: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/game/Assets/Data/Dialogue/Dialogue
+++ b/game/Assets/Data/Dialogue/Dialogue
@ -27,7 +27,9 @@ MonoBehaviour:
  _dialogueClips:
  - {fileID: 8300000, guid: c1690bc635976f14a80c9116e50283d3, type: 3}
  - {fileID: 8300000, guid: 898202449aaa9df418384303a39eb756, type: 3}
+  - {fileID: 8300000, guid: 89da168396ef88843849d85390995b19, type: 3}
  - {fileID: 8300000, guid: 5b670453e5d24a74fa2a7629c605eb4a, type: 3}
+  - {fileID: 8300000, guid: 1260162221e18434dbb75e07fdfd3453, type: 3}
  - {fileID: 8300000, guid: 97f8971bce7d3db4a8feb27ac3acbd16, type: 3}
  - {fileID: 8300000, guid: c4eaf5514fb966a4da64f3b185c48290, type: 3}
  - {fileID: 8300000, guid: ce62d7fa6c5c95344985c97227673466, type: 3}
@ -36,3 +38,4 @@ MonoBehaviour:
  - {fileID: 8300000, guid: 8f0e6b879fc37e44ea95b69cffff2273, type: 3}
  - {fileID: 8300000, guid: 8d98cd34796bee348859b1ef6e6201d1, type: 3}
  - {fileID: 8300000, guid: 946d08c7b7bf78b4ba7ca01fac1b5970, type: 3}
+  - {fileID: 8300000, guid: b779bb3dbd9efc5428eb6e7f5a8f1366, type: 3}
--- a/game/Assets/Prefabs/Player.prefab
+++ b/game/Assets/Prefabs/Player.prefab
@ -169,6 +169,8 @@ MonoBehaviour:
  _exhaustedColor: {r: 1, g: 0, b: 0, a: 0}
  objectTimeScale: {fileID: 11400000, guid: 9b68e167db44c0c42837e9a679da964e, type: 2}
  frozenTime: {fileID: 11400000, guid: 19273ba4ac237ab4381926cfb195dda8, type: 2}
+  _dialogueSystem: {fileID: 11400000, guid: 56369c4e83cc59e44bf55cd16fafc4e8, type: 2}
+  _freezeFirstUseDialogueKey: SD_FREEZE_0
 --- !u!114 &13726836969441780
 MonoBehaviour:
  m_ObjectHideFlags: 0
--- a/game/Assets/Scenes/Main.unity
+++ b/game/Assets/Scenes/Main.unity
@ -3069,35 +3069,35 @@ PrefabInstance:
    m_Modifications:
    - target: {fileID: 4676633831318799747, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
      propertyPath: m_LocalRotation.w
-      value: 0.97784
+      value: 0.56752455
      objectReference: {fileID: 0}
    - target: {fileID: 4676633831318799747, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
      propertyPath: m_LocalRotation.x
-      value: -0.13644
+      value: 0.06285194
      objectReference: {fileID: 0}
    - target: {fileID: 4676633831318799747, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
      propertyPath: m_LocalRotation.y
-      value: 0.15792163
+      value: 0.7702346
      objectReference: {fileID: 0}
    - target: {fileID: 4676633831318799747, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
      propertyPath: m_LocalRotation.z
-      value: -0.0165495
+      value: -0.28408483
      objectReference: {fileID: 0}
    - target: {fileID: 4676633831388223341, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
      propertyPath: m_LocalRotation.w
-      value: 0.72316885
+      value: 0.9724168
      objectReference: {fileID: 0}
    - target: {fileID: 4676633831388223341, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
      propertyPath: m_LocalRotation.x
-      value: -0.012375496
+      value: 0.2295565
      objectReference: {fileID: 0}
    - target: {fileID: 4676633831388223341, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
      propertyPath: m_LocalRotation.y
-      value: -0.6904594
+      value: 0.040237267
      objectReference: {fileID: 0}
    - target: {fileID: 4676633831388223341, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
      propertyPath: m_LocalRotation.z
-      value: -0.011815742
+      value: -0.009498731
      objectReference: {fileID: 0}
    - target: {fileID: 4676633831414007564, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
      propertyPath: m_Name
@ -3161,31 +3161,31 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: 4676633832789495666, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
      propertyPath: m_LocalRotation.w
-      value: 0.97784
+      value: 0.56752455
      objectReference: {fileID: 0}
    - target: {fileID: 4676633832789495666, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
      propertyPath: m_LocalRotation.x
-      value: -0.13644
+      value: 0.06285194
      objectReference: {fileID: 0}
    - target: {fileID: 4676633832789495666, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
      propertyPath: m_LocalRotation.y
-      value: 0.15792163
+      value: 0.7702346
      objectReference: {fileID: 0}
    - target: {fileID: 4676633832789495666, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
      propertyPath: m_LocalRotation.z
-      value: -0.0165495
+      value: -0.28408483
      objectReference: {fileID: 0}
    - target: {fileID: 4676633832928372887, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
      propertyPath: m_LocalRotation.x
-      value: -0.13541612
+      value: 0.059062183
      objectReference: {fileID: 0}
    - target: {fileID: 4676633832928372887, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
      propertyPath: m_LocalRotation.y
-      value: 0.19838297
+      value: 0.7917243
      objectReference: {fileID: 0}
    - target: {fileID: 4676633832928372887, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
      propertyPath: m_LocalRotation.z
-      value: -0.020789675
+      value: -0.29201087
      objectReference: {fileID: 0}
    m_RemovedComponents: []
  m_SourcePrefab: {fileID: 100100000, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
@ -4933,7 +4933,7 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: 592757652223086934, guid: b4c7a4f0875ec844a9abeec0c86084cf, type: 3}
      propertyPath: _key
-      value: SD_ALPHA_COMPLETE
+      value: SD_BETA_COMPLETE
      objectReference: {fileID: 0}
    - target: {fileID: 592757652223086935, guid: b4c7a4f0875ec844a9abeec0c86084cf, type: 3}
      propertyPath: m_Name
--- a/game/Assets/Scripts/Player/PlayerController.cs
+++ b/game/Assets/Scripts/Player/PlayerController.cs
@ -82,6 +82,12 @@ public class PlayerController : MonoBehaviour

    [SerializeField]
    private SerialFloat frozenTime;
+    
+    [SerializeField]
+    private DialogueSystem _dialogueSystem;
+    
+    [SerializeField]
+    private string _freezeFirstUseDialogueKey;

    private enum JumpState
    {
@ -177,6 +183,7 @@ public class PlayerController : MonoBehaviour
        if ( _powers.Freeze.timeSinceConsume > frozenTime && TimeIsFrozen )
        {
            UnfreezeTime();
+            _dialogueSystem.PlayLine( _freezeFirstUseDialogueKey, true );
            Debug.Log( "[PlayerController] time unfrozen" );
        }

--- a/Project/Build/Desktop/VO.bank
+++ b/Project/Build/Desktop/VO.bank