From f4b87a6d6e03efe733f2c5620ee22edb23d27935 Mon Sep 17 00:00:00 2001 From: louishorlaville Date: Sun, 15 May 2022 12:32:59 -0400 Subject: [PATCH 1/6] cant see enemies in different dimensions --- Assets/Prefabs/Dimension1/Dimension1.prefab | 170 +++++++++++++++----- Assets/Prefabs/Dimension2/Dimension2.prefab | 44 ++--- Assets/Prefabs/Dimension3/Dimension3.prefab | 28 ++-- Assets/Scenes/Game.unity | 12 +- Assets/Scripts/SpawnManager.cs | 7 + 5 files changed, 180 insertions(+), 81 deletions(-) diff --git a/Assets/Prefabs/Dimension1/Dimension1.prefab b/Assets/Prefabs/Dimension1/Dimension1.prefab index f465d6c..a720522 100644 --- a/Assets/Prefabs/Dimension1/Dimension1.prefab +++ b/Assets/Prefabs/Dimension1/Dimension1.prefab @@ -9,7 +9,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 9010563594325181686} - m_Layer: 0 + m_Layer: 7 m_Name: Enemy Landing (1) m_TagString: Untagged m_Icon: {fileID: 0} @@ -40,7 +40,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 292039564714576492} - m_Layer: 0 + m_Layer: 7 m_Name: Enemy Landing (2) m_TagString: Untagged m_Icon: {fileID: 0} @@ -71,7 +71,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 633778514577777118} - m_Layer: 0 + m_Layer: 7 m_Name: EnemySpawn (2) m_TagString: Untagged m_Icon: {fileID: 0} @@ -104,7 +104,7 @@ GameObject: - component: {fileID: 2398580280414332520} - component: {fileID: 2398580280414332522} - component: {fileID: 2398580280414332523} - m_Layer: 0 + m_Layer: 7 m_Name: Cube (7) m_TagString: Untagged m_Icon: {fileID: 0} @@ -187,7 +187,7 @@ GameObject: - component: {fileID: 2398580280414369023} - component: {fileID: 2398580280414369016} - component: {fileID: 2398580280414369017} - m_Layer: 0 + m_Layer: 7 m_Name: Planet_Ground m_TagString: Untagged m_Icon: {fileID: 0} @@ -270,7 +270,7 @@ GameObject: - component: {fileID: 2398580280438905666} - component: {fileID: 2398580280438905676} - component: {fileID: 2398580280438905677} - m_Layer: 0 + m_Layer: 7 m_Name: Cube (5) m_TagString: Untagged m_Icon: {fileID: 0} @@ -353,7 +353,7 @@ GameObject: - component: {fileID: 2398580280505649676} - component: {fileID: 2398580280505649678} - component: {fileID: 2398580280505649679} - m_Layer: 0 + m_Layer: 7 m_Name: Continent1 m_TagString: Untagged m_Icon: {fileID: 0} @@ -434,7 +434,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 2398580280514116546} - m_Layer: 0 + m_Layer: 7 m_Name: Continents m_TagString: Untagged m_Icon: {fileID: 0} @@ -472,7 +472,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 2398580280527440449} - m_Layer: 0 + m_Layer: 7 m_Name: Dimension1 m_TagString: Untagged m_Icon: {fileID: 0} @@ -515,7 +515,7 @@ GameObject: - component: {fileID: 2398580280568605063} - component: {fileID: 2398580280568605057} - component: {fileID: 2398580280568605062} - m_Layer: 0 + m_Layer: 7 m_Name: Continent1 (1) m_TagString: Untagged m_Icon: {fileID: 0} @@ -598,7 +598,7 @@ GameObject: - component: {fileID: 2398580280576879484} - component: {fileID: 2398580280576879486} - component: {fileID: 2398580280576879487} - m_Layer: 0 + m_Layer: 7 m_Name: Cube (4) m_TagString: Untagged m_Icon: {fileID: 0} @@ -681,7 +681,7 @@ GameObject: - component: {fileID: 2398580280739990207} - component: {fileID: 2398580280739990201} - component: {fileID: 2398580280739990206} - m_Layer: 0 + m_Layer: 7 m_Name: Cube (8) m_TagString: Untagged m_Icon: {fileID: 0} @@ -764,7 +764,7 @@ GameObject: - component: {fileID: 2398580280877037231} - component: {fileID: 2398580280877037225} - component: {fileID: 2398580280877037230} - m_Layer: 0 + m_Layer: 7 m_Name: Cube m_TagString: Untagged m_Icon: {fileID: 0} @@ -847,7 +847,7 @@ GameObject: - component: {fileID: 2398580280903408978} - component: {fileID: 2398580280903408988} - component: {fileID: 2398580280903408989} - m_Layer: 0 + m_Layer: 7 m_Name: Cube (3) m_TagString: Untagged m_Icon: {fileID: 0} @@ -930,7 +930,7 @@ GameObject: - component: {fileID: 2398580280959189017} - component: {fileID: 2398580280959189019} - component: {fileID: 2398580280959189016} - m_Layer: 0 + m_Layer: 7 m_Name: Cube (7) m_TagString: Untagged m_Icon: {fileID: 0} @@ -1011,7 +1011,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 2398580281078680705} - m_Layer: 0 + m_Layer: 7 m_Name: IcyRock1 (2) m_TagString: Untagged m_Icon: {fileID: 0} @@ -1052,7 +1052,7 @@ GameObject: - component: {fileID: 2398580281113924498} - component: {fileID: 2398580281113924508} - component: {fileID: 2398580281113924509} - m_Layer: 0 + m_Layer: 7 m_Name: Planet_Atmosphere m_TagString: Untagged m_Icon: {fileID: 0} @@ -1135,7 +1135,7 @@ GameObject: - component: {fileID: 2398580281173991539} - component: {fileID: 2398580281173991549} - component: {fileID: 2398580281173991538} - m_Layer: 0 + m_Layer: 7 m_Name: Planet_BackgroundAtmosphere m_TagString: Untagged m_Icon: {fileID: 0} @@ -1218,7 +1218,7 @@ GameObject: - component: {fileID: 2398580281174337941} - component: {fileID: 2398580281174337943} - component: {fileID: 2398580281174337940} - m_Layer: 0 + m_Layer: 7 m_Name: Continent2 m_TagString: Untagged m_Icon: {fileID: 0} @@ -1299,7 +1299,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 2398580281290026756} - m_Layer: 0 + m_Layer: 7 m_Name: Decorations m_TagString: Untagged m_Icon: {fileID: 0} @@ -1339,7 +1339,7 @@ GameObject: - component: {fileID: 2398580281378808011} - component: {fileID: 2398580281378808021} - component: {fileID: 2398580281378808010} - m_Layer: 0 + m_Layer: 7 m_Name: Planet_Atmosphere (2) m_TagString: Untagged m_Icon: {fileID: 0} @@ -1422,7 +1422,7 @@ GameObject: - component: {fileID: 2398580281413908952} - component: {fileID: 2398580281413908954} - component: {fileID: 2398580281413908955} - m_Layer: 0 + m_Layer: 7 m_Name: Cube (6) m_TagString: Untagged m_Icon: {fileID: 0} @@ -1505,7 +1505,7 @@ GameObject: - component: {fileID: 2398580281423920067} - component: {fileID: 2398580281423920077} - component: {fileID: 2398580281423920066} - m_Layer: 0 + m_Layer: 7 m_Name: Cube (6) m_TagString: Untagged m_Icon: {fileID: 0} @@ -1588,7 +1588,7 @@ GameObject: - component: {fileID: 2398580281473075025} - component: {fileID: 2398580281473075027} - component: {fileID: 2398580281473075024} - m_Layer: 0 + m_Layer: 7 m_Name: Continent1 (2) m_TagString: Untagged m_Icon: {fileID: 0} @@ -1671,7 +1671,7 @@ GameObject: - component: {fileID: 2398580281610698465} - component: {fileID: 2398580281610698467} - component: {fileID: 2398580281610698464} - m_Layer: 0 + m_Layer: 7 m_Name: Cube (1) m_TagString: Untagged m_Icon: {fileID: 0} @@ -1754,7 +1754,7 @@ GameObject: - component: {fileID: 2398580281783890033} - component: {fileID: 2398580281783890035} - component: {fileID: 2398580281783890032} - m_Layer: 0 + m_Layer: 7 m_Name: Continent3 m_TagString: Untagged m_Icon: {fileID: 0} @@ -1837,7 +1837,7 @@ GameObject: - component: {fileID: 2398580281850391256} - component: {fileID: 2398580281850391258} - component: {fileID: 2398580281850391259} - m_Layer: 0 + m_Layer: 7 m_Name: Cube (2) m_TagString: Untagged m_Icon: {fileID: 0} @@ -1920,7 +1920,7 @@ GameObject: - component: {fileID: 2398580281909144687} - component: {fileID: 2398580281909144681} - component: {fileID: 2398580281909144686} - m_Layer: 0 + m_Layer: 7 m_Name: Planet_Atmosphere (1) m_TagString: Untagged m_Icon: {fileID: 0} @@ -2003,7 +2003,7 @@ GameObject: - component: {fileID: 2398580282036884597} - component: {fileID: 2398580282036884599} - component: {fileID: 2398580282036884596} - m_Layer: 0 + m_Layer: 7 m_Name: Continent1 (3) m_TagString: Untagged m_Icon: {fileID: 0} @@ -2086,7 +2086,7 @@ GameObject: - component: {fileID: 2398580282294358776} - component: {fileID: 2398580282294358778} - component: {fileID: 2398580282294358779} - m_Layer: 0 + m_Layer: 7 m_Name: Continent4 m_TagString: Untagged m_Icon: {fileID: 0} @@ -2167,7 +2167,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 2303821081704660173} - m_Layer: 0 + m_Layer: 7 m_Name: EnemySpawn m_TagString: Untagged m_Icon: {fileID: 0} @@ -2198,7 +2198,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 5211607279053080136} - m_Layer: 0 + m_Layer: 7 m_Name: Enemy Landing m_TagString: Untagged m_Icon: {fileID: 0} @@ -2229,7 +2229,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1198892008880930734} - m_Layer: 0 + m_Layer: 7 m_Name: Enemy Landing (4) m_TagString: Untagged m_Icon: {fileID: 0} @@ -2261,7 +2261,7 @@ GameObject: m_Component: - component: {fileID: 4418854588605005661} - component: {fileID: 4588112000306363475} - m_Layer: 0 + m_Layer: 7 m_Name: SpawnManager m_TagString: Untagged m_Icon: {fileID: 0} @@ -2319,7 +2319,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 7337768835324858517} - m_Layer: 0 + m_Layer: 7 m_Name: EnemySpawn (3) m_TagString: Untagged m_Icon: {fileID: 0} @@ -2350,7 +2350,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 8416642017640767910} - m_Layer: 0 + m_Layer: 7 m_Name: Enemy Landings m_TagString: Untagged m_Icon: {fileID: 0} @@ -2386,7 +2386,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 7453516238471775280} - m_Layer: 0 + m_Layer: 7 m_Name: EnemySpawn (1) m_TagString: Untagged m_Icon: {fileID: 0} @@ -2417,7 +2417,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 8360311633524412580} - m_Layer: 0 + m_Layer: 7 m_Name: Enemy Landing (3) m_TagString: Untagged m_Icon: {fileID: 0} @@ -2448,7 +2448,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 6576895058904098596} - m_Layer: 0 + m_Layer: 7 m_Name: Enemy Spawns m_TagString: Untagged m_Icon: {fileID: 0} @@ -2481,6 +2481,10 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 2398580281290026756} m_Modifications: + - target: {fileID: 3615064021645340372, guid: 73a8b463fbb0b9f408110e7f4fda9135, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} - target: {fileID: 3615064022929581580, guid: 73a8b463fbb0b9f408110e7f4fda9135, type: 3} propertyPath: m_RootOrder value: 0 @@ -2529,6 +2533,30 @@ PrefabInstance: propertyPath: m_Name value: IcyRock2 objectReference: {fileID: 0} + - target: {fileID: 3615064022929581581, guid: 73a8b463fbb0b9f408110e7f4fda9135, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 3615064023001426710, guid: 73a8b463fbb0b9f408110e7f4fda9135, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 3615064023324551758, guid: 73a8b463fbb0b9f408110e7f4fda9135, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 3615064023352603840, guid: 73a8b463fbb0b9f408110e7f4fda9135, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 3615064023364307611, guid: 73a8b463fbb0b9f408110e7f4fda9135, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 3615064023710422362, guid: 73a8b463fbb0b9f408110e7f4fda9135, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 73a8b463fbb0b9f408110e7f4fda9135, type: 3} --- !u!4 &2398580281109583802 stripped @@ -2543,6 +2571,10 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 2398580281290026756} m_Modifications: + - target: {fileID: 3615064021645340372, guid: 73a8b463fbb0b9f408110e7f4fda9135, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} - target: {fileID: 3615064021645340379, guid: 73a8b463fbb0b9f408110e7f4fda9135, type: 3} propertyPath: m_LocalPosition.x value: 0.867048 @@ -2631,6 +2663,10 @@ PrefabInstance: propertyPath: m_Name value: IcyRock2 (1) objectReference: {fileID: 0} + - target: {fileID: 3615064022929581581, guid: 73a8b463fbb0b9f408110e7f4fda9135, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} - target: {fileID: 3615064023001426709, guid: 73a8b463fbb0b9f408110e7f4fda9135, type: 3} propertyPath: m_LocalPosition.x value: 0.86319417 @@ -2663,6 +2699,26 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: -88.789 objectReference: {fileID: 0} + - target: {fileID: 3615064023001426710, guid: 73a8b463fbb0b9f408110e7f4fda9135, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 3615064023324551758, guid: 73a8b463fbb0b9f408110e7f4fda9135, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 3615064023352603840, guid: 73a8b463fbb0b9f408110e7f4fda9135, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 3615064023364307611, guid: 73a8b463fbb0b9f408110e7f4fda9135, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 3615064023710422362, guid: 73a8b463fbb0b9f408110e7f4fda9135, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 73a8b463fbb0b9f408110e7f4fda9135, type: 3} --- !u!4 &1396733388385571276 stripped @@ -2677,10 +2733,18 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 2398580281290026756} m_Modifications: + - target: {fileID: 8669146300186134904, guid: 9a43ba91eb395dd4fadd425be923e739, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} - target: {fileID: 8669146300404556696, guid: 9a43ba91eb395dd4fadd425be923e739, type: 3} propertyPath: m_Name value: IcyRock1 (1) objectReference: {fileID: 0} + - target: {fileID: 8669146300404556696, guid: 9a43ba91eb395dd4fadd425be923e739, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} - target: {fileID: 8669146300404556697, guid: 9a43ba91eb395dd4fadd425be923e739, type: 3} propertyPath: m_RootOrder value: 1 @@ -2725,6 +2789,34 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 24.903 objectReference: {fileID: 0} + - target: {fileID: 8669146300691402093, guid: 9a43ba91eb395dd4fadd425be923e739, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 8669146300827426469, guid: 9a43ba91eb395dd4fadd425be923e739, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 8669146301155911452, guid: 9a43ba91eb395dd4fadd425be923e739, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 8669146301202920058, guid: 9a43ba91eb395dd4fadd425be923e739, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 8669146301783036773, guid: 9a43ba91eb395dd4fadd425be923e739, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 8669146302209401058, guid: 9a43ba91eb395dd4fadd425be923e739, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 8669146302311696029, guid: 9a43ba91eb395dd4fadd425be923e739, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 9a43ba91eb395dd4fadd425be923e739, type: 3} --- !u!4 &2398580282054495888 stripped diff --git a/Assets/Prefabs/Dimension2/Dimension2.prefab b/Assets/Prefabs/Dimension2/Dimension2.prefab index 909bb9a..2549a82 100644 --- a/Assets/Prefabs/Dimension2/Dimension2.prefab +++ b/Assets/Prefabs/Dimension2/Dimension2.prefab @@ -11,7 +11,7 @@ GameObject: - component: {fileID: 5015426419719319480} - component: {fileID: 5015426419719319482} - component: {fileID: 5015426419719319483} - m_Layer: 0 + m_Layer: 8 m_Name: Cube (14) m_TagString: Untagged m_Icon: {fileID: 0} @@ -94,7 +94,7 @@ GameObject: - component: {fileID: 5015426419875465636} - component: {fileID: 5015426419875465638} - component: {fileID: 5015426419875465639} - m_Layer: 0 + m_Layer: 8 m_Name: Cube (16) m_TagString: Untagged m_Icon: {fileID: 0} @@ -177,7 +177,7 @@ GameObject: - component: {fileID: 5015426419918852097} - component: {fileID: 5015426419918852099} - component: {fileID: 5015426419918852096} - m_Layer: 0 + m_Layer: 8 m_Name: Cube (8) m_TagString: Untagged m_Icon: {fileID: 0} @@ -260,7 +260,7 @@ GameObject: - component: {fileID: 5015426419922235450} - component: {fileID: 5015426419922235452} - component: {fileID: 5015426419922235453} - m_Layer: 0 + m_Layer: 8 m_Name: Planet_Atmosphere m_TagString: Untagged m_Icon: {fileID: 0} @@ -343,7 +343,7 @@ GameObject: - component: {fileID: 5015426420008476206} - component: {fileID: 5015426420008476192} - component: {fileID: 5015426420008476193} - m_Layer: 0 + m_Layer: 8 m_Name: Planet_BackgroundAtmosphere m_TagString: Untagged m_Icon: {fileID: 0} @@ -426,7 +426,7 @@ GameObject: - component: {fileID: 5015426420192244867} - component: {fileID: 5015426420192244869} - component: {fileID: 5015426420192244866} - m_Layer: 0 + m_Layer: 8 m_Name: Cube (9) m_TagString: Untagged m_Icon: {fileID: 0} @@ -509,7 +509,7 @@ GameObject: - component: {fileID: 5015426420385309114} - component: {fileID: 5015426420385309116} - component: {fileID: 5015426420385309117} - m_Layer: 0 + m_Layer: 8 m_Name: Cube (12) m_TagString: Untagged m_Icon: {fileID: 0} @@ -592,7 +592,7 @@ GameObject: - component: {fileID: 5015426420422623471} - component: {fileID: 5015426420422623457} - component: {fileID: 5015426420422623470} - m_Layer: 0 + m_Layer: 8 m_Name: Continent1 m_TagString: Untagged m_Icon: {fileID: 0} @@ -675,7 +675,7 @@ GameObject: - component: {fileID: 5015426420591082859} - component: {fileID: 5015426420591082861} - component: {fileID: 5015426420591082858} - m_Layer: 0 + m_Layer: 8 m_Name: Cube (13) m_TagString: Untagged m_Icon: {fileID: 0} @@ -758,7 +758,7 @@ GameObject: - component: {fileID: 5015426420724552572} - component: {fileID: 5015426420724552574} - component: {fileID: 5015426420724552575} - m_Layer: 0 + m_Layer: 8 m_Name: Cube (7) m_TagString: Untagged m_Icon: {fileID: 0} @@ -841,7 +841,7 @@ GameObject: - component: {fileID: 5015426420731532868} - component: {fileID: 5015426420731532870} - component: {fileID: 5015426420731532871} - m_Layer: 0 + m_Layer: 8 m_Name: Continent2 m_TagString: Untagged m_Icon: {fileID: 0} @@ -922,7 +922,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 5015426420924495231} - m_Layer: 0 + m_Layer: 8 m_Name: Cities m_TagString: Untagged m_Icon: {fileID: 0} @@ -967,7 +967,7 @@ GameObject: - component: {fileID: 5015426420985307135} - component: {fileID: 5015426420985307121} - component: {fileID: 5015426420985307134} - m_Layer: 0 + m_Layer: 8 m_Name: Planet_Ground m_TagString: Untagged m_Icon: {fileID: 0} @@ -1048,7 +1048,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 5015426421145494681} - m_Layer: 0 + m_Layer: 8 m_Name: Dimension2 m_TagString: Untagged m_Icon: {fileID: 0} @@ -1086,7 +1086,7 @@ GameObject: - component: {fileID: 5015426421163371972} - component: {fileID: 5015426421163371974} - component: {fileID: 5015426421163371975} - m_Layer: 0 + m_Layer: 8 m_Name: Cube (18) m_TagString: Untagged m_Icon: {fileID: 0} @@ -1167,7 +1167,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 5015426421230668050} - m_Layer: 0 + m_Layer: 8 m_Name: Continents m_TagString: Untagged m_Icon: {fileID: 0} @@ -1204,7 +1204,7 @@ GameObject: - component: {fileID: 5015426421255727514} - component: {fileID: 5015426421255727516} - component: {fileID: 5015426421255727517} - m_Layer: 0 + m_Layer: 8 m_Name: Continent4 m_TagString: Untagged m_Icon: {fileID: 0} @@ -1287,7 +1287,7 @@ GameObject: - component: {fileID: 5015426421334338294} - component: {fileID: 5015426421334338280} - component: {fileID: 5015426421334338281} - m_Layer: 0 + m_Layer: 8 m_Name: Cube (15) m_TagString: Untagged m_Icon: {fileID: 0} @@ -1370,7 +1370,7 @@ GameObject: - component: {fileID: 5015426421634053086} - component: {fileID: 5015426421634053072} - component: {fileID: 5015426421634053073} - m_Layer: 0 + m_Layer: 8 m_Name: Cube (10) m_TagString: Untagged m_Icon: {fileID: 0} @@ -1453,7 +1453,7 @@ GameObject: - component: {fileID: 5015426421686547116} - component: {fileID: 5015426421686547118} - component: {fileID: 5015426421686547119} - m_Layer: 0 + m_Layer: 8 m_Name: Continent3 m_TagString: Untagged m_Icon: {fileID: 0} @@ -1536,7 +1536,7 @@ GameObject: - component: {fileID: 5015426421738369925} - component: {fileID: 5015426421738369927} - component: {fileID: 5015426421738369924} - m_Layer: 0 + m_Layer: 8 m_Name: Cube (11) m_TagString: Untagged m_Icon: {fileID: 0} @@ -1619,7 +1619,7 @@ GameObject: - component: {fileID: 5015426421754054403} - component: {fileID: 5015426421754054405} - component: {fileID: 5015426421754054402} - m_Layer: 0 + m_Layer: 8 m_Name: Cube (17) m_TagString: Untagged m_Icon: {fileID: 0} diff --git a/Assets/Prefabs/Dimension3/Dimension3.prefab b/Assets/Prefabs/Dimension3/Dimension3.prefab index b6c152e..8582e01 100644 --- a/Assets/Prefabs/Dimension3/Dimension3.prefab +++ b/Assets/Prefabs/Dimension3/Dimension3.prefab @@ -9,7 +9,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 3716208029932851165} - m_Layer: 0 + m_Layer: 9 m_Name: Cities m_TagString: Untagged m_Icon: {fileID: 0} @@ -42,7 +42,7 @@ GameObject: - component: {fileID: 3716208030383299723} - component: {fileID: 3716208030383299721} - component: {fileID: 3716208030383299722} - m_Layer: 0 + m_Layer: 9 m_Name: Continent2 (2) m_TagString: Untagged m_Icon: {fileID: 0} @@ -125,7 +125,7 @@ GameObject: - component: {fileID: 3716208030397492588} - component: {fileID: 3716208030397492586} - component: {fileID: 3716208030397492587} - m_Layer: 0 + m_Layer: 9 m_Name: Planet_Atmosphere m_TagString: Untagged m_Icon: {fileID: 0} @@ -208,7 +208,7 @@ GameObject: - component: {fileID: 3716208030530224077} - component: {fileID: 3716208030530224075} - component: {fileID: 3716208030530224076} - m_Layer: 0 + m_Layer: 9 m_Name: Continent1 m_TagString: Untagged m_Icon: {fileID: 0} @@ -291,7 +291,7 @@ GameObject: - component: {fileID: 3716208030641813397} - component: {fileID: 3716208030641813395} - component: {fileID: 3716208030641813396} - m_Layer: 0 + m_Layer: 9 m_Name: Continent4 m_TagString: Untagged m_Icon: {fileID: 0} @@ -374,7 +374,7 @@ GameObject: - component: {fileID: 3716208030742951723} - component: {fileID: 3716208030742951721} - component: {fileID: 3716208030742951722} - m_Layer: 0 + m_Layer: 9 m_Name: Planet_Ground m_TagString: Untagged m_Icon: {fileID: 0} @@ -457,7 +457,7 @@ GameObject: - component: {fileID: 3716208030782673088} - component: {fileID: 3716208030782673118} - component: {fileID: 3716208030782673119} - m_Layer: 0 + m_Layer: 9 m_Name: Continent2 (1) m_TagString: Untagged m_Icon: {fileID: 0} @@ -538,7 +538,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 3716208031202886383} - m_Layer: 0 + m_Layer: 9 m_Name: Continents m_TagString: Untagged m_Icon: {fileID: 0} @@ -578,7 +578,7 @@ GameObject: - component: {fileID: 3716208031331476247} - component: {fileID: 3716208031331476245} - component: {fileID: 3716208031331476246} - m_Layer: 0 + m_Layer: 9 m_Name: Continent2 m_TagString: Untagged m_Icon: {fileID: 0} @@ -661,7 +661,7 @@ GameObject: - component: {fileID: 3716208031385118208} - component: {fileID: 3716208031385118238} - component: {fileID: 3716208031385118239} - m_Layer: 0 + m_Layer: 9 m_Name: Continent3 m_TagString: Untagged m_Icon: {fileID: 0} @@ -744,7 +744,7 @@ GameObject: - component: {fileID: 3716208031513825179} - component: {fileID: 3716208031513825177} - component: {fileID: 3716208031513825178} - m_Layer: 0 + m_Layer: 9 m_Name: Continent3 (1) m_TagString: Untagged m_Icon: {fileID: 0} @@ -825,13 +825,13 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 3716208031609914071} - m_Layer: 0 + m_Layer: 9 m_Name: Dimension3 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!4 &3716208031609914071 Transform: m_ObjectHideFlags: 0 @@ -863,7 +863,7 @@ GameObject: - component: {fileID: 3716208031751796222} - component: {fileID: 3716208031751796220} - component: {fileID: 3716208031751796221} - m_Layer: 0 + m_Layer: 9 m_Name: Planet_BackgroundAtmosphere m_TagString: Untagged m_Icon: {fileID: 0} diff --git a/Assets/Scenes/Game.unity b/Assets/Scenes/Game.unity index 59d037b..753bb88 100644 --- a/Assets/Scenes/Game.unity +++ b/Assets/Scenes/Game.unity @@ -437,7 +437,7 @@ Camera: m_Depth: -1 m_CullingMask: serializedVersion: 2 - m_Bits: 375 + m_Bits: 257 m_RenderingPath: -1 m_TargetTexture: {fileID: 0} m_TargetDisplay: 0 @@ -1024,7 +1024,7 @@ Camera: m_Depth: -1 m_CullingMask: serializedVersion: 2 - m_Bits: 247 + m_Bits: 129 m_RenderingPath: -1 m_TargetTexture: {fileID: 0} m_TargetDisplay: 0 @@ -1112,7 +1112,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5015426421145494681, guid: c6e211178d3ea1546899914e1452b290, type: 3} propertyPath: m_RootOrder - value: 6 + value: 5 objectReference: {fileID: 0} - target: {fileID: 5015426421145494681, guid: c6e211178d3ea1546899914e1452b290, type: 3} propertyPath: m_LocalPosition.x @@ -1281,7 +1281,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3716208031609914071, guid: 9f3415896428db647aa49abdf733b2f7, type: 3} propertyPath: m_RootOrder - value: 5 + value: 6 objectReference: {fileID: 0} - target: {fileID: 3716208031609914071, guid: 9f3415896428db647aa49abdf733b2f7, type: 3} propertyPath: m_LocalPosition.x @@ -1379,8 +1379,8 @@ Transform: - {fileID: 752215057} - {fileID: 1171843674} - {fileID: 1854821314} - - {fileID: 1177878285} - {fileID: 1164703814} + - {fileID: 1177878285} m_Father: {fileID: 0} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1732,7 +1732,7 @@ Camera: m_Depth: -1 m_CullingMask: serializedVersion: 2 - m_Bits: 631 + m_Bits: 512 m_RenderingPath: -1 m_TargetTexture: {fileID: 0} m_TargetDisplay: 0 diff --git a/Assets/Scripts/SpawnManager.cs b/Assets/Scripts/SpawnManager.cs index 84ac286..ad45856 100644 --- a/Assets/Scripts/SpawnManager.cs +++ b/Assets/Scripts/SpawnManager.cs @@ -29,6 +29,13 @@ public class SpawnManager : MonoBehaviour while (running) { GameObject spawned = Instantiate(GetRandomEnemy(), GetRandomSpawn().transform.position, Quaternion.identity); + + foreach (Transform trans in spawned.GetComponentsInChildren(true)) + { + trans.gameObject.layer = gameObject.layer; + } + + spawned.layer = gameObject.layer; spawned.GetComponent().SetLandingPoint(GetRandomLandingPoint().transform); //TODO: replace 2f by function depending on elapsed time, decreasing waiting time over time yield return new WaitForSeconds(2f); From bad5bb7f04921b574213a3027ec0955d664e39a5 Mon Sep 17 00:00:00 2001 From: louishorlaville Date: Sun, 15 May 2022 13:06:15 -0400 Subject: [PATCH 2/6] raycast layer ignore turret --- Assets/Scripts/CannonScript.cs | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/Assets/Scripts/CannonScript.cs b/Assets/Scripts/CannonScript.cs index 7e06060..3593610 100644 --- a/Assets/Scripts/CannonScript.cs +++ b/Assets/Scripts/CannonScript.cs @@ -17,7 +17,6 @@ public class CannonScript : MonoBehaviour private Vector3 lookDir; private Vector3[] offsets; [SerializeField]private int bullets; - // Start is called before the first frame update void Start() @@ -47,8 +46,9 @@ public class CannonScript : MonoBehaviour GameObject proj = Instantiate(projectile, cannon.transform.position, cannon.transform.rotation); proj.GetComponent().SetDamage(damage); proj.GetComponent().AddForce(cannonForce * lookDir, ForceMode.Impulse); + //proj.layer = GameManager.Instance.GetDimensionLayer(); RaycastHit hit; - if (Physics.Raycast(transform.position, lookDir, out hit, Mathf.Infinity)) + if (Physics.Raycast(transform.position, lookDir, out hit, Mathf.Infinity, GetCurrentDimensionLayerMask())) { Debug.DrawRay(transform.position, lookDir * hit.distance, Color.yellow, 0.5f); @@ -119,6 +119,12 @@ public class CannonScript : MonoBehaviour } } + int GetCurrentDimensionLayerMask() + { + int layer_mask = LayerMask.GetMask("Dimension1"); + return layer_mask; + } + public void SetFireRate(float nFireRate){ this.fireRate = nFireRate; } From 3b5e1800aee5fbd5247d8d763de4b373418c1bed Mon Sep 17 00:00:00 2001 From: louishorlaville Date: Sun, 15 May 2022 13:08:52 -0400 Subject: [PATCH 3/6] merge conflicts resolved --- Assets/Scripts/DimensionController.cs | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/Assets/Scripts/DimensionController.cs b/Assets/Scripts/DimensionController.cs index 88188b6..2c3201e 100644 --- a/Assets/Scripts/DimensionController.cs +++ b/Assets/Scripts/DimensionController.cs @@ -5,10 +5,9 @@ public class DimensionController : MonoBehaviour public const int STARTING_HP = 25; [SerializeField] private int dimensionId; - private float _hp; private float _maxHp; - + [SerializeField] private LayerMask mask; private void Start() { _maxHp = STARTING_HP; @@ -30,4 +29,9 @@ public class DimensionController : MonoBehaviour GameManager.Instance.DealDamage(dimensionId, _hp, _maxHp); } + + public int GetDimensionMask() + { + return mask; + } } From 1e575d842cee188311f9e50178a2afe0a73f2ea7 Mon Sep 17 00:00:00 2001 From: louishorlaville Date: Sun, 15 May 2022 13:40:08 -0400 Subject: [PATCH 4/6] dimension enemies separated --- Assets/Art/cursor.png.meta | 6 +- Assets/Prefabs/Dimension2/Dimension2.prefab | 412 ++++++++++++++++++++ Assets/Prefabs/Dimension3/Dimension3.prefab | 412 ++++++++++++++++++++ Assets/Scenes/Game.unity | 12 + Assets/Scripts/CannonScript.cs | 10 +- Assets/Scripts/DimensionController.cs | 5 - Assets/Scripts/GameManager.cs | 11 + 7 files changed, 853 insertions(+), 15 deletions(-) diff --git a/Assets/Art/cursor.png.meta b/Assets/Art/cursor.png.meta index 4b8f70a..3e555a7 100644 --- a/Assets/Art/cursor.png.meta +++ b/Assets/Art/cursor.png.meta @@ -1,3 +1,3 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ac9386c8be13c4b9deac08ce4ff6ef801e49620cf45ad9047ab3b36ecd41b823 -size 4179 +version https://git-lfs.github.com/spec/v1 +oid sha256:ac9386c8be13c4b9deac08ce4ff6ef801e49620cf45ad9047ab3b36ecd41b823 +size 4179 diff --git a/Assets/Prefabs/Dimension2/Dimension2.prefab b/Assets/Prefabs/Dimension2/Dimension2.prefab index 81c7004..8355ee5 100644 --- a/Assets/Prefabs/Dimension2/Dimension2.prefab +++ b/Assets/Prefabs/Dimension2/Dimension2.prefab @@ -1,5 +1,129 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &2701587130472382 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3307957941050450712} + m_Layer: 8 + m_Name: EnemySpawn (3) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3307957941050450712 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2701587130472382} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -133.2, y: 33.4, z: 150} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 4390159126840100824} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &872514834599087876 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4087598276950163442} + m_Layer: 8 + m_Name: EnemySpawn (2) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4087598276950163442 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 872514834599087876} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 109.3, y: 53, z: 150} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 4390159126840100824} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1429163120264613799 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5534391903454589477} + m_Layer: 8 + m_Name: Enemy Landing (2) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5534391903454589477 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1429163120264613799} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 7.42, y: -3.98, z: 24.33} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1426859382771449358} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1727159932004445829 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8218443273677692803} + m_Layer: 8 + m_Name: EnemySpawn + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8218443273677692803 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1727159932004445829} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -22.4, y: 41.2, z: 150} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 4390159126840100824} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2067193707710349373 GameObject: m_ObjectHideFlags: 0 @@ -112,6 +236,134 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: dimensionId: 2 +--- !u!1 &2673668038071217881 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 332759642294504909} + m_Layer: 8 + m_Name: Enemy Landing (3) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &332759642294504909 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2673668038071217881} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 20.67, y: -4.42, z: 25.64} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1426859382771449358} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &3296799804749181229 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4390159126840100824} + m_Layer: 8 + m_Name: Enemy Spawns + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4390159126840100824 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3296799804749181229} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -3.878889, y: 4.7333827, z: 16.574528} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 8218443273677692803} + - {fileID: 1289169414816097464} + - {fileID: 4087598276950163442} + - {fileID: 3307957941050450712} + m_Father: {fileID: 5015426421145494681} + m_RootOrder: 6 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &3475331081139614099 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8236024617097452169} + m_Layer: 8 + m_Name: Enemy Landing + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8236024617097452169 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3475331081139614099} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 11.55, y: -3.66, z: 25.58} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1426859382771449358} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &4742959875422135333 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7747752604380414441} + m_Layer: 8 + m_Name: Enemy Landing (4) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7747752604380414441 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4742959875422135333} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 11, y: -4.28, z: 28} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1426859382771449358} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &5015426419719319481 GameObject: m_ObjectHideFlags: 0 @@ -1185,6 +1437,9 @@ Transform: - {fileID: 5015426420008476206} - {fileID: 5015426421230668050} - {fileID: 5015426420924495231} + - {fileID: 4390159126840100824} + - {fileID: 1426859382771449358} + - {fileID: 710553525347762417} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1804,3 +2059,160 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} +--- !u!1 &6067272506863576365 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1426859382771449358} + m_Layer: 8 + m_Name: Enemy Landings + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1426859382771449358 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6067272506863576365} + 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: + - {fileID: 8236024617097452169} + - {fileID: 6442144022898257260} + - {fileID: 5534391903454589477} + - {fileID: 332759642294504909} + - {fileID: 7747752604380414441} + m_Father: {fileID: 5015426421145494681} + m_RootOrder: 7 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &6481477184910170220 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6442144022898257260} + m_Layer: 8 + m_Name: Enemy Landing (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6442144022898257260 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6481477184910170220} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 1.32, y: -3.82, z: 30.52} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1426859382771449358} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &7618011320230681307 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1289169414816097464} + m_Layer: 8 + m_Name: EnemySpawn (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1289169414816097464 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7618011320230681307} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -73.1, y: 85.1, z: 150} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 4390159126840100824} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &7869023986934457488 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 710553525347762417} + - component: {fileID: 7361106090890738573} + m_Layer: 8 + m_Name: SpawnManager + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &710553525347762417 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7869023986934457488} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 6.404957, y: -0.5432863, z: 1.7262154} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 5015426421145494681} + m_RootOrder: 8 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &7361106090890738573 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7869023986934457488} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 07df021cb972a6e4eb77f239ba39e7de, type: 3} + m_Name: + m_EditorClassIdentifier: + spawningEnemies: + - {fileID: 7237433744057047552, guid: df02591cd5be4aa409b2523b5fe03ae1, type: 3} + - {fileID: 4834061106301780291, guid: 03bebbba108d4de4c9067425294d4775, type: 3} + - {fileID: 1002961339065835567, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3} + spawnPoints: + - {fileID: 8218443273677692803} + - {fileID: 1289169414816097464} + - {fileID: 4087598276950163442} + - {fileID: 3307957941050450712} + landingPoints: + - {fileID: 3475331081139614099} + - {fileID: 6481477184910170220} + - {fileID: 1429163120264613799} + - {fileID: 2673668038071217881} + running: 1 diff --git a/Assets/Prefabs/Dimension3/Dimension3.prefab b/Assets/Prefabs/Dimension3/Dimension3.prefab index 0431861..cf91cca 100644 --- a/Assets/Prefabs/Dimension3/Dimension3.prefab +++ b/Assets/Prefabs/Dimension3/Dimension3.prefab @@ -1,5 +1,102 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &19811541430567091 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8779397912542609948} + m_Layer: 9 + m_Name: EnemySpawn + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8779397912542609948 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 19811541430567091} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -22.4, y: 41.2, z: 150} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 5145920572488045551} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1807295577977948361 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2766422221383217301} + m_Layer: 9 + m_Name: Enemy Landing (3) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2766422221383217301 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1807295577977948361} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 20.67, y: -4.42, z: 25.64} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1936437648488952921} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &3415776103809438191 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5145920572488045551} + m_Layer: 9 + m_Name: Enemy Spawns + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5145920572488045551 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3415776103809438191} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -3.878889, y: 4.7333827, z: 16.574528} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 8779397912542609948} + - {fileID: 3464309897132326659} + - {fileID: 5881209025834837093} + - {fileID: 5404368881060052500} + m_Father: {fileID: 3716208031609914071} + m_RootOrder: 6 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &3716208029932851166 GameObject: m_ObjectHideFlags: 0 @@ -850,6 +947,9 @@ Transform: - {fileID: 3716208031751796222} - {fileID: 3716208031202886383} - {fileID: 3716208029932851165} + - {fileID: 5145920572488045551} + - {fileID: 1936437648488952921} + - {fileID: 8128138394307918254} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -936,6 +1036,287 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} +--- !u!1 &3842119746123959489 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5881209025834837093} + m_Layer: 9 + m_Name: EnemySpawn (2) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5881209025834837093 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3842119746123959489} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 109.3, y: 53, z: 150} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 5145920572488045551} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &5098481318941174854 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2166645105684850335} + m_Layer: 9 + m_Name: Enemy Landing (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2166645105684850335 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5098481318941174854} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 1.32, y: -3.82, z: 30.52} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1936437648488952921} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &5243223669999565944 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5404368881060052500} + m_Layer: 9 + m_Name: EnemySpawn (3) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5404368881060052500 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5243223669999565944} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -133.2, y: 33.4, z: 150} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 5145920572488045551} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &5419338251677938639 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1936437648488952921} + m_Layer: 9 + m_Name: Enemy Landings + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1936437648488952921 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5419338251677938639} + 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: + - {fileID: 6461625708689664904} + - {fileID: 2166645105684850335} + - {fileID: 6555465357541113628} + - {fileID: 2766422221383217301} + - {fileID: 8285799162868878114} + m_Father: {fileID: 3716208031609914071} + m_RootOrder: 7 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &5453563914023133267 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6555465357541113628} + m_Layer: 9 + m_Name: Enemy Landing (2) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6555465357541113628 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5453563914023133267} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 7.42, y: -3.98, z: 24.33} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1936437648488952921} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &6020901559455421545 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8285799162868878114} + m_Layer: 9 + m_Name: Enemy Landing (4) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8285799162868878114 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6020901559455421545} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 11, y: -4.28, z: 28} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1936437648488952921} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &6953170598633149291 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8128138394307918254} + - component: {fileID: 1836184234573858010} + m_Layer: 9 + m_Name: SpawnManager + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8128138394307918254 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6953170598633149291} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 6.404957, y: -0.5432863, z: 1.7262154} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 3716208031609914071} + m_RootOrder: 8 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1836184234573858010 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6953170598633149291} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 07df021cb972a6e4eb77f239ba39e7de, type: 3} + m_Name: + m_EditorClassIdentifier: + spawningEnemies: + - {fileID: 7237433744057047552, guid: df02591cd5be4aa409b2523b5fe03ae1, type: 3} + - {fileID: 4834061106301780291, guid: 03bebbba108d4de4c9067425294d4775, type: 3} + - {fileID: 1002961339065835567, guid: 3c33f37ff1cce2d48b88e476df2d47a0, type: 3} + spawnPoints: + - {fileID: 8779397912542609948} + - {fileID: 3464309897132326659} + - {fileID: 5881209025834837093} + - {fileID: 5404368881060052500} + landingPoints: + - {fileID: 8570257711496401826} + - {fileID: 5098481318941174854} + - {fileID: 5453563914023133267} + - {fileID: 1807295577977948361} + running: 1 +--- !u!1 &7858295601794300604 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3464309897132326659} + m_Layer: 9 + m_Name: EnemySpawn (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3464309897132326659 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7858295601794300604} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -73.1, y: 85.1, z: 150} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 5145920572488045551} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &8121996451995446280 GameObject: m_ObjectHideFlags: 0 @@ -1048,3 +1429,34 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: dimensionId: 3 +--- !u!1 &8570257711496401826 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6461625708689664904} + m_Layer: 9 + m_Name: Enemy Landing + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6461625708689664904 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8570257711496401826} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 11.55, y: -3.66, z: 25.58} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1936437648488952921} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/Assets/Scenes/Game.unity b/Assets/Scenes/Game.unity index 753bb88..4f368c8 100644 --- a/Assets/Scenes/Game.unity +++ b/Assets/Scenes/Game.unity @@ -1616,6 +1616,9 @@ MonoBehaviour: layer: 9 tabWidth: 0.05 quadOffset: 0.87 + OnChangeWorld: + m_PersistentCalls: + m_Calls: [] --- !u!4 &1536863737 Transform: m_ObjectHideFlags: 0 @@ -2253,8 +2256,17 @@ MonoBehaviour: cannonList: - {fileID: 1171843675} uiController: {fileID: 1926098617} + worldSwitcher: {fileID: 1536863736} state: 0 points: 0 + k__BackingField: 0 + maskList: + - serializedVersion: 2 + m_Bits: 128 + - serializedVersion: 2 + m_Bits: 256 + - serializedVersion: 2 + m_Bits: 512 --- !u!4 &1882905304 Transform: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/CannonScript.cs b/Assets/Scripts/CannonScript.cs index 3593610..189b9bb 100644 --- a/Assets/Scripts/CannonScript.cs +++ b/Assets/Scripts/CannonScript.cs @@ -46,9 +46,9 @@ public class CannonScript : MonoBehaviour GameObject proj = Instantiate(projectile, cannon.transform.position, cannon.transform.rotation); proj.GetComponent().SetDamage(damage); proj.GetComponent().AddForce(cannonForce * lookDir, ForceMode.Impulse); - //proj.layer = GameManager.Instance.GetDimensionLayer(); + proj.layer = GameManager.Instance.GetCurrentLayerID(); RaycastHit hit; - if (Physics.Raycast(transform.position, lookDir, out hit, Mathf.Infinity, GetCurrentDimensionLayerMask())) + if (Physics.Raycast(transform.position, lookDir, out hit, Mathf.Infinity, GameManager.Instance.GetCurrentDimensionLayerMask())) { Debug.DrawRay(transform.position, lookDir * hit.distance, Color.yellow, 0.5f); @@ -119,11 +119,7 @@ public class CannonScript : MonoBehaviour } } - int GetCurrentDimensionLayerMask() - { - int layer_mask = LayerMask.GetMask("Dimension1"); - return layer_mask; - } + public void SetFireRate(float nFireRate){ this.fireRate = nFireRate; diff --git a/Assets/Scripts/DimensionController.cs b/Assets/Scripts/DimensionController.cs index 2c3201e..7f7e130 100644 --- a/Assets/Scripts/DimensionController.cs +++ b/Assets/Scripts/DimensionController.cs @@ -7,7 +7,6 @@ public class DimensionController : MonoBehaviour [SerializeField] private int dimensionId; private float _hp; private float _maxHp; - [SerializeField] private LayerMask mask; private void Start() { _maxHp = STARTING_HP; @@ -30,8 +29,4 @@ public class DimensionController : MonoBehaviour GameManager.Instance.DealDamage(dimensionId, _hp, _maxHp); } - public int GetDimensionMask() - { - return mask; - } } diff --git a/Assets/Scripts/GameManager.cs b/Assets/Scripts/GameManager.cs index ba1e498..335ecb0 100644 --- a/Assets/Scripts/GameManager.cs +++ b/Assets/Scripts/GameManager.cs @@ -12,6 +12,7 @@ public class GameManager : MonoBehaviour [SerializeField, ReadOnly] private GameState state; [SerializeField, ReadOnly] private float points; [field: SerializeField, ReadOnly] public int CurrentDimensionID { get; private set; } + [SerializeField] private int[] IDLayerList; public static GameManager Instance { get; private set; } @@ -123,6 +124,16 @@ public class GameManager : MonoBehaviour uiController.UpdatePointsText(points); } + public LayerMask GetCurrentDimensionLayerMask() + { + return LayerMask.GetMask(LayerMask.LayerToName(IDLayerList[CurrentDimensionID])); + } + + public int GetCurrentLayerID() + { + return IDLayerList[CurrentDimensionID]; + } + } public enum GameState From 6abff695cbd3c3b4c60487253d016d6e0db9a875 Mon Sep 17 00:00:00 2001 From: louishorlaville Date: Sun, 15 May 2022 13:50:27 -0400 Subject: [PATCH 5/6] clean up enemy --- Assets/Scripts/Enemy.cs | 1 - 1 file changed, 1 deletion(-) diff --git a/Assets/Scripts/Enemy.cs b/Assets/Scripts/Enemy.cs index 23d19b3..5be61a0 100644 --- a/Assets/Scripts/Enemy.cs +++ b/Assets/Scripts/Enemy.cs @@ -40,7 +40,6 @@ public class Enemy : MonoBehaviour public void IsShot(float distance, float turretDamage) { float destroyDelay = Mathf.Sqrt(distance)/(500/5); - Debug.Log(distance+" : "+destroyDelay); _health -= turretDamage; if (_health <= 0) StartCoroutine(Destroy(destroyDelay)); } From 509efc97550b13f62e2298a2f7ba37fcf10ce3c8 Mon Sep 17 00:00:00 2001 From: louishorlaville Date: Sun, 15 May 2022 13:53:42 -0400 Subject: [PATCH 6/6] forgor to save oops --- Assets/Scenes/Game.unity | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/Assets/Scenes/Game.unity b/Assets/Scenes/Game.unity index 4f368c8..f4817f5 100644 --- a/Assets/Scenes/Game.unity +++ b/Assets/Scenes/Game.unity @@ -1735,7 +1735,7 @@ Camera: m_Depth: -1 m_CullingMask: serializedVersion: 2 - m_Bits: 512 + m_Bits: 513 m_RenderingPath: -1 m_TargetTexture: {fileID: 0} m_TargetDisplay: 0 @@ -2260,13 +2260,7 @@ MonoBehaviour: state: 0 points: 0 k__BackingField: 0 - maskList: - - serializedVersion: 2 - m_Bits: 128 - - serializedVersion: 2 - m_Bits: 256 - - serializedVersion: 2 - m_Bits: 512 + IDLayerList: 070000000800000009000000 --- !u!4 &1882905304 Transform: m_ObjectHideFlags: 0