diff --git a/Assets/Fungus/Dialog/Audio/MidVoice.wav b/Assets/Fungus/Dialog/Audio/MidVoice.wav new file mode 100644 index 00000000..fe6e9a49 Binary files /dev/null and b/Assets/Fungus/Dialog/Audio/MidVoice.wav differ diff --git a/Assets/Fungus/Dialog/Audio/SkeletalType.wav.meta b/Assets/Fungus/Dialog/Audio/MidVoice.wav.meta similarity index 81% rename from Assets/Fungus/Dialog/Audio/SkeletalType.wav.meta rename to Assets/Fungus/Dialog/Audio/MidVoice.wav.meta index 97d7ac6c..4a22ebe2 100644 --- a/Assets/Fungus/Dialog/Audio/SkeletalType.wav.meta +++ b/Assets/Fungus/Dialog/Audio/MidVoice.wav.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 5a3c8e205638142dcb8227abe5f14f1f +guid: f637c5ce9d10e45c7855ed89bfc6b97e AudioImporter: serializedVersion: 4 format: -1 diff --git a/Assets/Fungus/Dialog/Audio/SkeletalType.wav b/Assets/Fungus/Dialog/Audio/SkeletalType.wav deleted file mode 100755 index 44048c06..00000000 Binary files a/Assets/Fungus/Dialog/Audio/SkeletalType.wav and /dev/null differ diff --git a/Assets/Fungus/Dialog/Resources/FungusSayDialog.prefab b/Assets/Fungus/Dialog/Resources/FungusSayDialog.prefab index 23597ed4..7dc7448e 100644 --- a/Assets/Fungus/Dialog/Resources/FungusSayDialog.prefab +++ b/Assets/Fungus/Dialog/Resources/FungusSayDialog.prefab @@ -252,9 +252,9 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: writingSpeed: 30 - writingSound: {fileID: 8300000, guid: 5a3c8e205638142dcb8227abe5f14f1f, type: 3} + writingSound: {fileID: 8300000, guid: f637c5ce9d10e45c7855ed89bfc6b97e, type: 3} loopWritingSound: 1 - beepPerCharacter: 0 + beepPerCharacter: 1 slowBeepsAt: 10 fastBeepsAt: 30 punctuationPause: .200000003 @@ -272,6 +272,7 @@ MonoBehaviour: characterImage: {fileID: 11448914} characterTypingSound: {fileID: 0} continueImage: {fileID: 11488898} + continueSound: {fileID: 0} --- !u!114 &11488896 MonoBehaviour: m_ObjectHideFlags: 1 diff --git a/Assets/FungusExamples/Sherlock/Audio/GUI/Continue.wav b/Assets/FungusExamples/Sherlock/Audio/GUI/Continue.wav new file mode 100644 index 00000000..75c2f621 Binary files /dev/null and b/Assets/FungusExamples/Sherlock/Audio/GUI/Continue.wav differ diff --git a/Assets/FungusExamples/Sherlock/Audio/GUI/Continue.wav.meta b/Assets/FungusExamples/Sherlock/Audio/GUI/Continue.wav.meta new file mode 100644 index 00000000..a9efca74 --- /dev/null +++ b/Assets/FungusExamples/Sherlock/Audio/GUI/Continue.wav.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: 7369647d7e7224eb1ba96356b0b7d38d +AudioImporter: + serializedVersion: 4 + format: -1 + quality: .5 + stream: 1 + 3D: 0 + forceToMono: 0 + useHardware: 0 + loopable: 0 + userData: diff --git a/Assets/FungusExamples/Sherlock/Audio/GUI/HighVoice.wav b/Assets/FungusExamples/Sherlock/Audio/GUI/HighVoice.wav new file mode 100644 index 00000000..a1ee7527 Binary files /dev/null and b/Assets/FungusExamples/Sherlock/Audio/GUI/HighVoice.wav differ diff --git a/Assets/FungusExamples/Sherlock/Audio/GUI/HighVoice.wav.meta b/Assets/FungusExamples/Sherlock/Audio/GUI/HighVoice.wav.meta new file mode 100644 index 00000000..402c412e --- /dev/null +++ b/Assets/FungusExamples/Sherlock/Audio/GUI/HighVoice.wav.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: 8e8286c2463884bbaa62cddbee8c7cb3 +AudioImporter: + serializedVersion: 4 + format: -1 + quality: .5 + stream: 1 + 3D: 0 + forceToMono: 0 + useHardware: 0 + loopable: 0 + userData: diff --git a/Assets/FungusExamples/Sherlock/Audio/GUI/LowVoice.wav b/Assets/FungusExamples/Sherlock/Audio/GUI/LowVoice.wav new file mode 100644 index 00000000..63293edf Binary files /dev/null and b/Assets/FungusExamples/Sherlock/Audio/GUI/LowVoice.wav differ diff --git a/Assets/FungusExamples/Sherlock/Audio/GUI/LowVoice.wav.meta b/Assets/FungusExamples/Sherlock/Audio/GUI/LowVoice.wav.meta new file mode 100644 index 00000000..5febf217 --- /dev/null +++ b/Assets/FungusExamples/Sherlock/Audio/GUI/LowVoice.wav.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: c89d9cff88a1247d3be3911553d119a2 +AudioImporter: + serializedVersion: 4 + format: -1 + quality: .5 + stream: 1 + 3D: 0 + forceToMono: 0 + useHardware: 0 + loopable: 0 + userData: diff --git a/Assets/FungusExamples/Sherlock/Audio/GUI/MidVoice.wav b/Assets/FungusExamples/Sherlock/Audio/GUI/MidVoice.wav new file mode 100644 index 00000000..fe6e9a49 Binary files /dev/null and b/Assets/FungusExamples/Sherlock/Audio/GUI/MidVoice.wav differ diff --git a/Assets/FungusExamples/Sherlock/Audio/GUI/MidVoice.wav.meta b/Assets/FungusExamples/Sherlock/Audio/GUI/MidVoice.wav.meta new file mode 100644 index 00000000..ebd40256 --- /dev/null +++ b/Assets/FungusExamples/Sherlock/Audio/GUI/MidVoice.wav.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: 1a1543b7873994f51911c9766dd6d83f +AudioImporter: + serializedVersion: 4 + format: -1 + quality: .5 + stream: 1 + 3D: 0 + forceToMono: 0 + useHardware: 0 + loopable: 0 + userData: diff --git a/Assets/FungusExamples/Sherlock/Audio/GUI/TypingSound.wav b/Assets/FungusExamples/Sherlock/Audio/GUI/TypingSound.wav new file mode 100644 index 00000000..601fed3e Binary files /dev/null and b/Assets/FungusExamples/Sherlock/Audio/GUI/TypingSound.wav differ diff --git a/Assets/FungusExamples/Sherlock/Audio/GUI/TypingSound.wav.meta b/Assets/FungusExamples/Sherlock/Audio/GUI/TypingSound.wav.meta new file mode 100644 index 00000000..338b73ac --- /dev/null +++ b/Assets/FungusExamples/Sherlock/Audio/GUI/TypingSound.wav.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: 07ae66b691a7c4097b8b74cdcc617b22 +AudioImporter: + serializedVersion: 4 + format: -1 + quality: .5 + stream: 1 + 3D: 0 + forceToMono: 0 + useHardware: 0 + loopable: 0 + userData: diff --git a/Assets/FungusExamples/Sherlock/Audio/GUI/WritingSound.wav b/Assets/FungusExamples/Sherlock/Audio/GUI/WritingSound.wav new file mode 100644 index 00000000..7c98b691 Binary files /dev/null and b/Assets/FungusExamples/Sherlock/Audio/GUI/WritingSound.wav differ diff --git a/Assets/FungusExamples/Sherlock/Audio/GUI/WritingSound.wav.meta b/Assets/FungusExamples/Sherlock/Audio/GUI/WritingSound.wav.meta new file mode 100644 index 00000000..f1e84ad1 --- /dev/null +++ b/Assets/FungusExamples/Sherlock/Audio/GUI/WritingSound.wav.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: 849f5fa7fe21b4d468d1858b6d1eb800 +AudioImporter: + serializedVersion: 4 + format: -1 + quality: -1 + stream: 1 + 3D: 1 + forceToMono: 0 + useHardware: 0 + loopable: 0 + userData: diff --git a/Assets/FungusExamples/Sherlock/TheExperiment.unity b/Assets/FungusExamples/Sherlock/TheExperiment.unity index 9155a948..c71fdc74 100644 --- a/Assets/FungusExamples/Sherlock/TheExperiment.unity +++ b/Assets/FungusExamples/Sherlock/TheExperiment.unity @@ -2326,7 +2326,7 @@ Camera: m_Enabled: 1 serializedVersion: 2 m_ClearFlags: 1 - m_BackGroundColor: {r: .192156866, g: .301960796, b: .474509805, a: .0196078438} + m_BackGroundColor: {r: 0, g: 0, b: 0, a: .0196078438} m_NormalizedViewPortRect: serializedVersion: 2 x: 0 @@ -3481,7 +3481,7 @@ MonoBehaviour: y: -1729.35046 width: 5969.4458 height: 2818.85034 - selectedSequence: {fileID: 1390555440} + selectedSequence: {fileID: 1390555298} selectedCommands: [] variables: [] description: 'Example scene from Sherlock: The Game Is On'