From 7a8e945f81cc4dc6a47d3d32e03f2cc454e561c3 Mon Sep 17 00:00:00 2001 From: milan Date: Tue, 16 May 2023 15:01:06 +0200 Subject: [PATCH] some more puzzle sounds --- Assets/Engine/Runtime/Editor/EngineEditor.cs | 4 +- .../Runtime/Modules/State/PuzzleState.cs | 9 + Assets/Scenes/PuzzleTest.unity | 11 +- .../Environments/Desert/Audio/solved.wav | 3 + .../Environments/Desert/Audio/solved.wav.meta | 23 ++ .../Environments/Desert/Audio/wrong.wav | 3 + .../Environments/Desert/Audio/wrong.wav.meta | 23 ++ .../Button Stand/Timed Button Stand.prefab | 144 ++++++++- .../Modules/Hexagon/Hexagon 3.prefab | 133 +++++++++ .../Modules/Holes/Fling Holes.prefab | 7 + Assets/Station46/Modules/Holes/Holes.prefab | 134 ++++++++- .../Station46/Modules/Hoop/Fling Hoop.prefab | 144 ++++++++- .../Modules/Laser/Laser Platform Sink.prefab | 10 + .../Station46/Modules/Laser/Laser Sink.prefab | 131 +++++++++ .../Modules/Rings/Align Rings.prefab | 131 +++++++++ Assets/Station46/Modules/Symbols/Audio.meta | 8 + .../Station46/Modules/Symbols/Audio/press.wav | 3 + .../Modules/Symbols/Audio/press.wav.meta | 23 ++ .../Modules/Symbols/Symbol Button.prefab | 160 +++++++++- .../Modules/Terminal/Scripts/Terminal.cs | 3 + .../Modules/Terminal/Terminal 3 Slots.prefab | 278 +++++++++++++++++- Assets/Station46/Scripts/ButtonSound.cs | 27 ++ Assets/Station46/Scripts/ButtonSound.cs.meta | 3 + Assets/Station46/Station 46 Mixer.mixer | 71 +++++ Assets/Test Assets/Test Theme.asset | 6 +- 25 files changed, 1477 insertions(+), 15 deletions(-) create mode 100644 Assets/Station46/Environments/Desert/Audio/solved.wav create mode 100644 Assets/Station46/Environments/Desert/Audio/solved.wav.meta create mode 100644 Assets/Station46/Environments/Desert/Audio/wrong.wav create mode 100644 Assets/Station46/Environments/Desert/Audio/wrong.wav.meta create mode 100644 Assets/Station46/Modules/Symbols/Audio.meta create mode 100644 Assets/Station46/Modules/Symbols/Audio/press.wav create mode 100644 Assets/Station46/Modules/Symbols/Audio/press.wav.meta create mode 100644 Assets/Station46/Scripts/ButtonSound.cs create mode 100644 Assets/Station46/Scripts/ButtonSound.cs.meta diff --git a/Assets/Engine/Runtime/Editor/EngineEditor.cs b/Assets/Engine/Runtime/Editor/EngineEditor.cs index 02a9be6..93c20b3 100644 --- a/Assets/Engine/Runtime/Editor/EngineEditor.cs +++ b/Assets/Engine/Runtime/Editor/EngineEditor.cs @@ -88,12 +88,12 @@ namespace EscapeRoomEngine.Engine.Runtime.Editor private void CameraUp() { - SceneView.lastActiveSceneView.pivot += new Vector3(0, 1000, 0); + SceneView.lastActiveSceneView.pivot += new Vector3(0, 400, 0); } private void CameraDown() { - SceneView.lastActiveSceneView.pivot += new Vector3(0, -1000, 0); + SceneView.lastActiveSceneView.pivot += new Vector3(0, -400, 0); } private void UpdateUI() diff --git a/Assets/Engine/Runtime/Modules/State/PuzzleState.cs b/Assets/Engine/Runtime/Modules/State/PuzzleState.cs index 7a2a3bb..8fdef27 100644 --- a/Assets/Engine/Runtime/Modules/State/PuzzleState.cs +++ b/Assets/Engine/Runtime/Modules/State/PuzzleState.cs @@ -2,6 +2,7 @@ using EscapeRoomEngine.Engine.Runtime.Utilities; using JetBrains.Annotations; using NaughtyAttributes; +using UnityEngine; using Logger = EscapeRoomEngine.Engine.Runtime.Utilities.Logger; using LogType = EscapeRoomEngine.Engine.Runtime.Utilities.LogType; @@ -33,6 +34,9 @@ namespace EscapeRoomEngine.Engine.Runtime.Modules.State /// public class PuzzleState : ModuleState { + [BoxGroup("Internal")] + public AudioSource solvedAudioSource; + /// /// Add event handlers to this hook to receive all events concerning this puzzle. /// @@ -53,6 +57,11 @@ namespace EscapeRoomEngine.Engine.Runtime.Modules.State : None.New(); _solved = value; type.Match(some: OnPuzzleEvent); + + if (type.Contains(PuzzleEventType.Solved)) + { + solvedAudioSource.Play(); + } } } diff --git a/Assets/Scenes/PuzzleTest.unity b/Assets/Scenes/PuzzleTest.unity index 5138005..d8171b4 100644 --- a/Assets/Scenes/PuzzleTest.unity +++ b/Assets/Scenes/PuzzleTest.unity @@ -1454,7 +1454,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!4 &411421604 Transform: m_ObjectHideFlags: 0 @@ -3268,7 +3268,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &1340421038 Transform: m_ObjectHideFlags: 0 @@ -5255,6 +5255,11 @@ PrefabInstance: propertyPath: m_Name value: Intro Room objectReference: {fileID: 0} + - target: {fileID: 8137769401290482906, guid: 1358b4ef564c4704682417dff526766a, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -5445,7 +5450,7 @@ PrefabInstance: - target: {fileID: 8254297096454668303, guid: 688a459dfb23b3844b9f14f23236d50c, type: 3} propertyPath: m_Name - value: Align Steles + value: Align Rings objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] diff --git a/Assets/Station46/Environments/Desert/Audio/solved.wav b/Assets/Station46/Environments/Desert/Audio/solved.wav new file mode 100644 index 0000000..3eedf7a --- /dev/null +++ b/Assets/Station46/Environments/Desert/Audio/solved.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7897ba288529b2809c4c81413f8ae775294ff0f4a450525bf3321a1cdcfa57e0 +size 862190 diff --git a/Assets/Station46/Environments/Desert/Audio/solved.wav.meta b/Assets/Station46/Environments/Desert/Audio/solved.wav.meta new file mode 100644 index 0000000..84689f6 --- /dev/null +++ b/Assets/Station46/Environments/Desert/Audio/solved.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 670efea3430dfd140b50556fdb7927c7 +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 1 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Station46/Environments/Desert/Audio/wrong.wav b/Assets/Station46/Environments/Desert/Audio/wrong.wav new file mode 100644 index 0000000..9f07823 --- /dev/null +++ b/Assets/Station46/Environments/Desert/Audio/wrong.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cf2d50de08f7f53b15731e4d4678e5c287ee67639f0c134fa40815eb0e89aab1 +size 55202 diff --git a/Assets/Station46/Environments/Desert/Audio/wrong.wav.meta b/Assets/Station46/Environments/Desert/Audio/wrong.wav.meta new file mode 100644 index 0000000..7698eac --- /dev/null +++ b/Assets/Station46/Environments/Desert/Audio/wrong.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: a09028d9dbf699b46b4ad05d0d3b270c +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 1 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Station46/Modules/Button Stand/Timed Button Stand.prefab b/Assets/Station46/Modules/Button Stand/Timed Button Stand.prefab index c8c7987..939fc06 100644 --- a/Assets/Station46/Modules/Button Stand/Timed Button Stand.prefab +++ b/Assets/Station46/Modules/Button Stand/Timed Button Stand.prefab @@ -1,5 +1,134 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &3346802638699084814 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5947615277545256937} + - component: {fileID: 8778303398811009174} + m_Layer: 0 + m_Name: Audio + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5947615277545256937 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3346802638699084814} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0.6999998, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 5820700980591386288} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!82 &8778303398811009174 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3346802638699084814} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 2431929790045522726, guid: 20d4bd74d308d434bbe4ed0adcd3ed7a, + type: 2} + m_audioClip: {fileID: 8300000, guid: 670efea3430dfd140b50556fdb7927c7, type: 3} + 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: 1 + 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!1001 &4628888916587005711 PrefabInstance: m_ObjectHideFlags: 0 @@ -11,7 +140,7 @@ PrefabInstance: - target: {fileID: 1223383990908721599, guid: 866e3516e2f8502408e17cb19c4e57cc, type: 3} propertyPath: m_RootOrder - value: 0 + value: -1 objectReference: {fileID: 0} - target: {fileID: 1223383990908721599, guid: 866e3516e2f8502408e17cb19c4e57cc, type: 3} @@ -70,7 +199,11 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] - m_AddedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 1223383990908721599, guid: 866e3516e2f8502408e17cb19c4e57cc, + type: 3} + insertIndex: -1 + addedObject: {fileID: 5947615277545256937} m_AddedComponents: - targetCorrespondingSourceObject: {fileID: 4346312165422302743, guid: 866e3516e2f8502408e17cb19c4e57cc, type: 3} @@ -101,6 +234,12 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 352860bb2c6549d0b3e84104afef3f54, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!4 &5820700980591386288 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1223383990908721599, guid: 866e3516e2f8502408e17cb19c4e57cc, + type: 3} + m_PrefabInstance: {fileID: 4628888916587005711} + m_PrefabAsset: {fileID: 0} --- !u!1 &8965591617983332632 stripped GameObject: m_CorrespondingSourceObject: {fileID: 4346312165422302743, guid: 866e3516e2f8502408e17cb19c4e57cc, @@ -120,6 +259,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: size: {x: 1, y: 1} + solvedAudioSource: {fileID: 8778303398811009174} states: 00000000 solution: 01000000 stateCount: 1 diff --git a/Assets/Station46/Modules/Hexagon/Hexagon 3.prefab b/Assets/Station46/Modules/Hexagon/Hexagon 3.prefab index 918f393..78c4740 100644 --- a/Assets/Station46/Modules/Hexagon/Hexagon 3.prefab +++ b/Assets/Station46/Modules/Hexagon/Hexagon 3.prefab @@ -33,6 +33,7 @@ Transform: m_Children: - {fileID: 8378683725785771029} - {fileID: 7734541192411211649} + - {fileID: 431087104447561069} m_Father: {fileID: 0} m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -49,6 +50,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: size: {x: 1, y: 1} + solvedAudioSource: {fileID: 5108535117731016977} states: 0000000000000000000000005a000000000000005a000000 solution: 5a0000005a0000005a0000005a0000005a0000005a000000 stateCount: 6 @@ -85,6 +87,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: color: {r: 8, g: 3.5137255, b: 0, a: 1} + startActive: 0 emissionRenderer: {fileID: 458321616436583559} --- !u!114 &7585276547670451487 MonoBehaviour: @@ -99,7 +102,137 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: color: {r: 8, g: 3.5137255, b: 0, a: 1} + startActive: 0 emissionRenderer: {fileID: 8389482297439967605} +--- !u!1 &6642509733831534537 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 431087104447561069} + - component: {fileID: 5108535117731016977} + m_Layer: 0 + m_Name: Audio + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &431087104447561069 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6642509733831534537} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 3968590605239387248} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!82 &5108535117731016977 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6642509733831534537} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 2431929790045522726, guid: 20d4bd74d308d434bbe4ed0adcd3ed7a, + type: 2} + m_audioClip: {fileID: 8300000, guid: 670efea3430dfd140b50556fdb7927c7, type: 3} + 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: 1 + 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 &8115437487426057382 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Station46/Modules/Holes/Fling Holes.prefab b/Assets/Station46/Modules/Holes/Fling Holes.prefab index 7b4ee3e..17dbd05 100644 --- a/Assets/Station46/Modules/Holes/Fling Holes.prefab +++ b/Assets/Station46/Modules/Holes/Fling Holes.prefab @@ -97,6 +97,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: size: {x: 2, y: 2} + solvedAudioSource: {fileID: 6047140761342617213} states: 000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 solution: 010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000001000000 stateCount: 36 @@ -114,3 +115,9 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 17de1e2991b64847bceea06f966f0560, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!82 &6047140761342617213 stripped +AudioSource: + m_CorrespondingSourceObject: {fileID: 209354830304850080, guid: 435cdab79ab05ef43b4a387004dc04b5, + type: 3} + m_PrefabInstance: {fileID: 5840048728257959645} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/Station46/Modules/Holes/Holes.prefab b/Assets/Station46/Modules/Holes/Holes.prefab index a51b486..2c7cd22 100644 --- a/Assets/Station46/Modules/Holes/Holes.prefab +++ b/Assets/Station46/Modules/Holes/Holes.prefab @@ -114,8 +114,9 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 441961844938445841} + - {fileID: 1603560497867779075} m_Father: {fileID: 0} - m_RootOrder: 0 + m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &2736082226738519698 MonoBehaviour: @@ -130,6 +131,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: size: {x: 2, y: 2} + solvedAudioSource: {fileID: 209354830304850080} states: 000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 solution: 010000000000000000000000000000000000000001000000000000000100000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000100000000000000010000000000000000000000000000000000000001000000 stateCount: 36 @@ -148,7 +150,137 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: color: {r: 8, g: 3.5137255, b: 0, a: 1} + startActive: 0 emissionRenderer: {fileID: 5835956621428549619} +--- !u!1 &7838153685150368580 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1603560497867779075} + - component: {fileID: 209354830304850080} + m_Layer: 0 + m_Name: Audio + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1603560497867779075 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7838153685150368580} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0.5, y: 0, z: 0.5} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 5456409340337094247} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!82 &209354830304850080 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7838153685150368580} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 2431929790045522726, guid: 20d4bd74d308d434bbe4ed0adcd3ed7a, + type: 2} + m_audioClip: {fileID: 8300000, guid: 670efea3430dfd140b50556fdb7927c7, type: 3} + 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: 1 + 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 &8678085014710146199 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Station46/Modules/Hoop/Fling Hoop.prefab b/Assets/Station46/Modules/Hoop/Fling Hoop.prefab index 720a0c9..4672f9f 100644 --- a/Assets/Station46/Modules/Hoop/Fling Hoop.prefab +++ b/Assets/Station46/Modules/Hoop/Fling Hoop.prefab @@ -1,5 +1,134 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &659288051492972913 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2709365389859220584} + - component: {fileID: 2792623841101328222} + m_Layer: 0 + m_Name: Audio + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2709365389859220584 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 659288051492972913} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 2216350971831476633} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!82 &2792623841101328222 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 659288051492972913} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 2431929790045522726, guid: 20d4bd74d308d434bbe4ed0adcd3ed7a, + type: 2} + m_audioClip: {fileID: 8300000, guid: 670efea3430dfd140b50556fdb7927c7, type: 3} + 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: 1 + 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!1001 &4028827982112082620 PrefabInstance: m_ObjectHideFlags: 0 @@ -46,7 +175,7 @@ PrefabInstance: - target: {fileID: 2966546982734834469, guid: c6f4a21ce6c0ce84584c90804c96ad80, type: 3} propertyPath: m_RootOrder - value: 0 + value: -1 objectReference: {fileID: 0} - target: {fileID: 2966546982734834469, guid: c6f4a21ce6c0ce84584c90804c96ad80, type: 3} @@ -75,7 +204,11 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] - m_AddedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 2966546982734834469, guid: c6f4a21ce6c0ce84584c90804c96ad80, + type: 3} + insertIndex: -1 + addedObject: {fileID: 2709365389859220584} m_AddedComponents: - targetCorrespondingSourceObject: {fileID: 7243067731848781317, guid: c6f4a21ce6c0ce84584c90804c96ad80, type: 3} @@ -94,6 +227,12 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 17de1e2991b64847bceea06f966f0560, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!4 &2216350971831476633 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 2966546982734834469, guid: c6f4a21ce6c0ce84584c90804c96ad80, + type: 3} + m_PrefabInstance: {fileID: 4028827982112082620} + m_PrefabAsset: {fileID: 0} --- !u!114 &2343766496756531927 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 1688848220615297131, guid: c6f4a21ce6c0ce84584c90804c96ad80, @@ -137,6 +276,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: size: {x: 1, y: 1} + solvedAudioSource: {fileID: 2792623841101328222} states: 00000000 solution: 03000000 stateCount: 1 diff --git a/Assets/Station46/Modules/Laser/Laser Platform Sink.prefab b/Assets/Station46/Modules/Laser/Laser Platform Sink.prefab index 655a393..1988177 100644 --- a/Assets/Station46/Modules/Laser/Laser Platform Sink.prefab +++ b/Assets/Station46/Modules/Laser/Laser Platform Sink.prefab @@ -78,6 +78,16 @@ PrefabInstance: propertyPath: m_Center.z value: -10.19 objectReference: {fileID: 0} + - target: {fileID: 6436953479080561402, guid: 7a8b76a212391334ea8e3937df152874, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6436953479080561402, guid: 7a8b76a212391334ea8e3937df152874, + type: 3} + propertyPath: m_LocalPosition.z + value: 9.700001 + objectReference: {fileID: 0} - target: {fileID: 7329942003389928718, guid: 7a8b76a212391334ea8e3937df152874, type: 3} propertyPath: m_Name diff --git a/Assets/Station46/Modules/Laser/Laser Sink.prefab b/Assets/Station46/Modules/Laser/Laser Sink.prefab index 1ec7aa1..3bac0bd 100644 --- a/Assets/Station46/Modules/Laser/Laser Sink.prefab +++ b/Assets/Station46/Modules/Laser/Laser Sink.prefab @@ -1,5 +1,134 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &2111808762434579141 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6436953479080561402} + - component: {fileID: 6655769653536455728} + m_Layer: 0 + m_Name: Audio + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6436953479080561402 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2111808762434579141} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 4721832177169651751} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!82 &6655769653536455728 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2111808762434579141} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 2431929790045522726, guid: 20d4bd74d308d434bbe4ed0adcd3ed7a, + type: 2} + m_audioClip: {fileID: 8300000, guid: 670efea3430dfd140b50556fdb7927c7, type: 3} + 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: 1 + 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 &3391168936345669427 GameObject: m_ObjectHideFlags: 0 @@ -61,6 +190,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 2613225240104883593} + - {fileID: 6436953479080561402} m_Father: {fileID: 2835502344937141734} m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -125,6 +255,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: size: {x: 1, y: 1} + solvedAudioSource: {fileID: 6655769653536455728} states: 00000000 solution: 01000000 stateCount: 1 diff --git a/Assets/Station46/Modules/Rings/Align Rings.prefab b/Assets/Station46/Modules/Rings/Align Rings.prefab index a616faf..0cb68c4 100644 --- a/Assets/Station46/Modules/Rings/Align Rings.prefab +++ b/Assets/Station46/Modules/Rings/Align Rings.prefab @@ -1,5 +1,134 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &47353657052914460 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6788857955920526987} + - component: {fileID: 5479846935478183391} + m_Layer: 0 + m_Name: Audio + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6788857955920526987 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 47353657052914460} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1377556053648530484} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!82 &5479846935478183391 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 47353657052914460} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 2431929790045522726, guid: 20d4bd74d308d434bbe4ed0adcd3ed7a, + type: 2} + m_audioClip: {fileID: 8300000, guid: 670efea3430dfd140b50556fdb7927c7, type: 3} + 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: 1 + 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 &438722653736032690 GameObject: m_ObjectHideFlags: 0 @@ -193,6 +322,7 @@ Transform: m_Children: - {fileID: 3486750519070425340} - {fileID: 1666949579012228321} + - {fileID: 6788857955920526987} m_Father: {fileID: 0} m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -209,6 +339,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: size: {x: 1, y: 1} + solvedAudioSource: {fileID: 5479846935478183391} states: 010000000100000001000000 solution: 000000000000000000000000 stateCount: 3 diff --git a/Assets/Station46/Modules/Symbols/Audio.meta b/Assets/Station46/Modules/Symbols/Audio.meta new file mode 100644 index 0000000..3328b02 --- /dev/null +++ b/Assets/Station46/Modules/Symbols/Audio.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 4b63521744301394e9f46918b20d80be +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Station46/Modules/Symbols/Audio/press.wav b/Assets/Station46/Modules/Symbols/Audio/press.wav new file mode 100644 index 0000000..9f88f77 --- /dev/null +++ b/Assets/Station46/Modules/Symbols/Audio/press.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3541293617f176dd508e0ad903a524fb4b3285eac28dd2566b87a675a9e4071b +size 145476 diff --git a/Assets/Station46/Modules/Symbols/Audio/press.wav.meta b/Assets/Station46/Modules/Symbols/Audio/press.wav.meta new file mode 100644 index 0000000..9275cfa --- /dev/null +++ b/Assets/Station46/Modules/Symbols/Audio/press.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: b04f57c993a9c974f8011a599feefc1e +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 1 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Station46/Modules/Symbols/Symbol Button.prefab b/Assets/Station46/Modules/Symbols/Symbol Button.prefab index 0b4388f..ad73f9d 100644 --- a/Assets/Station46/Modules/Symbols/Symbol Button.prefab +++ b/Assets/Station46/Modules/Symbols/Symbol Button.prefab @@ -1,5 +1,134 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &3121789093812028574 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7959747665069493947} + - component: {fileID: 2068962999202675103} + m_Layer: 0 + m_Name: Audio Source + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7959747665069493947 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3121789093812028574} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 6441084954992009755} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!82 &2068962999202675103 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3121789093812028574} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 1090617626336915418, guid: 20d4bd74d308d434bbe4ed0adcd3ed7a, + type: 2} + m_audioClip: {fileID: 8300000, guid: b04f57c993a9c974f8011a599feefc1e, type: 3} + 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!1001 &7296276792083978233 PrefabInstance: m_ObjectHideFlags: 0 @@ -22,7 +151,7 @@ PrefabInstance: - target: {fileID: 4333238779474015714, guid: d448da7d4695ed54cbc3c951c4e78509, type: 3} propertyPath: m_RootOrder - value: 0 + value: -1 objectReference: {fileID: 0} - target: {fileID: 4333238779474015714, guid: d448da7d4695ed54cbc3c951c4e78509, type: 3} @@ -81,12 +210,20 @@ PrefabInstance: objectReference: {fileID: 2100000, guid: d1f58490f6d04c64da01277723d63536, type: 2} m_RemovedComponents: [] m_RemovedGameObjects: [] - m_AddedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 4333238779474015714, guid: d448da7d4695ed54cbc3c951c4e78509, + type: 3} + insertIndex: -1 + addedObject: {fileID: 7959747665069493947} m_AddedComponents: - targetCorrespondingSourceObject: {fileID: 3992741351158361944, guid: d448da7d4695ed54cbc3c951c4e78509, type: 3} insertIndex: -1 addedObject: {fileID: 8232915369211415309} + - targetCorrespondingSourceObject: {fileID: 3992741351158361944, guid: d448da7d4695ed54cbc3c951c4e78509, + type: 3} + insertIndex: -1 + addedObject: {fileID: 5272534872498878152} - targetCorrespondingSourceObject: {fileID: 3992741351158361944, guid: d448da7d4695ed54cbc3c951c4e78509, type: 3} insertIndex: -1 @@ -124,6 +261,19 @@ MonoBehaviour: startInactive: 0 holoRenderer: {fileID: 3588071600122019806} symbolNumber: 0 +--- !u!114 &5272534872498878152 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5920126912232503457} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d6481047d71944108dc1d729ad344648, type: 3} + m_Name: + m_EditorClassIdentifier: + audioSource: {fileID: 2068962999202675103} --- !u!114 &441274444389109490 MonoBehaviour: m_ObjectHideFlags: 0 @@ -253,3 +403,9 @@ CapsuleCollider: m_Height: 0.2 m_Direction: 1 m_Center: {x: 0, y: -0.075, z: 0} +--- !u!4 &6441084954992009755 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4333238779474015714, guid: d448da7d4695ed54cbc3c951c4e78509, + type: 3} + m_PrefabInstance: {fileID: 7296276792083978233} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/Station46/Modules/Terminal/Scripts/Terminal.cs b/Assets/Station46/Modules/Terminal/Scripts/Terminal.cs index da2955a..41ca044 100644 --- a/Assets/Station46/Modules/Terminal/Scripts/Terminal.cs +++ b/Assets/Station46/Modules/Terminal/Scripts/Terminal.cs @@ -29,6 +29,8 @@ namespace Station46.Modules.Terminal.Scripts public List symbols; [BoxGroup("Internal")] public List symbolSlots; + [BoxGroup("Internal")] + public AudioSource wrongAudioSource; private IOption _activeSymbol; private Animator _animator; @@ -64,6 +66,7 @@ namespace Station46.Modules.Terminal.Scripts break; case PuzzleEventType.WrongInput: _animator.SetTrigger(LightFlash); + wrongAudioSource.Play(); break; } }; diff --git a/Assets/Station46/Modules/Terminal/Terminal 3 Slots.prefab b/Assets/Station46/Modules/Terminal/Terminal 3 Slots.prefab index 6ba5946..08a640e 100644 --- a/Assets/Station46/Modules/Terminal/Terminal 3 Slots.prefab +++ b/Assets/Station46/Modules/Terminal/Terminal 3 Slots.prefab @@ -93,6 +93,264 @@ Transform: m_Father: {fileID: 7756295983983028816} m_RootOrder: -1 m_LocalEulerAnglesHint: {x: -158.273, y: 0, z: -180} +--- !u!1 &8241685712984197265 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3109905407629528223} + - component: {fileID: 3605146934675753369} + m_Layer: 0 + m_Name: Audio + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3109905407629528223 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8241685712984197265} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 7756295983983028816} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!82 &3605146934675753369 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8241685712984197265} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 2431929790045522726, guid: 20d4bd74d308d434bbe4ed0adcd3ed7a, + type: 2} + m_audioClip: {fileID: 8300000, guid: 670efea3430dfd140b50556fdb7927c7, type: 3} + 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: 1 + 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 &8339327155135661406 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7313557793757843608} + - component: {fileID: 1206342032296252965} + m_Layer: 0 + m_Name: Wrong Audio + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7313557793757843608 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8339327155135661406} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 7756295983983028816} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!82 &1206342032296252965 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8339327155135661406} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 2431929790045522726, guid: 20d4bd74d308d434bbe4ed0adcd3ed7a, + type: 2} + m_audioClip: {fileID: 8300000, guid: a09028d9dbf699b46b4ad05d0d3b270c, type: 3} + 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: 1 + 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!1001 &2384246425946067472 PrefabInstance: m_ObjectHideFlags: 0 @@ -104,7 +362,7 @@ PrefabInstance: - target: {fileID: 5383329221585827904, guid: 02a72e7f56d97334c93a1449eedc9d91, type: 3} propertyPath: m_RootOrder - value: 0 + value: -1 objectReference: {fileID: 0} - target: {fileID: 5383329221585827904, guid: 02a72e7f56d97334c93a1449eedc9d91, type: 3} @@ -161,6 +419,16 @@ PrefabInstance: propertyPath: totalSteps value: 3 objectReference: {fileID: 0} + - target: {fileID: 5383329221585827905, guid: 02a72e7f56d97334c93a1449eedc9d91, + type: 3} + propertyPath: wrongAudioSource + value: + objectReference: {fileID: 1206342032296252965} + - target: {fileID: 5383329221585827905, guid: 02a72e7f56d97334c93a1449eedc9d91, + type: 3} + propertyPath: solvedAudioSource + value: + objectReference: {fileID: 3605146934675753369} - target: {fileID: 5383329221585827905, guid: 02a72e7f56d97334c93a1449eedc9d91, type: 3} propertyPath: symbols.Array.size @@ -206,6 +474,14 @@ PrefabInstance: type: 3} insertIndex: -1 addedObject: {fileID: 6165579071297624197} + - targetCorrespondingSourceObject: {fileID: 5383329221585827904, guid: 02a72e7f56d97334c93a1449eedc9d91, + type: 3} + insertIndex: -1 + addedObject: {fileID: 3109905407629528223} + - targetCorrespondingSourceObject: {fileID: 5383329221585827904, guid: 02a72e7f56d97334c93a1449eedc9d91, + type: 3} + insertIndex: -1 + addedObject: {fileID: 7313557793757843608} m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 02a72e7f56d97334c93a1449eedc9d91, type: 3} --- !u!4 &7756295983983028816 stripped diff --git a/Assets/Station46/Scripts/ButtonSound.cs b/Assets/Station46/Scripts/ButtonSound.cs new file mode 100644 index 0000000..58b7b81 --- /dev/null +++ b/Assets/Station46/Scripts/ButtonSound.cs @@ -0,0 +1,27 @@ +using NaughtyAttributes; +using UnityEngine; + +namespace Station46.Scripts +{ + [RequireComponent(typeof(Button))] + public class ButtonSound : MonoBehaviour + { + [BoxGroup("Internal")] public AudioSource audioSource; + + private void Awake() + { + audioSource.loop = false; + } + + private void Start() + { + GetComponent