diff --git a/Assets/Art/Materials/mat_trail.mat b/Assets/Art/Materials/mat_trail.mat index be5b389..4452d30 100644 --- a/Assets/Art/Materials/mat_trail.mat +++ b/Assets/Art/Materials/mat_trail.mat @@ -1,3 +1,3 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c265bf2e94c629fe2ba804aea7a08cdfdb59e47b2bbc6a0bd57f19ecab2447bb -size 3504 +version https://git-lfs.github.com/spec/v1 +oid sha256:c265bf2e94c629fe2ba804aea7a08cdfdb59e47b2bbc6a0bd57f19ecab2447bb +size 3504 diff --git a/Assets/Art/Materials/mat_trail.mat.meta b/Assets/Art/Materials/mat_trail.mat.meta index a0e3e41..c5d3d39 100644 --- a/Assets/Art/Materials/mat_trail.mat.meta +++ b/Assets/Art/Materials/mat_trail.mat.meta @@ -1,3 +1,3 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:46aef8acedacfac67e586ecb122984b45641543888639d45ff7fc506253ff156 -size 188 +version https://git-lfs.github.com/spec/v1 +oid sha256:46aef8acedacfac67e586ecb122984b45641543888639d45ff7fc506253ff156 +size 188 diff --git a/Assets/Art/cursor.png b/Assets/Art/cursor.png new file mode 100644 index 0000000..d2be765 --- /dev/null +++ b/Assets/Art/cursor.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:be2101d1fb92830d6dcd520f524f7e24d843da88158d6da2193796563cae5dc6 +size 534 diff --git a/Assets/Art/cursor.png.meta b/Assets/Art/cursor.png.meta new file mode 100644 index 0000000..10a4fe0 --- /dev/null +++ b/Assets/Art/cursor.png.meta @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:03e5482cd2175de469d9d5619ba7e4f606a45ab974d97548a45bf1bcd5ecb9e1 +size 3515 diff --git a/Assets/Scenes/Game.unity b/Assets/Scenes/Game.unity index 5ec849b..04faf89 100644 --- a/Assets/Scenes/Game.unity +++ b/Assets/Scenes/Game.unity @@ -132,7 +132,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 107155301} - m_Layer: 0 + m_Layer: 7 m_Name: EnemySpawn m_TagString: Untagged m_Icon: {fileID: 0} @@ -278,7 +278,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 177394885} - m_Layer: 0 + m_Layer: 7 m_Name: Enemy Landing m_TagString: Untagged m_Icon: {fileID: 0} @@ -311,7 +311,7 @@ GameObject: - component: {fileID: 191659642} - component: {fileID: 191659645} - component: {fileID: 191659644} - m_Layer: 0 + m_Layer: 7 m_Name: Sphere m_TagString: Untagged m_Icon: {fileID: 0} @@ -392,7 +392,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 206132549} - m_Layer: 0 + m_Layer: 7 m_Name: Enemy Landing (3) m_TagString: Untagged m_Icon: {fileID: 0} @@ -425,7 +425,7 @@ GameObject: - component: {fileID: 206856358} - component: {fileID: 206856357} - component: {fileID: 206856356} - m_Layer: 0 + m_Layer: 7 m_Name: Directional light (2) m_TagString: Untagged m_Icon: {fileID: 0} @@ -540,7 +540,7 @@ GameObject: - component: {fileID: 285032585} - component: {fileID: 285032587} - component: {fileID: 285032586} - m_Layer: 0 + m_Layer: 7 m_Name: Sphere (4) m_TagString: Untagged m_Icon: {fileID: 0} @@ -621,7 +621,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 305053892} - m_Layer: 0 + m_Layer: 7 m_Name: Dimension1 m_TagString: Untagged m_Icon: {fileID: 0} @@ -662,7 +662,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 441179166} - m_Layer: 0 + m_Layer: 7 m_Name: EnemySpawn (1) m_TagString: Untagged m_Icon: {fileID: 0} @@ -696,7 +696,7 @@ GameObject: - component: {fileID: 446939847} - component: {fileID: 446939846} - component: {fileID: 446939845} - m_Layer: 0 + m_Layer: 7 m_Name: Cube (9) m_TagString: Untagged m_Icon: {fileID: 0} @@ -790,7 +790,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 447514118} - m_Layer: 0 + m_Layer: 7 m_Name: Cannon m_TagString: Untagged m_Icon: {fileID: 0} @@ -824,6 +824,10 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 305053892} m_Modifications: + - target: {fileID: 6969840675257017922, guid: 486166ffed264a842ab4bc0affec38c4, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} - target: {fileID: 6969840675499469969, guid: 486166ffed264a842ab4bc0affec38c4, type: 3} propertyPath: m_RootOrder value: 2 @@ -872,6 +876,18 @@ PrefabInstance: propertyPath: m_Name value: Player objectReference: {fileID: 0} + - target: {fileID: 6969840675499469974, guid: 486166ffed264a842ab4bc0affec38c4, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 6969840675949508920, guid: 486166ffed264a842ab4bc0affec38c4, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 8541489750845001500, guid: 486166ffed264a842ab4bc0affec38c4, type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 486166ffed264a842ab4bc0affec38c4, type: 3} --- !u!1001 &493221991 @@ -964,7 +980,7 @@ GameObject: - component: {fileID: 543652973} - component: {fileID: 543652972} - component: {fileID: 543652971} - m_Layer: 0 + m_Layer: 7 m_Name: Cube (9) m_TagString: Untagged m_Icon: {fileID: 0} @@ -1137,7 +1153,7 @@ GameObject: - component: {fileID: 691100314} - component: {fileID: 691100313} - component: {fileID: 691100312} - m_Layer: 0 + m_Layer: 7 m_Name: Cube (8) m_TagString: Untagged m_Icon: {fileID: 0} @@ -1234,7 +1250,7 @@ GameObject: - component: {fileID: 727020436} - component: {fileID: 727020435} - component: {fileID: 727020434} - m_Layer: 0 + m_Layer: 7 m_Name: Cube (15) m_TagString: Untagged m_Icon: {fileID: 0} @@ -1328,7 +1344,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 767223067} - m_Layer: 0 + m_Layer: 7 m_Name: Enemy Landing (2) m_TagString: Untagged m_Icon: {fileID: 0} @@ -1362,7 +1378,7 @@ GameObject: - component: {fileID: 777505484} - component: {fileID: 777505483} - component: {fileID: 777505482} - m_Layer: 0 + m_Layer: 7 m_Name: Main Camera m_TagString: MainCamera m_Icon: {fileID: 0} @@ -1480,7 +1496,7 @@ GameObject: - component: {fileID: 825695522} - component: {fileID: 825695521} - component: {fileID: 825695520} - m_Layer: 0 + m_Layer: 7 m_Name: Cube (12) m_TagString: Untagged m_Icon: {fileID: 0} @@ -1577,7 +1593,7 @@ GameObject: - component: {fileID: 830349663} - component: {fileID: 830349662} - component: {fileID: 830349661} - m_Layer: 0 + m_Layer: 7 m_Name: Cube (11) m_TagString: Untagged m_Icon: {fileID: 0} @@ -1722,7 +1738,7 @@ GameObject: - component: {fileID: 893114647} - component: {fileID: 893114649} - component: {fileID: 893114648} - m_Layer: 0 + m_Layer: 7 m_Name: Shield m_TagString: Untagged m_Icon: {fileID: 0} @@ -1803,7 +1819,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 920644879} - m_Layer: 0 + m_Layer: 7 m_Name: EnemySpawn (2) m_TagString: Untagged m_Icon: {fileID: 0} @@ -1837,7 +1853,7 @@ GameObject: - component: {fileID: 934168211} - component: {fileID: 934168210} - component: {fileID: 934168209} - m_Layer: 0 + m_Layer: 7 m_Name: Cube (7) m_TagString: Untagged m_Icon: {fileID: 0} @@ -1934,7 +1950,7 @@ GameObject: - component: {fileID: 939499794} - component: {fileID: 939499793} - component: {fileID: 939499792} - m_Layer: 0 + m_Layer: 7 m_Name: Cube (13) m_TagString: Untagged m_Icon: {fileID: 0} @@ -2030,7 +2046,7 @@ GameObject: - component: {fileID: 949068560} - component: {fileID: 949068562} - component: {fileID: 949068561} - m_Layer: 0 + m_Layer: 7 m_Name: Sphere (5) m_TagString: Untagged m_Icon: {fileID: 0} @@ -2113,7 +2129,7 @@ GameObject: - component: {fileID: 949447414} - component: {fileID: 949447416} - component: {fileID: 949447415} - m_Layer: 0 + m_Layer: 7 m_Name: Atmosphere m_TagString: Untagged m_Icon: {fileID: 0} @@ -2194,7 +2210,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 960621281} - m_Layer: 0 + m_Layer: 7 m_Name: Enemy Landings m_TagString: Untagged m_Icon: {fileID: 0} @@ -2233,7 +2249,7 @@ GameObject: - component: {fileID: 1007592130} - component: {fileID: 1007592129} - component: {fileID: 1007592128} - m_Layer: 0 + m_Layer: 7 m_Name: Cube (18) m_TagString: Untagged m_Icon: {fileID: 0} @@ -2330,7 +2346,7 @@ GameObject: - component: {fileID: 1030989725} - component: {fileID: 1030989724} - component: {fileID: 1030989723} - m_Layer: 0 + m_Layer: 7 m_Name: Cube (5) m_TagString: Untagged m_Icon: {fileID: 0} @@ -2424,7 +2440,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1031939928} - m_Layer: 0 + m_Layer: 7 m_Name: Enemy Landing (1) m_TagString: Untagged m_Icon: {fileID: 0} @@ -2458,7 +2474,7 @@ GameObject: - component: {fileID: 1091733483} - component: {fileID: 1091733482} - component: {fileID: 1091733481} - m_Layer: 0 + m_Layer: 7 m_Name: Cube (17) m_TagString: Untagged m_Icon: {fileID: 0} @@ -2584,7 +2600,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1236806025} - m_Layer: 0 + m_Layer: 7 m_Name: Terrain m_TagString: Untagged m_Icon: {fileID: 0} @@ -2636,7 +2652,7 @@ GameObject: - component: {fileID: 1238131413} - component: {fileID: 1238131412} - component: {fileID: 1238131411} - m_Layer: 0 + m_Layer: 7 m_Name: Cube (6) m_TagString: Untagged m_Icon: {fileID: 0} @@ -2733,7 +2749,7 @@ GameObject: - component: {fileID: 1265433792} - component: {fileID: 1265433791} - component: {fileID: 1265433790} - m_Layer: 0 + m_Layer: 7 m_Name: Cube (8) m_TagString: Untagged m_Icon: {fileID: 0} @@ -2827,7 +2843,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1278694312} - m_Layer: 0 + m_Layer: 7 m_Name: EnemySpawn (3) m_TagString: Untagged m_Icon: {fileID: 0} @@ -2861,7 +2877,7 @@ GameObject: - component: {fileID: 1308427509} - component: {fileID: 1308427508} - component: {fileID: 1308427507} - m_Layer: 0 + m_Layer: 7 m_Name: Cube (5) m_TagString: Untagged m_Icon: {fileID: 0} @@ -2956,7 +2972,7 @@ GameObject: m_Component: - component: {fileID: 1362940785} - component: {fileID: 1362940786} - m_Layer: 0 + m_Layer: 7 m_Name: SpawnManager m_TagString: Untagged m_Icon: {fileID: 0} @@ -3015,7 +3031,7 @@ GameObject: - component: {fileID: 1556790004} - component: {fileID: 1556790006} - component: {fileID: 1556790005} - m_Layer: 0 + m_Layer: 7 m_Name: Sphere (6) m_TagString: Untagged m_Icon: {fileID: 0} @@ -3099,7 +3115,7 @@ GameObject: - component: {fileID: 1619262922} - component: {fileID: 1619262921} - component: {fileID: 1619262920} - m_Layer: 0 + m_Layer: 7 m_Name: Sphere (2) m_TagString: Untagged m_Icon: {fileID: 0} @@ -3196,7 +3212,7 @@ GameObject: - component: {fileID: 1644642074} - component: {fileID: 1644642073} - component: {fileID: 1644642072} - m_Layer: 0 + m_Layer: 7 m_Name: Cube (14) m_TagString: Untagged m_Icon: {fileID: 0} @@ -3293,7 +3309,7 @@ GameObject: - component: {fileID: 1752478147} - component: {fileID: 1752478146} - component: {fileID: 1752478145} - m_Layer: 0 + m_Layer: 7 m_Name: Cube (4) m_TagString: Untagged m_Icon: {fileID: 0} @@ -3390,7 +3406,7 @@ GameObject: - component: {fileID: 1761989142} - component: {fileID: 1761989141} - component: {fileID: 1761989140} - m_Layer: 0 + m_Layer: 7 m_Name: Cube (7) m_TagString: Untagged m_Icon: {fileID: 0} @@ -3487,7 +3503,7 @@ GameObject: - component: {fileID: 1792690161} - component: {fileID: 1792690160} - component: {fileID: 1792690159} - m_Layer: 0 + m_Layer: 7 m_Name: Cube (10) m_TagString: Untagged m_Icon: {fileID: 0} @@ -3572,6 +3588,136 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1792690157} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!1 &1795017774 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1795017776} + - component: {fileID: 1795017775} + m_Layer: 0 + m_Name: cursor + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!212 &1795017775 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1795017774} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: 21300000, guid: c6535c9f0b512474f9d06a68ab050a30, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 0.32, y: 0.32} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 0 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!4 &1795017776 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1795017774} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 7 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1882905302 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1882905304} + - component: {fileID: 1882905303} + m_Layer: 0 + m_Name: GameManager + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1882905303 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1882905302} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: cbbe9406db76ed447bdc7c36883ee139, type: 3} + m_Name: + m_EditorClassIdentifier: + _controls: {fileID: 0} + _state: 0 +--- !u!4 &1882905304 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1882905302} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 6 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1891622500 GameObject: m_ObjectHideFlags: 0 @@ -3581,7 +3727,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1891622501} - m_Layer: 0 + m_Layer: 7 m_Name: Enemy Landing (4) m_TagString: Untagged m_Icon: {fileID: 0} @@ -3615,7 +3761,7 @@ GameObject: - component: {fileID: 1940831247} - component: {fileID: 1940831246} - component: {fileID: 1940831245} - m_Layer: 0 + m_Layer: 7 m_Name: Cube (16) m_TagString: Untagged m_Icon: {fileID: 0} @@ -3711,7 +3857,7 @@ GameObject: - component: {fileID: 2069878909} - component: {fileID: 2069878911} - component: {fileID: 2069878910} - m_Layer: 0 + m_Layer: 7 m_Name: Sphere (7) m_TagString: Untagged m_Icon: {fileID: 0} @@ -3797,7 +3943,7 @@ GameObject: - component: {fileID: 2089817558} - component: {fileID: 2089817557} - component: {fileID: 2089817556} - m_Layer: 0 + m_Layer: 7 m_Name: Turret (1) m_TagString: Untagged m_Icon: {fileID: 0} @@ -4020,7 +4166,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 2100191970} - m_Layer: 0 + m_Layer: 7 m_Name: Enemy Spawns m_TagString: Untagged m_Icon: {fileID: 0} diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset index 5f7c784..9bd6d10 100644 --- a/ProjectSettings/EditorBuildSettings.asset +++ b/ProjectSettings/EditorBuildSettings.asset @@ -5,7 +5,7 @@ EditorBuildSettings: m_ObjectHideFlags: 0 serializedVersion: 2 m_Scenes: - - enabled: 1 - path: Assets/Scenes/SampleScene.unity - guid: 8c9cfa26abfee488c85f1582747f6a02 + - enabled: 0 + path: + guid: 00000000000000000000000000000000 m_configObjects: {} diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 9db7741..55379a2 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -14,7 +14,7 @@ PlayerSettings: accelerometerFrequency: 60 companyName: Conjure productName: ConjureCreativeJam20 - defaultCursor: {fileID: 0} + defaultCursor: {fileID: 2800000, guid: c6535c9f0b512474f9d06a68ab050a30, type: 3} cursorHotspot: {x: 0, y: 0} m_SplashScreenBackgroundColor: {r: 0.13725491, g: 0.12156863, b: 0.1254902, a: 1} m_ShowUnitySplashScreen: 1