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