From 47713e60123c1d618dad14db0cf5d7ed25d5fbfa Mon Sep 17 00:00:00 2001 From: Logic Monkey Date: Sun, 22 Apr 2018 19:11:55 -0400 Subject: [PATCH] Sounds added --- Assets/Animations/Lollipop.controller | 164 +++++++ Assets/Animations/Lollipop.controller.meta | 10 + Assets/Animations/Lollypop Hello.anim | 83 ++++ Assets/Animations/Lollypop Hello.anim.meta | 10 + Assets/Animations/Lollypop Idle.anim | 77 ++++ Assets/Animations/Lollypop Idle.anim.meta | 10 + Assets/Palettes/Background.prefab | 131 +++++- Assets/Palettes/tiles_ip_13.asset | 35 ++ Assets/Palettes/tiles_ip_13.asset.meta | 10 + Assets/Palettes/tiles_ip_14.asset | 35 ++ Assets/Palettes/tiles_ip_14.asset.meta | 10 + Assets/Palettes/tiles_ip_15.asset | 35 ++ Assets/Palettes/tiles_ip_15.asset.meta | 10 + Assets/Palettes/tiles_ip_16.asset | 35 ++ Assets/Palettes/tiles_ip_16.asset.meta | 10 + Assets/Palettes/tiles_ip_17.asset | 35 ++ Assets/Palettes/tiles_ip_17.asset.meta | 10 + Assets/Palettes/tiles_ip_18.asset | 35 ++ Assets/Palettes/tiles_ip_18.asset.meta | 10 + Assets/Palettes/tiles_ip_19.asset | 35 ++ Assets/Palettes/tiles_ip_19.asset.meta | 10 + Assets/Prefabs/Bomb.prefab | 93 ++++ Assets/Prefabs/PressurePlate.prefab | 82 ++++ Assets/Scenes/gameplay.unity | 441 ++++++++++++++----- Assets/Scripts/Bomb.cs | 5 +- Assets/Scripts/ExplosionSoundManager.cs | 23 + Assets/Scripts/ExplosionSoundManager.cs.meta | 13 + Assets/Scripts/LollipopSaysHi.cs | 29 ++ Assets/Scripts/LollipopSaysHi.cs.meta | 13 + Assets/Scripts/Player.cs | 15 +- Assets/Scripts/PressurePlate.cs | 8 +- Assets/Sprites/lolly.png | 3 + Assets/Sprites/lolly.png.meta | 268 +++++++++++ Assets/Sprites/tiles_ip.png | 4 +- Assets/Sprites/tiles_ip.png.meta | 129 +++++- Assets/audio.meta | 10 + Assets/audio/04 Fingerfeet.mp3 | 3 + Assets/audio/04 Fingerfeet.mp3.meta | 24 + Assets/audio/click.wav | 3 + Assets/audio/click.wav.meta | 24 + Assets/audio/explosion.wav | 3 + Assets/audio/explosion.wav.meta | 24 + Assets/audio/fire.wav | 3 + Assets/audio/fire.wav.meta | 24 + Assets/audio/ice.wav | 3 + Assets/audio/ice.wav.meta | 24 + Assets/audio/switch.wav | 3 + Assets/audio/switch.wav.meta | 24 + Assets/audio/whirlwind.wav | 3 + Assets/audio/whirlwind.wav.meta | 24 + 50 files changed, 1979 insertions(+), 146 deletions(-) create mode 100644 Assets/Animations/Lollipop.controller create mode 100644 Assets/Animations/Lollipop.controller.meta create mode 100644 Assets/Animations/Lollypop Hello.anim create mode 100644 Assets/Animations/Lollypop Hello.anim.meta create mode 100644 Assets/Animations/Lollypop Idle.anim create mode 100644 Assets/Animations/Lollypop Idle.anim.meta create mode 100644 Assets/Palettes/tiles_ip_13.asset create mode 100644 Assets/Palettes/tiles_ip_13.asset.meta create mode 100644 Assets/Palettes/tiles_ip_14.asset create mode 100644 Assets/Palettes/tiles_ip_14.asset.meta create mode 100644 Assets/Palettes/tiles_ip_15.asset create mode 100644 Assets/Palettes/tiles_ip_15.asset.meta create mode 100644 Assets/Palettes/tiles_ip_16.asset create mode 100644 Assets/Palettes/tiles_ip_16.asset.meta create mode 100644 Assets/Palettes/tiles_ip_17.asset create mode 100644 Assets/Palettes/tiles_ip_17.asset.meta create mode 100644 Assets/Palettes/tiles_ip_18.asset create mode 100644 Assets/Palettes/tiles_ip_18.asset.meta create mode 100644 Assets/Palettes/tiles_ip_19.asset create mode 100644 Assets/Palettes/tiles_ip_19.asset.meta create mode 100644 Assets/Scripts/ExplosionSoundManager.cs create mode 100644 Assets/Scripts/ExplosionSoundManager.cs.meta create mode 100644 Assets/Scripts/LollipopSaysHi.cs create mode 100644 Assets/Scripts/LollipopSaysHi.cs.meta create mode 100644 Assets/Sprites/lolly.png create mode 100644 Assets/Sprites/lolly.png.meta create mode 100644 Assets/audio.meta create mode 100644 Assets/audio/04 Fingerfeet.mp3 create mode 100644 Assets/audio/04 Fingerfeet.mp3.meta create mode 100644 Assets/audio/click.wav create mode 100644 Assets/audio/click.wav.meta create mode 100644 Assets/audio/explosion.wav create mode 100644 Assets/audio/explosion.wav.meta create mode 100644 Assets/audio/fire.wav create mode 100644 Assets/audio/fire.wav.meta create mode 100644 Assets/audio/ice.wav create mode 100644 Assets/audio/ice.wav.meta create mode 100644 Assets/audio/switch.wav create mode 100644 Assets/audio/switch.wav.meta create mode 100644 Assets/audio/whirlwind.wav create mode 100644 Assets/audio/whirlwind.wav.meta diff --git a/Assets/Animations/Lollipop.controller b/Assets/Animations/Lollipop.controller new file mode 100644 index 0000000..a7eac80 --- /dev/null +++ b/Assets/Animations/Lollipop.controller @@ -0,0 +1,164 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!91 &9100000 +AnimatorController: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: Lollipop + serializedVersion: 5 + m_AnimatorParameters: + - m_Name: SayHi + m_Type: 9 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 0} + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: 1107122209053777612} + m_Mask: {fileID: 0} + m_Motions: [] + m_Behaviours: [] + m_BlendingMode: 0 + m_SyncedLayerIndex: -1 + m_DefaultWeight: 0 + m_IKPass: 0 + m_SyncedLayerAffectsTiming: 0 + m_Controller: {fileID: 9100000} +--- !u!1101 &1101518809079741256 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: + m_Conditions: [] + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 1102980102543750172} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.5426582 + m_TransitionOffset: 0 + m_ExitTime: 2.9212575 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &1101979587164766938 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 1 + m_ConditionEvent: SayHi + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 1102479394110204516} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.47379237 + m_TransitionOffset: 0 + m_ExitTime: 8.3479945e-11 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1102 &1102479394110204516 +AnimatorState: + serializedVersion: 5 + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: Lollypop Hello + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: 1101518809079741256} + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: d8ac043ddb7cabf4796d6cf9b53b5710, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1102 &1102980102543750172 +AnimatorState: + serializedVersion: 5 + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: Lollypop Idle + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: 1101979587164766938} + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: fc283ebca5193c8459a2601b4d70ab91, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1107 &1107122209053777612 +AnimatorStateMachine: + serializedVersion: 5 + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: Base Layer + m_ChildStates: + - serializedVersion: 1 + m_State: {fileID: 1102980102543750172} + m_Position: {x: 308.87714, y: 240.07623, z: 0} + - serializedVersion: 1 + m_State: {fileID: 1102479394110204516} + m_Position: {x: 420, y: 36, z: 0} + m_ChildStateMachines: [] + m_AnyStateTransitions: [] + m_EntryTransitions: + - {fileID: 1109359953383408778} + m_StateMachineTransitions: {} + m_StateMachineBehaviours: [] + m_AnyStatePosition: {x: 50, y: 20, z: 0} + m_EntryPosition: {x: 50, y: 120, z: 0} + m_ExitPosition: {x: 800, y: 120, z: 0} + m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} + m_DefaultState: {fileID: 1102980102543750172} +--- !u!1109 &1109359953383408778 +AnimatorTransition: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: + m_Conditions: [] + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 1102980102543750172} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 1 diff --git a/Assets/Animations/Lollipop.controller.meta b/Assets/Animations/Lollipop.controller.meta new file mode 100644 index 0000000..655a48e --- /dev/null +++ b/Assets/Animations/Lollipop.controller.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: f4f4b456659de52488bdf61d9aa9451c +timeCreated: 1524409670 +licenseType: Free +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 9100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Animations/Lollypop Hello.anim b/Assets/Animations/Lollypop Hello.anim new file mode 100644 index 0000000..f40e6bb --- /dev/null +++ b/Assets/Animations/Lollypop Hello.anim @@ -0,0 +1,83 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: Lollypop Hello + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: + - curve: + - time: 0 + value: {fileID: 21300008, guid: 131ea62735a77a4459821cc3c99734d0, type: 3} + - time: 0.083333336 + value: {fileID: 21300010, guid: 131ea62735a77a4459821cc3c99734d0, type: 3} + - time: 0.16666667 + value: {fileID: 21300012, guid: 131ea62735a77a4459821cc3c99734d0, type: 3} + - time: 0.25 + value: {fileID: 21300014, guid: 131ea62735a77a4459821cc3c99734d0, type: 3} + - time: 0.33333334 + value: {fileID: 21300016, guid: 131ea62735a77a4459821cc3c99734d0, type: 3} + - time: 0.41666666 + value: {fileID: 21300018, guid: 131ea62735a77a4459821cc3c99734d0, type: 3} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + m_SampleRate: 12 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 0 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + pptrCurveMapping: + - {fileID: 21300008, guid: 131ea62735a77a4459821cc3c99734d0, type: 3} + - {fileID: 21300010, guid: 131ea62735a77a4459821cc3c99734d0, type: 3} + - {fileID: 21300012, guid: 131ea62735a77a4459821cc3c99734d0, type: 3} + - {fileID: 21300014, guid: 131ea62735a77a4459821cc3c99734d0, type: 3} + - {fileID: 21300016, guid: 131ea62735a77a4459821cc3c99734d0, type: 3} + - {fileID: 21300018, guid: 131ea62735a77a4459821cc3c99734d0, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.5 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 1 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: [] + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_GenerateMotionCurves: 0 + m_Events: [] diff --git a/Assets/Animations/Lollypop Hello.anim.meta b/Assets/Animations/Lollypop Hello.anim.meta new file mode 100644 index 0000000..5dc0928 --- /dev/null +++ b/Assets/Animations/Lollypop Hello.anim.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: d8ac043ddb7cabf4796d6cf9b53b5710 +timeCreated: 1524409611 +licenseType: Free +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Animations/Lollypop Idle.anim b/Assets/Animations/Lollypop Idle.anim new file mode 100644 index 0000000..be835be --- /dev/null +++ b/Assets/Animations/Lollypop Idle.anim @@ -0,0 +1,77 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: Lollypop Idle + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: + - curve: + - time: 0 + value: {fileID: 21300000, guid: 131ea62735a77a4459821cc3c99734d0, type: 3} + - time: 5 + value: {fileID: 21300002, guid: 131ea62735a77a4459821cc3c99734d0, type: 3} + - time: 5.0833335 + value: {fileID: 21300004, guid: 131ea62735a77a4459821cc3c99734d0, type: 3} + - time: 5.1666665 + value: {fileID: 21300006, guid: 131ea62735a77a4459821cc3c99734d0, type: 3} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + m_SampleRate: 12 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 0 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + pptrCurveMapping: + - {fileID: 21300000, guid: 131ea62735a77a4459821cc3c99734d0, type: 3} + - {fileID: 21300002, guid: 131ea62735a77a4459821cc3c99734d0, type: 3} + - {fileID: 21300004, guid: 131ea62735a77a4459821cc3c99734d0, type: 3} + - {fileID: 21300006, guid: 131ea62735a77a4459821cc3c99734d0, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 5.25 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 1 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: [] + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_GenerateMotionCurves: 0 + m_Events: [] diff --git a/Assets/Animations/Lollypop Idle.anim.meta b/Assets/Animations/Lollypop Idle.anim.meta new file mode 100644 index 0000000..f881d92 --- /dev/null +++ b/Assets/Animations/Lollypop Idle.anim.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: fc283ebca5193c8459a2601b4d70ab91 +timeCreated: 1524409441 +licenseType: Free +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Palettes/Background.prefab b/Assets/Palettes/Background.prefab index 55d4640..2bcf1eb 100644 --- a/Assets/Palettes/Background.prefab +++ b/Assets/Palettes/Background.prefab @@ -141,6 +141,69 @@ Tilemap: m_GameObject: {fileID: 1288762788032418} m_Enabled: 1 m_Tiles: + - first: {x: 0, y: -3, z: 0} + second: + m_TileIndex: 10 + m_TileSpriteIndex: 10 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_ObjectToInstantiate: {fileID: 0} + m_TileFlags: 1 + m_ColliderType: 1 + - first: {x: 1, y: -3, z: 0} + second: + m_TileIndex: 11 + m_TileSpriteIndex: 11 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_ObjectToInstantiate: {fileID: 0} + m_TileFlags: 1 + m_ColliderType: 1 + - first: {x: 0, y: -2, z: 0} + second: + m_TileIndex: 7 + m_TileSpriteIndex: 7 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_ObjectToInstantiate: {fileID: 0} + m_TileFlags: 1 + m_ColliderType: 1 + - first: {x: 1, y: -2, z: 0} + second: + m_TileIndex: 6 + m_TileSpriteIndex: 6 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_ObjectToInstantiate: {fileID: 0} + m_TileFlags: 1 + m_ColliderType: 1 + - first: {x: 2, y: -2, z: 0} + second: + m_TileIndex: 8 + m_TileSpriteIndex: 8 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_ObjectToInstantiate: {fileID: 0} + m_TileFlags: 1 + m_ColliderType: 1 + - first: {x: 3, y: -2, z: 0} + second: + m_TileIndex: 9 + m_TileSpriteIndex: 9 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_ObjectToInstantiate: {fileID: 0} + m_TileFlags: 1 + m_ColliderType: 1 + - first: {x: 0, y: -1, z: 0} + second: + m_TileIndex: 5 + m_TileSpriteIndex: 5 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_ObjectToInstantiate: {fileID: 0} + m_TileFlags: 1 + m_ColliderType: 1 - first: {x: 0, y: 0, z: 0} second: m_TileIndex: 1 @@ -168,23 +231,68 @@ Tilemap: m_ObjectToInstantiate: {fileID: 0} m_TileFlags: 1 m_ColliderType: 1 + - first: {x: 1, y: 1, z: 0} + second: + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_ObjectToInstantiate: {fileID: 0} + m_TileFlags: 1 + m_ColliderType: 1 m_AnimatedTiles: {} m_TileAssetArray: - - m_RefCount: 1 + - m_RefCount: 2 m_Data: {fileID: 11400000, guid: ccd1189a390b74c4d9498bd35441a9a5, type: 2} - m_RefCount: 1 m_Data: {fileID: 11400000, guid: 93829538c60c13b4da7dfa6981eab367, type: 2} - m_RefCount: 1 m_Data: {fileID: 11400000, guid: 0da8836ae05e77a46a3953aa2b346809, type: 2} - m_TileSpriteArray: + - m_RefCount: 0 + m_Data: {fileID: 0} + - m_RefCount: 0 + m_Data: {fileID: 0} - m_RefCount: 1 + m_Data: {fileID: 11400000, guid: c83701eb0b3c1154d9766340ddcdabd8, type: 2} + - m_RefCount: 1 + m_Data: {fileID: 11400000, guid: c0bc655d1309e7d4190c539104e18802, type: 2} + - m_RefCount: 1 + m_Data: {fileID: 11400000, guid: eb4fd42536af6e7468d6f2245b9bd1b8, type: 2} + - m_RefCount: 1 + m_Data: {fileID: 11400000, guid: ecf710f5ced31cc438d5da7c80075479, type: 2} + - m_RefCount: 1 + m_Data: {fileID: 11400000, guid: 30d0b2978e177d44e9d08a251c9f6fe4, type: 2} + - m_RefCount: 1 + m_Data: {fileID: 11400000, guid: e32d62d44ca5c8742aff754acc6f7239, type: 2} + - m_RefCount: 1 + m_Data: {fileID: 11400000, guid: dd338c7a2fd4336478dd5a86fbef1eea, type: 2} + m_TileSpriteArray: + - m_RefCount: 2 m_Data: {fileID: 21300000, guid: f0425e92c7345064ab2dccbd778f3b15, type: 3} - m_RefCount: 1 m_Data: {fileID: 21300002, guid: f0425e92c7345064ab2dccbd778f3b15, type: 3} - m_RefCount: 1 m_Data: {fileID: 21300010, guid: f0425e92c7345064ab2dccbd778f3b15, type: 3} + - m_RefCount: 0 + m_Data: {fileID: 0} + - m_RefCount: 0 + m_Data: {fileID: 0} + - m_RefCount: 1 + m_Data: {fileID: 21300026, guid: f0425e92c7345064ab2dccbd778f3b15, type: 3} + - m_RefCount: 1 + m_Data: {fileID: 21300028, guid: f0425e92c7345064ab2dccbd778f3b15, type: 3} + - m_RefCount: 1 + m_Data: {fileID: 21300030, guid: f0425e92c7345064ab2dccbd778f3b15, type: 3} + - m_RefCount: 1 + m_Data: {fileID: 21300032, guid: f0425e92c7345064ab2dccbd778f3b15, type: 3} + - m_RefCount: 1 + m_Data: {fileID: 21300034, guid: f0425e92c7345064ab2dccbd778f3b15, type: 3} + - m_RefCount: 1 + m_Data: {fileID: 21300036, guid: f0425e92c7345064ab2dccbd778f3b15, type: 3} + - m_RefCount: 1 + m_Data: {fileID: 21300038, guid: f0425e92c7345064ab2dccbd778f3b15, type: 3} m_TileMatrixArray: - - m_RefCount: 3 + - m_RefCount: 11 m_Data: e00: 1 e01: 0 @@ -203,12 +311,16 @@ Tilemap: e32: 0 e33: 1 m_TileColorArray: - - m_RefCount: 3 + - m_RefCount: 11 m_Data: {r: 1, g: 1, b: 1, a: 1} + - m_RefCount: 0 + m_Data: {r: 0.0000006854534, g: 0, b: 21.724108, a: 1e-45} + - m_RefCount: 0 + m_Data: {r: 9.3910887e-35, g: 0, b: 21.724108, a: 1e-45} m_AnimationFrameRate: 1 m_Color: {r: 1, g: 1, b: 1, a: 1} - m_Origin: {x: -4, y: 0, z: 0} - m_Size: {x: 6, y: 8, z: 1} + m_Origin: {x: -4, y: -3, z: 0} + m_Size: {x: 8, y: 11, z: 1} m_TileAnchor: {x: 0.5, y: 0.5, z: 0} m_TileOrientation: 0 m_TileOrientationMatrix: @@ -228,10 +340,3 @@ Tilemap: e31: 0 e32: 0 e33: 1 - m_TileRefreshArray: - - serializedVersion: 1 - m_DirtyIndex: 0 - - serializedVersion: 1 - m_DirtyIndex: 0 - - serializedVersion: 1 - m_DirtyIndex: 0 diff --git a/Assets/Palettes/tiles_ip_13.asset b/Assets/Palettes/tiles_ip_13.asset new file mode 100644 index 0000000..e80af6f --- /dev/null +++ b/Assets/Palettes/tiles_ip_13.asset @@ -0,0 +1,35 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 13312, guid: 0000000000000000e000000000000000, type: 0} + m_Name: tiles_ip_13 + m_EditorClassIdentifier: + m_Sprite: {fileID: 21300026, guid: f0425e92c7345064ab2dccbd778f3b15, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Transform: + e00: 1 + e01: 0 + e02: 0 + e03: 0 + e10: 0 + e11: 1 + e12: 0 + e13: 0 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + m_InstancedGameObject: {fileID: 0} + m_Flags: 1 + m_ColliderType: 1 diff --git a/Assets/Palettes/tiles_ip_13.asset.meta b/Assets/Palettes/tiles_ip_13.asset.meta new file mode 100644 index 0000000..3e1c41c --- /dev/null +++ b/Assets/Palettes/tiles_ip_13.asset.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: c83701eb0b3c1154d9766340ddcdabd8 +timeCreated: 1524408780 +licenseType: Free +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Palettes/tiles_ip_14.asset b/Assets/Palettes/tiles_ip_14.asset new file mode 100644 index 0000000..173c2dd --- /dev/null +++ b/Assets/Palettes/tiles_ip_14.asset @@ -0,0 +1,35 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 13312, guid: 0000000000000000e000000000000000, type: 0} + m_Name: tiles_ip_14 + m_EditorClassIdentifier: + m_Sprite: {fileID: 21300028, guid: f0425e92c7345064ab2dccbd778f3b15, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Transform: + e00: 1 + e01: 0 + e02: 0 + e03: 0 + e10: 0 + e11: 1 + e12: 0 + e13: 0 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + m_InstancedGameObject: {fileID: 0} + m_Flags: 1 + m_ColliderType: 1 diff --git a/Assets/Palettes/tiles_ip_14.asset.meta b/Assets/Palettes/tiles_ip_14.asset.meta new file mode 100644 index 0000000..b026e90 --- /dev/null +++ b/Assets/Palettes/tiles_ip_14.asset.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: c0bc655d1309e7d4190c539104e18802 +timeCreated: 1524408792 +licenseType: Free +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Palettes/tiles_ip_15.asset b/Assets/Palettes/tiles_ip_15.asset new file mode 100644 index 0000000..4162a58 --- /dev/null +++ b/Assets/Palettes/tiles_ip_15.asset @@ -0,0 +1,35 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 13312, guid: 0000000000000000e000000000000000, type: 0} + m_Name: tiles_ip_15 + m_EditorClassIdentifier: + m_Sprite: {fileID: 21300030, guid: f0425e92c7345064ab2dccbd778f3b15, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Transform: + e00: 1 + e01: 0 + e02: 0 + e03: 0 + e10: 0 + e11: 1 + e12: 0 + e13: 0 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + m_InstancedGameObject: {fileID: 0} + m_Flags: 1 + m_ColliderType: 1 diff --git a/Assets/Palettes/tiles_ip_15.asset.meta b/Assets/Palettes/tiles_ip_15.asset.meta new file mode 100644 index 0000000..dd888ce --- /dev/null +++ b/Assets/Palettes/tiles_ip_15.asset.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: eb4fd42536af6e7468d6f2245b9bd1b8 +timeCreated: 1524408796 +licenseType: Free +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Palettes/tiles_ip_16.asset b/Assets/Palettes/tiles_ip_16.asset new file mode 100644 index 0000000..3c0b764 --- /dev/null +++ b/Assets/Palettes/tiles_ip_16.asset @@ -0,0 +1,35 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 13312, guid: 0000000000000000e000000000000000, type: 0} + m_Name: tiles_ip_16 + m_EditorClassIdentifier: + m_Sprite: {fileID: 21300032, guid: f0425e92c7345064ab2dccbd778f3b15, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Transform: + e00: 1 + e01: 0 + e02: 0 + e03: 0 + e10: 0 + e11: 1 + e12: 0 + e13: 0 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + m_InstancedGameObject: {fileID: 0} + m_Flags: 1 + m_ColliderType: 1 diff --git a/Assets/Palettes/tiles_ip_16.asset.meta b/Assets/Palettes/tiles_ip_16.asset.meta new file mode 100644 index 0000000..94d8134 --- /dev/null +++ b/Assets/Palettes/tiles_ip_16.asset.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: ecf710f5ced31cc438d5da7c80075479 +timeCreated: 1524408826 +licenseType: Free +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Palettes/tiles_ip_17.asset b/Assets/Palettes/tiles_ip_17.asset new file mode 100644 index 0000000..bdee641 --- /dev/null +++ b/Assets/Palettes/tiles_ip_17.asset @@ -0,0 +1,35 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 13312, guid: 0000000000000000e000000000000000, type: 0} + m_Name: tiles_ip_17 + m_EditorClassIdentifier: + m_Sprite: {fileID: 21300034, guid: f0425e92c7345064ab2dccbd778f3b15, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Transform: + e00: 1 + e01: 0 + e02: 0 + e03: 0 + e10: 0 + e11: 1 + e12: 0 + e13: 0 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + m_InstancedGameObject: {fileID: 0} + m_Flags: 1 + m_ColliderType: 1 diff --git a/Assets/Palettes/tiles_ip_17.asset.meta b/Assets/Palettes/tiles_ip_17.asset.meta new file mode 100644 index 0000000..8c68bd3 --- /dev/null +++ b/Assets/Palettes/tiles_ip_17.asset.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 30d0b2978e177d44e9d08a251c9f6fe4 +timeCreated: 1524408836 +licenseType: Free +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Palettes/tiles_ip_18.asset b/Assets/Palettes/tiles_ip_18.asset new file mode 100644 index 0000000..3b56ec5 --- /dev/null +++ b/Assets/Palettes/tiles_ip_18.asset @@ -0,0 +1,35 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 13312, guid: 0000000000000000e000000000000000, type: 0} + m_Name: tiles_ip_18 + m_EditorClassIdentifier: + m_Sprite: {fileID: 21300036, guid: f0425e92c7345064ab2dccbd778f3b15, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Transform: + e00: 1 + e01: 0 + e02: 0 + e03: 0 + e10: 0 + e11: 1 + e12: 0 + e13: 0 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + m_InstancedGameObject: {fileID: 0} + m_Flags: 1 + m_ColliderType: 1 diff --git a/Assets/Palettes/tiles_ip_18.asset.meta b/Assets/Palettes/tiles_ip_18.asset.meta new file mode 100644 index 0000000..d2f0f01 --- /dev/null +++ b/Assets/Palettes/tiles_ip_18.asset.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: e32d62d44ca5c8742aff754acc6f7239 +timeCreated: 1524408847 +licenseType: Free +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Palettes/tiles_ip_19.asset b/Assets/Palettes/tiles_ip_19.asset new file mode 100644 index 0000000..0c64096 --- /dev/null +++ b/Assets/Palettes/tiles_ip_19.asset @@ -0,0 +1,35 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 13312, guid: 0000000000000000e000000000000000, type: 0} + m_Name: tiles_ip_19 + m_EditorClassIdentifier: + m_Sprite: {fileID: 21300038, guid: f0425e92c7345064ab2dccbd778f3b15, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Transform: + e00: 1 + e01: 0 + e02: 0 + e03: 0 + e10: 0 + e11: 1 + e12: 0 + e13: 0 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + m_InstancedGameObject: {fileID: 0} + m_Flags: 1 + m_ColliderType: 1 diff --git a/Assets/Palettes/tiles_ip_19.asset.meta b/Assets/Palettes/tiles_ip_19.asset.meta new file mode 100644 index 0000000..850c6d0 --- /dev/null +++ b/Assets/Palettes/tiles_ip_19.asset.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: dd338c7a2fd4336478dd5a86fbef1eea +timeCreated: 1524408858 +licenseType: Free +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Bomb.prefab b/Assets/Prefabs/Bomb.prefab index 60b44ec..8a94f78 100644 --- a/Assets/Prefabs/Bomb.prefab +++ b/Assets/Prefabs/Bomb.prefab @@ -44,6 +44,8 @@ GameObject: - component: {fileID: 61141062028954146} - component: {fileID: 114649402457597828} - component: {fileID: 95624140020433348} + - component: {fileID: 82255175266320114} + - component: {fileID: 114669975556388784} m_Layer: 0 m_Name: Explosion m_TagString: Untagged @@ -168,6 +170,86 @@ BoxCollider2D: serializedVersion: 2 m_Size: {x: 0.32, y: 0.32} m_EdgeRadius: 0 +--- !u!82 &82255175266320114 +AudioSource: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1952939246476874} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 8300000, guid: 65d73bad2b44f274db0282dd7047e00b, type: 3} + m_PlayOnAwake: 0 + m_Volume: 0.75 + m_Pitch: 0.75 + 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: 1 + rolloffCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 2 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + - serializedVersion: 2 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + panLevelCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 2 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 0 + spreadCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 2 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 0 + reverbZoneMixCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 2 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 0 --- !u!95 &95624140020433348 Animator: serializedVersion: 3 @@ -214,6 +296,17 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: value: 0 +--- !u!114 &114669975556388784 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1952939246476874} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a80a790e2417fd343a40595cca7052e2, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!114 &114937917394596370 MonoBehaviour: m_ObjectHideFlags: 1 diff --git a/Assets/Prefabs/PressurePlate.prefab b/Assets/Prefabs/PressurePlate.prefab index d7bfb04..334488a 100644 --- a/Assets/Prefabs/PressurePlate.prefab +++ b/Assets/Prefabs/PressurePlate.prefab @@ -23,6 +23,7 @@ GameObject: - component: {fileID: 61327631154944780} - component: {fileID: 114433314137723076} - component: {fileID: 114549851177645310} + - component: {fileID: 82811328138529428} m_Layer: 0 m_Name: PressurePlate m_TagString: Untagged @@ -68,6 +69,86 @@ BoxCollider2D: serializedVersion: 2 m_Size: {x: 0.16, y: 0.16} m_EdgeRadius: 0 +--- !u!82 &82811328138529428 +AudioSource: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1195685452723360} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {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: 2 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + - serializedVersion: 2 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + panLevelCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 2 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 0 + spreadCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 2 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + reverbZoneMixCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 2 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 0 --- !u!114 &114433314137723076 MonoBehaviour: m_ObjectHideFlags: 1 @@ -81,6 +162,7 @@ MonoBehaviour: m_EditorClassIdentifier: pressed: 0 alternateSprite: {fileID: 21300022, guid: f0425e92c7345064ab2dccbd778f3b15, type: 3} + sound: {fileID: 8300000, guid: ddb6b1cbfdf4b8e42ac35a4ca043db10, type: 3} --- !u!114 &114549851177645310 MonoBehaviour: m_ObjectHideFlags: 1 diff --git a/Assets/Scenes/gameplay.unity b/Assets/Scenes/gameplay.unity index 561c6bd..ab47c60 100644 --- a/Assets/Scenes/gameplay.unity +++ b/Assets/Scenes/gameplay.unity @@ -838,8 +838,8 @@ Tilemap: m_ColliderType: 1 - first: {x: 15, y: -54, z: 0} second: - m_TileIndex: 0 - m_TileSpriteIndex: 0 + m_TileIndex: 1 + m_TileSpriteIndex: 1 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_ObjectToInstantiate: {fileID: 0} @@ -1612,8 +1612,8 @@ Tilemap: m_ColliderType: 1 - first: {x: 15, y: -39, z: 0} second: - m_TileIndex: 0 - m_TileSpriteIndex: 0 + m_TileIndex: 1 + m_TileSpriteIndex: 1 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_ObjectToInstantiate: {fileID: 0} @@ -3511,8 +3511,8 @@ Tilemap: m_ColliderType: 1 - first: {x: -11, y: -20, z: 0} second: - m_TileIndex: 0 - m_TileSpriteIndex: 0 + m_TileIndex: 1 + m_TileSpriteIndex: 1 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_ObjectToInstantiate: {fileID: 0} @@ -4123,8 +4123,8 @@ Tilemap: m_ColliderType: 1 - first: {x: -9, y: -17, z: 0} second: - m_TileIndex: 0 - m_TileSpriteIndex: 0 + m_TileIndex: 1 + m_TileSpriteIndex: 1 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_ObjectToInstantiate: {fileID: 0} @@ -4987,8 +4987,8 @@ Tilemap: m_ColliderType: 1 - first: {x: 9, y: -11, z: 0} second: - m_TileIndex: 0 - m_TileSpriteIndex: 0 + m_TileIndex: 8 + m_TileSpriteIndex: 8 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_ObjectToInstantiate: {fileID: 0} @@ -5689,8 +5689,8 @@ Tilemap: m_ColliderType: 1 - first: {x: 0, y: -3, z: 0} second: - m_TileIndex: 0 - m_TileSpriteIndex: 0 + m_TileIndex: 4 + m_TileSpriteIndex: 4 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_ObjectToInstantiate: {fileID: 0} @@ -5698,8 +5698,8 @@ Tilemap: m_ColliderType: 1 - first: {x: 1, y: -3, z: 0} second: - m_TileIndex: 0 - m_TileSpriteIndex: 0 + m_TileIndex: 6 + m_TileSpriteIndex: 6 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_ObjectToInstantiate: {fileID: 0} @@ -5707,8 +5707,8 @@ Tilemap: m_ColliderType: 1 - first: {x: 2, y: -3, z: 0} second: - m_TileIndex: 0 - m_TileSpriteIndex: 0 + m_TileIndex: 7 + m_TileSpriteIndex: 7 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_ObjectToInstantiate: {fileID: 0} @@ -6040,8 +6040,8 @@ Tilemap: m_ColliderType: 1 - first: {x: -3, y: 0, z: 0} second: - m_TileIndex: 0 - m_TileSpriteIndex: 0 + m_TileIndex: 3 + m_TileSpriteIndex: 3 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_ObjectToInstantiate: {fileID: 0} @@ -6049,8 +6049,8 @@ Tilemap: m_ColliderType: 1 - first: {x: -2, y: 0, z: 0} second: - m_TileIndex: 0 - m_TileSpriteIndex: 0 + m_TileIndex: 4 + m_TileSpriteIndex: 4 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_ObjectToInstantiate: {fileID: 0} @@ -6058,8 +6058,8 @@ Tilemap: m_ColliderType: 1 - first: {x: -1, y: 0, z: 0} second: - m_TileIndex: 0 - m_TileSpriteIndex: 0 + m_TileIndex: 5 + m_TileSpriteIndex: 5 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_ObjectToInstantiate: {fileID: 0} @@ -6175,8 +6175,8 @@ Tilemap: m_ColliderType: 1 - first: {x: -2, y: 1, z: 0} second: - m_TileIndex: 0 - m_TileSpriteIndex: 0 + m_TileIndex: 2 + m_TileSpriteIndex: 2 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_ObjectToInstantiate: {fileID: 0} @@ -6760,19 +6760,43 @@ Tilemap: m_ColliderType: 1 m_AnimatedTiles: {} m_TileAssetArray: - - m_RefCount: 686 + - m_RefCount: 674 m_Data: {fileID: 11400000, guid: ccd1189a390b74c4d9498bd35441a9a5, type: 2} - - m_RefCount: 6 + - m_RefCount: 10 m_Data: {fileID: 11400000, guid: 93829538c60c13b4da7dfa6981eab367, type: 2} - - m_RefCount: 0 - m_Data: {fileID: 0} + - m_RefCount: 1 + m_Data: {fileID: 11400000, guid: c83701eb0b3c1154d9766340ddcdabd8, type: 2} + - m_RefCount: 1 + m_Data: {fileID: 11400000, guid: c0bc655d1309e7d4190c539104e18802, type: 2} + - m_RefCount: 2 + m_Data: {fileID: 11400000, guid: eb4fd42536af6e7468d6f2245b9bd1b8, type: 2} + - m_RefCount: 1 + m_Data: {fileID: 11400000, guid: ecf710f5ced31cc438d5da7c80075479, type: 2} + - m_RefCount: 1 + m_Data: {fileID: 11400000, guid: e32d62d44ca5c8742aff754acc6f7239, type: 2} + - m_RefCount: 1 + m_Data: {fileID: 11400000, guid: dd338c7a2fd4336478dd5a86fbef1eea, type: 2} + - m_RefCount: 1 + m_Data: {fileID: 11400000, guid: 30d0b2978e177d44e9d08a251c9f6fe4, type: 2} m_TileSpriteArray: - - m_RefCount: 686 + - m_RefCount: 674 m_Data: {fileID: 21300000, guid: f0425e92c7345064ab2dccbd778f3b15, type: 3} - - m_RefCount: 6 + - m_RefCount: 10 m_Data: {fileID: 21300002, guid: f0425e92c7345064ab2dccbd778f3b15, type: 3} - - m_RefCount: 0 - m_Data: {fileID: 0} + - m_RefCount: 1 + m_Data: {fileID: 21300026, guid: f0425e92c7345064ab2dccbd778f3b15, type: 3} + - m_RefCount: 1 + m_Data: {fileID: 21300028, guid: f0425e92c7345064ab2dccbd778f3b15, type: 3} + - m_RefCount: 2 + m_Data: {fileID: 21300030, guid: f0425e92c7345064ab2dccbd778f3b15, type: 3} + - m_RefCount: 1 + m_Data: {fileID: 21300032, guid: f0425e92c7345064ab2dccbd778f3b15, type: 3} + - m_RefCount: 1 + m_Data: {fileID: 21300036, guid: f0425e92c7345064ab2dccbd778f3b15, type: 3} + - m_RefCount: 1 + m_Data: {fileID: 21300038, guid: f0425e92c7345064ab2dccbd778f3b15, type: 3} + - m_RefCount: 1 + m_Data: {fileID: 21300034, guid: f0425e92c7345064ab2dccbd778f3b15, type: 3} m_TileMatrixArray: - m_RefCount: 692 m_Data: @@ -7873,6 +7897,110 @@ Transform: m_PrefabParentObject: {fileID: 4727204445767746, guid: 05968d49eff9aa04b9087b76d2a70f50, type: 2} m_PrefabInternal: {fileID: 961785501} +--- !u!1 &536953977 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 536953981} + - component: {fileID: 536953980} + - component: {fileID: 536953979} + - component: {fileID: 536953978} + m_Layer: 0 + m_Name: Lollipop + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &536953978 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 536953977} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c507cc0b3e5960d4c9c32a4f73709d14, type: 3} + m_Name: + m_EditorClassIdentifier: + timeTillWave: 10 +--- !u!95 &536953979 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 536953977} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: f4f4b456659de52488bdf61d9aa9451c, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 +--- !u!212 &536953980 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 536953977} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 0 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: -1935211587 + m_SortingLayer: 3 + m_SortingOrder: 0 + m_Sprite: {fileID: 21300008, guid: 131ea62735a77a4459821cc3c99734d0, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 0.32, y: 0.32} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 +--- !u!4 &536953981 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 536953977} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 1.541, y: -8.325, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 6 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &549292835 stripped Transform: m_PrefabParentObject: {fileID: 4564474961553612, guid: c4d410a301c013a468dc133a094e5478, @@ -8965,8 +9093,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0, y: 0, z: 0} - m_Children: - - {fileID: 1290387091} + m_Children: [] m_Father: {fileID: 0} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -12007,6 +12134,7 @@ GameObject: - component: {fileID: 1089679579} - component: {fileID: 1089679578} - component: {fileID: 1089679582} + - component: {fileID: 1089679583} m_Layer: 0 m_Name: Main Camera m_TagString: MainCamera @@ -12037,7 +12165,7 @@ Camera: m_Enabled: 1 serializedVersion: 2 m_ClearFlags: 1 - m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} + m_BackGroundColor: {r: 0.0522275, g: 0.09768477, b: 0.16911763, a: 0} m_NormalizedViewPortRect: serializedVersion: 2 x: 0 @@ -12089,6 +12217,86 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: player: {fileID: 1602044328} +--- !u!82 &1089679583 +AudioSource: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1089679577} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 8300000, guid: 3c2ff16dce709074da5d027432c25915, type: 3} + m_PlayOnAwake: 1 + m_Volume: 0.75 + m_Pitch: 1 + Loop: 1 + Mute: 0 + Spatialize: 0 + SpatializePostEffects: 0 + Priority: 128 + DopplerLevel: 1 + MinDistance: 1 + MaxDistance: 500 + Pan2D: 0 + rolloffMode: 0 + BypassEffects: 1 + BypassListenerEffects: 0 + BypassReverbZones: 0 + rolloffCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 2 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + - serializedVersion: 2 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + panLevelCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 2 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 0 + spreadCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 2 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 0 + reverbZoneMixCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 2 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 0 --- !u!1001 &1094080425 Prefab: m_ObjectHideFlags: 0 @@ -13076,84 +13284,6 @@ Transform: m_PrefabParentObject: {fileID: 4284655955952716, guid: fef65b57e8170f049a86ce4d2931c8ff, type: 2} m_PrefabInternal: {fileID: 1401020275} ---- !u!1 &1290387090 -GameObject: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 - m_Component: - - component: {fileID: 1290387091} - - component: {fileID: 1290387093} - - component: {fileID: 1290387092} - m_Layer: 5 - m_Name: Text - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1290387091 -RectTransform: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1290387090} - 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_Children: [] - m_Father: {fileID: 921564298} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 80, y: -15} - m_SizeDelta: {x: 160, y: 30} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1290387092 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1290387090} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 14 - m_FontStyle: 1 - m_BestFit: 0 - m_MinSize: 10 - m_MaxSize: 40 - m_Alignment: 0 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 1 - m_VerticalOverflow: 1 - m_LineSpacing: 1 - m_Text: 'Move: WASD - - Shoot: Space - - Change: E' ---- !u!222 &1290387093 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1290387090} --- !u!1001 &1300898991 Prefab: m_ObjectHideFlags: 0 @@ -14100,6 +14230,7 @@ GameObject: - component: {fileID: 1602044329} - component: {fileID: 1602044335} - component: {fileID: 1602044332} + - component: {fileID: 1602044330} m_Layer: 0 m_Name: Player m_TagString: Untagged @@ -14124,6 +14255,90 @@ MonoBehaviour: type: 2} windPelletPrefab: {fileID: 1389927462137108, guid: 407acfcef7e27af47a3df873b629b4a4, type: 2} + fireClip: {fileID: 8300000, guid: b28e7db6008e00f4682d095cdd21fa83, type: 3} + iceClip: {fileID: 8300000, guid: e1d92c0786f8ed841ab5216717f9df54, type: 3} + windClip: {fileID: 8300000, guid: 11a342e270ebcfc4f82d92d64dbb414c, type: 3} + switchClip: {fileID: 8300000, guid: f5c835dad93484a4e9bbe3a8cf6b9973, type: 3} +--- !u!82 &1602044330 +AudioSource: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1602044328} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 0} + 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: 2 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + - serializedVersion: 2 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + panLevelCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 2 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 0 + spreadCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 2 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + reverbZoneMixCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 2 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 0 --- !u!50 &1602044331 Rigidbody2D: serializedVersion: 4 diff --git a/Assets/Scripts/Bomb.cs b/Assets/Scripts/Bomb.cs index 6739537..524466b 100644 --- a/Assets/Scripts/Bomb.cs +++ b/Assets/Scripts/Bomb.cs @@ -3,7 +3,8 @@ using System.Collections.Generic; using UnityEngine; public class Bomb : MonoBehaviour { - Animator animator; + + Animator animator; Rigidbody2D rigidBody; public float timer; @@ -15,11 +16,11 @@ public class Bomb : MonoBehaviour { public Respawner respawner; //this can be respawned float birthTime; + void Awake() { animator = GetComponent (); rigidBody = GetComponent (); - if (timer < 0) { animator.enabled = false; diff --git a/Assets/Scripts/ExplosionSoundManager.cs b/Assets/Scripts/ExplosionSoundManager.cs new file mode 100644 index 0000000..343abc1 --- /dev/null +++ b/Assets/Scripts/ExplosionSoundManager.cs @@ -0,0 +1,23 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class ExplosionSoundManager : MonoBehaviour { + + static AudioSource asrc; + + + // Use this for initialization + void Awake () { + if (asrc == null) + { + asrc = GetComponent(); + asrc.Play(); + } + } + + + void LateUpdate () { + asrc = null; + } +} diff --git a/Assets/Scripts/ExplosionSoundManager.cs.meta b/Assets/Scripts/ExplosionSoundManager.cs.meta new file mode 100644 index 0000000..14a9176 --- /dev/null +++ b/Assets/Scripts/ExplosionSoundManager.cs.meta @@ -0,0 +1,13 @@ +fileFormatVersion: 2 +guid: a80a790e2417fd343a40595cca7052e2 +timeCreated: 1524428442 +licenseType: Free +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/LollipopSaysHi.cs b/Assets/Scripts/LollipopSaysHi.cs new file mode 100644 index 0000000..37e48e6 --- /dev/null +++ b/Assets/Scripts/LollipopSaysHi.cs @@ -0,0 +1,29 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class LollipopSaysHi : MonoBehaviour { + + float timeAccumulated; + public float timeTillWave = 10; + // Use this for initialization + Animator a; + + void Start () { + timeAccumulated = Random.Range(0, timeTillWave); + a = GetComponent(); + } + + // Update is called once per frame + void Update () { + timeAccumulated += Time.deltaTime; + if (timeAccumulated >= timeTillWave) + { + if (Random.Range(0, 2) == 0) + { + a.SetTrigger("SayHi"); + } + timeAccumulated = 0; + } + } +} diff --git a/Assets/Scripts/LollipopSaysHi.cs.meta b/Assets/Scripts/LollipopSaysHi.cs.meta new file mode 100644 index 0000000..1aeb2fd --- /dev/null +++ b/Assets/Scripts/LollipopSaysHi.cs.meta @@ -0,0 +1,13 @@ +fileFormatVersion: 2 +guid: c507cc0b3e5960d4c9c32a4f73709d14 +timeCreated: 1524409809 +licenseType: Free +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Player.cs b/Assets/Scripts/Player.cs index 9291edf..be67a2f 100644 --- a/Assets/Scripts/Player.cs +++ b/Assets/Scripts/Player.cs @@ -21,11 +21,15 @@ public class Player : MonoBehaviour { public GameObject icePelletPrefab; public GameObject windPelletPrefab; + AudioSource aSource; + public AudioClip fireClip, iceClip, windClip, switchClip; + + void Awake() { animator = GetComponent (); rigidBody = GetComponent (); witchAnimateScript = GetComponent (); - + aSource = GetComponent(); speed = 0.79f; } @@ -50,6 +54,8 @@ public class Player : MonoBehaviour { if (deltaForce != Vector2.zero) { lastDirection = rigidBody.velocity; } + + if (Input.GetButtonDown("Switch")) aSource.PlayOneShot(switchClip); } void Move() { @@ -66,13 +72,16 @@ public class Player : MonoBehaviour { switch (witchAnimateScript.el) { case witchAnimate.Element.fire: + aSource.PlayOneShot(fireClip); pellet = Instantiate (firePelletPrefab); break; case witchAnimate.Element.ice: - pellet = Instantiate (icePelletPrefab); + aSource.PlayOneShot(iceClip); + pellet = Instantiate (icePelletPrefab); break; case witchAnimate.Element.wind: - pellet = Instantiate (windPelletPrefab); + aSource.PlayOneShot(windClip); + pellet = Instantiate (windPelletPrefab); break; } diff --git a/Assets/Scripts/PressurePlate.cs b/Assets/Scripts/PressurePlate.cs index cf46af8..a8421c9 100644 --- a/Assets/Scripts/PressurePlate.cs +++ b/Assets/Scripts/PressurePlate.cs @@ -10,8 +10,12 @@ public class PressurePlate : MonoBehaviour { GameObject presser; + AudioSource asrc; + public AudioClip sound; + void Awake() { spriteRenderer = GetComponent (); + asrc = GetComponent(); } void OnTriggerEnter2D(Collider2D collider) { @@ -22,6 +26,7 @@ public class PressurePlate : MonoBehaviour { presser = go; pressed = true; SwitchSprite (); + asrc.PlayOneShot(sound); } } } @@ -31,7 +36,8 @@ public class PressurePlate : MonoBehaviour { presser = null; pressed = false; SwitchSprite (); - } + asrc.PlayOneShot(sound); + } } void SwitchSprite() { diff --git a/Assets/Sprites/lolly.png b/Assets/Sprites/lolly.png new file mode 100644 index 0000000..0f32c53 --- /dev/null +++ b/Assets/Sprites/lolly.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b3b6deac52e50206679051d3801bde3fd4c22b77c14f0e13b920723da163fcd5 +size 927 diff --git a/Assets/Sprites/lolly.png.meta b/Assets/Sprites/lolly.png.meta new file mode 100644 index 0000000..fda2303 --- /dev/null +++ b/Assets/Sprites/lolly.png.meta @@ -0,0 +1,268 @@ +fileFormatVersion: 2 +guid: 131ea62735a77a4459821cc3c99734d0 +timeCreated: 1524409305 +licenseType: Free +TextureImporter: + fileIDToRecycleName: + 21300000: lolly_0 + 21300002: lolly_1 + 21300004: lolly_2 + 21300006: lolly_3 + 21300008: lolly_4 + 21300010: lolly_5 + 21300012: lolly_6 + 21300014: lolly_7 + 21300016: lolly_8 + 21300018: lolly_9 + externalObjects: {} + serializedVersion: 4 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 0 + aniso: -1 + mipBias: -1 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 2 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - buildTarget: Windows Store Apps + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: + - serializedVersion: 2 + name: lolly_0 + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + - serializedVersion: 2 + name: lolly_1 + rect: + serializedVersion: 2 + x: 32 + y: 0 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + - serializedVersion: 2 + name: lolly_2 + rect: + serializedVersion: 2 + x: 64 + y: 0 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + - serializedVersion: 2 + name: lolly_3 + rect: + serializedVersion: 2 + x: 96 + y: 0 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + - serializedVersion: 2 + name: lolly_4 + rect: + serializedVersion: 2 + x: 128 + y: 0 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + - serializedVersion: 2 + name: lolly_5 + rect: + serializedVersion: 2 + x: 160 + y: 0 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + - serializedVersion: 2 + name: lolly_6 + rect: + serializedVersion: 2 + x: 192 + y: 0 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + - serializedVersion: 2 + name: lolly_7 + rect: + serializedVersion: 2 + x: 224 + y: 0 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + - serializedVersion: 2 + name: lolly_8 + rect: + serializedVersion: 2 + x: 256 + y: 0 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + - serializedVersion: 2 + name: lolly_9 + rect: + serializedVersion: 2 + x: 288 + y: 0 + width: 32 + height: 32 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + outline: [] + physicsShape: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sprites/tiles_ip.png b/Assets/Sprites/tiles_ip.png index 21cf765..83087c0 100644 --- a/Assets/Sprites/tiles_ip.png +++ b/Assets/Sprites/tiles_ip.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a5f7aadde193468b39db8c2b88e6132c006e29dfb727e0932d952cf056bc0bef -size 1301 +oid sha256:3187242dd32b5658bb213c33c670e965a7468793300584898c15e3746a987e66 +size 1749 diff --git a/Assets/Sprites/tiles_ip.png.meta b/Assets/Sprites/tiles_ip.png.meta index 439b1f1..31e6ee8 100644 --- a/Assets/Sprites/tiles_ip.png.meta +++ b/Assets/Sprites/tiles_ip.png.meta @@ -17,6 +17,13 @@ TextureImporter: 21300020: tiles_ip_10 21300022: tiles_ip_11 21300024: tiles_ip_12 + 21300026: tiles_ip_13 + 21300028: tiles_ip_14 + 21300030: tiles_ip_15 + 21300032: tiles_ip_16 + 21300034: tiles_ip_17 + 21300036: tiles_ip_18 + 21300038: tiles_ip_19 externalObjects: {} serializedVersion: 4 mipmaps: @@ -108,7 +115,7 @@ TextureImporter: rect: serializedVersion: 2 x: 0 - y: 16 + y: 32 width: 16 height: 16 alignment: 0 @@ -122,7 +129,7 @@ TextureImporter: rect: serializedVersion: 2 x: 16 - y: 16 + y: 32 width: 16 height: 16 alignment: 0 @@ -136,7 +143,7 @@ TextureImporter: rect: serializedVersion: 2 x: 32 - y: 16 + y: 32 width: 16 height: 16 alignment: 0 @@ -150,7 +157,7 @@ TextureImporter: rect: serializedVersion: 2 x: 48 - y: 16 + y: 32 width: 16 height: 16 alignment: 0 @@ -164,7 +171,7 @@ TextureImporter: rect: serializedVersion: 2 x: 64 - y: 16 + y: 32 width: 16 height: 16 alignment: 0 @@ -178,7 +185,7 @@ TextureImporter: rect: serializedVersion: 2 x: 80 - y: 16 + y: 32 width: 16 height: 16 alignment: 0 @@ -192,7 +199,7 @@ TextureImporter: rect: serializedVersion: 2 x: 96 - y: 16 + y: 32 width: 16 height: 16 alignment: 0 @@ -206,7 +213,7 @@ TextureImporter: rect: serializedVersion: 2 x: 112 - y: 16 + y: 32 width: 16 height: 16 alignment: 0 @@ -220,7 +227,7 @@ TextureImporter: rect: serializedVersion: 2 x: 0 - y: 0 + y: 16 width: 16 height: 16 alignment: 0 @@ -234,7 +241,7 @@ TextureImporter: rect: serializedVersion: 2 x: 16 - y: 0 + y: 16 width: 16 height: 16 alignment: 0 @@ -248,7 +255,7 @@ TextureImporter: rect: serializedVersion: 2 x: 32 - y: 0 + y: 16 width: 16 height: 16 alignment: 0 @@ -262,7 +269,7 @@ TextureImporter: rect: serializedVersion: 2 x: 48 - y: 0 + y: 16 width: 16 height: 16 alignment: 0 @@ -276,6 +283,104 @@ TextureImporter: rect: serializedVersion: 2 x: 64 + y: 16 + width: 16 + height: 16 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + - serializedVersion: 2 + name: tiles_ip_13 + rect: + serializedVersion: 2 + x: 80 + y: 16 + width: 16 + height: 16 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + - serializedVersion: 2 + name: tiles_ip_14 + rect: + serializedVersion: 2 + x: 96 + y: 16 + width: 16 + height: 16 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + - serializedVersion: 2 + name: tiles_ip_15 + rect: + serializedVersion: 2 + x: 112 + y: 16 + width: 16 + height: 16 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + - serializedVersion: 2 + name: tiles_ip_16 + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 16 + height: 16 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + - serializedVersion: 2 + name: tiles_ip_17 + rect: + serializedVersion: 2 + x: 16 + y: 0 + width: 16 + height: 16 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + - serializedVersion: 2 + name: tiles_ip_18 + rect: + serializedVersion: 2 + x: 32 + y: 0 + width: 16 + height: 16 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + - serializedVersion: 2 + name: tiles_ip_19 + rect: + serializedVersion: 2 + x: 48 y: 0 width: 16 height: 16 diff --git a/Assets/audio.meta b/Assets/audio.meta new file mode 100644 index 0000000..30ba5b5 --- /dev/null +++ b/Assets/audio.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 3a08258b706a5c442bd0d2d2f2b311db +folderAsset: yes +timeCreated: 1524416340 +licenseType: Free +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/audio/04 Fingerfeet.mp3 b/Assets/audio/04 Fingerfeet.mp3 new file mode 100644 index 0000000..c1794ca --- /dev/null +++ b/Assets/audio/04 Fingerfeet.mp3 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:15e6f7eba1f4c841aa30059d3082f056662b846fcfa359971ab069bdd7bc3149 +size 3274955 diff --git a/Assets/audio/04 Fingerfeet.mp3.meta b/Assets/audio/04 Fingerfeet.mp3.meta new file mode 100644 index 0000000..2753d78 --- /dev/null +++ b/Assets/audio/04 Fingerfeet.mp3.meta @@ -0,0 +1,24 @@ +fileFormatVersion: 2 +guid: 3c2ff16dce709074da5d027432c25915 +timeCreated: 1524427941 +licenseType: Free +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/audio/click.wav b/Assets/audio/click.wav new file mode 100644 index 0000000..cdd5e49 --- /dev/null +++ b/Assets/audio/click.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ecc8a4266986df5daf481d01fa92dfdc8e73f7fe1f424af8f7ea37ebfadbbcf8 +size 24974 diff --git a/Assets/audio/click.wav.meta b/Assets/audio/click.wav.meta new file mode 100644 index 0000000..207200e --- /dev/null +++ b/Assets/audio/click.wav.meta @@ -0,0 +1,24 @@ +fileFormatVersion: 2 +guid: ddb6b1cbfdf4b8e42ac35a4ca043db10 +timeCreated: 1524427065 +licenseType: Free +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/audio/explosion.wav b/Assets/audio/explosion.wav new file mode 100644 index 0000000..38cc98c --- /dev/null +++ b/Assets/audio/explosion.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:846b61c0db2c8a88a91f860330496e83488063702ef47b197447a742258ad02d +size 80406 diff --git a/Assets/audio/explosion.wav.meta b/Assets/audio/explosion.wav.meta new file mode 100644 index 0000000..5a8b205 --- /dev/null +++ b/Assets/audio/explosion.wav.meta @@ -0,0 +1,24 @@ +fileFormatVersion: 2 +guid: 65d73bad2b44f274db0282dd7047e00b +timeCreated: 1524416358 +licenseType: Free +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/audio/fire.wav b/Assets/audio/fire.wav new file mode 100644 index 0000000..ac964fa --- /dev/null +++ b/Assets/audio/fire.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e19ed6b253e7e8a86e060c179b0821b5748d090aa83811250c8b190b67fe0054 +size 68736 diff --git a/Assets/audio/fire.wav.meta b/Assets/audio/fire.wav.meta new file mode 100644 index 0000000..7f90eba --- /dev/null +++ b/Assets/audio/fire.wav.meta @@ -0,0 +1,24 @@ +fileFormatVersion: 2 +guid: b28e7db6008e00f4682d095cdd21fa83 +timeCreated: 1524416359 +licenseType: Free +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/audio/ice.wav b/Assets/audio/ice.wav new file mode 100644 index 0000000..a317999 --- /dev/null +++ b/Assets/audio/ice.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8ab3b5907dbe78f5de7be4219d4f5c68f047a038d9f816556816d0d03d71464d +size 43704 diff --git a/Assets/audio/ice.wav.meta b/Assets/audio/ice.wav.meta new file mode 100644 index 0000000..a9b0610 --- /dev/null +++ b/Assets/audio/ice.wav.meta @@ -0,0 +1,24 @@ +fileFormatVersion: 2 +guid: e1d92c0786f8ed841ab5216717f9df54 +timeCreated: 1524416474 +licenseType: Free +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/audio/switch.wav b/Assets/audio/switch.wav new file mode 100644 index 0000000..2c680df --- /dev/null +++ b/Assets/audio/switch.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7bcc4183f7c1633620d700b9cce24ab9ec2b51ece3b6cab47f6bd2092d5c4ebc +size 63510 diff --git a/Assets/audio/switch.wav.meta b/Assets/audio/switch.wav.meta new file mode 100644 index 0000000..0930753 --- /dev/null +++ b/Assets/audio/switch.wav.meta @@ -0,0 +1,24 @@ +fileFormatVersion: 2 +guid: f5c835dad93484a4e9bbe3a8cf6b9973 +timeCreated: 1524416359 +licenseType: Free +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/audio/whirlwind.wav b/Assets/audio/whirlwind.wav new file mode 100644 index 0000000..d28acd3 --- /dev/null +++ b/Assets/audio/whirlwind.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:eb25a8e4f451e5f407b9c7245f1a2c2f883644865d863eb103ff07ca77b84f01 +size 48516 diff --git a/Assets/audio/whirlwind.wav.meta b/Assets/audio/whirlwind.wav.meta new file mode 100644 index 0000000..4cf9bce --- /dev/null +++ b/Assets/audio/whirlwind.wav.meta @@ -0,0 +1,24 @@ +fileFormatVersion: 2 +guid: 11a342e270ebcfc4f82d92d64dbb414c +timeCreated: 1524416358 +licenseType: Free +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: