Merge branch 'main' into 95-freeze-sequence

This commit is contained in:
Cat Flynn 2021-04-16 14:23:37 +01:00
commit 3bc0b48c74
10 changed files with 131 additions and 2 deletions

BIN
game/Assets/Audio/VO/PA_FREEZE.wav (Stored with Git LFS) Normal file

Binary file not shown.

View File

@ -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:

BIN
game/Assets/Audio/VO/SD_BETA_COMPLETE.wav (Stored with Git LFS) Normal file

Binary file not shown.

View File

@ -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:

BIN
game/Assets/Audio/VO/SD_FREEZE_0.wav (Stored with Git LFS) Normal file

Binary file not shown.

View File

@ -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:

View File

@ -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}

View File

@ -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

View File

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

BIN
game/FMOD Project/Build/Desktop/VO.bank (Stored with Git LFS)

Binary file not shown.