diff --git a/Assets/Prefabs/Fireball.prefab b/Assets/Prefabs/Fireball.prefab index 944b93e..6894a85 100644 --- a/Assets/Prefabs/Fireball.prefab +++ b/Assets/Prefabs/Fireball.prefab @@ -648,6 +648,7 @@ GameObject: - component: {fileID: -6779566855310870620} - component: {fileID: -3086558469575312007} - component: {fileID: 675591839127287660} + - component: {fileID: 3094641793885824954} m_Layer: 0 m_Name: Fireball m_TagString: Untagged @@ -744,7 +745,6 @@ MonoBehaviour: - {fileID: 3119057312710479026} - {fileID: 7413032045150601107} - {fileID: 7633761631504793847} - destination: {x: 0, y: 0, z: 0} --- !u!61 &-3086558469575312007 BoxCollider2D: m_ObjectHideFlags: 0 @@ -790,3 +790,24 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!50 &3094641793885824954 +Rigidbody2D: + serializedVersion: 4 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6846999857528980847} + m_BodyType: 1 + m_Simulated: 1 + m_UseFullKinematicContacts: 0 + m_UseAutoMass: 0 + m_Mass: 1 + m_LinearDrag: 0 + m_AngularDrag: 0.05 + m_GravityScale: 1 + m_Material: {fileID: 0} + m_Interpolate: 0 + m_SleepingMode: 1 + m_CollisionDetection: 0 + m_Constraints: 0 diff --git a/Assets/Scenes/Gameplay.unity b/Assets/Scenes/Gameplay.unity index b8a9b17..29fa945 100644 --- a/Assets/Scenes/Gameplay.unity +++ b/Assets/Scenes/Gameplay.unity @@ -123,6 +123,114 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} +--- !u!1 &36267658 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 36267661} + - component: {fileID: 36267660} + - component: {fileID: 36267659} + m_Layer: 0 + m_Name: ColliderOuterBoundary + m_TagString: ColliderOuterBoundary + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!68 &36267659 +EdgeCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 36267658} + 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_EdgeRadius: 0 + m_Points: + - {x: -0.17932618, y: -0.49968} + - {x: -0.18438786, y: 0.53811705} + - {x: 0.52388495, y: 0.5334146} + - {x: 0.51490104, y: -0.5290033} + - {x: -0.18596312, y: -0.5355544} + m_AdjacentStartPoint: {x: 0, y: 0} + m_AdjacentEndPoint: {x: 0, y: 0} + m_UseAdjacentStartPoint: 0 + m_UseAdjacentEndPoint: 0 +--- !u!212 &36267660 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 36267658} + m_Enabled: 0 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + 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_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + 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: 7482667652216324306, guid: 48e93eef0688c4a259cb0eddcd8661f7, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 1, y: 1} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!4 &36267661 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 36267658} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0.1096, y: 0.0353, z: 0} + m_LocalScale: {x: 19.792568, y: 10.769127, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &226149505 PrefabInstance: m_ObjectHideFlags: 0 @@ -563,7 +671,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 569685893} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -0.097918645, y: -0.20009108, z: -10} + m_LocalPosition: {x: -0.097918645, y: -0.20009108, z: -8} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 1027402150} diff --git a/Assets/Scripts/Fireball.cs b/Assets/Scripts/Fireball.cs index 4e1f0c3..0991ca2 100644 --- a/Assets/Scripts/Fireball.cs +++ b/Assets/Scripts/Fireball.cs @@ -22,4 +22,9 @@ public class Fireball : MonoBehaviour { transform.position += transform.up * speed * Time.deltaTime * -1; } + + void OnTriggerEnter2D(Collider2D collider) + { + if (collider.name == "ColliderOuterBoundary") Destroy(gameObject); + } } diff --git a/ProjectSettings/TagManager.asset b/ProjectSettings/TagManager.asset index 1577cfb..b05258a 100644 --- a/ProjectSettings/TagManager.asset +++ b/ProjectSettings/TagManager.asset @@ -5,6 +5,7 @@ TagManager: serializedVersion: 2 tags: - DragonHealthBar + - ColliderOuterBoundary layers: - Default - TransparentFX