From ed67e81098947258fa7c0560a8b8f74be3806b8c Mon Sep 17 00:00:00 2001 From: Kayne Ruse Date: Sat, 21 Apr 2018 14:41:24 +1000 Subject: [PATCH] Blocks are all acting correctly, bomb is acting correctly --- Assets/Animations/Player_Down.anim | 20 +- Assets/Animations/Player_Left.anim | 7 +- Assets/Animations/Player_Right.anim | 7 +- Assets/Animations/Player_Up.anim | 7 +- Assets/{Scripts/Damagers => }/IceDamager.cs | 0 .../{Scripts/Damagers => }/IceDamager.cs.meta | 0 Assets/Prefabs/Block_Bush.prefab | 198 ++++++++++++ Assets/Prefabs/Block_Bush.prefab.meta | 10 + Assets/Prefabs/Block_Ice.prefab | 126 ++++++++ Assets/Prefabs/Block_Ice.prefab.meta | 10 + Assets/Prefabs/Bomb.prefab | 282 ++++++++++++++++++ Assets/Prefabs/Bomb.prefab.meta | 10 + Assets/Prefabs/Fire_Pellet.prefab | 7 +- Assets/Scenes/gameplay.unity | 183 +++++++++++- Assets/Scripts/Blocks.meta | 10 + Assets/Scripts/Blocks/BlockBush.cs | 21 ++ Assets/Scripts/Blocks/BlockBush.cs.meta | 13 + Assets/Scripts/{ => Blocks}/BlockCracked.cs | 0 .../Scripts/{ => Blocks}/BlockCracked.cs.meta | 0 Assets/Scripts/Blocks/BlockIce.cs | 22 ++ Assets/Scripts/Blocks/BlockIce.cs.meta | 13 + Assets/Scripts/Bomb.cs | 23 +- Assets/Scripts/Damagers/DamagerBase.cs | 13 +- Assets/Scripts/Player.cs | 6 +- ProjectSettings/InputManager.asset | 162 +--------- 25 files changed, 957 insertions(+), 193 deletions(-) rename Assets/{Scripts/Damagers => }/IceDamager.cs (100%) rename Assets/{Scripts/Damagers => }/IceDamager.cs.meta (100%) create mode 100644 Assets/Prefabs/Block_Bush.prefab create mode 100644 Assets/Prefabs/Block_Bush.prefab.meta create mode 100644 Assets/Prefabs/Block_Ice.prefab create mode 100644 Assets/Prefabs/Block_Ice.prefab.meta create mode 100644 Assets/Prefabs/Bomb.prefab create mode 100644 Assets/Prefabs/Bomb.prefab.meta create mode 100644 Assets/Scripts/Blocks.meta create mode 100644 Assets/Scripts/Blocks/BlockBush.cs create mode 100644 Assets/Scripts/Blocks/BlockBush.cs.meta rename Assets/Scripts/{ => Blocks}/BlockCracked.cs (100%) rename Assets/Scripts/{ => Blocks}/BlockCracked.cs.meta (100%) create mode 100644 Assets/Scripts/Blocks/BlockIce.cs create mode 100644 Assets/Scripts/Blocks/BlockIce.cs.meta diff --git a/Assets/Animations/Player_Down.anim b/Assets/Animations/Player_Down.anim index 0e69455..d4f4cb6 100644 --- a/Assets/Animations/Player_Down.anim +++ b/Assets/Animations/Player_Down.anim @@ -24,7 +24,7 @@ AnimationClip: path: classID: 212 script: {fileID: 0} - m_SampleRate: 60 + m_SampleRate: 12 m_WrapMode: 0 m_Bounds: m_Center: {x: 0, y: 0, z: 0} @@ -45,7 +45,7 @@ AnimationClip: m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 0.016666668 + m_StopTime: 0.083333336 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 @@ -65,18 +65,4 @@ AnimationClip: m_HasGenericRootTransform: 0 m_HasMotionFloatCurves: 0 m_GenerateMotionCurves: 0 - m_Events: - - time: 0 - functionName: - data: - objectReferenceParameter: {fileID: 0} - floatParameter: 0 - intParameter: 0 - messageOptions: 0 - - time: 0 - functionName: - data: - objectReferenceParameter: {fileID: 0} - floatParameter: 0 - intParameter: 0 - messageOptions: 0 + m_Events: [] diff --git a/Assets/Animations/Player_Left.anim b/Assets/Animations/Player_Left.anim index 8f97b29..11b13a5 100644 --- a/Assets/Animations/Player_Left.anim +++ b/Assets/Animations/Player_Left.anim @@ -20,13 +20,11 @@ AnimationClip: - curve: - time: 0 value: {fileID: 21300006, guid: 52ef75616890e664ca6a6f6fbc2e8039, type: 3} - - time: 1 - value: {fileID: 21300000, guid: 52ef75616890e664ca6a6f6fbc2e8039, type: 3} attribute: m_Sprite path: classID: 212 script: {fileID: 0} - m_SampleRate: 60 + m_SampleRate: 12 m_WrapMode: 0 m_Bounds: m_Center: {x: 0, y: 0, z: 0} @@ -42,13 +40,12 @@ AnimationClip: isPPtrCurve: 1 pptrCurveMapping: - {fileID: 21300006, guid: 52ef75616890e664ca6a6f6fbc2e8039, type: 3} - - {fileID: 21300000, guid: 52ef75616890e664ca6a6f6fbc2e8039, type: 3} m_AnimationClipSettings: serializedVersion: 2 m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 1.0166667 + m_StopTime: 0.083333336 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 diff --git a/Assets/Animations/Player_Right.anim b/Assets/Animations/Player_Right.anim index 492a62a..659571e 100644 --- a/Assets/Animations/Player_Right.anim +++ b/Assets/Animations/Player_Right.anim @@ -20,13 +20,11 @@ AnimationClip: - curve: - time: 0 value: {fileID: 21300004, guid: 52ef75616890e664ca6a6f6fbc2e8039, type: 3} - - time: 1 - value: {fileID: 21300000, guid: 52ef75616890e664ca6a6f6fbc2e8039, type: 3} attribute: m_Sprite path: classID: 212 script: {fileID: 0} - m_SampleRate: 60 + m_SampleRate: 12 m_WrapMode: 0 m_Bounds: m_Center: {x: 0, y: 0, z: 0} @@ -42,13 +40,12 @@ AnimationClip: isPPtrCurve: 1 pptrCurveMapping: - {fileID: 21300004, guid: 52ef75616890e664ca6a6f6fbc2e8039, type: 3} - - {fileID: 21300000, guid: 52ef75616890e664ca6a6f6fbc2e8039, type: 3} m_AnimationClipSettings: serializedVersion: 2 m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 1.0166667 + m_StopTime: 0.083333336 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 diff --git a/Assets/Animations/Player_Up.anim b/Assets/Animations/Player_Up.anim index cd2a06a..6b57e78 100644 --- a/Assets/Animations/Player_Up.anim +++ b/Assets/Animations/Player_Up.anim @@ -20,13 +20,11 @@ AnimationClip: - curve: - time: 0 value: {fileID: 21300002, guid: 52ef75616890e664ca6a6f6fbc2e8039, type: 3} - - time: 1 - value: {fileID: 21300000, guid: 52ef75616890e664ca6a6f6fbc2e8039, type: 3} attribute: m_Sprite path: classID: 212 script: {fileID: 0} - m_SampleRate: 60 + m_SampleRate: 12 m_WrapMode: 0 m_Bounds: m_Center: {x: 0, y: 0, z: 0} @@ -42,13 +40,12 @@ AnimationClip: isPPtrCurve: 1 pptrCurveMapping: - {fileID: 21300002, guid: 52ef75616890e664ca6a6f6fbc2e8039, type: 3} - - {fileID: 21300000, guid: 52ef75616890e664ca6a6f6fbc2e8039, type: 3} m_AnimationClipSettings: serializedVersion: 2 m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 1.0166667 + m_StopTime: 0.083333336 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 diff --git a/Assets/Scripts/Damagers/IceDamager.cs b/Assets/IceDamager.cs similarity index 100% rename from Assets/Scripts/Damagers/IceDamager.cs rename to Assets/IceDamager.cs diff --git a/Assets/Scripts/Damagers/IceDamager.cs.meta b/Assets/IceDamager.cs.meta similarity index 100% rename from Assets/Scripts/Damagers/IceDamager.cs.meta rename to Assets/IceDamager.cs.meta diff --git a/Assets/Prefabs/Block_Bush.prefab b/Assets/Prefabs/Block_Bush.prefab new file mode 100644 index 0000000..cfdb6d6 --- /dev/null +++ b/Assets/Prefabs/Block_Bush.prefab @@ -0,0 +1,198 @@ +%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: 1324933357127122} + m_IsPrefabParent: 1 +--- !u!1 &1324933357127122 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 5 + m_Component: + - component: {fileID: 4890223527033060} + - component: {fileID: 212954187972121728} + - component: {fileID: 61582461202445894} + - component: {fileID: 114736311550290120} + m_Layer: 0 + m_Name: Block_Bush + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!1 &1545017530465668 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 5 + m_Component: + - component: {fileID: 4646328609572822} + - component: {fileID: 212550988989982930} + m_Layer: 0 + m_Name: Burnt_Bush + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &4646328609572822 +Transform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1545017530465668} + 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: 4890223527033060} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!4 &4890223527033060 +Transform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1324933357127122} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0.325, y: -0.079, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 4646328609572822} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!61 &61582461202445894 +BoxCollider2D: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1324933357127122} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 0 + 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 &114736311550290120 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1324933357127122} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3637ac4ce14452c4cada0ccc2d5d8e75, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!212 &212550988989982930 +SpriteRenderer: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1545017530465668} + 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: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: 21300016, 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 +--- !u!212 &212954187972121728 +SpriteRenderer: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1324933357127122} + 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: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: 21300014, 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/Block_Bush.prefab.meta b/Assets/Prefabs/Block_Bush.prefab.meta new file mode 100644 index 0000000..9c80fd1 --- /dev/null +++ b/Assets/Prefabs/Block_Bush.prefab.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 55b556ac6e46dbb4abdebeb341e45cce +timeCreated: 1524283253 +licenseType: Free +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 100100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Block_Ice.prefab b/Assets/Prefabs/Block_Ice.prefab new file mode 100644 index 0000000..b5b1a81 --- /dev/null +++ b/Assets/Prefabs/Block_Ice.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: 1382120285849756} + m_IsPrefabParent: 1 +--- !u!1 &1382120285849756 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 5 + m_Component: + - component: {fileID: 4564474961553612} + - component: {fileID: 212113642525661062} + - component: {fileID: 61034069375293356} + - component: {fileID: 114831880267786856} + m_Layer: 0 + m_Name: Block_Ice + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4564474961553612 +Transform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1382120285849756} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0.662, y: 0.112, z: 0.09375} + 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 &61034069375293356 +BoxCollider2D: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1382120285849756} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 0 + 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 &114831880267786856 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1382120285849756} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: bb19c1709331b3d44b5ddc164ca9dbbe, type: 3} + m_Name: + m_EditorClassIdentifier: + bombTimer: -1 + bombPrefab: {fileID: 1849067685587954, guid: 37dd8e63a4accd043b621e3886a2e847, type: 2} +--- !u!212 &212113642525661062 +SpriteRenderer: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1382120285849756} + 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: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: 21300008, 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/Block_Ice.prefab.meta b/Assets/Prefabs/Block_Ice.prefab.meta new file mode 100644 index 0000000..9c402b0 --- /dev/null +++ b/Assets/Prefabs/Block_Ice.prefab.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: c4d410a301c013a468dc133a094e5478 +timeCreated: 1524283912 +licenseType: Free +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 100100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Bomb.prefab b/Assets/Prefabs/Bomb.prefab new file mode 100644 index 0000000..51384a8 --- /dev/null +++ b/Assets/Prefabs/Bomb.prefab @@ -0,0 +1,282 @@ +%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: 1849067685587954} + m_IsPrefabParent: 1 +--- !u!1 &1849067685587954 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 5 + m_Component: + - component: {fileID: 4059329389201350} + - component: {fileID: 212367768635825822} + - component: {fileID: 50571448290894828} + - component: {fileID: 61113286589161286} + - component: {fileID: 114937917394596370} + m_Layer: 0 + m_Name: Bomb + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!1 &1952939246476874 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 5 + m_Component: + - component: {fileID: 4483972206079060} + - component: {fileID: 212136561808670036} + - component: {fileID: 50604060452749572} + - component: {fileID: 61141062028954146} + - component: {fileID: 114649402457597828} + m_Layer: 0 + m_Name: Explosion + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &4059329389201350 +Transform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1849067685587954} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0.167, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 4483972206079060} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!4 &4483972206079060 +Transform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1952939246476874} + 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: 4059329389201350} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!50 &50571448290894828 +Rigidbody2D: + serializedVersion: 4 + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1849067685587954} + m_BodyType: 0 + m_Simulated: 1 + m_UseFullKinematicContacts: 0 + m_UseAutoMass: 0 + m_Mass: 1 + m_LinearDrag: 5 + m_AngularDrag: 0 + m_GravityScale: 0 + m_Material: {fileID: 0} + m_Interpolate: 0 + m_SleepingMode: 1 + m_CollisionDetection: 0 + m_Constraints: 4 +--- !u!50 &50604060452749572 +Rigidbody2D: + serializedVersion: 4 + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1952939246476874} + m_BodyType: 0 + m_Simulated: 1 + m_UseFullKinematicContacts: 0 + m_UseAutoMass: 0 + m_Mass: 1 + m_LinearDrag: 0 + m_AngularDrag: 0 + m_GravityScale: 0 + m_Material: {fileID: 0} + m_Interpolate: 0 + m_SleepingMode: 1 + m_CollisionDetection: 0 + m_Constraints: 7 +--- !u!61 &61113286589161286 +BoxCollider2D: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1849067685587954} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 0 + 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!61 &61141062028954146 +BoxCollider2D: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1952939246476874} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 0 + 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.32, y: 0.32} + m_EdgeRadius: 0 +--- !u!114 &114649402457597828 +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: dd95736c14a0eac4aa8f5d682f624d9d, type: 3} + m_Name: + m_EditorClassIdentifier: + value: 0 +--- !u!114 &114937917394596370 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1849067685587954} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c1f0e082d5001504c913bdebe25279ea, type: 3} + m_Name: + m_EditorClassIdentifier: + timer: 0 + iceBlockPrefab: {fileID: 1382120285849756, guid: c4d410a301c013a468dc133a094e5478, + type: 2} +--- !u!212 &212136561808670036 +SpriteRenderer: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1952939246476874} + 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: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: 21300000, guid: 4a78316eda9aad14bb3a456e2f28b38d, 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 +--- !u!212 &212367768635825822 +SpriteRenderer: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1849067685587954} + 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: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: 21300002, guid: 4a78316eda9aad14bb3a456e2f28b38d, 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/Bomb.prefab.meta b/Assets/Prefabs/Bomb.prefab.meta new file mode 100644 index 0000000..7cb09c6 --- /dev/null +++ b/Assets/Prefabs/Bomb.prefab.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 37dd8e63a4accd043b621e3886a2e847 +timeCreated: 1524283583 +licenseType: Free +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 100100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Fire_Pellet.prefab b/Assets/Prefabs/Fire_Pellet.prefab index ae93ad6..d582785 100644 --- a/Assets/Prefabs/Fire_Pellet.prefab +++ b/Assets/Prefabs/Fire_Pellet.prefab @@ -56,8 +56,8 @@ Rigidbody2D: m_UseAutoMass: 0 m_Mass: 1 m_LinearDrag: 0 - m_AngularDrag: 0.05 - m_GravityScale: 1 + m_AngularDrag: 0 + m_GravityScale: 0 m_Material: {fileID: 0} m_Interpolate: 0 m_SleepingMode: 1 @@ -72,7 +72,7 @@ BoxCollider2D: m_Enabled: 1 m_Density: 1 m_Material: {fileID: 0} - m_IsTrigger: 0 + m_IsTrigger: 1 m_UsedByEffector: 0 m_UsedByComposite: 0 m_Offset: {x: 0, y: 0} @@ -99,6 +99,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 310ee2a5851703045af5c47b1b760328, type: 3} m_Name: m_EditorClassIdentifier: + value: 1 --- !u!212 &212847360632789898 SpriteRenderer: m_ObjectHideFlags: 1 diff --git a/Assets/Scenes/gameplay.unity b/Assets/Scenes/gameplay.unity index 8c0d754..3e62dbb 100644 --- a/Assets/Scenes/gameplay.unity +++ b/Assets/Scenes/gameplay.unity @@ -113,6 +113,95 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} +--- !u!1001 &377649863 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 4102967640087092, guid: 7f7220d1cb75b7f4f8eac561a76ac977, type: 2} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4102967640087092, guid: 7f7220d1cb75b7f4f8eac561a76ac977, type: 2} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4102967640087092, guid: 7f7220d1cb75b7f4f8eac561a76ac977, type: 2} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4102967640087092, guid: 7f7220d1cb75b7f4f8eac561a76ac977, type: 2} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4102967640087092, guid: 7f7220d1cb75b7f4f8eac561a76ac977, type: 2} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4102967640087092, guid: 7f7220d1cb75b7f4f8eac561a76ac977, type: 2} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4102967640087092, guid: 7f7220d1cb75b7f4f8eac561a76ac977, type: 2} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4102967640087092, guid: 7f7220d1cb75b7f4f8eac561a76ac977, type: 2} + propertyPath: m_RootOrder + value: 3 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 100100000, guid: 7f7220d1cb75b7f4f8eac561a76ac977, type: 2} + m_IsPrefabParent: 0 +--- !u!1001 &1069598685 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 4059329389201350, guid: 37dd8e63a4accd043b621e3886a2e847, type: 2} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4059329389201350, guid: 37dd8e63a4accd043b621e3886a2e847, type: 2} + propertyPath: m_LocalPosition.y + value: 0.167 + objectReference: {fileID: 0} + - target: {fileID: 4059329389201350, guid: 37dd8e63a4accd043b621e3886a2e847, type: 2} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4059329389201350, guid: 37dd8e63a4accd043b621e3886a2e847, type: 2} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4059329389201350, guid: 37dd8e63a4accd043b621e3886a2e847, type: 2} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4059329389201350, guid: 37dd8e63a4accd043b621e3886a2e847, type: 2} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4059329389201350, guid: 37dd8e63a4accd043b621e3886a2e847, type: 2} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4059329389201350, guid: 37dd8e63a4accd043b621e3886a2e847, type: 2} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 114937917394596370, guid: 37dd8e63a4accd043b621e3886a2e847, + type: 2} + propertyPath: timer + value: 10 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 100100000, guid: 37dd8e63a4accd043b621e3886a2e847, type: 2} + m_IsPrefabParent: 0 --- !u!1 &1089679577 GameObject: m_ObjectHideFlags: 0 @@ -225,6 +314,12 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c9a7a743ce869904ca255dc7e2ecd693, type: 3} m_Name: m_EditorClassIdentifier: + firePelletPrefab: {fileID: 1924244257779608, guid: 58d70ad16ebe6124491841cb23c8c298, + type: 2} + icePelletPrefab: {fileID: 1640966317816230, guid: 0608694d641daa2438d681a6ba301fa3, + type: 2} + windPelletPrefab: {fileID: 1389927462137108, guid: 407acfcef7e27af47a3df873b629b4a4, + type: 2} --- !u!61 &1602044330 BoxCollider2D: m_ObjectHideFlags: 0 @@ -269,7 +364,7 @@ Rigidbody2D: m_Interpolate: 0 m_SleepingMode: 1 m_CollisionDetection: 0 - m_Constraints: 0 + m_Constraints: 4 --- !u!95 &1602044332 Animator: serializedVersion: 3 @@ -338,9 +433,93 @@ Transform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1602044328} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: 0.355, y: 0.175, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &1630315066 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 4890223527033060, guid: 55b556ac6e46dbb4abdebeb341e45cce, type: 2} + propertyPath: m_LocalPosition.x + value: 0.325 + objectReference: {fileID: 0} + - target: {fileID: 4890223527033060, guid: 55b556ac6e46dbb4abdebeb341e45cce, type: 2} + propertyPath: m_LocalPosition.y + value: -0.079 + objectReference: {fileID: 0} + - target: {fileID: 4890223527033060, guid: 55b556ac6e46dbb4abdebeb341e45cce, type: 2} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4890223527033060, guid: 55b556ac6e46dbb4abdebeb341e45cce, type: 2} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4890223527033060, guid: 55b556ac6e46dbb4abdebeb341e45cce, type: 2} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4890223527033060, guid: 55b556ac6e46dbb4abdebeb341e45cce, type: 2} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4890223527033060, guid: 55b556ac6e46dbb4abdebeb341e45cce, type: 2} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4890223527033060, guid: 55b556ac6e46dbb4abdebeb341e45cce, type: 2} + propertyPath: m_RootOrder + value: 4 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 100100000, guid: 55b556ac6e46dbb4abdebeb341e45cce, type: 2} + m_IsPrefabParent: 0 +--- !u!1001 &2004955173 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 4564474961553612, guid: c4d410a301c013a468dc133a094e5478, type: 2} + propertyPath: m_LocalPosition.x + value: 0.662 + objectReference: {fileID: 0} + - target: {fileID: 4564474961553612, guid: c4d410a301c013a468dc133a094e5478, type: 2} + propertyPath: m_LocalPosition.y + value: 0.112 + objectReference: {fileID: 0} + - target: {fileID: 4564474961553612, guid: c4d410a301c013a468dc133a094e5478, type: 2} + propertyPath: m_LocalPosition.z + value: 0.09375 + objectReference: {fileID: 0} + - target: {fileID: 4564474961553612, guid: c4d410a301c013a468dc133a094e5478, type: 2} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4564474961553612, guid: c4d410a301c013a468dc133a094e5478, type: 2} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4564474961553612, guid: c4d410a301c013a468dc133a094e5478, type: 2} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4564474961553612, guid: c4d410a301c013a468dc133a094e5478, type: 2} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4564474961553612, guid: c4d410a301c013a468dc133a094e5478, type: 2} + propertyPath: m_RootOrder + value: 5 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 100100000, guid: c4d410a301c013a468dc133a094e5478, type: 2} + m_IsPrefabParent: 0 diff --git a/Assets/Scripts/Blocks.meta b/Assets/Scripts/Blocks.meta new file mode 100644 index 0000000..6aa3198 --- /dev/null +++ b/Assets/Scripts/Blocks.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 60b898dd509fa664d986aed43f17b8ba +folderAsset: yes +timeCreated: 1524282772 +licenseType: Free +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Blocks/BlockBush.cs b/Assets/Scripts/Blocks/BlockBush.cs new file mode 100644 index 0000000..bc8fb15 --- /dev/null +++ b/Assets/Scripts/Blocks/BlockBush.cs @@ -0,0 +1,21 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class BlockBush : MonoBehaviour { + GameObject burnt; + + void Awake() { + burnt = transform.GetChild (0).gameObject; + } + + void OnTriggerEnter2D(Collider2D collider) { + //TODO: use durability class? + FireDamager fire = collider.gameObject.GetComponent (); + if (fire != null) { + burnt.SetActive (true); + transform.DetachChildren (); + Destroy (gameObject); + } + } +} diff --git a/Assets/Scripts/Blocks/BlockBush.cs.meta b/Assets/Scripts/Blocks/BlockBush.cs.meta new file mode 100644 index 0000000..f52a43c --- /dev/null +++ b/Assets/Scripts/Blocks/BlockBush.cs.meta @@ -0,0 +1,13 @@ +fileFormatVersion: 2 +guid: 3637ac4ce14452c4cada0ccc2d5d8e75 +timeCreated: 1524282472 +licenseType: Free +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/BlockCracked.cs b/Assets/Scripts/Blocks/BlockCracked.cs similarity index 100% rename from Assets/Scripts/BlockCracked.cs rename to Assets/Scripts/Blocks/BlockCracked.cs diff --git a/Assets/Scripts/BlockCracked.cs.meta b/Assets/Scripts/Blocks/BlockCracked.cs.meta similarity index 100% rename from Assets/Scripts/BlockCracked.cs.meta rename to Assets/Scripts/Blocks/BlockCracked.cs.meta diff --git a/Assets/Scripts/Blocks/BlockIce.cs b/Assets/Scripts/Blocks/BlockIce.cs new file mode 100644 index 0000000..6ae6f82 --- /dev/null +++ b/Assets/Scripts/Blocks/BlockIce.cs @@ -0,0 +1,22 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class BlockIce : MonoBehaviour { + public float bombTimer = -1; + + public GameObject bombPrefab; + + void OnTriggerEnter2D(Collider2D collider) { + //TODO: use durability class? + FireDamager fire = collider.gameObject.GetComponent (); + if (fire != null) { + if (bombTimer >= 0) { + GameObject bomb = Instantiate (bombPrefab); + bomb.transform.position = transform.position; + bomb.GetComponent ().timer = bombTimer; + } + Destroy (gameObject); + } + } +} diff --git a/Assets/Scripts/Blocks/BlockIce.cs.meta b/Assets/Scripts/Blocks/BlockIce.cs.meta new file mode 100644 index 0000000..032e69d --- /dev/null +++ b/Assets/Scripts/Blocks/BlockIce.cs.meta @@ -0,0 +1,13 @@ +fileFormatVersion: 2 +guid: bb19c1709331b3d44b5ddc164ca9dbbe +timeCreated: 1524283289 +licenseType: Free +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Bomb.cs b/Assets/Scripts/Bomb.cs index 53473fe..69e4572 100644 --- a/Assets/Scripts/Bomb.cs +++ b/Assets/Scripts/Bomb.cs @@ -6,11 +6,32 @@ public class Bomb : MonoBehaviour { public float timer; GameObject explosion; + public GameObject iceBlockPrefab; - void Awake() { + float birthTime; + + void Start() { StartCoroutine (ExplodeAfter (timer)); explosion = transform.GetChild (0).gameObject; + + birthTime = Time.time; + } + + void OnTriggerEnter2D(Collider2D collider) { + FireDamager fire = collider.gameObject.GetComponent (); + if (fire != null) { + //explode immediately + StartCoroutine(ExplodeAfter(0)); + } + + IceDamager ice = collider.gameObject.GetComponent (); + if (ice != null) { + GameObject iceBlock = Instantiate (iceBlockPrefab); + iceBlock.transform.position = transform.position; + iceBlock.GetComponent ().bombTimer = timer - (Time.time - birthTime); + Destroy (gameObject); + } } IEnumerator ExplodeAfter(float delay) { diff --git a/Assets/Scripts/Damagers/DamagerBase.cs b/Assets/Scripts/Damagers/DamagerBase.cs index efe2852..7b8f690 100644 --- a/Assets/Scripts/Damagers/DamagerBase.cs +++ b/Assets/Scripts/Damagers/DamagerBase.cs @@ -1,5 +1,16 @@ -using UnityEngine; +using System.Collections; +using System.Collections.Generic; +using UnityEngine; public class DamagerBase : MonoBehaviour { public int value = 1; + + void Awake() { + StartCoroutine (DestroySelfAfter (30)); + } + + IEnumerator DestroySelfAfter(float delay) { + yield return new WaitForSeconds (delay); + Destroy (gameObject); + } } \ No newline at end of file diff --git a/Assets/Scripts/Player.cs b/Assets/Scripts/Player.cs index 8b880ff..38771cc 100644 --- a/Assets/Scripts/Player.cs +++ b/Assets/Scripts/Player.cs @@ -4,7 +4,8 @@ using UnityEngine; public class Player : MonoBehaviour { public enum Mode { - FIRE, ICE, WIND + FIRE, ICE, WIND, + LAST }; Animator animator; @@ -55,6 +56,9 @@ public class Player : MonoBehaviour { if (Input.GetButtonDown("Switch")) { mode += 1; + if (mode == Mode.LAST) { + mode = 0; + } } } diff --git a/ProjectSettings/InputManager.asset b/ProjectSettings/InputManager.asset index 17c8f53..57e5835 100644 --- a/ProjectSettings/InputManager.asset +++ b/ProjectSettings/InputManager.asset @@ -13,10 +13,10 @@ InputManager: positiveButton: right altNegativeButton: a altPositiveButton: d - gravity: 3 + gravity: 1000 dead: 0.001 - sensitivity: 3 - snap: 1 + sensitivity: 1000 + snap: 0 invert: 0 type: 0 axis: 0 @@ -29,22 +29,22 @@ InputManager: positiveButton: up altNegativeButton: s altPositiveButton: w - gravity: 3 + gravity: 1000 dead: 0.001 - sensitivity: 3 + sensitivity: 1000 snap: 1 invert: 0 type: 0 axis: 0 joyNum: 0 - serializedVersion: 3 - m_Name: Fire1 + m_Name: Switch descriptiveName: descriptiveNegativeName: negativeButton: - positiveButton: left ctrl + positiveButton: e altNegativeButton: - altPositiveButton: mouse 0 + altPositiveButton: gravity: 1000 dead: 0.001 sensitivity: 1000 @@ -86,7 +86,7 @@ InputManager: axis: 0 joyNum: 0 - serializedVersion: 3 - m_Name: Jump + m_Name: Attack descriptiveName: descriptiveNegativeName: negativeButton: @@ -149,147 +149,3 @@ InputManager: type: 1 axis: 2 joyNum: 0 - - serializedVersion: 3 - m_Name: Horizontal - descriptiveName: - descriptiveNegativeName: - negativeButton: - positiveButton: - altNegativeButton: - altPositiveButton: - gravity: 0 - dead: 0.19 - sensitivity: 1 - snap: 0 - invert: 0 - type: 2 - axis: 0 - joyNum: 0 - - serializedVersion: 3 - m_Name: Vertical - descriptiveName: - descriptiveNegativeName: - negativeButton: - positiveButton: - altNegativeButton: - altPositiveButton: - gravity: 0 - dead: 0.19 - sensitivity: 1 - snap: 0 - invert: 1 - type: 2 - axis: 1 - joyNum: 0 - - serializedVersion: 3 - m_Name: Fire1 - descriptiveName: - descriptiveNegativeName: - negativeButton: - positiveButton: joystick button 0 - altNegativeButton: - altPositiveButton: - gravity: 1000 - dead: 0.001 - sensitivity: 1000 - snap: 0 - invert: 0 - type: 0 - axis: 0 - joyNum: 0 - - serializedVersion: 3 - m_Name: Fire2 - descriptiveName: - descriptiveNegativeName: - negativeButton: - positiveButton: joystick button 1 - altNegativeButton: - altPositiveButton: - gravity: 1000 - dead: 0.001 - sensitivity: 1000 - snap: 0 - invert: 0 - type: 0 - axis: 0 - joyNum: 0 - - serializedVersion: 3 - m_Name: Fire3 - descriptiveName: - descriptiveNegativeName: - negativeButton: - positiveButton: joystick button 2 - altNegativeButton: - altPositiveButton: - gravity: 1000 - dead: 0.001 - sensitivity: 1000 - snap: 0 - invert: 0 - type: 0 - axis: 0 - joyNum: 0 - - serializedVersion: 3 - m_Name: Jump - descriptiveName: - descriptiveNegativeName: - negativeButton: - positiveButton: joystick button 3 - altNegativeButton: - altPositiveButton: - gravity: 1000 - dead: 0.001 - sensitivity: 1000 - snap: 0 - invert: 0 - type: 0 - axis: 0 - joyNum: 0 - - serializedVersion: 3 - m_Name: Submit - descriptiveName: - descriptiveNegativeName: - negativeButton: - positiveButton: return - altNegativeButton: - altPositiveButton: joystick button 0 - gravity: 1000 - dead: 0.001 - sensitivity: 1000 - snap: 0 - invert: 0 - type: 0 - axis: 0 - joyNum: 0 - - serializedVersion: 3 - m_Name: Submit - descriptiveName: - descriptiveNegativeName: - negativeButton: - positiveButton: enter - altNegativeButton: - altPositiveButton: space - gravity: 1000 - dead: 0.001 - sensitivity: 1000 - snap: 0 - invert: 0 - type: 0 - axis: 0 - joyNum: 0 - - serializedVersion: 3 - m_Name: Cancel - descriptiveName: - descriptiveNegativeName: - negativeButton: - positiveButton: escape - altNegativeButton: - altPositiveButton: joystick button 1 - gravity: 1000 - dead: 0.001 - sensitivity: 1000 - snap: 0 - invert: 0 - type: 0 - axis: 0 - joyNum: 0