From 77e894d14aebc4a47d74c05a72448391e5aad01a Mon Sep 17 00:00:00 2001 From: Ivy Date: Thu, 22 Apr 2021 10:35:11 -0500 Subject: [PATCH] Added floor tags --- .../Assets/Scenes/DemoLevels/BossRoom.unity | 2 +- .../Scenes/DemoLevels/EnemyTunnel.unity | 2 +- .../Assets/Scenes/DemoLevels/PathToBoss.unity | 2 +- .../Scenes/DemoLevels/RouteToTower.unity | 17 ------------- .../Assets/Scenes/DemoLevels/Spawn.unity | 2 +- .../Scenes/DemoLevels/Spike Scene.unity | 2 +- .../Assets/Scenes/DemoLevels/Tower.unity | 4 ++-- MuseumGame/ProjectSettings/TagManager.asset | 2 +- .../UserSettings/EditorUserSettings.asset | 24 +++++-------------- 9 files changed, 14 insertions(+), 43 deletions(-) diff --git a/MuseumGame/Assets/Scenes/DemoLevels/BossRoom.unity b/MuseumGame/Assets/Scenes/DemoLevels/BossRoom.unity index 2daf059..3b2c717 100644 --- a/MuseumGame/Assets/Scenes/DemoLevels/BossRoom.unity +++ b/MuseumGame/Assets/Scenes/DemoLevels/BossRoom.unity @@ -140,7 +140,7 @@ GameObject: - component: {fileID: 73552635} m_Layer: 0 m_Name: Floor - m_TagString: Platform + m_TagString: Floor m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 diff --git a/MuseumGame/Assets/Scenes/DemoLevels/EnemyTunnel.unity b/MuseumGame/Assets/Scenes/DemoLevels/EnemyTunnel.unity index 9b6d984..540437d 100644 --- a/MuseumGame/Assets/Scenes/DemoLevels/EnemyTunnel.unity +++ b/MuseumGame/Assets/Scenes/DemoLevels/EnemyTunnel.unity @@ -304,7 +304,7 @@ GameObject: - component: {fileID: 73552635} m_Layer: 0 m_Name: Floor - m_TagString: Untagged + m_TagString: Floor m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 diff --git a/MuseumGame/Assets/Scenes/DemoLevels/PathToBoss.unity b/MuseumGame/Assets/Scenes/DemoLevels/PathToBoss.unity index 49fa9a6..9d3a347 100644 --- a/MuseumGame/Assets/Scenes/DemoLevels/PathToBoss.unity +++ b/MuseumGame/Assets/Scenes/DemoLevels/PathToBoss.unity @@ -140,7 +140,7 @@ GameObject: - component: {fileID: 73552635} m_Layer: 0 m_Name: Floor - m_TagString: Untagged + m_TagString: Floor m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 diff --git a/MuseumGame/Assets/Scenes/DemoLevels/RouteToTower.unity b/MuseumGame/Assets/Scenes/DemoLevels/RouteToTower.unity index 9ce3aba..a0eadc6 100644 --- a/MuseumGame/Assets/Scenes/DemoLevels/RouteToTower.unity +++ b/MuseumGame/Assets/Scenes/DemoLevels/RouteToTower.unity @@ -1870,7 +1870,6 @@ GameObject: - component: {fileID: 378298694} - component: {fileID: 378298696} - component: {fileID: 378298695} - - component: {fileID: 378298697} m_Layer: 0 m_Name: Lava m_TagString: EnemyPlatform @@ -2782,22 +2781,6 @@ Tilemap: e31: 0 e32: 0 e33: 1 ---- !u!19719996 &378298697 -TilemapCollider2D: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 378298693} - 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 &392279113 GameObject: m_ObjectHideFlags: 0 diff --git a/MuseumGame/Assets/Scenes/DemoLevels/Spawn.unity b/MuseumGame/Assets/Scenes/DemoLevels/Spawn.unity index e94cc87..d952c74 100644 --- a/MuseumGame/Assets/Scenes/DemoLevels/Spawn.unity +++ b/MuseumGame/Assets/Scenes/DemoLevels/Spawn.unity @@ -3466,7 +3466,7 @@ GameObject: - component: {fileID: 1607880950} m_Layer: 0 m_Name: Floor - m_TagString: Untagged + m_TagString: Floor 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 869d0c9..bde582a 100644 --- a/MuseumGame/Assets/Scenes/DemoLevels/Spike Scene.unity +++ b/MuseumGame/Assets/Scenes/DemoLevels/Spike Scene.unity @@ -140,7 +140,7 @@ GameObject: - component: {fileID: 73552635} m_Layer: 0 m_Name: Floor - m_TagString: Untagged + m_TagString: Floor m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 diff --git a/MuseumGame/Assets/Scenes/DemoLevels/Tower.unity b/MuseumGame/Assets/Scenes/DemoLevels/Tower.unity index d1bd241..b36fc04 100644 --- a/MuseumGame/Assets/Scenes/DemoLevels/Tower.unity +++ b/MuseumGame/Assets/Scenes/DemoLevels/Tower.unity @@ -946,7 +946,7 @@ GameObject: - component: {fileID: 1177871980} m_Layer: 0 m_Name: Floor - m_TagString: Untagged + m_TagString: Floor m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -3574,7 +3574,7 @@ GameObject: - component: {fileID: 1716577441} m_Layer: 0 m_Name: Oneway - m_TagString: Untagged + m_TagString: Floor m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 diff --git a/MuseumGame/ProjectSettings/TagManager.asset b/MuseumGame/ProjectSettings/TagManager.asset index 6b63989..6327a33 100644 --- a/MuseumGame/ProjectSettings/TagManager.asset +++ b/MuseumGame/ProjectSettings/TagManager.asset @@ -7,7 +7,7 @@ TagManager: - EnemyProjectile - Platform - Enemy - - EnemyPlatform + - Floor layers: - Default - TransparentFX diff --git a/MuseumGame/UserSettings/EditorUserSettings.asset b/MuseumGame/UserSettings/EditorUserSettings.asset index 1511cd8..0f3da36 100644 --- a/MuseumGame/UserSettings/EditorUserSettings.asset +++ b/MuseumGame/UserSettings/EditorUserSettings.asset @@ -9,34 +9,22 @@ EditorUserSettings: value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23620c1336eff9002dece933e5a92f31352d1b flags: 0 RecentlyUsedScenePath-1: - value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621a0d3ae9e5740be1e238eca92f31352d1b + value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621d1224e7f27a2decee22f0 flags: 0 RecentlyUsedScenePath-2: - value: 22424703114646680e0b0227036c7b151b18342f3a2d2a2362191c27ead43b1aedf425a7f234362820 + value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23620b1220f1d23b37efa923e7ee2e26 flags: 0 RecentlyUsedScenePath-3: - value: 22424703114646680e0b0227036c6c111b07142f1f2b233e2867083debf42d - flags: 0 - RecentlyUsedScenePath-4: - value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621d1224e7f27a2decee22f0 - value: 22424703114646680e0b0227036c6b1505032b292926237e38271427fb - flags: 0 - RecentlyUsedScenePath-5: value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621a0d32f5ee7a2decee22f0 - value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23620b1220f1d23b37efa923e7ee2e26 flags: 0 - RecentlyUsedScenePath-6: + RecentlyUsedScenePath-4: value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621b1226f6e50037d6e821ecf5742a323016f6 - value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23620b1132eceb7414e7f133e5a92f31352d1b flags: 0 - RecentlyUsedScenePath-7: + RecentlyUsedScenePath-5: value: 22424703114646680e0b0227036c7b151b18342f3a2d2a2362191c27ead43b1aedf425a7f234362820 flags: 0 - RecentlyUsedScenePath-8: - value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621b1226f6e50037d6e821ecf5742a323016f6 - flags: 0 - RecentlyUsedScenePath-9: - value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621a0d32f5ee7a2decee22f0 + RecentlyUsedScenePath-6: + value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621a0d3ae9e5740be1e238eca92f31352d1b flags: 0 vcSharedLogLevel: value: 0d5e400f0650