diff --git a/Assets/Block/Block.prefab b/Assets/Block/Block.prefab index ec7c0b1..3281cc7 100644 --- a/Assets/Block/Block.prefab +++ b/Assets/Block/Block.prefab @@ -13,7 +13,7 @@ GameObject: - component: {fileID: 2323667017725586191} - component: {fileID: 8967009380059366119} - component: {fileID: 7290293607820690937} - m_Layer: 6 + m_Layer: 7 m_Name: Block m_TagString: Untagged m_Icon: {fileID: 0} @@ -138,6 +138,7 @@ MonoBehaviour: - {fileID: 8470849048189565944, guid: 07676f3c42557424c82b5586340089b9, type: 3} debrisCount: 3 explosionForce: 1 + debrisLifetime: 2 --- !u!61 &7290293607820690937 BoxCollider2D: m_ObjectHideFlags: 0 diff --git a/Assets/Block/DestructibleBlock.cs b/Assets/Block/DestructibleBlock.cs index 7624ba5..f998daa 100644 --- a/Assets/Block/DestructibleBlock.cs +++ b/Assets/Block/DestructibleBlock.cs @@ -2,37 +2,51 @@ using UnityEngine; public class DestructibleBlock : Entity { - [SerializeField] private GameObject[] debrisPrefabs; - [SerializeField] private int debrisCount = 5; - [SerializeField] private float explosionForce = 5f; + [SerializeField] private GameObject[] debrisPrefabs; + [SerializeField] private int debrisCount = 5; + [SerializeField] private float explosionForce = 5f; + [SerializeField] private float debrisLifetime = 2f; - public override void TakeDamage(int damage) + protected override void Die() { - base.TakeDamage(damage); + SpawnDebris(); + base.Die(); } - private void OnDestroy() + private void OnCollisionEnter2D(Collision2D collision) { - SpawnDebris(); + if (collision.gameObject.CompareTag("Player")) + { + Player player = collision.gameObject.GetComponent(); + if (player != null && player.IsDashing()) + { + Die(); + } + } } private void SpawnDebris() { + if (debrisPrefabs == null || debrisPrefabs.Length == 0) + { + return; + } + for (int i = 0; i < debrisCount; i++) { + Vector2 spawnPos = (Vector2)transform.position + Random.insideUnitCircle * 0.5f; GameObject prefab = debrisPrefabs[Random.Range(0, debrisPrefabs.Length)]; - Vector2 randomPos = (Vector2)transform.position + Random.insideUnitCircle * 0.5f; - GameObject debris = Instantiate(prefab, randomPos, Quaternion.identity); + GameObject debris = Instantiate(prefab, spawnPos, Quaternion.identity); Rigidbody2D rb = debris.GetComponent(); - if (rb != null) { - Vector2 dir = (randomPos - (Vector2)transform.position).normalized; - dir += Random.insideUnitCircle * 0.5f; + Vector2 dir = (spawnPos - (Vector2)transform.position).normalized; + dir += Random.insideUnitCircle * 0.5f; rb.AddForce(dir.normalized * explosionForce, ForceMode2D.Impulse); + rb.AddTorque(Random.Range(-180f, 180f)); } - Destroy(debris, 2f); + Destroy(debris, debrisLifetime); } } } \ No newline at end of file diff --git a/Assets/Block/Trap.prefab b/Assets/Block/Trap.prefab new file mode 100644 index 0000000..9818a67 --- /dev/null +++ b/Assets/Block/Trap.prefab @@ -0,0 +1,156 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &2025971683497085228 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6964338176317010345} + - component: {fileID: 5109637665812112634} + - component: {fileID: 4845338078289388792} + - component: {fileID: 8311574796361930648} + m_Layer: 3 + m_Name: Trap + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6964338176317010345 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2025971683497085228} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -0.5, y: 1.5, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &5109637665812112634 +SpriteRenderer: + serializedVersion: 2 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2025971683497085228} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} + 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_GlobalIlluminationMeshLod: 0 + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_MaskInteraction: 0 + m_Sprite: {fileID: -855298285791758126, guid: 9fc32b26c4b0b87459965e872a8507d2, 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_SpriteSortPoint: 0 +--- !u!114 &4845338078289388792 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2025971683497085228} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c81c9e0030ef823459d0d8a8f6a159e5, type: 3} + m_Name: + m_EditorClassIdentifier: Assembly-CSharp::TrapBlock + damage: 10 + activationTime: 2 + damageInterval: 1 +--- !u!61 &8311574796361930648 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2025971683497085228} + m_Enabled: 1 + serializedVersion: 3 + m_Density: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ForceSendLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ForceReceiveLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ContactCaptureLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_CallbackLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_CompositeOperation: 0 + m_CompositeOrder: 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: 1, y: 1} + newSize: {x: 1, y: 1} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + m_Size: {x: 1, y: 1} + m_EdgeRadius: 0 diff --git a/Assets/Block/Trap.prefab.meta b/Assets/Block/Trap.prefab.meta new file mode 100644 index 0000000..4340b40 --- /dev/null +++ b/Assets/Block/Trap.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: c1e04369fcd95764abcbb1a9fd356bde +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Block/TrapBlock.cs b/Assets/Block/TrapBlock.cs index 6d754b3..dc36187 100644 --- a/Assets/Block/TrapBlock.cs +++ b/Assets/Block/TrapBlock.cs @@ -1,6 +1,47 @@ +using System.Collections; using UnityEngine; public class TrapBlock : MonoBehaviour { + [SerializeField] private int damage = 10; + [SerializeField] private float activationTime = 2f; + [SerializeField] private float damageInterval = 1f; + private Coroutine trapCoroutine; + + private void OnCollisionEnter2D(Collision2D collision) + { + if (collision.gameObject.CompareTag("Player")) + { + Player player = collision.gameObject.GetComponent(); + if (player != null) + { + if (trapCoroutine != null) + { + StopCoroutine(trapCoroutine); + } + + trapCoroutine = StartCoroutine(ProcessTrapDamage(player)); + } + } + } + + private void OnCollisionExit2D(Collision2D collision) + { + if (collision.gameObject.CompareTag("Player")) + { + StopCoroutine(trapCoroutine); + trapCoroutine = null; + } + } + + private IEnumerator ProcessTrapDamage(Player player) + { + yield return new WaitForSeconds(activationTime); + while (player != null) + { + player.TakeDamage(damage); + yield return new WaitForSeconds(damageInterval); + } + } } \ No newline at end of file diff --git a/Assets/Prefabs/TestEntity.prefab b/Assets/Prefabs/TestEntity.prefab index 79c91f3..b18d95a 100644 --- a/Assets/Prefabs/TestEntity.prefab +++ b/Assets/Prefabs/TestEntity.prefab @@ -11,7 +11,6 @@ GameObject: - component: {fileID: 3182903703610233758} - component: {fileID: 3818235801779510969} - component: {fileID: 3096000554608240826} - - component: {fileID: 4449206212094151330} m_Layer: 6 m_Name: TestEntity m_TagString: Untagged @@ -139,22 +138,3 @@ BoxCollider2D: m_AutoTiling: 0 m_Size: {x: 1, y: 1} m_EdgeRadius: 0 ---- !u!114 &4449206212094151330 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3345230653483034275} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 3eada057783728046bc1f3df10f17294, type: 3} - m_Name: - m_EditorClassIdentifier: Assembly-CSharp::Entity - OnDeath: - m_PersistentCalls: - m_Calls: [] - OnTakeDamage: - m_PersistentCalls: - m_Calls: [] - data: {fileID: 11400000, guid: a5edb67c4940a4e4692478c7267fc1f8, type: 2} diff --git a/Assets/Scenes/JTestScene.unity b/Assets/Scenes/JTestScene.unity index 4d9370c..ff66110 100644 --- a/Assets/Scenes/JTestScene.unity +++ b/Assets/Scenes/JTestScene.unity @@ -127,10 +127,26 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 1665208702870125763, guid: ae58a5fa402b1d941b0878d356d1389d, type: 3} + propertyPath: m_IsTrigger + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1806294682707300264, guid: ae58a5fa402b1d941b0878d356d1389d, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} - target: {fileID: 1888074432508430436, guid: ae58a5fa402b1d941b0878d356d1389d, type: 3} propertyPath: data value: objectReference: {fileID: 11400000, guid: a5edb67c4940a4e4692478c7267fc1f8, type: 2} + - target: {fileID: 4539706167822133972, guid: ae58a5fa402b1d941b0878d356d1389d, type: 3} + propertyPath: m_LocalScale.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4539706167822133972, guid: ae58a5fa402b1d941b0878d356d1389d, type: 3} + propertyPath: m_LocalScale.y + value: 0.5 + objectReference: {fileID: 0} - target: {fileID: 4539706167822133972, guid: ae58a5fa402b1d941b0878d356d1389d, type: 3} propertyPath: m_LocalPosition.x value: -3.57 @@ -175,6 +191,10 @@ PrefabInstance: propertyPath: m_Name value: Player objectReference: {fileID: 0} + - target: {fileID: 9138407101546400895, guid: ae58a5fa402b1d941b0878d356d1389d, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: @@ -186,6 +206,84 @@ PrefabInstance: insertIndex: -1 addedObject: {fileID: 1052407373} m_SourcePrefab: {fileID: 100100000, guid: ae58a5fa402b1d941b0878d356d1389d, type: 3} +--- !u!1 &312230460 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 312230461} + - component: {fileID: 312230462} + m_Layer: 8 + m_Name: HitBox + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &312230461 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 312230460} + serializedVersion: 2 + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1117392528} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!61 &312230462 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 312230460} + m_Enabled: 1 + serializedVersion: 3 + m_Density: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ForceSendLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ForceReceiveLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ContactCaptureLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_CallbackLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_IsTrigger: 1 + m_UsedByEffector: 0 + m_CompositeOperation: 0 + m_CompositeOrder: 0 + m_Offset: {x: 0, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0, y: 0} + oldSize: {x: 0, y: 0} + newSize: {x: 0, y: 0} + adaptiveTilingThreshold: 0 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + m_Size: {x: 1, y: 1} + m_EdgeRadius: 0 --- !u!1 &435424068 GameObject: m_ObjectHideFlags: 0 @@ -231,6 +329,182 @@ Transform: - {fileID: 994327117} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &497925060 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 497925065} + - component: {fileID: 497925064} + - component: {fileID: 497925063} + - component: {fileID: 497925062} + - component: {fileID: 497925061} + m_Layer: 6 + m_Name: Circle + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!114 &497925061 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 497925060} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: acacf576fd681b94087260c82b6f530c, type: 3} + m_Name: + m_EditorClassIdentifier: Assembly-CSharp::FlyEnemyMovement + data: {fileID: 11400000, guid: a5edb67c4940a4e4692478c7267fc1f8, type: 2} + detectionRange: 8 + moveSpeed: 3 + obstacleLayer: + serializedVersion: 2 + m_Bits: 512 +--- !u!58 &497925062 +CircleCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 497925060} + m_Enabled: 1 + serializedVersion: 3 + m_Density: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ForceSendLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ForceReceiveLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ContactCaptureLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_CallbackLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_CompositeOperation: 0 + m_CompositeOrder: 0 + m_Offset: {x: 0, y: 0} + m_Radius: 0.5 +--- !u!50 &497925063 +Rigidbody2D: + serializedVersion: 5 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 497925060} + m_BodyType: 0 + m_Simulated: 1 + m_UseFullKinematicContacts: 0 + m_UseAutoMass: 0 + m_Mass: 1 + m_LinearDamping: 0 + m_AngularDamping: 0.05 + m_GravityScale: 0 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_Interpolate: 0 + m_SleepingMode: 1 + m_CollisionDetection: 0 + m_Constraints: 0 +--- !u!212 &497925064 +SpriteRenderer: + serializedVersion: 2 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 497925060} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} + 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_GlobalIlluminationMeshLod: 0 + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_MaskInteraction: 0 + m_Sprite: {fileID: -2413806693520163455, guid: a86470a33a6bf42c4b3595704624658b, 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_SpriteSortPoint: 0 +--- !u!4 &497925065 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 497925060} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 3.81169, y: -3.57282, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 889416821} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &519420028 GameObject: m_ObjectHideFlags: 0 @@ -243,7 +517,7 @@ GameObject: - component: {fileID: 519420031} - component: {fileID: 519420029} - component: {fileID: 519420030} - m_Layer: 0 + m_Layer: 9 m_Name: Main Camera m_TagString: MainCamera m_Icon: {fileID: 0} @@ -457,6 +731,87 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &889416820 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 889416821} + - component: {fileID: 889416823} + - component: {fileID: 889416822} + m_Layer: 8 + m_Name: GameObject + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &889416821 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 889416820} + serializedVersion: 2 + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 497925065} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &889416822 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 889416820} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ba177d4337a6fb748b2d22b71512d6a5, type: 3} + m_Name: + m_EditorClassIdentifier: Assembly-CSharp::EnemyHitbox +--- !u!58 &889416823 +CircleCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 889416820} + m_Enabled: 1 + serializedVersion: 3 + m_Density: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ForceSendLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ForceReceiveLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ContactCaptureLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_CallbackLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_IsTrigger: 1 + m_UsedByEffector: 0 + m_CompositeOperation: 0 + m_CompositeOrder: 0 + m_Offset: {x: 0, y: 0} + m_Radius: 0.5 --- !u!1 &994327116 GameObject: m_ObjectHideFlags: 0 @@ -469,6 +824,8 @@ GameObject: - component: {fileID: 994327119} - component: {fileID: 994327118} - component: {fileID: 994327120} + - component: {fileID: 994327122} + - component: {fileID: 994327121} m_Layer: 3 m_Name: Tilemap m_TagString: Untagged @@ -1046,6 +1403,86 @@ Tilemap: m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 + - first: {x: -16, y: -7, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: -15, y: -7, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: -14, y: -7, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: -13, y: -7, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: -12, y: -7, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: -11, y: -7, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: -10, y: -7, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: -9, y: -7, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 - first: {x: -8, y: -7, z: 0} second: serializedVersion: 2 @@ -1076,6 +1513,66 @@ Tilemap: m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 + - first: {x: -5, y: -7, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: -4, y: -7, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: -3, y: -7, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: -2, y: -7, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: -1, y: -7, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 0, y: -7, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 - first: {x: 5, y: -7, z: 0} second: serializedVersion: 2 @@ -1106,7 +1603,7 @@ Tilemap: m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 - - first: {x: -6, y: -6, z: 0} + - first: {x: -16, y: -6, z: 0} second: serializedVersion: 2 m_TileIndex: 0 @@ -1126,7 +1623,7 @@ Tilemap: m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 - - first: {x: -6, y: -5, z: 0} + - first: {x: -16, y: -5, z: 0} second: serializedVersion: 2 m_TileIndex: 0 @@ -1146,7 +1643,17 @@ Tilemap: m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 - - first: {x: -6, y: -4, z: 0} + - first: {x: -16, y: -4, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: -15, y: -4, z: 0} second: serializedVersion: 2 m_TileIndex: 0 @@ -1166,6 +1673,36 @@ Tilemap: m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 + - first: {x: -15, y: -3, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: -8, y: -3, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: -7, y: -3, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 - first: {x: -6, y: -3, z: 0} second: serializedVersion: 2 @@ -1186,6 +1723,66 @@ Tilemap: m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 + - first: {x: -15, y: -2, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: -14, y: -2, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: -11, y: -2, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: -9, y: -2, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: -8, y: -2, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: -7, y: -2, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 - first: {x: -6, y: -2, z: 0} second: serializedVersion: 2 @@ -1216,26 +1813,6 @@ Tilemap: m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 - - first: {x: -3, y: -2, z: 0} - second: - serializedVersion: 2 - m_TileIndex: 0 - m_TileSpriteIndex: 0 - m_TileMatrixIndex: 0 - m_TileColorIndex: 0 - m_TileObjectToInstantiateIndex: 65535 - dummyAlignment: 0 - m_AllTileFlags: 1073741825 - - first: {x: -2, y: -2, z: 0} - second: - serializedVersion: 2 - m_TileIndex: 0 - m_TileSpriteIndex: 0 - m_TileMatrixIndex: 0 - m_TileColorIndex: 0 - m_TileObjectToInstantiateIndex: 65535 - dummyAlignment: 0 - m_AllTileFlags: 1073741825 - first: {x: -1, y: -2, z: 0} second: serializedVersion: 2 @@ -1266,16 +1843,6 @@ Tilemap: m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 - - first: {x: 2, y: -2, z: 0} - second: - serializedVersion: 2 - m_TileIndex: 0 - m_TileSpriteIndex: 0 - m_TileMatrixIndex: 0 - m_TileColorIndex: 0 - m_TileObjectToInstantiateIndex: 65535 - dummyAlignment: 0 - m_AllTileFlags: 1073741825 - first: {x: 3, y: -2, z: 0} second: serializedVersion: 2 @@ -1306,6 +1873,86 @@ Tilemap: m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 + - first: {x: -14, y: -1, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: -13, y: -1, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: -12, y: -1, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: -11, y: -1, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: -10, y: -1, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: -9, y: -1, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: -8, y: -1, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: -7, y: -1, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 - first: {x: -6, y: -1, z: 0} second: serializedVersion: 2 @@ -1458,17 +2105,17 @@ Tilemap: m_AllTileFlags: 1073741825 m_AnimatedTiles: {} m_TileAssetArray: - - m_RefCount: 90 + - m_RefCount: 119 m_Data: {fileID: 11400000, guid: 8309c65724c3a8e40884dda0cfb55bae, type: 2} - m_RefCount: 0 m_Data: {fileID: 0} m_TileSpriteArray: - - m_RefCount: 90 + - m_RefCount: 119 m_Data: {fileID: -855298285791758126, guid: 9fc32b26c4b0b87459965e872a8507d2, type: 3} - m_RefCount: 0 m_Data: {fileID: 0} m_TileMatrixArray: - - m_RefCount: 90 + - m_RefCount: 119 m_Data: e00: 1 e01: 0 @@ -1487,13 +2134,13 @@ Tilemap: e32: 0 e33: 1 m_TileColorArray: - - m_RefCount: 90 + - m_RefCount: 119 m_Data: {r: 1, g: 1, b: 1, a: 1} m_TileObjectToInstantiateArray: [] m_AnimationFrameRate: 1 m_Color: {r: 1, g: 1, b: 1, a: 1} - m_Origin: {x: -8, y: -32, z: 0} - m_Size: {x: 16, y: 39, z: 1} + m_Origin: {x: -16, y: -32, z: 0} + m_Size: {x: 24, y: 39, z: 1} m_TileAnchor: {x: 0.5, y: 0.5, z: 0} m_TileOrientation: 0 m_TileOrientationMatrix: @@ -1545,12 +2192,236 @@ TilemapCollider2D: m_Bits: 4294967295 m_IsTrigger: 0 m_UsedByEffector: 0 - m_CompositeOperation: 0 + m_CompositeOperation: 1 m_CompositeOrder: 0 m_Offset: {x: 0, y: 0} m_MaximumTileChangeCount: 1000 m_ExtrusionFactor: 0 m_UseDelaunayMesh: 0 +--- !u!66 &994327121 +CompositeCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 994327116} + m_Enabled: 1 + serializedVersion: 3 + m_Density: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ForceSendLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ForceReceiveLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ContactCaptureLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_CallbackLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_CompositeOperation: 0 + m_CompositeOrder: 0 + m_Offset: {x: 0, y: 0} + m_GeometryType: 0 + m_GenerationType: 0 + m_EdgeRadius: 0 + m_ColliderPaths: + - m_Collider: {fileID: 994327120} + m_ColliderPaths: + - - X: 60000000 + Y: -70000000 + - X: 80000000 + Y: -70000000 + - X: 80000000 + Y: -60000000 + - X: 60000000 + Y: -60000000 + - X: 60000000 + Y: 70000000 + - X: 50000000 + Y: 70000000 + - X: 50000000 + Y: -10000000 + - X: 30000000 + Y: -10000000 + - X: 30000000 + Y: -20000000 + - X: 50000000 + Y: -20000000 + - X: 50000000 + Y: -310000000 + - X: 60000000 + Y: -310000000 + - - X: -50000000 + Y: -70000000 + - X: 10000000 + Y: -70000000 + - X: 10000000 + Y: -60000000 + - X: -150000000 + Y: -60000000 + - X: -150000000 + Y: -40000000 + - X: -140000000 + Y: -40000000 + - X: -140000000 + Y: -20000000 + - X: -130000000 + Y: -20000000 + - X: -130000000 + Y: -10000000 + - X: -110000000 + Y: -10000000 + - X: -110000000 + Y: -20000000 + - X: -100000000 + Y: -20000000 + - X: -100000000 + Y: -10000000 + - X: -90000000 + Y: -10000000 + - X: -90000000 + Y: -20000000 + - X: -80000000 + Y: -20000000 + - X: -80000000 + Y: -30000000 + - X: -50000000 + Y: -30000000 + - X: -50000000 + Y: -20000000 + - X: -30000000 + Y: -20000000 + - X: -30000000 + Y: -10000000 + - X: -50000000 + Y: -10000000 + - X: -50000000 + Y: 60000000 + - X: -60000000 + Y: 60000000 + - X: -60000000 + Y: 0 + - X: -140000000 + Y: 0 + - X: -140000000 + Y: -10000000 + - X: -150000000 + Y: -10000000 + - X: -150000000 + Y: -30000000 + - X: -160000000 + Y: -30000000 + - X: -160000000 + Y: -70000000 + - X: -60000000 + Y: -70000000 + - X: -60000000 + Y: -320000000 + - X: -50000000 + Y: -320000000 + - - X: 20000000 + Y: -10000000 + - X: -10000000 + Y: -10000000 + - X: -10000000 + Y: -20000000 + - X: 20000000 + Y: -20000000 + m_CompositePaths: + m_Paths: + - - {x: 5.999971, y: -31} + - {x: 6.0000296, y: -7} + - {x: 8, y: -6.9999704} + - {x: 7.9999704, y: -6} + - {x: 6, y: -5.9999704} + - {x: 5.999971, y: 7} + - {x: 5, y: 6.9999704} + - {x: 4.9999704, y: -1} + - {x: 3, y: -1.0000293} + - {x: 3.0000293, y: -2} + - {x: 5, y: -2.0000293} + - {x: 5.000029, y: -31} + - - {x: -5.000029, y: -32} + - {x: -4.9999704, y: -7} + - {x: 1, y: -6.9999704} + - {x: 0.99997073, y: -6} + - {x: -15, y: -5.9999704} + - {x: -14.999971, y: -4} + - {x: -14, y: -3.999971} + - {x: -13.999971, y: -2} + - {x: -13, y: -1.9999708} + - {x: -12.99997, y: -1} + - {x: -11, y: -1.0000294} + - {x: -10.99997, y: -2} + - {x: -10, y: -1.9999708} + - {x: -9.99997, y: -1} + - {x: -9, y: -1.0000294} + - {x: -8.99997, y: -2} + - {x: -8, y: -2.0000293} + - {x: -7.9999704, y: -3} + - {x: -5, y: -2.999971} + - {x: -4.9999704, y: -2} + - {x: -3, y: -1.9999708} + - {x: -3.0000293, y: -1} + - {x: -5, y: -0.9999706} + - {x: -5.000029, y: 6} + - {x: -6, y: 5.999971} + - {x: -6.0000296, y: 0} + - {x: -14, y: -0.000029300001} + - {x: -14.000029, y: -1} + - {x: -15, y: -1.0000293} + - {x: -15.000029, y: -3} + - {x: -16, y: -3.0000293} + - {x: -15.999971, y: -7} + - {x: -6, y: -7.0000296} + - {x: -5.999971, y: -32} + - - {x: 1.9999708, y: -2} + - {x: 1.9999708, y: -1} + - {x: -1, y: -1.0000293} + - {x: -0.99997073, y: -2} + m_VertexDistance: 0.0005 + m_OffsetDistance: 0.00005 + m_UseDelaunayMesh: 0 + m_CompositeGameObject: {fileID: 994327116} +--- !u!50 &994327122 +Rigidbody2D: + serializedVersion: 5 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 994327116} + m_BodyType: 1 + m_Simulated: 1 + m_UseFullKinematicContacts: 0 + m_UseAutoMass: 0 + m_Mass: 1 + m_LinearDamping: 0 + m_AngularDamping: 0.05 + m_GravityScale: 0 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_Interpolate: 0 + m_SleepingMode: 1 + m_CollisionDetection: 0 + m_Constraints: 0 --- !u!1001 &1002941971 PrefabInstance: m_ObjectHideFlags: 0 @@ -1565,7 +2436,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 264733977300749662, guid: 9f6bbfc37f93a0e4e8266ff424f3624f, type: 3} propertyPath: m_Layer - value: 3 + value: 7 objectReference: {fileID: 0} - target: {fileID: 6507705106265860797, guid: 9f6bbfc37f93a0e4e8266ff424f3624f, type: 3} propertyPath: m_LocalPosition.x @@ -1644,7 +2515,7 @@ MonoBehaviour: attackBoxSize: {x: 3, y: 1} enemyLayer: serializedVersion: 2 - m_Bits: 72 + m_Bits: 192 dashTime: 0.5 dashDistance: 5 --- !u!4 &1052407379 stripped @@ -1729,6 +2600,9 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c81c9e0030ef823459d0d8a8f6a159e5, type: 3} m_Name: m_EditorClassIdentifier: Assembly-CSharp::TrapBlock + damage: 10 + activationTime: 2 + damageInterval: 1 --- !u!212 &1089674888 SpriteRenderer: serializedVersion: 2 @@ -1839,7 +2713,7 @@ Rigidbody2D: m_Interpolate: 0 m_SleepingMode: 1 m_CollisionDetection: 0 - m_Constraints: 2 + m_Constraints: 4 --- !u!114 &1117392526 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1852,13 +2726,31 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7e036d2115ad53f48ba9c059c6cea1bb, type: 3} m_Name: m_EditorClassIdentifier: Assembly-CSharp::GroundEnemyMovement - maxHp: 1 - attackDamage: 5 data: {fileID: 11400000, guid: a5edb67c4940a4e4692478c7267fc1f8, type: 2} rigidBody: {fileID: 1117392525} spriteRenderer: {fileID: 1117392523} Speed: 3 startDirection: 1.5 + terrainLayer: + serializedVersion: 2 + m_Bits: 136 +--- !u!4 &1117392528 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 3182903703610233758, guid: a5f5cf89603320347975ecc8f39129b7, type: 3} + m_PrefabInstance: {fileID: 960162597646736108} + m_PrefabAsset: {fileID: 0} +--- !u!114 &1117392529 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1117392520} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ba177d4337a6fb748b2d22b71512d6a5, type: 3} + m_Name: + m_EditorClassIdentifier: Assembly-CSharp::EnemyHitbox --- !u!1001 &960162597646736108 PrefabInstance: m_ObjectHideFlags: 0 @@ -1867,17 +2759,53 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 3096000554608240826, guid: a5f5cf89603320347975ecc8f39129b7, type: 3} + propertyPath: m_Offset.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 3096000554608240826, guid: a5f5cf89603320347975ecc8f39129b7, type: 3} propertyPath: m_IsTrigger + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3096000554608240826, guid: a5f5cf89603320347975ecc8f39129b7, type: 3} + propertyPath: m_SpriteTilingProperty.pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3096000554608240826, guid: a5f5cf89603320347975ecc8f39129b7, type: 3} + propertyPath: m_SpriteTilingProperty.border.w + value: 0.25 + objectReference: {fileID: 0} + - target: {fileID: 3096000554608240826, guid: a5f5cf89603320347975ecc8f39129b7, type: 3} + propertyPath: m_SpriteTilingProperty.border.x + value: 0.25 + objectReference: {fileID: 0} + - target: {fileID: 3096000554608240826, guid: a5f5cf89603320347975ecc8f39129b7, type: 3} + propertyPath: m_SpriteTilingProperty.border.y + value: 0.25 + objectReference: {fileID: 0} + - target: {fileID: 3096000554608240826, guid: a5f5cf89603320347975ecc8f39129b7, type: 3} + propertyPath: m_SpriteTilingProperty.border.z + value: 0.25 + objectReference: {fileID: 0} + - target: {fileID: 3096000554608240826, guid: a5f5cf89603320347975ecc8f39129b7, type: 3} + propertyPath: m_SpriteTilingProperty.oldSize.x + value: 0.984375 + objectReference: {fileID: 0} + - target: {fileID: 3096000554608240826, guid: a5f5cf89603320347975ecc8f39129b7, type: 3} + propertyPath: m_SpriteTilingProperty.oldSize.y + value: 0.984375 + objectReference: {fileID: 0} + - target: {fileID: 3182903703610233758, guid: a5f5cf89603320347975ecc8f39129b7, type: 3} + propertyPath: m_LocalScale.x value: 1 objectReference: {fileID: 0} - target: {fileID: 3182903703610233758, guid: a5f5cf89603320347975ecc8f39129b7, type: 3} propertyPath: m_LocalPosition.x - value: -0.43 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3182903703610233758, guid: a5f5cf89603320347975ecc8f39129b7, type: 3} propertyPath: m_LocalPosition.y - value: -0.66 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3182903703610233758, guid: a5f5cf89603320347975ecc8f39129b7, type: 3} propertyPath: m_LocalPosition.z @@ -1915,14 +2843,24 @@ PrefabInstance: propertyPath: m_Name value: TestEntity objectReference: {fileID: 0} + - target: {fileID: 3345230653483034275, guid: a5f5cf89603320347975ecc8f39129b7, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3818235801779510969, guid: a5f5cf89603320347975ecc8f39129b7, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: -5177388603050735206, guid: cc35afd292fc349128b36a291fb3a165, type: 3} - target: {fileID: 4449206212094151330, guid: a5f5cf89603320347975ecc8f39129b7, type: 3} propertyPath: m_Enabled value: 1 objectReference: {fileID: 0} - m_RemovedComponents: - - {fileID: 4449206212094151330, guid: a5f5cf89603320347975ecc8f39129b7, type: 3} + m_RemovedComponents: [] m_RemovedGameObjects: [] - m_AddedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 3182903703610233758, guid: a5f5cf89603320347975ecc8f39129b7, type: 3} + insertIndex: -1 + addedObject: {fileID: 312230461} m_AddedComponents: - targetCorrespondingSourceObject: {fileID: 3345230653483034275, guid: a5f5cf89603320347975ecc8f39129b7, type: 3} insertIndex: -1 @@ -1930,7 +2868,71 @@ PrefabInstance: - targetCorrespondingSourceObject: {fileID: 3345230653483034275, guid: a5f5cf89603320347975ecc8f39129b7, type: 3} insertIndex: -1 addedObject: {fileID: 1117392525} + - targetCorrespondingSourceObject: {fileID: 3345230653483034275, guid: a5f5cf89603320347975ecc8f39129b7, type: 3} + insertIndex: -1 + addedObject: {fileID: 1117392529} m_SourcePrefab: {fileID: 100100000, guid: a5f5cf89603320347975ecc8f39129b7, type: 3} +--- !u!1001 &3474780228686745984 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 2025971683497085228, guid: c1e04369fcd95764abcbb1a9fd356bde, type: 3} + propertyPath: m_Name + value: GameObject + objectReference: {fileID: 0} + - target: {fileID: 2025971683497085228, guid: c1e04369fcd95764abcbb1a9fd356bde, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6964338176317010345, guid: c1e04369fcd95764abcbb1a9fd356bde, type: 3} + propertyPath: m_LocalPosition.x + value: -0.5 + objectReference: {fileID: 0} + - target: {fileID: 6964338176317010345, guid: c1e04369fcd95764abcbb1a9fd356bde, type: 3} + propertyPath: m_LocalPosition.y + value: 1.5 + objectReference: {fileID: 0} + - target: {fileID: 6964338176317010345, guid: c1e04369fcd95764abcbb1a9fd356bde, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6964338176317010345, guid: c1e04369fcd95764abcbb1a9fd356bde, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6964338176317010345, guid: c1e04369fcd95764abcbb1a9fd356bde, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6964338176317010345, guid: c1e04369fcd95764abcbb1a9fd356bde, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6964338176317010345, guid: c1e04369fcd95764abcbb1a9fd356bde, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6964338176317010345, guid: c1e04369fcd95764abcbb1a9fd356bde, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6964338176317010345, guid: c1e04369fcd95764abcbb1a9fd356bde, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6964338176317010345, guid: c1e04369fcd95764abcbb1a9fd356bde, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: c1e04369fcd95764abcbb1a9fd356bde, type: 3} --- !u!1660057539 &9223372036854775807 SceneRoots: m_ObjectHideFlags: 0 @@ -1941,3 +2943,5 @@ SceneRoots: - {fileID: 960162597646736108} - {fileID: 1002941971} - {fileID: 1089674889} + - {fileID: 3474780228686745984} + - {fileID: 497925065} diff --git a/Assets/Monster.meta b/Assets/Scripts/Item.meta similarity index 77% rename from Assets/Monster.meta rename to Assets/Scripts/Item.meta index a9e5588..cd45f06 100644 --- a/Assets/Monster.meta +++ b/Assets/Scripts/Item.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 1f477f6b90a7bde409fd49711c61b0d6 +guid: 66251bf89c540684597e665280210ffb folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Scripts/Item/Item.cs b/Assets/Scripts/Item/Item.cs new file mode 100644 index 0000000..a7ff5c6 --- /dev/null +++ b/Assets/Scripts/Item/Item.cs @@ -0,0 +1,16 @@ +using UnityEngine; + +public class NewMonoBehaviourScript : MonoBehaviour +{ + // Start is called once before the first execution of Update after the MonoBehaviour is created + void Start() + { + + } + + // Update is called once per frame + void Update() + { + + } +} diff --git a/Assets/Scripts/Item/Item.cs.meta b/Assets/Scripts/Item/Item.cs.meta new file mode 100644 index 0000000..8cc2caa --- /dev/null +++ b/Assets/Scripts/Item/Item.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 4c920d8c33f050549989daf15e771bf2 \ No newline at end of file diff --git a/Assets/Scripts/Monster.meta b/Assets/Scripts/Monster.meta index a9e5588..fe50321 100644 --- a/Assets/Scripts/Monster.meta +++ b/Assets/Scripts/Monster.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 1f477f6b90a7bde409fd49711c61b0d6 +guid: 24abfdeea51026848bbc59f4654e211b folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Scripts/Monster/EnemyHitbox.cs b/Assets/Scripts/Monster/EnemyHitbox.cs new file mode 100644 index 0000000..d2005f3 --- /dev/null +++ b/Assets/Scripts/Monster/EnemyHitbox.cs @@ -0,0 +1,22 @@ +using UnityEngine; + +public class EnemyHitbox : MonoBehaviour +{ + private Entity owner; + + private void Awake() + { + owner = GetComponentInParent(); + } + + private void OnTriggerEnter2D(Collider2D other) + { + Player player = other.GetComponent(); + if (player == null) + { + return; + } + + owner.OnHitPlayer(player); + } +} \ No newline at end of file diff --git a/Assets/Scripts/Monster/EnemyHitbox.cs.meta b/Assets/Scripts/Monster/EnemyHitbox.cs.meta new file mode 100644 index 0000000..66f425a --- /dev/null +++ b/Assets/Scripts/Monster/EnemyHitbox.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: ba177d4337a6fb748b2d22b71512d6a5 \ No newline at end of file diff --git a/Assets/Scripts/Monster/Entity.cs b/Assets/Scripts/Monster/Entity.cs index 9a0d87e..bcf71d6 100644 --- a/Assets/Scripts/Monster/Entity.cs +++ b/Assets/Scripts/Monster/Entity.cs @@ -3,45 +3,52 @@ using UnityEngine.Events; public class Entity : MonoBehaviour { - private int maxHp; - private int currentHp; - private int attackDamage; + protected int maxHp; + protected int currentHp; + protected int attackDamage; - [SerializeField] private EntityData data; + [SerializeField] protected EntityData data; - void Awake() + protected virtual void Awake() { - maxHp = data.maxHealth; - currentHp = data.maxHealth; - attackDamage = data.attackDamage; + if (data != null) + { + maxHp = data.maxHealth; + currentHp = data.maxHealth; + attackDamage = data.attackDamage; + } } - public virtual void TakeDamage(int playerAttackDamage) + public virtual void TakeDamage(int damage) { - currentHp -= playerAttackDamage; + currentHp -= damage; + if (currentHp <= 0) { - currentHp = 0; - Destroy(gameObject); + Die(); } } - private void OnTriggerEnter2D(Collider2D other) + protected virtual void Die() { - if (other.CompareTag("Player")) - { - other.gameObject.GetComponent().TakeDamage(attackDamage); - Destroy(gameObject); - } + currentHp = 0; + Destroy(gameObject); + } + + public virtual void OnHitPlayer(Player player) + { + + player.TakeDamage(attackDamage); + Die(); + } + + public virtual void RunAI() + { + } void Update() { - this.RunAI(); - } - - public virtual void RunAI() - { - + RunAI(); } } \ No newline at end of file diff --git a/Assets/Scripts/Monster/EntityData.cs b/Assets/Scripts/Monster/EntityData.cs index 5a56571..6e012c3 100644 --- a/Assets/Scripts/Monster/EntityData.cs +++ b/Assets/Scripts/Monster/EntityData.cs @@ -6,4 +6,4 @@ public class EntityData : ScriptableObject public string name; public int maxHealth; public int attackDamage; -} +} \ No newline at end of file diff --git a/Assets/Scripts/Monster/FlyEnemyMovement.cs b/Assets/Scripts/Monster/FlyEnemyMovement.cs index cf6ec32..098aaf6 100644 --- a/Assets/Scripts/Monster/FlyEnemyMovement.cs +++ b/Assets/Scripts/Monster/FlyEnemyMovement.cs @@ -1,21 +1,16 @@ using UnityEngine; -using UnityEngine.AI; public class FlyEnemyMovement : Entity { + [SerializeField] private float detectionRange = 8.0f; + [SerializeField] private float moveSpeed = 3.0f; + [SerializeField] private LayerMask obstacleLayer; + private GameObject playerObject; - private NavMeshAgent agent; - [SerializeField] private float detectionRange = 5.0f; // 감지 범위 변수 - [SerializeField] private float EnemyTime; - - private void Awake() + protected override void Awake() { - agent = GetComponent(); - - // NavMeshPlus 2D 설정 - agent.updateRotation = false; - agent.updateUpAxis = false; + base.Awake(); } private void Start() @@ -27,33 +22,32 @@ public class FlyEnemyMovement : Entity { if (playerObject != null) { - // 1. 현재 위치와 플레이어 위치 사이의 거리를 계산 float distance = Vector3.Distance(transform.position, playerObject.transform.position); - if (distance <= detectionRange) { - SetAgentPosition(); // 추격 시작 - } - else - { - // 범위 밖이라면 이동을 멈춤 - if (!agent.isStopped) - { - agent.ResetPath(); - } + MoveTowardsPlayer(); } } } - private void SetAgentPosition() + private void MoveTowardsPlayer() { - if (!agent.isActiveAndEnabled || !agent.isOnNavMesh) + Vector3 direction = (playerObject.transform.position - transform.position).normalized; + RaycastHit2D hit = Physics2D.Raycast(transform.position, direction, 1.0f, obstacleLayer); + + if (hit.collider != null) { - return; + Vector2 tangent = Vector2.Perpendicular(hit.normal); + direction = Vector3.Lerp(direction, tangent, 0.5f).normalized; + } + + transform.position += direction * moveSpeed * Time.deltaTime; + + if (direction.x != 0) + { + transform.localScale = new Vector3(direction.x > 0 ? 1 : -1, 1, 1); } - Vector3 targetPos = playerObject.transform.position; - agent.SetDestination(new Vector3(targetPos.x, targetPos.y)); } private void OnDrawGizmosSelected() diff --git a/Assets/Scripts/Monster/GroundEnemyMovement.cs b/Assets/Scripts/Monster/GroundEnemyMovement.cs index 560d7de..9c85915 100644 --- a/Assets/Scripts/Monster/GroundEnemyMovement.cs +++ b/Assets/Scripts/Monster/GroundEnemyMovement.cs @@ -7,10 +7,11 @@ public class GroundEnemyMovement : Entity [SerializeField] private SpriteRenderer spriteRenderer; [SerializeField] private float Speed = 3f; [SerializeField] private float startDirection = 1.5f; + [SerializeField] private LayerMask terrainLayer; private float currentDirection; private float halfWidth; - private Vector2 movemenet; + private Vector2 movement; private void Start() { @@ -21,9 +22,9 @@ public class GroundEnemyMovement : Entity public override void RunAI() { - movemenet.x = Speed * currentDirection; - movemenet.y = rigidBody.linearVelocity.y; - rigidBody.linearVelocity = movemenet; + movement.x = Speed * currentDirection; + movement.y = rigidBody.linearVelocity.y; + rigidBody.linearVelocity = movement; SetDirection(); } @@ -44,11 +45,11 @@ public class GroundEnemyMovement : Entity wallDir = Vector2.left; } - RaycastHit2D cliffHit = Physics2D.Raycast(frontVec, Vector2.down, 1f, LayerMask.GetMask("Ground")); + RaycastHit2D cliffHit = Physics2D.Raycast(frontVec, Vector2.down, 1f, terrainLayer); Debug.DrawRay(frontVec, Vector2.down * 1f, Color.green); float wallDist = halfWidth + 0.2f; - RaycastHit2D wallHit = Physics2D.Raycast(transform.position, wallDir, wallDist, LayerMask.GetMask("Ground")); + RaycastHit2D wallHit = Physics2D.Raycast(transform.position, wallDir, wallDist, terrainLayer); Debug.DrawRay(transform.position, wallDir * wallDist, Color.blue); if (cliffHit.collider == null || wallHit.collider != null) @@ -57,4 +58,4 @@ public class GroundEnemyMovement : Entity spriteRenderer.flipX = !spriteRenderer.flipX; } } -} \ No newline at end of file +} diff --git a/Assets/Scripts/Shop.meta b/Assets/Scripts/Shop.meta new file mode 100644 index 0000000..5c6378c --- /dev/null +++ b/Assets/Scripts/Shop.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 3ce03408c5f65174590e62ebb43c41bb +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Packages/manifest.json b/Packages/manifest.json index 9f1d668..8d51fcc 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -17,7 +17,6 @@ "com.unity.render-pipelines.universal": "17.3.0", "com.unity.test-framework": "1.6.0", "com.unity.timeline": "1.8.10", - "com.unity.ugui": "2.0.0", "com.unity.visualscripting": "1.9.9", "com.unity.modules.accessibility": "1.0.0", "com.unity.modules.adaptiveperformance": "1.0.0", diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index fe800e6..b99b21f 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -275,7 +275,7 @@ }, "com.unity.ugui": { "version": "2.0.0", - "depth": 0, + "depth": 1, "source": "builtin", "dependencies": { "com.unity.modules.ui": "1.0.0", diff --git a/ProjectSettings/Physics2DSettings.asset b/ProjectSettings/Physics2DSettings.asset index 6cfcdda..1b8defd 100644 --- a/ProjectSettings/Physics2DSettings.asset +++ b/ProjectSettings/Physics2DSettings.asset @@ -3,12 +3,12 @@ --- !u!19 &1 Physics2DSettings: m_ObjectHideFlags: 0 - serializedVersion: 5 + serializedVersion: 11 m_Gravity: {x: 0, y: -9.81} m_DefaultMaterial: {fileID: 0} m_VelocityIterations: 8 m_PositionIterations: 3 - m_VelocityThreshold: 1 + m_BounceThreshold: 1 m_MaxLinearCorrection: 0.2 m_MaxAngularCorrection: 8 m_MaxTranslationSpeed: 100 @@ -19,6 +19,7 @@ Physics2DSettings: m_LinearSleepTolerance: 0.01 m_AngularSleepTolerance: 2 m_DefaultContactOffset: 0.01 + m_ContactThreshold: 0 m_JobOptions: serializedVersion: 2 useMultithreading: 0 @@ -39,18 +40,18 @@ Physics2DSettings: m_IslandSolverBodiesPerJob: 50 m_IslandSolverContactsPerJob: 50 m_SimulationMode: 0 + m_SimulationLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_MaxSubStepCount: 4 + m_MinSubStepFPS: 30 + m_UseSubStepping: 0 + m_UseSubStepContacts: 0 m_QueriesHitTriggers: 1 m_QueriesStartInColliders: 1 m_CallbacksOnDisable: 1 m_ReuseCollisionCallbacks: 1 m_AutoSyncTransforms: 0 - m_AlwaysShowColliders: 0 - m_ShowColliderSleep: 1 - m_ShowColliderContacts: 0 - m_ShowColliderAABB: 0 - m_ContactArrowScale: 0.2 - m_ColliderAwakeColor: {r: 0.5686275, g: 0.95686275, b: 0.54509807, a: 0.7529412} - 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: ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff + m_GizmoOptions: 10 + m_LayerCollisionMatrix: fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffeffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff + m_PhysicsLowLevelSettings: {fileID: 0} diff --git a/ProjectSettings/TagManager.asset b/ProjectSettings/TagManager.asset index bfb2ee5..73552d6 100644 --- a/ProjectSettings/TagManager.asset +++ b/ProjectSettings/TagManager.asset @@ -12,9 +12,9 @@ TagManager: - Water - UI - Enemy - - - - - - + - Destructible + - EnemyHitbox + - Player - - -