diff --git a/MuseumGame/Assets/Scenes/DemoLevels/EnemyTunnel.unity b/MuseumGame/Assets/Scenes/DemoLevels/EnemyTunnel.unity index 540437d..ed4e975 100644 --- a/MuseumGame/Assets/Scenes/DemoLevels/EnemyTunnel.unity +++ b/MuseumGame/Assets/Scenes/DemoLevels/EnemyTunnel.unity @@ -2990,9 +2990,10 @@ GameObject: - component: {fileID: 1067141781} - component: {fileID: 1067141783} - component: {fileID: 1067141782} + - component: {fileID: 1067141784} m_Layer: 0 m_Name: Lava - m_TagString: Untagged + m_TagString: EnemyPlatform m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -3231,6 +3232,22 @@ Tilemap: e31: 0 e32: 0 e33: 1 +--- !u!19719996 &1067141784 +TilemapCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1067141780} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + m_MaximumTileChangeCount: 1000 + m_ExtrusionFactor: 0.00001 --- !u!1 &1132203375 GameObject: m_ObjectHideFlags: 0 diff --git a/MuseumGame/Assets/Scenes/DemoLevels/PathToBoss.unity b/MuseumGame/Assets/Scenes/DemoLevels/PathToBoss.unity index 9d3a347..df27452 100644 --- a/MuseumGame/Assets/Scenes/DemoLevels/PathToBoss.unity +++ b/MuseumGame/Assets/Scenes/DemoLevels/PathToBoss.unity @@ -8769,7 +8769,7 @@ GameObject: - component: {fileID: 1704149513} m_Layer: 0 m_Name: Lava - m_TagString: Untagged + m_TagString: EnemyPlatform m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 diff --git a/MuseumGame/Assets/Scenes/DemoLevels/Spike Scene.unity b/MuseumGame/Assets/Scenes/DemoLevels/Spike Scene.unity index bde582a..6177b2f 100644 --- a/MuseumGame/Assets/Scenes/DemoLevels/Spike Scene.unity +++ b/MuseumGame/Assets/Scenes/DemoLevels/Spike Scene.unity @@ -3142,9 +3142,10 @@ GameObject: - component: {fileID: 1952136972} - component: {fileID: 1952136974} - component: {fileID: 1952136973} + - component: {fileID: 1952136975} m_Layer: 0 m_Name: Lava - m_TagString: Untagged + m_TagString: EnemyPlatform m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -3407,6 +3408,22 @@ Tilemap: e31: 0 e32: 0 e33: 1 +--- !u!19719996 &1952136975 +TilemapCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1952136971} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + m_MaximumTileChangeCount: 1000 + m_ExtrusionFactor: 0.00001 --- !u!1 &2054795115 GameObject: m_ObjectHideFlags: 0 diff --git a/MuseumGame/Assets/Scripts/Health.cs b/MuseumGame/Assets/Scripts/Health.cs index 7df784a..b683d23 100644 --- a/MuseumGame/Assets/Scripts/Health.cs +++ b/MuseumGame/Assets/Scripts/Health.cs @@ -18,7 +18,11 @@ public class Health : MonoBehaviour { DamagePlayer(10); } - if (collider2D.gameObject.CompareTag("EnemyPlatform")) + + } + void OnCollisionEnter2D(Collision2D collider2D) + { + if (collider2D.gameObject.CompareTag("EnemyPlatform")) { Debug.Log("lava"); DamagePlayer(10); diff --git a/MuseumGame/UserSettings/EditorUserSettings.asset b/MuseumGame/UserSettings/EditorUserSettings.asset index 0f3da36..bf0c596 100644 --- a/MuseumGame/UserSettings/EditorUserSettings.asset +++ b/MuseumGame/UserSettings/EditorUserSettings.asset @@ -6,26 +6,40 @@ EditorUserSettings: serializedVersion: 4 m_ConfigSettings: RecentlyUsedScenePath-0: - value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23620c1336eff9002dece933e5a92f31352d1b + value: 22424703114646680e0b0227036c6c111b07142f1f2b233e2867083debf42d flags: 0 RecentlyUsedScenePath-1: + value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621b1226f6e50037d6e821ecf5742a323016f6 value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621d1224e7f27a2decee22f0 flags: 0 RecentlyUsedScenePath-2: + value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621b1226f6e50037d6e821ecf5742a323016f6 value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23620b1220f1d23b37efa923e7ee2e26 flags: 0 RecentlyUsedScenePath-3: + value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621d1224e7f27a2decee22f0 value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621a0d32f5ee7a2decee22f0 flags: 0 RecentlyUsedScenePath-4: + value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621a0d3ae9e5740be1e238eca92f31352d1b value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621b1226f6e50037d6e821ecf5742a323016f6 flags: 0 RecentlyUsedScenePath-5: value: 22424703114646680e0b0227036c7b151b18342f3a2d2a2362191c27ead43b1aedf425a7f234362820 flags: 0 RecentlyUsedScenePath-6: + value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23620c1336eff9002dece933e5a92f31352d1b value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621a0d3ae9e5740be1e238eca92f31352d1b flags: 0 + RecentlyUsedScenePath-7: + value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23620b1132eceb7414e7f133e5a92f31352d1b + flags: 0 + RecentlyUsedScenePath-8: + value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621a0d32f5ee7a2decee22f0 + flags: 0 + RecentlyUsedScenePath-9: + value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23620b1132eceb7414e7f133e5a92f31352d1b + flags: 0 vcSharedLogLevel: value: 0d5e400f0650 flags: 0