From 07852b94068dc3cd7e67588f8b775e3ec8b7d6a4 Mon Sep 17 00:00:00 2001 From: Andrei Gavra Date: Mon, 1 Jul 2019 20:48:31 +0300 Subject: [PATCH] Almost nothing --- Assets/Animations/Misc.meta | 8 + Assets/Animations/Misc/New Animation.anim | 53 +++++++ .../Animations/Misc/New Animation.anim.meta | 8 + Assets/Animations/Misc/Pulverise.anim | 77 ++++++++++ Assets/Animations/Misc/Pulverise.anim.meta | 8 + Assets/Animations/Misc/Pulverised.controller | 93 ++++++++++++ .../Misc/Pulverised.controller.meta | 8 + .../Misc/RespawnPosition.controller | 72 +++++++++ .../Misc/RespawnPosition.controller.meta | 8 + Assets/Prefabs/Ammo/Bomb.prefab | 93 +++++++++--- Assets/Prefabs/Ammo/Explosion.prefab | 121 ++++++++++------ Assets/Prefabs/RespawnPosition.prefab | 20 +++ .../Walls/destructible_high_snow.prefab | 21 +++ Assets/Prefabs/Walls/destructible_snow.prefab | 23 ++- Assets/Scenes/BombScene.unity | 137 +++++++++++++----- Assets/Scenes/SampleScene2.unity | 2 +- Assets/Scripts/src/Ammo/BombController.cs | 10 +- Assets/Scripts/src/Wall/DestructibleWall.cs | 11 +- .../Ammo/bman_spritesheet_bomb_v01-03.png | Bin 0 -> 23854 bytes .../bman_spritesheet_bomb_v01-03.png.meta | 88 +++++++++++ ProjectSettings/Physics2DSettings.asset | 2 +- 21 files changed, 754 insertions(+), 109 deletions(-) create mode 100644 Assets/Animations/Misc.meta create mode 100644 Assets/Animations/Misc/New Animation.anim create mode 100644 Assets/Animations/Misc/New Animation.anim.meta create mode 100644 Assets/Animations/Misc/Pulverise.anim create mode 100644 Assets/Animations/Misc/Pulverise.anim.meta create mode 100644 Assets/Animations/Misc/Pulverised.controller create mode 100644 Assets/Animations/Misc/Pulverised.controller.meta create mode 100644 Assets/Animations/Misc/RespawnPosition.controller create mode 100644 Assets/Animations/Misc/RespawnPosition.controller.meta create mode 100644 Assets/Sprites/Ammo/bman_spritesheet_bomb_v01-03.png create mode 100644 Assets/Sprites/Ammo/bman_spritesheet_bomb_v01-03.png.meta diff --git a/Assets/Animations/Misc.meta b/Assets/Animations/Misc.meta new file mode 100644 index 0000000..a09e941 --- /dev/null +++ b/Assets/Animations/Misc.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 55efdd6010414554092e24563071b9f7 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Animations/Misc/New Animation.anim b/Assets/Animations/Misc/New Animation.anim new file mode 100644 index 0000000..6f2c2b0 --- /dev/null +++ b/Assets/Animations/Misc/New Animation.anim @@ -0,0 +1,53 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: New Animation + 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: [] + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: [] + pptrCurveMapping: [] + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 1 + 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_Events: [] diff --git a/Assets/Animations/Misc/New Animation.anim.meta b/Assets/Animations/Misc/New Animation.anim.meta new file mode 100644 index 0000000..db7cb13 --- /dev/null +++ b/Assets/Animations/Misc/New Animation.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 79ce70887698d1346967cbaf607d171d +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Animations/Misc/Pulverise.anim b/Assets/Animations/Misc/Pulverise.anim new file mode 100644 index 0000000..e2bedcb --- /dev/null +++ b/Assets/Animations/Misc/Pulverise.anim @@ -0,0 +1,77 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Pulverise + 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: 21300052, guid: 1611b607563ac5b4d919348f10e92487, type: 3} + - time: 0.06666667 + value: {fileID: 21300054, guid: 1611b607563ac5b4d919348f10e92487, type: 3} + - time: 0.13333334 + value: {fileID: 21300056, guid: 1611b607563ac5b4d919348f10e92487, type: 3} + - time: 0.2 + value: {fileID: 21300058, guid: 1611b607563ac5b4d919348f10e92487, type: 3} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + m_SampleRate: 15 + 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: 21300052, guid: 1611b607563ac5b4d919348f10e92487, type: 3} + - {fileID: 21300054, guid: 1611b607563ac5b4d919348f10e92487, type: 3} + - {fileID: 21300056, guid: 1611b607563ac5b4d919348f10e92487, type: 3} + - {fileID: 21300058, guid: 1611b607563ac5b4d919348f10e92487, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.26666668 + 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_Events: [] diff --git a/Assets/Animations/Misc/Pulverise.anim.meta b/Assets/Animations/Misc/Pulverise.anim.meta new file mode 100644 index 0000000..0cbf6f5 --- /dev/null +++ b/Assets/Animations/Misc/Pulverise.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 536dece361312c14bac0cf30829bee84 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Animations/Misc/Pulverised.controller b/Assets/Animations/Misc/Pulverised.controller new file mode 100644 index 0000000..043de82 --- /dev/null +++ b/Assets/Animations/Misc/Pulverised.controller @@ -0,0 +1,93 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!91 &9100000 +AnimatorController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Pulverised + serializedVersion: 5 + m_AnimatorParameters: + - m_Name: Blend + m_Type: 1 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 0} + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: 1107354719584562404} + 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!206 &206365093828297014 +BlendTree: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Blend Tree + m_Childs: [] + m_BlendParameter: Blend + m_BlendParameterY: Blend + m_MinThreshold: 0 + m_MaxThreshold: 1 + m_UseAutomaticThresholds: 1 + m_NormalizedBlendValues: 0 + m_BlendType: 0 +--- !u!1102 &1102215421647958874 +AnimatorState: + serializedVersion: 5 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Pulverise + m_Speed: 1 + 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: 206365093828297014} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1107 &1107354719584562404 +AnimatorStateMachine: + serializedVersion: 5 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Base Layer + m_ChildStates: + - serializedVersion: 1 + m_State: {fileID: 1102215421647958874} + m_Position: {x: 264, y: 72, z: 0} + m_ChildStateMachines: [] + m_AnyStateTransitions: [] + m_EntryTransitions: [] + m_StateMachineTransitions: {} + m_StateMachineBehaviours: [] + m_AnyStatePosition: {x: 48, y: 24, z: 0} + m_EntryPosition: {x: 48, y: 120, z: 0} + m_ExitPosition: {x: 800, y: 120, z: 0} + m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} + m_DefaultState: {fileID: 1102215421647958874} diff --git a/Assets/Animations/Misc/Pulverised.controller.meta b/Assets/Animations/Misc/Pulverised.controller.meta new file mode 100644 index 0000000..d427a88 --- /dev/null +++ b/Assets/Animations/Misc/Pulverised.controller.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f99f14e77d0442846ba579190dffc1c2 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 9100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Animations/Misc/RespawnPosition.controller b/Assets/Animations/Misc/RespawnPosition.controller new file mode 100644 index 0000000..b474d0a --- /dev/null +++ b/Assets/Animations/Misc/RespawnPosition.controller @@ -0,0 +1,72 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!91 &9100000 +AnimatorController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: RespawnPosition + serializedVersion: 5 + m_AnimatorParameters: [] + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: 1107214311928363052} + 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 &1102082738737299528 +AnimatorState: + serializedVersion: 5 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Pulverise + m_Speed: 1 + 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: 536dece361312c14bac0cf30829bee84, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1107 &1107214311928363052 +AnimatorStateMachine: + serializedVersion: 5 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Base Layer + m_ChildStates: + - serializedVersion: 1 + m_State: {fileID: 1102082738737299528} + m_Position: {x: 200, y: 0, 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: 1102082738737299528} diff --git a/Assets/Animations/Misc/RespawnPosition.controller.meta b/Assets/Animations/Misc/RespawnPosition.controller.meta new file mode 100644 index 0000000..ecf84c9 --- /dev/null +++ b/Assets/Animations/Misc/RespawnPosition.controller.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 621169a4828cad04ba17bb6ddfae4979 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 9100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Ammo/Bomb.prefab b/Assets/Prefabs/Ammo/Bomb.prefab index ca849ce..ef8c415 100644 --- a/Assets/Prefabs/Ammo/Bomb.prefab +++ b/Assets/Prefabs/Ammo/Bomb.prefab @@ -1,6 +1,6 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &5909392949477884267 +--- !u!1 &4697357098161651588 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -8,40 +8,37 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 6884214445299032247} - - component: {fileID: 1758273947879077417} - - component: {fileID: 8277411166637495994} - - component: {fileID: 1412018915745597861} - - component: {fileID: 662054772667612550} + - component: {fileID: 7051718864318870241} + - component: {fileID: 5205340436538485392} + - component: {fileID: 9038174535399619494} m_Layer: 0 - m_Name: Bomb - m_TagString: Bomb + m_Name: Sprite + m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &6884214445299032247 +--- !u!4 &7051718864318870241 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5909392949477884267} + m_GameObject: {fileID: 4697357098161651588} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0.0552, y: 0.0418, z: 0} - m_LocalScale: {x: 1, y: 1, z: 0} - m_Children: - - {fileID: 6508079771898401246} - m_Father: {fileID: 0} - m_RootOrder: 0 + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 6884214445299032247} + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!212 &1758273947879077417 +--- !u!212 &5205340436538485392 SpriteRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5909392949477884267} + m_GameObject: {fileID: 4697357098161651588} m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 @@ -83,6 +80,60 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 1 +--- !u!95 &9038174535399619494 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4697357098161651588} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 59ef0a1e37fe3024a8d436860c0fcafb, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!1 &5909392949477884267 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6884214445299032247} + - component: {fileID: 8277411166637495994} + - component: {fileID: 1412018915745597861} + - component: {fileID: 662054772667612550} + m_Layer: 0 + m_Name: Bomb + m_TagString: Bomb + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6884214445299032247 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5909392949477884267} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0.0552, y: 0.0418, z: 0} + m_LocalScale: {x: 1, y: 1, z: 0} + m_Children: + - {fileID: 6508079771898401246} + - {fileID: 7051718864318870241} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &8277411166637495994 MonoBehaviour: m_ObjectHideFlags: 0 @@ -147,7 +198,7 @@ GameObject: m_Component: - component: {fileID: 6508079771898401246} - component: {fileID: 2175931883523803554} - m_Layer: 8 + m_Layer: 0 m_Name: 2DCollider m_TagString: Bomb m_Icon: {fileID: 0} @@ -181,7 +232,7 @@ BoxCollider2D: m_IsTrigger: 1 m_UsedByEffector: 0 m_UsedByComposite: 0 - m_Offset: {x: 0.52, y: 0.48} + m_Offset: {x: 0.5, y: 0.5} m_SpriteTilingProperty: border: {x: 0, y: 0, z: 0, w: 0} pivot: {x: 0, y: 0} @@ -192,5 +243,5 @@ BoxCollider2D: adaptiveTiling: 0 m_AutoTiling: 0 serializedVersion: 2 - m_Size: {x: 1.01, y: 0.75} + m_Size: {x: 0.9, y: 0.9} m_EdgeRadius: 0 diff --git a/Assets/Prefabs/Ammo/Explosion.prefab b/Assets/Prefabs/Ammo/Explosion.prefab index a5ccc5a..aa53f6d 100644 --- a/Assets/Prefabs/Ammo/Explosion.prefab +++ b/Assets/Prefabs/Ammo/Explosion.prefab @@ -9,10 +9,8 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 2219719956326328737} - - component: {fileID: 105666002419767893} - component: {fileID: 2976769454423190410} - component: {fileID: 5317321277803550577} - - component: {fileID: 2410738329680383200} m_Layer: 0 m_Name: Explosion m_TagString: Explosion @@ -30,18 +28,89 @@ Transform: 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_Children: + - {fileID: 8737805297418370719} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!212 &105666002419767893 -SpriteRenderer: +--- !u!114 &2976769454423190410 +MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2086996798441195857} m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 00b7acc459217644283ce8202cadcded, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!61 &5317321277803550577 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2086996798441195857} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0.5, y: 0.5} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0, y: 0} + oldSize: {x: 1, y: 1} + newSize: {x: 1.28, y: 1.28} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 0.5, y: 0.5} + m_EdgeRadius: 0 +--- !u!1 &5120645164323341697 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8737805297418370719} + - component: {fileID: 4831945246361153012} + - component: {fileID: 5454153158745391500} + m_Layer: 0 + m_Name: Sprite + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8737805297418370719 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5120645164323341697} + 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: 2219719956326328737} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &4831945246361153012 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5120645164323341697} + m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 @@ -82,52 +151,14 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 1 ---- !u!114 &2976769454423190410 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2086996798441195857} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 00b7acc459217644283ce8202cadcded, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!61 &5317321277803550577 -BoxCollider2D: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2086996798441195857} - m_Enabled: 1 - m_Density: 1 - m_Material: {fileID: 0} - m_IsTrigger: 1 - m_UsedByEffector: 0 - m_UsedByComposite: 0 - m_Offset: {x: 0.53872055, y: 0.5387204} - m_SpriteTilingProperty: - border: {x: 0, y: 0, z: 0, w: 0} - pivot: {x: 0, y: 0} - oldSize: {x: 1, y: 1} - newSize: {x: 1.28, y: 1.28} - adaptiveTilingThreshold: 0.5 - drawMode: 0 - adaptiveTiling: 0 - m_AutoTiling: 0 - serializedVersion: 2 - m_Size: {x: 1.0666667, y: 1.0666667} - m_EdgeRadius: 0 ---- !u!95 &2410738329680383200 +--- !u!95 &5454153158745391500 Animator: serializedVersion: 3 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2086996798441195857} + m_GameObject: {fileID: 5120645164323341697} m_Enabled: 1 m_Avatar: {fileID: 0} m_Controller: {fileID: 9100000, guid: a351957d95100344b99c9f5dc6c97ae4, type: 2} diff --git a/Assets/Prefabs/RespawnPosition.prefab b/Assets/Prefabs/RespawnPosition.prefab index 8a5545c..c684728 100644 --- a/Assets/Prefabs/RespawnPosition.prefab +++ b/Assets/Prefabs/RespawnPosition.prefab @@ -9,6 +9,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 9082059503774285365} + - component: {fileID: 4558977740769419058} m_Layer: 0 m_Name: RespawnPosition m_TagString: Untagged @@ -30,3 +31,22 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!95 &4558977740769419058 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9082059503774285364} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 0} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorControllerStateOnDisable: 0 diff --git a/Assets/Prefabs/Walls/destructible_high_snow.prefab b/Assets/Prefabs/Walls/destructible_high_snow.prefab index 801cc1c..38ca5e3 100644 --- a/Assets/Prefabs/Walls/destructible_high_snow.prefab +++ b/Assets/Prefabs/Walls/destructible_high_snow.prefab @@ -10,6 +10,7 @@ GameObject: m_Component: - component: {fileID: 5407421983573782568} - component: {fileID: 8221087269156402184} + - component: {fileID: 9007082834052858790} m_Layer: 0 m_Name: Sprite m_TagString: Untagged @@ -79,6 +80,25 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!95 &9007082834052858790 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2151260512302392238} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: f99f14e77d0442846ba579190dffc1c2, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorControllerStateOnDisable: 0 --- !u!1 &8729402555587492036 GameObject: m_ObjectHideFlags: 0 @@ -189,3 +209,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: f76d22fdcb894023bd111d6b5bc1da5e, type: 3} m_Name: m_EditorClassIdentifier: + secondsToWait: 0.1 diff --git a/Assets/Prefabs/Walls/destructible_snow.prefab b/Assets/Prefabs/Walls/destructible_snow.prefab index eeaeb71..6547ed6 100644 --- a/Assets/Prefabs/Walls/destructible_snow.prefab +++ b/Assets/Prefabs/Walls/destructible_snow.prefab @@ -14,7 +14,7 @@ GameObject: - component: {fileID: 2823577682722293689} - component: {fileID: 4525879622828546227} m_Layer: 8 - m_Name: bman_destructible_wall1 + m_Name: destructible_snow m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -110,6 +110,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: f76d22fdcb894023bd111d6b5bc1da5e, type: 3} m_Name: m_EditorClassIdentifier: + secondsToWait: 0.1 --- !u!1 &5688352134163068791 GameObject: m_ObjectHideFlags: 0 @@ -120,6 +121,7 @@ GameObject: m_Component: - component: {fileID: 8553251917334281199} - component: {fileID: 2562328647522734305} + - component: {fileID: 1235137903643130781} m_Layer: 8 m_Name: Sprite m_TagString: Untagged @@ -189,3 +191,22 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!95 &1235137903643130781 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5688352134163068791} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: f99f14e77d0442846ba579190dffc1c2, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorControllerStateOnDisable: 0 diff --git a/Assets/Scenes/BombScene.unity b/Assets/Scenes/BombScene.unity index b271000..e2bf4b7 100644 --- a/Assets/Scenes/BombScene.unity +++ b/Assets/Scenes/BombScene.unity @@ -247,7 +247,7 @@ PrefabInstance: - target: {fileID: 4177940729222266821, guid: da559e681f8d34d58bb5f3457045664a, type: 3} propertyPath: m_RootOrder - value: 3 + value: 6 objectReference: {fileID: 0} - target: {fileID: 4177940729222266821, guid: da559e681f8d34d58bb5f3457045664a, type: 3} @@ -294,7 +294,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 35 + m_RootOrder: 36 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &266944714 GameObject: @@ -364,7 +364,7 @@ Transform: m_Children: - {fileID: 97386695} m_Father: {fileID: 0} - m_RootOrder: 33 + m_RootOrder: 34 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &266944717 MonoBehaviour: @@ -433,7 +433,7 @@ PrefabInstance: - target: {fileID: 4177940729222266821, guid: da559e681f8d34d58bb5f3457045664a, type: 3} propertyPath: m_RootOrder - value: 12 + value: 15 objectReference: {fileID: 0} - target: {fileID: 4177940729222266821, guid: da559e681f8d34d58bb5f3457045664a, type: 3} @@ -502,7 +502,7 @@ PrefabInstance: - target: {fileID: 4177940729222266821, guid: da559e681f8d34d58bb5f3457045664a, type: 3} propertyPath: m_RootOrder - value: 17 + value: 20 objectReference: {fileID: 0} - target: {fileID: 4177940729222266821, guid: da559e681f8d34d58bb5f3457045664a, type: 3} @@ -571,7 +571,7 @@ PrefabInstance: - target: {fileID: 644191348100887617, guid: e719de70e335f4e49ae40cc6731309d4, type: 3} propertyPath: m_RootOrder - value: 21 + value: 24 objectReference: {fileID: 0} - target: {fileID: 644191348100887617, guid: e719de70e335f4e49ae40cc6731309d4, type: 3} @@ -645,7 +645,7 @@ PrefabInstance: - target: {fileID: 4177940729222266821, guid: da559e681f8d34d58bb5f3457045664a, type: 3} propertyPath: m_RootOrder - value: 2 + value: 4 objectReference: {fileID: 0} - target: {fileID: 4177940729222266821, guid: da559e681f8d34d58bb5f3457045664a, type: 3} @@ -714,7 +714,7 @@ PrefabInstance: - target: {fileID: 4177940729222266821, guid: da559e681f8d34d58bb5f3457045664a, type: 3} propertyPath: m_RootOrder - value: 14 + value: 17 objectReference: {fileID: 0} - target: {fileID: 4177940729222266821, guid: da559e681f8d34d58bb5f3457045664a, type: 3} @@ -783,7 +783,7 @@ PrefabInstance: - target: {fileID: 4177940729222266821, guid: da559e681f8d34d58bb5f3457045664a, type: 3} propertyPath: m_RootOrder - value: 7 + value: 10 objectReference: {fileID: 0} - target: {fileID: 4177940729222266821, guid: da559e681f8d34d58bb5f3457045664a, type: 3} @@ -972,7 +972,7 @@ PrefabInstance: - target: {fileID: 3746656334748574901, guid: fe8fb4e4a7e127648b306469b723d81e, type: 3} propertyPath: m_RootOrder - value: 3 + value: 5 objectReference: {fileID: 0} - target: {fileID: 3746656334748574901, guid: fe8fb4e4a7e127648b306469b723d81e, type: 3} @@ -1033,7 +1033,7 @@ Transform: m_Children: - {fileID: 1057764284} m_Father: {fileID: 0} - m_RootOrder: 32 + m_RootOrder: 33 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &631584947 PrefabInstance: @@ -1085,7 +1085,7 @@ PrefabInstance: - target: {fileID: 4177940729222266821, guid: da559e681f8d34d58bb5f3457045664a, type: 3} propertyPath: m_RootOrder - value: 20 + value: 23 objectReference: {fileID: 0} - target: {fileID: 4177940729222266821, guid: da559e681f8d34d58bb5f3457045664a, type: 3} @@ -1154,7 +1154,7 @@ PrefabInstance: - target: {fileID: 4177940729222266821, guid: da559e681f8d34d58bb5f3457045664a, type: 3} propertyPath: m_RootOrder - value: 13 + value: 16 objectReference: {fileID: 0} - target: {fileID: 4177940729222266821, guid: da559e681f8d34d58bb5f3457045664a, type: 3} @@ -1223,7 +1223,7 @@ PrefabInstance: - target: {fileID: 4177940729222266821, guid: da559e681f8d34d58bb5f3457045664a, type: 3} propertyPath: m_RootOrder - value: 18 + value: 21 objectReference: {fileID: 0} - target: {fileID: 4177940729222266821, guid: da559e681f8d34d58bb5f3457045664a, type: 3} @@ -1292,7 +1292,7 @@ PrefabInstance: - target: {fileID: 938747944624895500, guid: 7e54504f1e1de4334be2e6a115b838c2, type: 3} propertyPath: m_RootOrder - value: 27 + value: 31 objectReference: {fileID: 0} - target: {fileID: 938747944624895500, guid: 7e54504f1e1de4334be2e6a115b838c2, type: 3} @@ -1311,6 +1311,75 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 7e54504f1e1de4334be2e6a115b838c2, type: 3} +--- !u!1001 &1035159237 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 158905820630581597, guid: fdaa7451ab31b477b930076bbc888bab, + type: 3} + propertyPath: m_Name + value: GameManager + objectReference: {fileID: 0} + - target: {fileID: 158905820630581587, guid: fdaa7451ab31b477b930076bbc888bab, + type: 3} + propertyPath: m_LocalPosition.x + value: 7.2735596 + objectReference: {fileID: 0} + - target: {fileID: 158905820630581587, guid: fdaa7451ab31b477b930076bbc888bab, + type: 3} + propertyPath: m_LocalPosition.y + value: -6.5702896 + objectReference: {fileID: 0} + - target: {fileID: 158905820630581587, guid: fdaa7451ab31b477b930076bbc888bab, + type: 3} + propertyPath: m_LocalPosition.z + value: -10.295408 + objectReference: {fileID: 0} + - target: {fileID: 158905820630581587, guid: fdaa7451ab31b477b930076bbc888bab, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 158905820630581587, guid: fdaa7451ab31b477b930076bbc888bab, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 158905820630581587, guid: fdaa7451ab31b477b930076bbc888bab, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 158905820630581587, guid: fdaa7451ab31b477b930076bbc888bab, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 158905820630581587, guid: fdaa7451ab31b477b930076bbc888bab, + type: 3} + propertyPath: m_RootOrder + value: 26 + objectReference: {fileID: 0} + - target: {fileID: 158905820630581587, guid: fdaa7451ab31b477b930076bbc888bab, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 158905820630581587, guid: fdaa7451ab31b477b930076bbc888bab, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 158905820630581587, guid: fdaa7451ab31b477b930076bbc888bab, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: fdaa7451ab31b477b930076bbc888bab, type: 3} --- !u!1 &1057764283 GameObject: m_ObjectHideFlags: 0 @@ -9101,7 +9170,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 34 + m_RootOrder: 35 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1313336368 PrefabInstance: @@ -9153,7 +9222,7 @@ PrefabInstance: - target: {fileID: 4177940729222266821, guid: da559e681f8d34d58bb5f3457045664a, type: 3} propertyPath: m_RootOrder - value: 15 + value: 18 objectReference: {fileID: 0} - target: {fileID: 4177940729222266821, guid: da559e681f8d34d58bb5f3457045664a, type: 3} @@ -9222,7 +9291,7 @@ PrefabInstance: - target: {fileID: 3746656334748574901, guid: fe8fb4e4a7e127648b306469b723d81e, type: 3} propertyPath: m_RootOrder - value: 1 + value: 2 objectReference: {fileID: 0} - target: {fileID: 3746656334748574901, guid: fe8fb4e4a7e127648b306469b723d81e, type: 3} @@ -9291,7 +9360,7 @@ PrefabInstance: - target: {fileID: 644191348100887617, guid: e719de70e335f4e49ae40cc6731309d4, type: 3} propertyPath: m_RootOrder - value: 23 + value: 27 objectReference: {fileID: 0} - target: {fileID: 644191348100887617, guid: e719de70e335f4e49ae40cc6731309d4, type: 3} @@ -9370,7 +9439,7 @@ PrefabInstance: - target: {fileID: 6843575828445418654, guid: d3055091a17dc4aa1accf2e33ccef144, type: 3} propertyPath: m_RootOrder - value: 24 + value: 28 objectReference: {fileID: 0} - target: {fileID: 6843575828445418654, guid: d3055091a17dc4aa1accf2e33ccef144, type: 3} @@ -9443,7 +9512,7 @@ PrefabInstance: - target: {fileID: 4177940729222266821, guid: da559e681f8d34d58bb5f3457045664a, type: 3} propertyPath: m_RootOrder - value: 4 + value: 7 objectReference: {fileID: 0} - target: {fileID: 4177940729222266821, guid: da559e681f8d34d58bb5f3457045664a, type: 3} @@ -9512,7 +9581,7 @@ PrefabInstance: - target: {fileID: 4177940729222266821, guid: da559e681f8d34d58bb5f3457045664a, type: 3} propertyPath: m_RootOrder - value: 6 + value: 9 objectReference: {fileID: 0} - target: {fileID: 4177940729222266821, guid: da559e681f8d34d58bb5f3457045664a, type: 3} @@ -9581,7 +9650,7 @@ PrefabInstance: - target: {fileID: 4177940729222266821, guid: da559e681f8d34d58bb5f3457045664a, type: 3} propertyPath: m_RootOrder - value: 11 + value: 14 objectReference: {fileID: 0} - target: {fileID: 4177940729222266821, guid: da559e681f8d34d58bb5f3457045664a, type: 3} @@ -9719,7 +9788,7 @@ PrefabInstance: - target: {fileID: 4177940729222266821, guid: da559e681f8d34d58bb5f3457045664a, type: 3} propertyPath: m_RootOrder - value: 10 + value: 13 objectReference: {fileID: 0} - target: {fileID: 4177940729222266821, guid: da559e681f8d34d58bb5f3457045664a, type: 3} @@ -9788,7 +9857,7 @@ PrefabInstance: - target: {fileID: 4177940729222266821, guid: da559e681f8d34d58bb5f3457045664a, type: 3} propertyPath: m_RootOrder - value: 8 + value: 11 objectReference: {fileID: 0} - target: {fileID: 4177940729222266821, guid: da559e681f8d34d58bb5f3457045664a, type: 3} @@ -9857,7 +9926,7 @@ PrefabInstance: - target: {fileID: 3746656334748574901, guid: fe8fb4e4a7e127648b306469b723d81e, type: 3} propertyPath: m_RootOrder - value: 2 + value: 3 objectReference: {fileID: 0} - target: {fileID: 3746656334748574901, guid: fe8fb4e4a7e127648b306469b723d81e, type: 3} @@ -9926,7 +9995,7 @@ PrefabInstance: - target: {fileID: 938747944624895500, guid: 7e54504f1e1de4334be2e6a115b838c2, type: 3} propertyPath: m_RootOrder - value: 26 + value: 30 objectReference: {fileID: 0} - target: {fileID: 938747944624895500, guid: 7e54504f1e1de4334be2e6a115b838c2, type: 3} @@ -9995,7 +10064,7 @@ PrefabInstance: - target: {fileID: 4177940729222266821, guid: da559e681f8d34d58bb5f3457045664a, type: 3} propertyPath: m_RootOrder - value: 9 + value: 12 objectReference: {fileID: 0} - target: {fileID: 4177940729222266821, guid: da559e681f8d34d58bb5f3457045664a, type: 3} @@ -10064,7 +10133,7 @@ PrefabInstance: - target: {fileID: 4177940729222266821, guid: da559e681f8d34d58bb5f3457045664a, type: 3} propertyPath: m_RootOrder - value: 19 + value: 22 objectReference: {fileID: 0} - target: {fileID: 4177940729222266821, guid: da559e681f8d34d58bb5f3457045664a, type: 3} @@ -10133,7 +10202,7 @@ PrefabInstance: - target: {fileID: 4177940729222266821, guid: da559e681f8d34d58bb5f3457045664a, type: 3} propertyPath: m_RootOrder - value: 25 + value: 29 objectReference: {fileID: 0} - target: {fileID: 4177940729222266821, guid: da559e681f8d34d58bb5f3457045664a, type: 3} @@ -10202,7 +10271,7 @@ PrefabInstance: - target: {fileID: 4177940729222266821, guid: da559e681f8d34d58bb5f3457045664a, type: 3} propertyPath: m_RootOrder - value: 5 + value: 8 objectReference: {fileID: 0} - target: {fileID: 4177940729222266821, guid: da559e681f8d34d58bb5f3457045664a, type: 3} @@ -10271,7 +10340,7 @@ PrefabInstance: - target: {fileID: 4177940729222266821, guid: da559e681f8d34d58bb5f3457045664a, type: 3} propertyPath: m_RootOrder - value: 16 + value: 19 objectReference: {fileID: 0} - target: {fileID: 4177940729222266821, guid: da559e681f8d34d58bb5f3457045664a, type: 3} @@ -10340,7 +10409,7 @@ PrefabInstance: - target: {fileID: 644191348100887617, guid: e719de70e335f4e49ae40cc6731309d4, type: 3} propertyPath: m_RootOrder - value: 22 + value: 25 objectReference: {fileID: 0} - target: {fileID: 644191348100887617, guid: e719de70e335f4e49ae40cc6731309d4, type: 3} @@ -10414,7 +10483,7 @@ PrefabInstance: - target: {fileID: 1896072655702505676, guid: c9b7903151183144dbf30c9b2ab371b2, type: 3} propertyPath: m_RootOrder - value: 28 + value: 32 objectReference: {fileID: 0} - target: {fileID: 1896072655702505676, guid: c9b7903151183144dbf30c9b2ab371b2, type: 3} diff --git a/Assets/Scenes/SampleScene2.unity b/Assets/Scenes/SampleScene2.unity index 058e54b..34cebb9 100644 --- a/Assets/Scenes/SampleScene2.unity +++ b/Assets/Scenes/SampleScene2.unity @@ -404,7 +404,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 519420028} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 14.768887, y: -4.0430503, z: -10} + m_LocalPosition: {x: 7.7731028, y: -4.0430503, z: -10} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} diff --git a/Assets/Scripts/src/Ammo/BombController.cs b/Assets/Scripts/src/Ammo/BombController.cs index f458f7a..ce06343 100644 --- a/Assets/Scripts/src/Ammo/BombController.cs +++ b/Assets/Scripts/src/Ammo/BombController.cs @@ -22,14 +22,15 @@ namespace src.Ammo { Instantiate(explosionPrefab, transform.position, Quaternion.identity); - GetComponent().enabled = false; - transform.Find("2DCollider").gameObject.SetActive(false); + GetComponentInChildren().enabled = false; StartCoroutine(CreateExplosions(Vector3.down)); StartCoroutine(CreateExplosions(Vector3.left)); StartCoroutine(CreateExplosions(Vector3.up)); StartCoroutine(CreateExplosions(Vector3.right)); + transform.Find("2DCollider").gameObject.SetActive(false); + _exploded = true; Destroy(gameObject, 0.55f); } @@ -39,9 +40,8 @@ namespace src.Ammo var currentPosition = transform.position; for (var i = 1; i < _bombsUtil.Power; i++) { - var distance = i == _bombsUtil.Power ? i : i - 0.5f; var hit = Physics2D.Raycast(new Vector2(currentPosition.x + 0.5f, - currentPosition.y + 0.5f), direction, distance, 1 << 8); + currentPosition.y + 0.5f), direction, i, 1 << 8); if (!hit.collider) { @@ -50,9 +50,9 @@ namespace src.Ammo } else { + Debug.Log("Hit something"); var key = hit.collider.GetComponent(); key?.onExplosion(); - break; } } diff --git a/Assets/Scripts/src/Wall/DestructibleWall.cs b/Assets/Scripts/src/Wall/DestructibleWall.cs index 240985a..c429116 100644 --- a/Assets/Scripts/src/Wall/DestructibleWall.cs +++ b/Assets/Scripts/src/Wall/DestructibleWall.cs @@ -14,10 +14,13 @@ namespace src.Wall private UpgradeManager _upgradeManager; public GameObject explosionPrefab; public GameObject exitDoorPrefab; + private Animator _animator; private void Start() { _upgradeManager = GameManager.Instance.GetUpgradeManager(); + _animator = GetComponentInChildren(); + // _animator.speed = 0; } public void SpawnsExit() @@ -49,13 +52,19 @@ namespace src.Wall var upgrade = _upgradeManager.GetUpgradePrefab(); Instantiate(upgrade, currentPosition, Quaternion.identity); } + SwapToPulverise(); + } + + private void SwapToPulverise() + { + // _animator.speed = 10; } public void onExplosion() { DebugHelper.LogInfo($"Destructible wall hit by explosion {transform.position}"); BeforeDestroy(); - Destroy(gameObject); + Destroy(gameObject, .55f); } } } \ No newline at end of file diff --git a/Assets/Sprites/Ammo/bman_spritesheet_bomb_v01-03.png b/Assets/Sprites/Ammo/bman_spritesheet_bomb_v01-03.png new file mode 100644 index 0000000000000000000000000000000000000000..ecb5637d0b2da8044d9683c10980916417660fe9 GIT binary patch literal 23854 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 literal 0 HcmV?d00001 diff --git a/Assets/Sprites/Ammo/bman_spritesheet_bomb_v01-03.png.meta b/Assets/Sprites/Ammo/bman_spritesheet_bomb_v01-03.png.meta new file mode 100644 index 0000000..434b35a --- /dev/null +++ b/Assets/Sprites/Ammo/bman_spritesheet_bomb_v01-03.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: 4c4ca1cd54e20a048ac5674d71a90858 +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + 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 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + 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 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: f834b41e5db02f440ba85b29a7440b42 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/ProjectSettings/Physics2DSettings.asset b/ProjectSettings/Physics2DSettings.asset index f4abec4..8c8f397 100644 --- a/ProjectSettings/Physics2DSettings.asset +++ b/ProjectSettings/Physics2DSettings.asset @@ -53,4 +53,4 @@ Physics2DSettings: m_ColliderAsleepColor: {r: 0.5686275, g: 0.95686275, b: 0.54509807, a: 0.36078432} m_ColliderContactColor: {r: 1, g: 0, b: 1, a: 0.6862745} m_ColliderAABBColor: {r: 1, g: 1, b: 0, a: 0.2509804} - m_LayerCollisionMatrix: fffbffffff3bffffff3bffffffffffffff3bfffffffbfffffffffffffffffffffffbffffffffffffc83affffffffffffffffffffffffffffe93bffffe9bbffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff + m_LayerCollisionMatrix: fffbffffff3bffffff3bffffffffffffff3bfffffffbfffffffffffffffffffffffbffffffffffffc80affffffffffffff7bfffffffbffffe93bffffe9abffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff