diff --git a/Assets/Prefabs/Characters/PulverCharacter.prefab b/Assets/Prefabs/Characters/PulverCharacter.prefab index fd998159..7ba89fdf 100644 --- a/Assets/Prefabs/Characters/PulverCharacter.prefab +++ b/Assets/Prefabs/Characters/PulverCharacter.prefab @@ -15,6 +15,9 @@ GameObject: - component: {fileID: 7852204877518954380} - component: {fileID: 1621671461027776358} - component: {fileID: 7002695641417196458} + - component: {fileID: 2639422347702149680} + - component: {fileID: 4467608046243604209} + - component: {fileID: 887004370483616855} m_Layer: 8 m_Name: PulverCharacter m_TagString: Pulver @@ -93,6 +96,9 @@ MonoBehaviour: manualMoveSmooth: 100 justCombined: 0 heldObjectRenderer: {fileID: 2099200424669714683} + PulverIsCombining: + m_PersistentCalls: + m_Calls: [] --- !u!114 &8947209170748834035 MonoBehaviour: m_ObjectHideFlags: 0 @@ -230,6 +236,132 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 +--- !u!114 &2639422347702149680 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1102400833121127473} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2bd397a60643eed45b586961ae6e3453, type: 3} + m_Name: + m_EditorClassIdentifier: AppleHillsScripts::PulverAudioController + combineAudio: {fileID: 8300000, guid: 768a16f348fe1d94c9cc267dc7ecf3b5, type: 3} +--- !u!82 &4467608046243604209 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1102400833121127473} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 0} + m_Resource: {fileID: 0} + m_PlayOnAwake: 1 + 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!114 &887004370483616855 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1102400833121127473} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 242e6101be071f44fb14c3c12641c833, type: 3} + m_Name: + m_EditorClassIdentifier: AppleHillsScripts::AppleAudioSource + audioSourceType: 3 + audioSource: {fileID: 0} + clipPriority: 0 + sourcePriority: 0 --- !u!1 &5934518940303293264 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/Levels/Quarry.unity b/Assets/Scenes/Levels/Quarry.unity index bdf26c6f..5503d9a6 100644 --- a/Assets/Scenes/Levels/Quarry.unity +++ b/Assets/Scenes/Levels/Quarry.unity @@ -439075,6 +439075,124 @@ RectTransform: m_CorrespondingSourceObject: {fileID: 3484825090253933040, guid: a8b0a1c6cf21352439dc24d3b03182db, type: 3} m_PrefabInstance: {fileID: 534194577} m_PrefabAsset: {fileID: 0} +--- !u!1 &535364674 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 5336239774528417475, guid: ae9b91dd59f66a348a8c888106aa0815, type: 3} + m_PrefabInstance: {fileID: 1328912324} + m_PrefabAsset: {fileID: 0} +--- !u!114 &535364680 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 535364674} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 242e6101be071f44fb14c3c12641c833, type: 3} + m_Name: + m_EditorClassIdentifier: AppleHillsScripts::AppleAudioSource + audioSourceType: 3 + audioSource: {fileID: 0} + clipPriority: 0 + sourcePriority: 0 +--- !u!82 &535364681 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 535364674} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 0} + m_Resource: {fileID: 6418180475301049370, guid: ee2166600ebe2b84ea8b22d20e34a691, type: 2} + 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!4 &536054998 stripped Transform: m_CorrespondingSourceObject: {fileID: 2071071585578300598, guid: 9b2926886934b554f9a1727331d34787, type: 3} @@ -456811,6 +456929,90 @@ PrefabInstance: propertyPath: characterToInteract value: 2 objectReference: {fileID: 0} + - target: {fileID: 4963228844360083416, guid: ae9b91dd59f66a348a8c888106aa0815, type: 3} + propertyPath: characterArrived.m_PersistentCalls.m_Calls.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4963228844360083416, guid: ae9b91dd59f66a348a8c888106aa0815, type: 3} + propertyPath: interactionStarted.m_PersistentCalls.m_Calls.Array.size + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4963228844360083416, guid: ae9b91dd59f66a348a8c888106aa0815, type: 3} + propertyPath: interactionComplete.m_PersistentCalls.m_Calls.Array.size + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4963228844360083416, guid: ae9b91dd59f66a348a8c888106aa0815, type: 3} + propertyPath: characterArrived.m_PersistentCalls.m_Calls.Array.data[0].m_Mode + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 4963228844360083416, guid: ae9b91dd59f66a348a8c888106aa0815, type: 3} + propertyPath: characterArrived.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 535364680} + - target: {fileID: 4963228844360083416, guid: ae9b91dd59f66a348a8c888106aa0815, type: 3} + propertyPath: interactionStarted.m_PersistentCalls.m_Calls.Array.data[0].m_Mode + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 4963228844360083416, guid: ae9b91dd59f66a348a8c888106aa0815, type: 3} + propertyPath: interactionComplete.m_PersistentCalls.m_Calls.Array.data[0].m_Mode + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 4963228844360083416, guid: ae9b91dd59f66a348a8c888106aa0815, type: 3} + propertyPath: interactionStarted.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 535364680} + - target: {fileID: 4963228844360083416, guid: ae9b91dd59f66a348a8c888106aa0815, type: 3} + propertyPath: characterArrived.m_PersistentCalls.m_Calls.Array.data[0].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 4963228844360083416, guid: ae9b91dd59f66a348a8c888106aa0815, type: 3} + propertyPath: interactionComplete.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 535364680} + - target: {fileID: 4963228844360083416, guid: ae9b91dd59f66a348a8c888106aa0815, type: 3} + propertyPath: characterArrived.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: Play + objectReference: {fileID: 0} + - target: {fileID: 4963228844360083416, guid: ae9b91dd59f66a348a8c888106aa0815, type: 3} + propertyPath: interactionStarted.m_PersistentCalls.m_Calls.Array.data[0].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 4963228844360083416, guid: ae9b91dd59f66a348a8c888106aa0815, type: 3} + propertyPath: interactionComplete.m_PersistentCalls.m_Calls.Array.data[0].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 4963228844360083416, guid: ae9b91dd59f66a348a8c888106aa0815, type: 3} + propertyPath: interactionStarted.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: Play + objectReference: {fileID: 0} + - target: {fileID: 4963228844360083416, guid: ae9b91dd59f66a348a8c888106aa0815, type: 3} + propertyPath: interactionComplete.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: Play + objectReference: {fileID: 0} + - target: {fileID: 4963228844360083416, guid: ae9b91dd59f66a348a8c888106aa0815, type: 3} + propertyPath: characterArrived.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName + value: AppleAudioSource, AppleHillsScripts + objectReference: {fileID: 0} + - target: {fileID: 4963228844360083416, guid: ae9b91dd59f66a348a8c888106aa0815, type: 3} + propertyPath: interactionStarted.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName + value: AppleAudioSource, AppleHillsScripts + objectReference: {fileID: 0} + - target: {fileID: 4963228844360083416, guid: ae9b91dd59f66a348a8c888106aa0815, type: 3} + propertyPath: interactionComplete.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName + value: AppleAudioSource, AppleHillsScripts + objectReference: {fileID: 0} + - target: {fileID: 4963228844360083416, guid: ae9b91dd59f66a348a8c888106aa0815, type: 3} + propertyPath: characterArrived.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 4963228844360083416, guid: ae9b91dd59f66a348a8c888106aa0815, type: 3} + propertyPath: interactionStarted.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 4963228844360083416, guid: ae9b91dd59f66a348a8c888106aa0815, type: 3} + propertyPath: interactionComplete.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} - target: {fileID: 4996209826323415114, guid: ae9b91dd59f66a348a8c888106aa0815, type: 3} propertyPath: m_Sprite value: @@ -456835,7 +457037,13 @@ PrefabInstance: - {fileID: 200688012287672078, guid: ae9b91dd59f66a348a8c888106aa0815, type: 3} m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 5336239774528417475, guid: ae9b91dd59f66a348a8c888106aa0815, type: 3} + insertIndex: -1 + addedObject: {fileID: 535364681} + - targetCorrespondingSourceObject: {fileID: 5336239774528417475, guid: ae9b91dd59f66a348a8c888106aa0815, type: 3} + insertIndex: -1 + addedObject: {fileID: 535364680} m_SourcePrefab: {fileID: 100100000, guid: ae9b91dd59f66a348a8c888106aa0815, type: 3} --- !u!1 &1332387987 GameObject: diff --git a/Assets/Scripts/Movement/FollowerController.cs b/Assets/Scripts/Movement/FollowerController.cs index 7eaaceed..33ef4dae 100644 --- a/Assets/Scripts/Movement/FollowerController.cs +++ b/Assets/Scripts/Movement/FollowerController.cs @@ -5,6 +5,7 @@ using UnityEngine.SceneManagement; using Utils; using AppleHills.Core.Settings; using Core; +using UnityEngine.Events; /// /// Controls the follower character, including following the player, handling pickups, and managing held items. @@ -75,7 +76,12 @@ public class FollowerController: MonoBehaviour /// public event FollowerPickupHandler OnPickupReturned; private Coroutine _pickupCoroutine; - + + /// + /// Event fired when Pulver is combining stuff + /// + public UnityEvent PulverIsCombining; + private Input.PlayerTouchController _playerTouchController; void Awake() @@ -583,6 +589,7 @@ public class FollowerController: MonoBehaviour Destroy(pickupB.gameObject); TryPickupItem(newItem, itemData); PlayAnimationStationary("Combine", 10.0f); + PulverIsCombining.Invoke(); return CombinationResult.Successful; } diff --git a/Assets/Scripts/Sound/PulverAudioController.cs b/Assets/Scripts/Sound/PulverAudioController.cs new file mode 100644 index 00000000..6eee1f89 --- /dev/null +++ b/Assets/Scripts/Sound/PulverAudioController.cs @@ -0,0 +1,26 @@ +using UnityEngine; +using UnityEngine.Audio; + +public class PulverAudioController : MonoBehaviour +{ + private AppleAudioSource audioSource; + public AudioResource combineAudio; + private FollowerController followerController; + + // Start is called once before the first execution of Update after the MonoBehaviour is created + void Start() + { + audioSource = GetComponent(); + followerController = GetComponent(); + followerController.PulverIsCombining.AddListener(PulverIsCombining); + + } + + void PulverIsCombining() + { + audioSource.audioSource.resource = combineAudio; + audioSource.Play(0); + } + + +} diff --git a/Assets/Scripts/Sound/PulverAudioController.cs.meta b/Assets/Scripts/Sound/PulverAudioController.cs.meta new file mode 100644 index 00000000..b874afe1 --- /dev/null +++ b/Assets/Scripts/Sound/PulverAudioController.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 2bd397a60643eed45b586961ae6e3453 \ No newline at end of file diff --git a/Assets/Sound/General.meta b/Assets/Sound/General.meta new file mode 100644 index 00000000..5254cf02 --- /dev/null +++ b/Assets/Sound/General.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: a5c4864d6fae98447a76452972ad4ad9 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sound/General/Combination.wav b/Assets/Sound/General/Combination.wav new file mode 100644 index 00000000..32a84029 Binary files /dev/null and b/Assets/Sound/General/Combination.wav differ diff --git a/Assets/Sound/General/Combination.wav.meta b/Assets/Sound/General/Combination.wav.meta new file mode 100644 index 00000000..59246376 --- /dev/null +++ b/Assets/Sound/General/Combination.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 768a16f348fe1d94c9cc267dc7ecf3b5 +AudioImporter: + externalObjects: {} + serializedVersion: 8 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sound/General/swishRandomizer.asset b/Assets/Sound/General/swishRandomizer.asset new file mode 100644 index 00000000..1986d0d5 --- /dev/null +++ b/Assets/Sound/General/swishRandomizer.asset @@ -0,0 +1,71 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1233149941 &-4006783513306292613 +AudioContainerElement: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: swish_2_{-4006783513306292613} + m_AudioClip: {fileID: 8300000, guid: 8cbe11c2fe4e827479670fc5e4dac588, type: 3} + m_Volume: 0 + m_Enabled: 1 +--- !u!1233149941 &-2456671993081397450 +AudioContainerElement: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: swish_1_{-2456671993081397450} + m_AudioClip: {fileID: 8300000, guid: 971050c451255304ca83aba1251c09fe, type: 3} + m_Volume: 0 + m_Enabled: 1 +--- !u!1233149941 &3830103697733071554 +AudioContainerElement: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: swish_4_{3830103697733071554} + m_AudioClip: {fileID: 8300000, guid: 21fc339fb1bcf9b47b426842cd75cc1d, type: 3} + m_Volume: 0 + m_Enabled: 1 +--- !u!1307931743 &6418180475301049370 +AudioRandomContainer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: swishRandomizer + m_Volume: 0 + m_Pitch: 0 + m_AutomaticTriggerTime: 0 + m_LoopCount: 1 + m_VolumeRandomizationRange: {x: 0, y: 0} + m_PitchRandomizationRange: {x: 0, y: 0} + m_AutomaticTriggerTimeRandomizationRange: {x: 0, y: 0} + m_LoopCountRandomizationRange: {x: 0, y: 0} + m_Elements: + - {fileID: -2456671993081397450} + - {fileID: -4006783513306292613} + - {fileID: 6583024804558522230} + - {fileID: 3830103697733071554} + m_AvoidRepeatingLast: 1 + m_PlaybackMode: 2 + m_TriggerMode: 0 + m_AutomaticTriggerMode: 1 + m_LoopMode: 2 + m_VolumeRandomizationEnabled: 0 + m_PitchRandomizationEnabled: 0 + m_AutomaticTriggerTimeRandomizationEnabled: 0 + m_LoopCountRandomizationEnabled: 0 +--- !u!1233149941 &6583024804558522230 +AudioContainerElement: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: swish_3_{6583024804558522230} + m_AudioClip: {fileID: 8300000, guid: 832c0036a6b50584b91b977c7a69de4c, type: 3} + m_Volume: 0 + m_Enabled: 1 diff --git a/Assets/Sound/General/swishRandomizer.asset.meta b/Assets/Sound/General/swishRandomizer.asset.meta new file mode 100644 index 00000000..8edf8f83 --- /dev/null +++ b/Assets/Sound/General/swishRandomizer.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ee2166600ebe2b84ea8b22d20e34a691 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 6418180475301049370 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sound/General/swish_1.wav b/Assets/Sound/General/swish_1.wav new file mode 100644 index 00000000..b8062d5d Binary files /dev/null and b/Assets/Sound/General/swish_1.wav differ diff --git a/Assets/Sound/General/swish_1.wav.meta b/Assets/Sound/General/swish_1.wav.meta new file mode 100644 index 00000000..14d5246b --- /dev/null +++ b/Assets/Sound/General/swish_1.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 971050c451255304ca83aba1251c09fe +AudioImporter: + externalObjects: {} + serializedVersion: 8 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sound/General/swish_2.wav b/Assets/Sound/General/swish_2.wav new file mode 100644 index 00000000..dfa539ca Binary files /dev/null and b/Assets/Sound/General/swish_2.wav differ diff --git a/Assets/Sound/General/swish_2.wav.meta b/Assets/Sound/General/swish_2.wav.meta new file mode 100644 index 00000000..f5682c32 --- /dev/null +++ b/Assets/Sound/General/swish_2.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 8cbe11c2fe4e827479670fc5e4dac588 +AudioImporter: + externalObjects: {} + serializedVersion: 8 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sound/General/swish_3.wav b/Assets/Sound/General/swish_3.wav new file mode 100644 index 00000000..a75ac7e3 Binary files /dev/null and b/Assets/Sound/General/swish_3.wav differ diff --git a/Assets/Sound/General/swish_3.wav.meta b/Assets/Sound/General/swish_3.wav.meta new file mode 100644 index 00000000..a6a9abca --- /dev/null +++ b/Assets/Sound/General/swish_3.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 832c0036a6b50584b91b977c7a69de4c +AudioImporter: + externalObjects: {} + serializedVersion: 8 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sound/General/swish_4.wav b/Assets/Sound/General/swish_4.wav new file mode 100644 index 00000000..fd5b3d14 Binary files /dev/null and b/Assets/Sound/General/swish_4.wav differ diff --git a/Assets/Sound/General/swish_4.wav.meta b/Assets/Sound/General/swish_4.wav.meta new file mode 100644 index 00000000..279c0f42 --- /dev/null +++ b/Assets/Sound/General/swish_4.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 21fc339fb1bcf9b47b426842cd75cc1d +AudioImporter: + externalObjects: {} + serializedVersion: 8 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: