From d6f2f973f6060e5fbff0b17e257324dc0910384e Mon Sep 17 00:00:00 2001 From: Kayne Ruse Date: Sun, 22 Apr 2018 21:36:25 +1000 Subject: [PATCH] Explosion, pressure plate, bomb ice in place --- Assets/Animations/Explosion.anim | 83 ++++++++ Assets/Animations/Explosion.anim.meta | 10 + Assets/Animations/Explosion.controller | 69 +++++++ Assets/Animations/Explosion.controller.meta | 10 + Assets/Prefabs/Blocks.meta | 10 + Assets/Prefabs/{ => Blocks}/Block_Bush.prefab | 0 .../{ => Blocks}/Block_Bush.prefab.meta | 0 .../Prefabs/{ => Blocks}/Block_Cracked.prefab | 0 .../{ => Blocks}/Block_Cracked.prefab.meta | 0 Assets/Prefabs/{ => Blocks}/Block_Ice.prefab | 1 + .../{ => Blocks}/Block_Ice.prefab.meta | 0 .../Prefabs/{ => Blocks}/Block_Water.prefab | 0 .../{ => Blocks}/Block_Water.prefab.meta | 0 Assets/Prefabs/Bomb.prefab | 18 ++ Assets/Prefabs/Pellets.meta | 10 + .../Prefabs/{ => Pellets}/Fire_Pellet.prefab | 0 .../{ => Pellets}/Fire_Pellet.prefab.meta | 0 .../Prefabs/{ => Pellets}/Ice_Pellet.prefab | 0 .../{ => Pellets}/Ice_Pellet.prefab.meta | 0 .../Prefabs/{ => Pellets}/Wind_Pellet.prefab | 0 .../{ => Pellets}/Wind_Pellet.prefab.meta | 0 Assets/Prefabs/PressurePlate.prefab | 126 ++++++++++++ Assets/Prefabs/PressurePlate.prefab.meta | 10 + Assets/Scenes/gameplay.unity | 42 ++++ Assets/Scripts/Blocks/BlockIce.cs | 12 ++ Assets/Scripts/PressurePlate.cs | 42 ++++ Assets/Scripts/PressurePlate.cs.meta | 13 ++ Assets/Sprites/explosion.png | 3 + Assets/Sprites/explosion.png.meta | 188 ++++++++++++++++++ Assets/Sprites/tiles_ip.png | 4 +- Assets/Sprites/tiles_ip.png.meta | 48 ++++- ProjectSettings/InputManager.asset | 20 +- ProjectSettings/ProjectSettings.asset | 1 + 33 files changed, 715 insertions(+), 5 deletions(-) create mode 100644 Assets/Animations/Explosion.anim create mode 100644 Assets/Animations/Explosion.anim.meta create mode 100644 Assets/Animations/Explosion.controller create mode 100644 Assets/Animations/Explosion.controller.meta create mode 100644 Assets/Prefabs/Blocks.meta rename Assets/Prefabs/{ => Blocks}/Block_Bush.prefab (100%) rename Assets/Prefabs/{ => Blocks}/Block_Bush.prefab.meta (100%) rename Assets/Prefabs/{ => Blocks}/Block_Cracked.prefab (100%) rename Assets/Prefabs/{ => Blocks}/Block_Cracked.prefab.meta (100%) rename Assets/Prefabs/{ => Blocks}/Block_Ice.prefab (97%) rename Assets/Prefabs/{ => Blocks}/Block_Ice.prefab.meta (100%) rename Assets/Prefabs/{ => Blocks}/Block_Water.prefab (100%) rename Assets/Prefabs/{ => Blocks}/Block_Water.prefab.meta (100%) create mode 100644 Assets/Prefabs/Pellets.meta rename Assets/Prefabs/{ => Pellets}/Fire_Pellet.prefab (100%) rename Assets/Prefabs/{ => Pellets}/Fire_Pellet.prefab.meta (100%) rename Assets/Prefabs/{ => Pellets}/Ice_Pellet.prefab (100%) rename Assets/Prefabs/{ => Pellets}/Ice_Pellet.prefab.meta (100%) rename Assets/Prefabs/{ => Pellets}/Wind_Pellet.prefab (100%) rename Assets/Prefabs/{ => Pellets}/Wind_Pellet.prefab.meta (100%) create mode 100644 Assets/Prefabs/PressurePlate.prefab create mode 100644 Assets/Prefabs/PressurePlate.prefab.meta create mode 100644 Assets/Scripts/PressurePlate.cs create mode 100644 Assets/Scripts/PressurePlate.cs.meta create mode 100644 Assets/Sprites/explosion.png create mode 100644 Assets/Sprites/explosion.png.meta diff --git a/Assets/Animations/Explosion.anim b/Assets/Animations/Explosion.anim new file mode 100644 index 0000000..d0078b9 --- /dev/null +++ b/Assets/Animations/Explosion.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: Explosion + 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: 3c69ccd5854a08b4186b1de9534631d6, type: 3} + - time: 0.083333336 + value: {fileID: 21300002, guid: 3c69ccd5854a08b4186b1de9534631d6, type: 3} + - time: 0.16666667 + value: {fileID: 21300004, guid: 3c69ccd5854a08b4186b1de9534631d6, type: 3} + - time: 0.25 + value: {fileID: 21300006, guid: 3c69ccd5854a08b4186b1de9534631d6, type: 3} + - time: 0.33333334 + value: {fileID: 21300008, guid: 3c69ccd5854a08b4186b1de9534631d6, type: 3} + - time: 0.41666666 + value: {fileID: 21300010, guid: 3c69ccd5854a08b4186b1de9534631d6, 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: 3c69ccd5854a08b4186b1de9534631d6, type: 3} + - {fileID: 21300002, guid: 3c69ccd5854a08b4186b1de9534631d6, type: 3} + - {fileID: 21300004, guid: 3c69ccd5854a08b4186b1de9534631d6, type: 3} + - {fileID: 21300006, guid: 3c69ccd5854a08b4186b1de9534631d6, type: 3} + - {fileID: 21300008, guid: 3c69ccd5854a08b4186b1de9534631d6, type: 3} + - {fileID: 21300010, guid: 3c69ccd5854a08b4186b1de9534631d6, 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/Explosion.anim.meta b/Assets/Animations/Explosion.anim.meta new file mode 100644 index 0000000..19b1f87 --- /dev/null +++ b/Assets/Animations/Explosion.anim.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: f2075058463a3ac45add1222799ec37e +timeCreated: 1524396768 +licenseType: Free +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Animations/Explosion.controller b/Assets/Animations/Explosion.controller new file mode 100644 index 0000000..81c2dc7 --- /dev/null +++ b/Assets/Animations/Explosion.controller @@ -0,0 +1,69 @@ +%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: Explosion + serializedVersion: 5 + m_AnimatorParameters: [] + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: 1107756366905492316} + 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!1102 &1102763190472429966 +AnimatorState: + serializedVersion: 5 + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: Explosion + m_Speed: 0.9 + m_CycleOffset: 0 + m_Transitions: [] + 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: f2075058463a3ac45add1222799ec37e, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1107 &1107756366905492316 +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: 1102763190472429966} + m_Position: {x: 240, y: 156, z: 0} + m_ChildStateMachines: [] + m_AnyStateTransitions: [] + m_EntryTransitions: [] + 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: 1102763190472429966} diff --git a/Assets/Animations/Explosion.controller.meta b/Assets/Animations/Explosion.controller.meta new file mode 100644 index 0000000..21eb2b1 --- /dev/null +++ b/Assets/Animations/Explosion.controller.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 432ce5745e8bf934b8e794f319920dea +timeCreated: 1524396768 +licenseType: Free +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 9100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Blocks.meta b/Assets/Prefabs/Blocks.meta new file mode 100644 index 0000000..e2d2f0c --- /dev/null +++ b/Assets/Prefabs/Blocks.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 9fd9fd93b9bdb514db8319f684822dd4 +folderAsset: yes +timeCreated: 1524396446 +licenseType: Free +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Block_Bush.prefab b/Assets/Prefabs/Blocks/Block_Bush.prefab similarity index 100% rename from Assets/Prefabs/Block_Bush.prefab rename to Assets/Prefabs/Blocks/Block_Bush.prefab diff --git a/Assets/Prefabs/Block_Bush.prefab.meta b/Assets/Prefabs/Blocks/Block_Bush.prefab.meta similarity index 100% rename from Assets/Prefabs/Block_Bush.prefab.meta rename to Assets/Prefabs/Blocks/Block_Bush.prefab.meta diff --git a/Assets/Prefabs/Block_Cracked.prefab b/Assets/Prefabs/Blocks/Block_Cracked.prefab similarity index 100% rename from Assets/Prefabs/Block_Cracked.prefab rename to Assets/Prefabs/Blocks/Block_Cracked.prefab diff --git a/Assets/Prefabs/Block_Cracked.prefab.meta b/Assets/Prefabs/Blocks/Block_Cracked.prefab.meta similarity index 100% rename from Assets/Prefabs/Block_Cracked.prefab.meta rename to Assets/Prefabs/Blocks/Block_Cracked.prefab.meta diff --git a/Assets/Prefabs/Block_Ice.prefab b/Assets/Prefabs/Blocks/Block_Ice.prefab similarity index 97% rename from Assets/Prefabs/Block_Ice.prefab rename to Assets/Prefabs/Blocks/Block_Ice.prefab index 9736883..8eb157e 100644 --- a/Assets/Prefabs/Block_Ice.prefab +++ b/Assets/Prefabs/Blocks/Block_Ice.prefab @@ -101,6 +101,7 @@ MonoBehaviour: m_EditorClassIdentifier: bombTimer: -1 bombPrefab: {fileID: 1849067685587954, guid: 37dd8e63a4accd043b621e3886a2e847, type: 2} + alternateSprite: {fileID: 21300018, guid: f0425e92c7345064ab2dccbd778f3b15, type: 3} --- !u!212 &212113642525661062 SpriteRenderer: m_ObjectHideFlags: 1 diff --git a/Assets/Prefabs/Block_Ice.prefab.meta b/Assets/Prefabs/Blocks/Block_Ice.prefab.meta similarity index 100% rename from Assets/Prefabs/Block_Ice.prefab.meta rename to Assets/Prefabs/Blocks/Block_Ice.prefab.meta diff --git a/Assets/Prefabs/Block_Water.prefab b/Assets/Prefabs/Blocks/Block_Water.prefab similarity index 100% rename from Assets/Prefabs/Block_Water.prefab rename to Assets/Prefabs/Blocks/Block_Water.prefab diff --git a/Assets/Prefabs/Block_Water.prefab.meta b/Assets/Prefabs/Blocks/Block_Water.prefab.meta similarity index 100% rename from Assets/Prefabs/Block_Water.prefab.meta rename to Assets/Prefabs/Blocks/Block_Water.prefab.meta diff --git a/Assets/Prefabs/Bomb.prefab b/Assets/Prefabs/Bomb.prefab index 70561b9..1988bfd 100644 --- a/Assets/Prefabs/Bomb.prefab +++ b/Assets/Prefabs/Bomb.prefab @@ -42,6 +42,7 @@ GameObject: - component: {fileID: 50604060452749572} - component: {fileID: 61141062028954146} - component: {fileID: 114649402457597828} + - component: {fileID: 95624140020433348} m_Layer: 0 m_Name: Explosion m_TagString: Untagged @@ -166,6 +167,23 @@ BoxCollider2D: serializedVersion: 2 m_Size: {x: 0.32, y: 0.32} m_EdgeRadius: 0 +--- !u!95 &95624140020433348 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1952939246476874} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 432ce5745e8bf934b8e794f319920dea, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 --- !u!114 &114649402457597828 MonoBehaviour: m_ObjectHideFlags: 1 diff --git a/Assets/Prefabs/Pellets.meta b/Assets/Prefabs/Pellets.meta new file mode 100644 index 0000000..92896ba --- /dev/null +++ b/Assets/Prefabs/Pellets.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: a0eb0d80e0563bd4ea290a37ce35b33e +folderAsset: yes +timeCreated: 1524396465 +licenseType: Free +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Fire_Pellet.prefab b/Assets/Prefabs/Pellets/Fire_Pellet.prefab similarity index 100% rename from Assets/Prefabs/Fire_Pellet.prefab rename to Assets/Prefabs/Pellets/Fire_Pellet.prefab diff --git a/Assets/Prefabs/Fire_Pellet.prefab.meta b/Assets/Prefabs/Pellets/Fire_Pellet.prefab.meta similarity index 100% rename from Assets/Prefabs/Fire_Pellet.prefab.meta rename to Assets/Prefabs/Pellets/Fire_Pellet.prefab.meta diff --git a/Assets/Prefabs/Ice_Pellet.prefab b/Assets/Prefabs/Pellets/Ice_Pellet.prefab similarity index 100% rename from Assets/Prefabs/Ice_Pellet.prefab rename to Assets/Prefabs/Pellets/Ice_Pellet.prefab diff --git a/Assets/Prefabs/Ice_Pellet.prefab.meta b/Assets/Prefabs/Pellets/Ice_Pellet.prefab.meta similarity index 100% rename from Assets/Prefabs/Ice_Pellet.prefab.meta rename to Assets/Prefabs/Pellets/Ice_Pellet.prefab.meta diff --git a/Assets/Prefabs/Wind_Pellet.prefab b/Assets/Prefabs/Pellets/Wind_Pellet.prefab similarity index 100% rename from Assets/Prefabs/Wind_Pellet.prefab rename to Assets/Prefabs/Pellets/Wind_Pellet.prefab diff --git a/Assets/Prefabs/Wind_Pellet.prefab.meta b/Assets/Prefabs/Pellets/Wind_Pellet.prefab.meta similarity index 100% rename from Assets/Prefabs/Wind_Pellet.prefab.meta rename to Assets/Prefabs/Pellets/Wind_Pellet.prefab.meta diff --git a/Assets/Prefabs/PressurePlate.prefab b/Assets/Prefabs/PressurePlate.prefab new file mode 100644 index 0000000..01de21b --- /dev/null +++ b/Assets/Prefabs/PressurePlate.prefab @@ -0,0 +1,126 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1001 &100100000 +Prefab: + m_ObjectHideFlags: 1 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: [] + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 0} + m_RootGameObject: {fileID: 1195685452723360} + m_IsPrefabParent: 1 +--- !u!1 &1195685452723360 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 5 + m_Component: + - component: {fileID: 4284655955952716} + - component: {fileID: 212347854642183678} + - component: {fileID: 61327631154944780} + - component: {fileID: 114433314137723076} + m_Layer: 0 + m_Name: PressurePlate + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4284655955952716 +Transform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1195685452723360} + 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: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!61 &61327631154944780 +BoxCollider2D: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1195685452723360} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.5, y: 0.5} + oldSize: {x: 0.16, y: 0.16} + newSize: {x: 0.16, y: 0.16} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 0.16, y: 0.16} + m_EdgeRadius: 0 +--- !u!114 &114433314137723076 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1195685452723360} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3a1398ea75e79b94a9b35acb86196c53, type: 3} + m_Name: + m_EditorClassIdentifier: + pressed: 0 + alternateSprite: {fileID: 21300022, guid: f0425e92c7345064ab2dccbd778f3b15, type: 3} +--- !u!212 &212347854642183678 +SpriteRenderer: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1195685452723360} + 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: 1398306609 + m_SortingLayer: 2 + m_SortingOrder: 0 + m_Sprite: {fileID: 21300020, guid: f0425e92c7345064ab2dccbd778f3b15, 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.16, y: 0.16} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 diff --git a/Assets/Prefabs/PressurePlate.prefab.meta b/Assets/Prefabs/PressurePlate.prefab.meta new file mode 100644 index 0000000..ada1739 --- /dev/null +++ b/Assets/Prefabs/PressurePlate.prefab.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: fef65b57e8170f049a86ce4d2931c8ff +timeCreated: 1524396437 +licenseType: Free +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 100100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/gameplay.unity b/Assets/Scenes/gameplay.unity index 870e41c..093acc3 100644 --- a/Assets/Scenes/gameplay.unity +++ b/Assets/Scenes/gameplay.unity @@ -5666,6 +5666,48 @@ Prefab: m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: 55b556ac6e46dbb4abdebeb341e45cce, type: 2} m_IsPrefabParent: 0 +--- !u!1001 &397859789 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 4284655955952716, guid: fef65b57e8170f049a86ce4d2931c8ff, type: 2} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4284655955952716, guid: fef65b57e8170f049a86ce4d2931c8ff, type: 2} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4284655955952716, guid: fef65b57e8170f049a86ce4d2931c8ff, type: 2} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4284655955952716, guid: fef65b57e8170f049a86ce4d2931c8ff, type: 2} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4284655955952716, guid: fef65b57e8170f049a86ce4d2931c8ff, type: 2} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4284655955952716, guid: fef65b57e8170f049a86ce4d2931c8ff, type: 2} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4284655955952716, guid: fef65b57e8170f049a86ce4d2931c8ff, type: 2} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4284655955952716, guid: fef65b57e8170f049a86ce4d2931c8ff, type: 2} + propertyPath: m_RootOrder + value: 6 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 100100000, guid: fef65b57e8170f049a86ce4d2931c8ff, type: 2} + m_IsPrefabParent: 0 --- !u!4 &405829488 stripped Transform: m_PrefabParentObject: {fileID: 4890223527033060, guid: 55b556ac6e46dbb4abdebeb341e45cce, diff --git a/Assets/Scripts/Blocks/BlockIce.cs b/Assets/Scripts/Blocks/BlockIce.cs index ac5fa19..fafb9b7 100644 --- a/Assets/Scripts/Blocks/BlockIce.cs +++ b/Assets/Scripts/Blocks/BlockIce.cs @@ -3,18 +3,30 @@ using System.Collections.Generic; using UnityEngine; public class BlockIce : MonoBehaviour { + SpriteRenderer spriteRenderer; Rigidbody2D rigidBody; public float bombTimer = -1; public GameObject bombPrefab; + public Sprite alternateSprite; void Awake() { + spriteRenderer = GetComponent (); rigidBody = GetComponent (); rigidBody.Sleep (); } + void Start() { + //switch if it's a bomb block + if (bombTimer >= 0) { + Sprite spr = spriteRenderer.sprite; + spriteRenderer.sprite = alternateSprite; + alternateSprite = spr; + } + } + void OnTriggerEnter2D(Collider2D collider) { //TODO: use durability class? FireDamager fire = collider.gameObject.GetComponent (); diff --git a/Assets/Scripts/PressurePlate.cs b/Assets/Scripts/PressurePlate.cs new file mode 100644 index 0000000..cf46af8 --- /dev/null +++ b/Assets/Scripts/PressurePlate.cs @@ -0,0 +1,42 @@ + using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class PressurePlate : MonoBehaviour { + SpriteRenderer spriteRenderer; + + public bool pressed; + public Sprite alternateSprite; + + GameObject presser; + + void Awake() { + spriteRenderer = GetComponent (); + } + + void OnTriggerEnter2D(Collider2D collider) { + GameObject go = collider.gameObject; + + if (go.GetComponent() != null || go.GetComponent() != null || go.GetComponent() != null) { + if (presser == null) { + presser = go; + pressed = true; + SwitchSprite (); + } + } + } + + void OnTriggerExit2D(Collider2D collider) { + if (collider.gameObject == presser) { + presser = null; + pressed = false; + SwitchSprite (); + } + } + + void SwitchSprite() { + Sprite spr = spriteRenderer.sprite; + spriteRenderer.sprite = alternateSprite; + alternateSprite = spr; + } +} diff --git a/Assets/Scripts/PressurePlate.cs.meta b/Assets/Scripts/PressurePlate.cs.meta new file mode 100644 index 0000000..848aa35 --- /dev/null +++ b/Assets/Scripts/PressurePlate.cs.meta @@ -0,0 +1,13 @@ +fileFormatVersion: 2 +guid: 3a1398ea75e79b94a9b35acb86196c53 +timeCreated: 1524394967 +licenseType: Free +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sprites/explosion.png b/Assets/Sprites/explosion.png new file mode 100644 index 0000000..7bcf436 --- /dev/null +++ b/Assets/Sprites/explosion.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:261dbc490cac4d132740af9d8866ef9ac4d784a37f098579ee88ffdf20599784 +size 810 diff --git a/Assets/Sprites/explosion.png.meta b/Assets/Sprites/explosion.png.meta new file mode 100644 index 0000000..09cbb85 --- /dev/null +++ b/Assets/Sprites/explosion.png.meta @@ -0,0 +1,188 @@ +fileFormatVersion: 2 +guid: 3c69ccd5854a08b4186b1de9534631d6 +timeCreated: 1524396561 +licenseType: Free +TextureImporter: + fileIDToRecycleName: + 21300000: explosion_0 + 21300002: explosion_1 + 21300004: explosion_2 + 21300006: explosion_3 + 21300008: explosion_4 + 21300010: explosion_5 + 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: 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: explosion_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: explosion_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: explosion_2 + 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: explosion_3 + 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: explosion_4 + 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: explosion_5 + 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 + outline: [] + physicsShape: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sprites/tiles_ip.png b/Assets/Sprites/tiles_ip.png index 0579c17..d98fa7a 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:7a03513c4aa4d7cbe202c273217364cc6de37e8d6535342c3ddee8aab44ad677 -size 910 +oid sha256:5393e4691a47a5e469998cf5228a87c8188f50ca4987a000db028a66c9840f2b +size 1249 diff --git a/Assets/Sprites/tiles_ip.png.meta b/Assets/Sprites/tiles_ip.png.meta index f2f0101..05e8ae5 100644 --- a/Assets/Sprites/tiles_ip.png.meta +++ b/Assets/Sprites/tiles_ip.png.meta @@ -13,6 +13,9 @@ TextureImporter: 21300012: tiles_ip_6 21300014: tiles_ip_7 21300016: tiles_ip_8 + 21300018: tiles_ip_9 + 21300020: tiles_ip_10 + 21300022: tiles_ip_11 externalObjects: {} serializedVersion: 4 mipmaps: @@ -54,8 +57,9 @@ TextureImporter: spriteMeshType: 0 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spriteBorder: {x: 0, y: 0, z: 0, w: 0} spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 alphaIsTransparency: 1 spriteTessellationDetail: -1 @@ -224,6 +228,48 @@ TextureImporter: outline: [] physicsShape: [] tessellationDetail: 0 + - serializedVersion: 2 + name: tiles_ip_9 + 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_10 + 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_11 + rect: + serializedVersion: 2 + x: 48 + 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 outline: [] physicsShape: [] spritePackingTag: diff --git a/ProjectSettings/InputManager.asset b/ProjectSettings/InputManager.asset index 57e5835..bf9f9a4 100644 --- a/ProjectSettings/InputManager.asset +++ b/ProjectSettings/InputManager.asset @@ -134,7 +134,23 @@ InputManager: axis: 1 joyNum: 0 - serializedVersion: 3 - m_Name: Mouse ScrollWheel + m_Name: Cancel + descriptiveName: + descriptiveNegativeName: + negativeButton: + positiveButton: + altNegativeButton: + altPositiveButton: + gravity: 0 + dead: 0 + sensitivity: 0.1 + snap: 0 + invert: 0 + type: 0 + axis: 0 + joyNum: 0 + - serializedVersion: 3 + m_Name: Submit descriptiveName: descriptiveNegativeName: negativeButton: @@ -147,5 +163,5 @@ InputManager: snap: 0 invert: 0 type: 1 - axis: 2 + axis: 0 joyNum: 0 diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index a02b524..e3bf71b 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -624,6 +624,7 @@ PlayerSettings: XboxOneSplashScreen: {fileID: 0} XboxOneAllowedProductIds: [] XboxOnePersistentLocalStorageSize: 0 + XboxOneXTitleMemory: 8 xboxOneScriptCompiler: 0 vrEditorSettings: daydream: