From 9dd1758b4cb5396678614bc209fc646d7d859ecc Mon Sep 17 00:00:00 2001 From: Skiedas <> Date: Mon, 1 Mar 2021 18:39:29 +0300 Subject: [PATCH] Code refactoring --- Assets/Group1/Prefabs.meta | 8 + Assets/Group1/Prefabs/Enemy.prefab | 127 +++++ Assets/Group1/Prefabs/Enemy.prefab.meta | 7 + Assets/Group1/Prefabs/SpeedBooster.prefab | 127 +++++ .../Group1/Prefabs/SpeedBooster.prefab.meta | 7 + Assets/Group1/Scenes/KillAllEnemies.unity | 519 ++++-------------- Assets/Group1/Scripts/Enemy.meta | 8 + Assets/Group1/Scripts/Enemy/Enemy.cs | 14 + .../{e.cs.meta => Enemy/Enemy.cs.meta} | 2 +- Assets/Group1/Scripts/Enemy/EnemyMover.cs | 28 + .../EnemyMover.cs.meta} | 2 +- Assets/Group1/Scripts/GameController.cs | 38 -- Assets/Group1/Scripts/GameOverScreen.cs | 7 + ...Script1.cs.meta => GameOverScreen.cs.meta} | 2 +- Assets/Group1/Scripts/NewBehaviourScript1.cs | 65 --- Assets/Group1/Scripts/Player.meta | 8 + Assets/Group1/Scripts/Player/Player.cs | 50 ++ Assets/Group1/Scripts/Player/Player.cs.meta | 11 + .../Scripts/Player/PlayerCollisionHandler.cs | 29 + .../Player/PlayerCollisionHandler.cs.meta | 11 + Assets/Group1/Scripts/Player/PlayerInput.cs | 29 + .../Group1/Scripts/Player/PlayerInput.cs.meta | 11 + Assets/Group1/Scripts/Player/PlayerMover.cs | 19 + .../Group1/Scripts/Player/PlayerMover.cs.meta | 11 + Assets/Group1/Scripts/Spawner.cs | 45 ++ Assets/Group1/Scripts/Spawner.cs.meta | 11 + Assets/Group1/Scripts/SpeedBooster.cs | 12 + Assets/Group1/Scripts/SpeedBooster.cs.meta | 11 + Assets/Group1/Scripts/e.cs | 22 - Assets/Group1/Sprites.meta | 8 + Assets/Group1/{ => Sprites}/Player.png | Bin Assets/Group1/{ => Sprites}/Player.png.meta | 0 .../{enemy.png => Sprites/SpeedBooster.png} | Bin Assets/Group1/Sprites/SpeedBooster.png.meta | 98 ++++ Assets/Group1/Sprites/enemy.png | Bin 0 -> 78 bytes Assets/Group1/{ => Sprites}/enemy.png.meta | 0 36 files changed, 808 insertions(+), 539 deletions(-) create mode 100644 Assets/Group1/Prefabs.meta create mode 100644 Assets/Group1/Prefabs/Enemy.prefab create mode 100644 Assets/Group1/Prefabs/Enemy.prefab.meta create mode 100644 Assets/Group1/Prefabs/SpeedBooster.prefab create mode 100644 Assets/Group1/Prefabs/SpeedBooster.prefab.meta create mode 100644 Assets/Group1/Scripts/Enemy.meta create mode 100644 Assets/Group1/Scripts/Enemy/Enemy.cs rename Assets/Group1/Scripts/{e.cs.meta => Enemy/Enemy.cs.meta} (83%) create mode 100644 Assets/Group1/Scripts/Enemy/EnemyMover.cs rename Assets/Group1/Scripts/{GameController.cs.meta => Enemy/EnemyMover.cs.meta} (83%) delete mode 100644 Assets/Group1/Scripts/GameController.cs create mode 100644 Assets/Group1/Scripts/GameOverScreen.cs rename Assets/Group1/Scripts/{NewBehaviourScript1.cs.meta => GameOverScreen.cs.meta} (83%) delete mode 100644 Assets/Group1/Scripts/NewBehaviourScript1.cs create mode 100644 Assets/Group1/Scripts/Player.meta create mode 100644 Assets/Group1/Scripts/Player/Player.cs create mode 100644 Assets/Group1/Scripts/Player/Player.cs.meta create mode 100644 Assets/Group1/Scripts/Player/PlayerCollisionHandler.cs create mode 100644 Assets/Group1/Scripts/Player/PlayerCollisionHandler.cs.meta create mode 100644 Assets/Group1/Scripts/Player/PlayerInput.cs create mode 100644 Assets/Group1/Scripts/Player/PlayerInput.cs.meta create mode 100644 Assets/Group1/Scripts/Player/PlayerMover.cs create mode 100644 Assets/Group1/Scripts/Player/PlayerMover.cs.meta create mode 100644 Assets/Group1/Scripts/Spawner.cs create mode 100644 Assets/Group1/Scripts/Spawner.cs.meta create mode 100644 Assets/Group1/Scripts/SpeedBooster.cs create mode 100644 Assets/Group1/Scripts/SpeedBooster.cs.meta delete mode 100644 Assets/Group1/Scripts/e.cs create mode 100644 Assets/Group1/Sprites.meta rename Assets/Group1/{ => Sprites}/Player.png (100%) rename Assets/Group1/{ => Sprites}/Player.png.meta (100%) rename Assets/Group1/{enemy.png => Sprites/SpeedBooster.png} (100%) create mode 100644 Assets/Group1/Sprites/SpeedBooster.png.meta create mode 100644 Assets/Group1/Sprites/enemy.png rename Assets/Group1/{ => Sprites}/enemy.png.meta (100%) diff --git a/Assets/Group1/Prefabs.meta b/Assets/Group1/Prefabs.meta new file mode 100644 index 00000000..19fc37fb --- /dev/null +++ b/Assets/Group1/Prefabs.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 9061dc5cf88a69a43b02cd9f05a38a43 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Group1/Prefabs/Enemy.prefab b/Assets/Group1/Prefabs/Enemy.prefab new file mode 100644 index 00000000..eab45d25 --- /dev/null +++ b/Assets/Group1/Prefabs/Enemy.prefab @@ -0,0 +1,127 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &2826145763983631586 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2826145763983631588} + - component: {fileID: 2826145763983631587} + - component: {fileID: 2826145763983631590} + - component: {fileID: 2826145763983631589} + - component: {fileID: 2826145763983631591} + m_Layer: 0 + m_Name: Enemy + m_TagString: Enemy + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2826145763983631588 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2826145763983631586} + 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_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &2826145763983631587 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2826145763983631586} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 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: 0 + 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: c393ddce902166c4fb0e2130d216d549, type: 3} + m_Color: {r: 0.9056604, g: 0.2947668, b: 0.2947668, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 1, y: 1} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!114 &2826145763983631590 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2826145763983631586} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f22588b0fcbefcc4b84f9e3517c3ff7e, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &2826145763983631589 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2826145763983631586} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5cdb8dffa9a1f234b94d495bcf37708b, type: 3} + m_Name: + m_EditorClassIdentifier: + _speed: 2 +--- !u!58 &2826145763983631591 +CircleCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2826145763983631586} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + serializedVersion: 2 + m_Radius: 0.1 diff --git a/Assets/Group1/Prefabs/Enemy.prefab.meta b/Assets/Group1/Prefabs/Enemy.prefab.meta new file mode 100644 index 00000000..f86e75e0 --- /dev/null +++ b/Assets/Group1/Prefabs/Enemy.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 0ca5c49e436c8274faf062e614408af8 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Group1/Prefabs/SpeedBooster.prefab b/Assets/Group1/Prefabs/SpeedBooster.prefab new file mode 100644 index 00000000..d506dd64 --- /dev/null +++ b/Assets/Group1/Prefabs/SpeedBooster.prefab @@ -0,0 +1,127 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &568039437005198880 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 568039437005198886} + - component: {fileID: 568039437005198881} + - component: {fileID: 4155048477881768868} + - component: {fileID: -5997274343979170712} + m_Layer: 0 + m_Name: SpeedBooster + m_TagString: Enemy + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &568039437005198886 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 568039437005198880} + 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_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &568039437005198881 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 568039437005198880} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 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: 0 + 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: dbbfd62221409ce4fb9432aef8762019, type: 3} + m_Color: {r: 0, g: 0.42026186, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 1, y: 1} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!114 &4155048477881768868 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 568039437005198880} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c02f3824249df2e4e95f28d2901f2e00, type: 3} + m_Name: + m_EditorClassIdentifier: + _multiplier: 1.25 + _duration: 2 +--- !u!60 &-5997274343979170712 +PolygonCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 568039437005198880} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.5, y: 0.5} + oldSize: {x: 1, y: 1} + newSize: {x: 1, y: 1} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + m_Points: + m_Paths: + - - {x: 0, y: 0.4} + - {x: -0.3330127, y: -0.2} + - {x: 0.3330127, y: -0.2} diff --git a/Assets/Group1/Prefabs/SpeedBooster.prefab.meta b/Assets/Group1/Prefabs/SpeedBooster.prefab.meta new file mode 100644 index 00000000..79075343 --- /dev/null +++ b/Assets/Group1/Prefabs/SpeedBooster.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 04495cea03a3ef5478681567c8ead932 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Group1/Scenes/KillAllEnemies.unity b/Assets/Group1/Scenes/KillAllEnemies.unity index 21adfb9b..2564a501 100644 --- a/Assets/Group1/Scenes/KillAllEnemies.unity +++ b/Assets/Group1/Scenes/KillAllEnemies.unity @@ -37,8 +37,8 @@ RenderSettings: m_ReflectionBounces: 1 m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} - m_Sun: {fileID: 170076734} - m_IndirectSpecularColor: {r: 0.44657898, g: 0.4964133, b: 0.5748178, a: 1} + m_Sun: {fileID: 0} + m_IndirectSpecularColor: {r: 0.37311926, g: 0.38073996, b: 0.35872698, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -54,7 +54,7 @@ LightmapSettings: m_EnableBakedLightmaps: 1 m_EnableRealtimeLightmaps: 0 m_LightmapEditorSettings: - serializedVersion: 10 + serializedVersion: 12 m_Resolution: 2 m_BakeResolution: 10 m_AtlasSize: 512 @@ -62,6 +62,7 @@ LightmapSettings: m_AOMaxDistance: 1 m_CompAOExponent: 1 m_CompAOExponentDirect: 0 + m_ExtractAmbientOcclusion: 0 m_Padding: 2 m_LightmapParameters: {fileID: 0} m_LightmapsBakeMode: 1 @@ -76,10 +77,16 @@ LightmapSettings: m_PVRDirectSampleCount: 32 m_PVRSampleCount: 256 m_PVRBounces: 2 + m_PVREnvironmentSampleCount: 256 + m_PVREnvironmentReferencePointCount: 2048 + m_PVRFilteringMode: 2 + m_PVRDenoiserTypeDirect: 0 + m_PVRDenoiserTypeIndirect: 0 + m_PVRDenoiserTypeAO: 0 m_PVRFilterTypeDirect: 0 m_PVRFilterTypeIndirect: 0 m_PVRFilterTypeAO: 0 - m_PVRFilteringMode: 1 + m_PVREnvironmentMIS: 0 m_PVRCulling: 1 m_PVRFilteringGaussRadiusDirect: 1 m_PVRFilteringGaussRadiusIndirect: 5 @@ -87,7 +94,9 @@ LightmapSettings: m_PVRFilteringAtrousPositionSigmaDirect: 0.5 m_PVRFilteringAtrousPositionSigmaIndirect: 2 m_PVRFilteringAtrousPositionSigmaAO: 1 - m_ShowResolutionOverlay: 1 + m_ExportTrainingData: 0 + m_TrainingDataDestination: TrainingData + m_LightProbeSampleCountMultiplier: 4 m_LightingDataAsset: {fileID: 0} m_UseShadowmask: 1 --- !u!196 &4 @@ -112,7 +121,7 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} ---- !u!1 &141422275 +--- !u!1 &496305290 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -120,159 +129,49 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 141422279} - - component: {fileID: 141422278} - - component: {fileID: 141422277} + - component: {fileID: 496305292} + - component: {fileID: 496305291} m_Layer: 0 - m_Name: enemy - m_TagString: Enemy + m_Name: Spawner + m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!114 &141422277 +--- !u!114 &496305291 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 141422275} + m_GameObject: {fileID: 496305290} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 65f7df4705b7dae48944a39b48934484, type: 3} + m_Script: {fileID: 11500000, guid: 55cfb65f5037dc242841c683f721a388, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!212 &141422278 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 141422275} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - 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_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 0 - 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: c393ddce902166c4fb0e2130d216d549, type: 3} - m_Color: {r: 0.9056604, g: 0.2947668, b: 0.2947668, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 1, y: 1} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 ---- !u!4 &141422279 + _gameOverScreen: {fileID: 1054253065} + _enemyTemplate: {fileID: 2826145763983631586, guid: 0ca5c49e436c8274faf062e614408af8, + type: 3} + _speedBoosterTemplate: {fileID: 568039437005198880, guid: 04495cea03a3ef5478681567c8ead932, + type: 3} + _enemyCount: 10 + _speedBoosterCount: 3 + _spawnRadius: 6 +--- !u!4 &496305292 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 141422275} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 3.59, y: 3.09, z: 0} + m_GameObject: {fileID: 496305290} + 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_Children: [] m_Father: {fileID: 0} - m_RootOrder: 4 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &170076733 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 170076735} - - component: {fileID: 170076734} - m_Layer: 0 - m_Name: Directional Light - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!108 &170076734 -Light: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 170076733} - m_Enabled: 1 - serializedVersion: 8 - m_Type: 1 - m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1} - m_Intensity: 1 - m_Range: 10 - m_SpotAngle: 30 - m_CookieSize: 10 - m_Shadows: - m_Type: 2 - m_Resolution: -1 - m_CustomResolution: -1 - m_Strength: 1 - m_Bias: 0.05 - m_NormalBias: 0.4 - m_NearPlane: 0.2 - m_Cookie: {fileID: 0} - m_DrawHalo: 0 - m_Flare: {fileID: 0} - m_RenderMode: 0 - m_CullingMask: - serializedVersion: 2 - m_Bits: 4294967295 - m_Lightmapping: 1 - m_LightShadowCasterMode: 0 - m_AreaSize: {x: 1, y: 1} - m_BounceIntensity: 1 - m_ColorTemperature: 6570 - m_UseColorTemperature: 0 - m_ShadowRadius: 0 - m_ShadowAngle: 0 ---- !u!4 &170076735 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 170076733} - m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261} - m_LocalPosition: {x: 0, y: 3, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} --- !u!1 &534669902 GameObject: m_ObjectHideFlags: 0 @@ -284,7 +183,6 @@ GameObject: - component: {fileID: 534669905} - component: {fileID: 534669904} - component: {fileID: 534669903} - - component: {fileID: 534669906} m_Layer: 0 m_Name: Main Camera m_TagString: MainCamera @@ -312,9 +210,10 @@ Camera: m_ClearFlags: 1 m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} m_projectionMatrixMode: 1 + m_GateFitMode: 2 + m_FOVAxisMode: 0 m_SensorSize: {x: 36, y: 24} m_LensShift: {x: 0, y: 0} - m_GateFitMode: 2 m_FocalLength: 50 m_NormalizedViewPortRect: serializedVersion: 2 @@ -356,25 +255,6 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &534669906 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 534669902} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: cd6d0074e725a114e850d2e604fe4b0d, type: 3} - m_Name: - m_EditorClassIdentifier: - go: {fileID: 1054253062} - a: {fileID: 1761935009} - B: - - {fileID: 2083640146} - - {fileID: 1754708960} - - {fileID: 141422275} - - {fileID: 1578050036} --- !u!1 &1054253062 GameObject: m_ObjectHideFlags: 0 @@ -385,8 +265,9 @@ GameObject: m_Component: - component: {fileID: 1054253064} - component: {fileID: 1054253063} + - component: {fileID: 1054253065} m_Layer: 0 - m_Name: New Sprite + m_Name: GameOverScreen m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -406,6 +287,7 @@ SpriteRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -417,6 +299,7 @@ SpriteRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -448,196 +331,24 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1054253062} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -0.08, y: 0.56, z: -0.15457831} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 25, y: 25, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 7 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1578050036 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1578050040} - - component: {fileID: 1578050039} - - component: {fileID: 1578050038} - m_Layer: 0 - m_Name: enemy - m_TagString: Enemy - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &1578050038 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1578050036} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 65f7df4705b7dae48944a39b48934484, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!212 &1578050039 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1578050036} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - 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_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 0 - 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: c393ddce902166c4fb0e2130d216d549, type: 3} - m_Color: {r: 0.9056604, g: 0.2947668, b: 0.2947668, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 1, y: 1} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 ---- !u!4 &1578050040 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1578050036} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 3.59, y: -1.34, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 5 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1754708960 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1754708964} - - component: {fileID: 1754708963} - - component: {fileID: 1754708962} - m_Layer: 0 - m_Name: enemy - m_TagString: Enemy - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &1754708962 +--- !u!114 &1054253065 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1754708960} + m_GameObject: {fileID: 1054253062} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 65f7df4705b7dae48944a39b48934484, type: 3} + m_Script: {fileID: 11500000, guid: 329b2fcbaa5b147459845ba5442cafc0, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!212 &1754708963 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1754708960} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - 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_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 0 - 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: c393ddce902166c4fb0e2130d216d549, type: 3} - m_Color: {r: 0.9056604, g: 0.2947668, b: 0.2947668, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 1, y: 1} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 ---- !u!4 &1754708964 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1754708960} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 3.59, y: 0.71, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 3 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1761935009 GameObject: m_ObjectHideFlags: 0 @@ -648,9 +359,14 @@ GameObject: m_Component: - component: {fileID: 1761935011} - component: {fileID: 1761935010} + - component: {fileID: 1761935016} + - component: {fileID: 1761935015} + - component: {fileID: 1761935017} + - component: {fileID: 1761935014} + - component: {fileID: 1761935013} - component: {fileID: 1761935012} m_Layer: 0 - m_Name: New Sprite (1) + m_Name: Player m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -670,6 +386,7 @@ SpriteRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -681,6 +398,7 @@ SpriteRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -716,7 +434,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 6 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1761935012 MonoBehaviour: @@ -727,101 +445,80 @@ MonoBehaviour: m_GameObject: {fileID: 1761935009} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: dede9e7d6741aea4cb07b98da83cc6a8, type: 3} + m_Script: {fileID: 11500000, guid: 2980487a27ec549429c43378f52fc7e3, type: 3} m_Name: m_EditorClassIdentifier: - spEed: 4 - timer: 0 - time: 0 ---- !u!1 &2083640146 -GameObject: + _startSpeed: 4 +--- !u!114 &1761935013 +MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2083640148} - - component: {fileID: 2083640147} - - component: {fileID: 2083640150} - m_Layer: 0 - m_Name: enemy - m_TagString: Enemy - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!212 &2083640147 -SpriteRenderer: + m_GameObject: {fileID: 1761935009} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e06602854c5d6074ab288b80915bde90, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &1761935014 +MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2083640146} + m_GameObject: {fileID: 1761935009} m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - 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_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 0 - 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: c393ddce902166c4fb0e2130d216d549, type: 3} - m_Color: {r: 0.9056604, g: 0.2947668, b: 0.2947668, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 1, y: 1} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 ---- !u!4 &2083640148 -Transform: + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2d1a7545db259ab448984225825534c0, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!50 &1761935015 +Rigidbody2D: + serializedVersion: 4 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2083640146} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -3.13, y: 0.71, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &2083640150 + m_GameObject: {fileID: 1761935009} + m_BodyType: 1 + m_Simulated: 1 + m_UseFullKinematicContacts: 0 + m_UseAutoMass: 0 + m_Mass: 1 + m_LinearDrag: 0 + m_AngularDrag: 0.05 + m_GravityScale: 0 + m_Material: {fileID: 0} + m_Interpolate: 0 + m_SleepingMode: 1 + m_CollisionDetection: 0 + m_Constraints: 0 +--- !u!58 &1761935016 +CircleCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1761935009} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + serializedVersion: 2 + m_Radius: 0.1 +--- !u!114 &1761935017 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2083640146} + m_GameObject: {fileID: 1761935009} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 65f7df4705b7dae48944a39b48934484, type: 3} + m_Script: {fileID: 11500000, guid: 4c6ddf112459e0f41806ae24021c3e8e, type: 3} m_Name: m_EditorClassIdentifier: diff --git a/Assets/Group1/Scripts/Enemy.meta b/Assets/Group1/Scripts/Enemy.meta new file mode 100644 index 00000000..31b53b1d --- /dev/null +++ b/Assets/Group1/Scripts/Enemy.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f03f25fabf499f54b96d302ad461537f +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Group1/Scripts/Enemy/Enemy.cs b/Assets/Group1/Scripts/Enemy/Enemy.cs new file mode 100644 index 00000000..a472ef89 --- /dev/null +++ b/Assets/Group1/Scripts/Enemy/Enemy.cs @@ -0,0 +1,14 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.Events; + +public class Enemy : MonoBehaviour +{ + public event UnityAction EnemyDied; + + public void Dying() + { + EnemyDied?.Invoke(this); + } +} diff --git a/Assets/Group1/Scripts/e.cs.meta b/Assets/Group1/Scripts/Enemy/Enemy.cs.meta similarity index 83% rename from Assets/Group1/Scripts/e.cs.meta rename to Assets/Group1/Scripts/Enemy/Enemy.cs.meta index ab764d30..ee178c8f 100644 --- a/Assets/Group1/Scripts/e.cs.meta +++ b/Assets/Group1/Scripts/Enemy/Enemy.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 65f7df4705b7dae48944a39b48934484 +guid: f22588b0fcbefcc4b84f9e3517c3ff7e MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/Group1/Scripts/Enemy/EnemyMover.cs b/Assets/Group1/Scripts/Enemy/EnemyMover.cs new file mode 100644 index 00000000..96746487 --- /dev/null +++ b/Assets/Group1/Scripts/Enemy/EnemyMover.cs @@ -0,0 +1,28 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class EnemyMover : MonoBehaviour +{ + [SerializeField] private float _speed; + + private Vector3 _target; + + private void Start() + { + SetNextTarget(); + } + + private void Update() + { + if (transform.position == _target) + SetNextTarget(); + + transform.position = Vector3.MoveTowards(transform.position, _target, _speed * Time.deltaTime); + } + + private void SetNextTarget() + { + _target = Random.insideUnitCircle * 4; + } +} diff --git a/Assets/Group1/Scripts/GameController.cs.meta b/Assets/Group1/Scripts/Enemy/EnemyMover.cs.meta similarity index 83% rename from Assets/Group1/Scripts/GameController.cs.meta rename to Assets/Group1/Scripts/Enemy/EnemyMover.cs.meta index e9cd6afe..174ffbf5 100644 --- a/Assets/Group1/Scripts/GameController.cs.meta +++ b/Assets/Group1/Scripts/Enemy/EnemyMover.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: cd6d0074e725a114e850d2e604fe4b0d +guid: 5cdb8dffa9a1f234b94d495bcf37708b MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/Group1/Scripts/GameController.cs b/Assets/Group1/Scripts/GameController.cs deleted file mode 100644 index 6afe5356..00000000 --- a/Assets/Group1/Scripts/GameController.cs +++ /dev/null @@ -1,38 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -public class GameController : MonoBehaviour -{ - public static GameController controller; - - public GameObject go; - public GameObject a; - public GameObject[] B; - - // Start is called before the first frame update - void Start() - { - controller = this; - } - - public void End() - { - go.SetActive(true); - } - - // Update is called once per frame - void Update(){ - foreach (var b in B) - { - if (b == null) - continue; - - if (Vector3.Distance(a.gameObject.gameObject.GetComponent().position, b.gameObject.gameObject.transform.position) < 0.2f) - { - a.SendMessage("SendMEssage", b); - } - - } - } -} diff --git a/Assets/Group1/Scripts/GameOverScreen.cs b/Assets/Group1/Scripts/GameOverScreen.cs new file mode 100644 index 00000000..24494a76 --- /dev/null +++ b/Assets/Group1/Scripts/GameOverScreen.cs @@ -0,0 +1,7 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class GameOverScreen : MonoBehaviour +{ +} diff --git a/Assets/Group1/Scripts/NewBehaviourScript1.cs.meta b/Assets/Group1/Scripts/GameOverScreen.cs.meta similarity index 83% rename from Assets/Group1/Scripts/NewBehaviourScript1.cs.meta rename to Assets/Group1/Scripts/GameOverScreen.cs.meta index c96b73f8..98bfbacd 100644 --- a/Assets/Group1/Scripts/NewBehaviourScript1.cs.meta +++ b/Assets/Group1/Scripts/GameOverScreen.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: dede9e7d6741aea4cb07b98da83cc6a8 +guid: 329b2fcbaa5b147459845ba5442cafc0 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/Group1/Scripts/NewBehaviourScript1.cs b/Assets/Group1/Scripts/NewBehaviourScript1.cs deleted file mode 100644 index 14bd7c3f..00000000 --- a/Assets/Group1/Scripts/NewBehaviourScript1.cs +++ /dev/null @@ -1,65 +0,0 @@ -using UnityEngine; -using System.Collections; - -public class NewBehaviourScript1 : MonoBehaviour -{ - public float spEed; - public bool timer; - public float time; - // Use this for initialization - - - void Start() - { - } - // Update is called once per frame - void Update(){ - if (timer) - { - time -= Time.deltaTime; - if(time < 0) - { - timer = false; - spEed /= 2; - } - } - - GameObject[] result = GameObject.FindGameObjectsWithTag("Enemy"); - - if(result.Length == 0) - { - GameController.controller.End(); - enabled = false; - } - - if (Input.GetKey(KeyCode.W)) - transform.Translate(0, spEed * Time.deltaTime, 0); - - if (Input.GetKey(KeyCode.S)) - transform.Translate(0, -spEed * Time.deltaTime, 0); - - if (Input.GetKey(KeyCode.A)) - transform.Translate(-spEed * Time.deltaTime, 0, 0); - - if (Input.GetKey(KeyCode.D)) - transform.Translate(spEed * Time.deltaTime, 0, 0); - } - - public void SendMEssage(GameObject b) - { - - - if(b.name == "enemy") - { - Destroy(b); - }if(b.name == "speed") - { - spEed *= 2; - timer = true; - time = 2; - - - - } - } -} diff --git a/Assets/Group1/Scripts/Player.meta b/Assets/Group1/Scripts/Player.meta new file mode 100644 index 00000000..5f6a6642 --- /dev/null +++ b/Assets/Group1/Scripts/Player.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 6c932822c7d4186498a2211d0176ea70 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Group1/Scripts/Player/Player.cs b/Assets/Group1/Scripts/Player/Player.cs new file mode 100644 index 00000000..ebe081c3 --- /dev/null +++ b/Assets/Group1/Scripts/Player/Player.cs @@ -0,0 +1,50 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class Player : MonoBehaviour +{ + [SerializeField] private float _startSpeed; + + private float _currentSpeed; + private bool _isBoosterActive; + private float _boosterTimeLeft; + private float _speedMultiplier; + + public float CurrentSpeed => _currentSpeed; + + private void Start() + { + _currentSpeed = _startSpeed; + } + + private void Update() + { + if (_isBoosterActive == true) + { + _boosterTimeLeft -= Time.deltaTime; + if (_boosterTimeLeft <= 0) + { + _isBoosterActive = false; + _currentSpeed /= _speedMultiplier; + } + } + } + + public void PickUpSpeedBooster(float speedMultiplier, float boosterDuration) + { + _speedMultiplier = speedMultiplier; + + _isBoosterActive = true; + + if (_isBoosterActive == true) + { + _boosterTimeLeft += boosterDuration; + } + else + { + _currentSpeed *= _speedMultiplier; + _boosterTimeLeft = boosterDuration; + } + } +} diff --git a/Assets/Group1/Scripts/Player/Player.cs.meta b/Assets/Group1/Scripts/Player/Player.cs.meta new file mode 100644 index 00000000..d4f40a57 --- /dev/null +++ b/Assets/Group1/Scripts/Player/Player.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 2980487a27ec549429c43378f52fc7e3 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Group1/Scripts/Player/PlayerCollisionHandler.cs b/Assets/Group1/Scripts/Player/PlayerCollisionHandler.cs new file mode 100644 index 00000000..ed040f55 --- /dev/null +++ b/Assets/Group1/Scripts/Player/PlayerCollisionHandler.cs @@ -0,0 +1,29 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +[RequireComponent(typeof(Player))] +public class PlayerCollisionHandler : MonoBehaviour +{ + private Player _player; + + private void Start() + { + _player = GetComponent(); + } + + private void OnTriggerEnter2D(Collider2D collider) + { + if (collider.TryGetComponent(out Enemy enemy)) + { + enemy.Dying(); + Destroy(enemy.gameObject); + } + + if (collider.TryGetComponent(out SpeedBooster speedBooster)) + { + _player.PickUpSpeedBooster(speedBooster.Multiplier, speedBooster.Duration); + Destroy(speedBooster.gameObject); + } + } +} diff --git a/Assets/Group1/Scripts/Player/PlayerCollisionHandler.cs.meta b/Assets/Group1/Scripts/Player/PlayerCollisionHandler.cs.meta new file mode 100644 index 00000000..84229baf --- /dev/null +++ b/Assets/Group1/Scripts/Player/PlayerCollisionHandler.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: e06602854c5d6074ab288b80915bde90 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Group1/Scripts/Player/PlayerInput.cs b/Assets/Group1/Scripts/Player/PlayerInput.cs new file mode 100644 index 00000000..db970edf --- /dev/null +++ b/Assets/Group1/Scripts/Player/PlayerInput.cs @@ -0,0 +1,29 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +[RequireComponent(typeof(PlayerMover))] +public class PlayerInput : MonoBehaviour +{ + private PlayerMover _playerMover; + + private void Start() + { + _playerMover = GetComponent(); + } + + private void Update() + { + if (Input.GetKey(KeyCode.W)) + _playerMover.Move(Vector3.up); + + if (Input.GetKey(KeyCode.S)) + _playerMover.Move(Vector3.down); + + if (Input.GetKey(KeyCode.A)) + _playerMover.Move(Vector3.left); + + if (Input.GetKey(KeyCode.D)) + _playerMover.Move(Vector3.right); + } +} diff --git a/Assets/Group1/Scripts/Player/PlayerInput.cs.meta b/Assets/Group1/Scripts/Player/PlayerInput.cs.meta new file mode 100644 index 00000000..c6e7a00e --- /dev/null +++ b/Assets/Group1/Scripts/Player/PlayerInput.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 4c6ddf112459e0f41806ae24021c3e8e +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Group1/Scripts/Player/PlayerMover.cs b/Assets/Group1/Scripts/Player/PlayerMover.cs new file mode 100644 index 00000000..0afc7da7 --- /dev/null +++ b/Assets/Group1/Scripts/Player/PlayerMover.cs @@ -0,0 +1,19 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +[RequireComponent(typeof(Player))] +public class PlayerMover : MonoBehaviour +{ + private Player _player; + + private void Start() + { + _player = GetComponent(); + } + + public void Move(Vector3 direction) + { + transform.position += direction * _player.CurrentSpeed * Time.deltaTime; + } +} diff --git a/Assets/Group1/Scripts/Player/PlayerMover.cs.meta b/Assets/Group1/Scripts/Player/PlayerMover.cs.meta new file mode 100644 index 00000000..2a618d4d --- /dev/null +++ b/Assets/Group1/Scripts/Player/PlayerMover.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 2d1a7545db259ab448984225825534c0 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Group1/Scripts/Spawner.cs b/Assets/Group1/Scripts/Spawner.cs new file mode 100644 index 00000000..5a78414b --- /dev/null +++ b/Assets/Group1/Scripts/Spawner.cs @@ -0,0 +1,45 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class Spawner : MonoBehaviour +{ + [SerializeField] private GameOverScreen _gameOverScreen; + [SerializeField] private GameObject _enemyTemplate; + [SerializeField] private GameObject _speedBoosterTemplate; + [SerializeField] private int _enemyCount; + [SerializeField] private int _speedBoosterCount; + [SerializeField] private int _spawnRadius; + + private int _numberOfSpawnedEnemy; + private int _numberOfKilledEnemy; + + private void Start() + { + SpawnObjects(_speedBoosterTemplate, _speedBoosterCount); + SpawnObjects(_enemyTemplate, _enemyCount); + } + + private void OnEnemyDied(Enemy enemy) + { + enemy.EnemyDied -= OnEnemyDied; + _numberOfKilledEnemy++; + + if (_numberOfKilledEnemy == _numberOfSpawnedEnemy) + _gameOverScreen.gameObject.SetActive(true); + } + + private void SpawnObjects(GameObject template, int count) + { + for (int i = 0; i < count; i++) + { + var spawned = Instantiate(template, Random.insideUnitCircle * _spawnRadius, Quaternion.identity); + + if (spawned.TryGetComponent(out Enemy enemy)) + { + enemy.EnemyDied += OnEnemyDied; + _numberOfSpawnedEnemy++; + } + } + } +} diff --git a/Assets/Group1/Scripts/Spawner.cs.meta b/Assets/Group1/Scripts/Spawner.cs.meta new file mode 100644 index 00000000..32ec8c0e --- /dev/null +++ b/Assets/Group1/Scripts/Spawner.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 55cfb65f5037dc242841c683f721a388 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Group1/Scripts/SpeedBooster.cs b/Assets/Group1/Scripts/SpeedBooster.cs new file mode 100644 index 00000000..a41c7669 --- /dev/null +++ b/Assets/Group1/Scripts/SpeedBooster.cs @@ -0,0 +1,12 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class SpeedBooster : MonoBehaviour +{ + [SerializeField] private float _multiplier; + [SerializeField] private float _duration; + + public float Multiplier => _multiplier; + public float Duration => _duration; +} diff --git a/Assets/Group1/Scripts/SpeedBooster.cs.meta b/Assets/Group1/Scripts/SpeedBooster.cs.meta new file mode 100644 index 00000000..8d568317 --- /dev/null +++ b/Assets/Group1/Scripts/SpeedBooster.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: c02f3824249df2e4e95f28d2901f2e00 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Group1/Scripts/e.cs b/Assets/Group1/Scripts/e.cs deleted file mode 100644 index 048ebf2d..00000000 --- a/Assets/Group1/Scripts/e.cs +++ /dev/null @@ -1,22 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -public class e : MonoBehaviour -{ - private Vector3 Target; - - // Start is called before the first frame update - void Start() - { - Target = Random.insideUnitCircle * 4; - } - - // Update is called once per frame - void Update() - { - transform.position = Vector3.MoveTowards(transform.position, Target, 2 * Time.deltaTime); - if (transform.position == Target) - Target = Random.insideUnitCircle * 4 ; - } -} diff --git a/Assets/Group1/Sprites.meta b/Assets/Group1/Sprites.meta new file mode 100644 index 00000000..3a563d16 --- /dev/null +++ b/Assets/Group1/Sprites.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 33df2fce48f057e4da7c9b52d6e92961 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Group1/Player.png b/Assets/Group1/Sprites/Player.png similarity index 100% rename from Assets/Group1/Player.png rename to Assets/Group1/Sprites/Player.png diff --git a/Assets/Group1/Player.png.meta b/Assets/Group1/Sprites/Player.png.meta similarity index 100% rename from Assets/Group1/Player.png.meta rename to Assets/Group1/Sprites/Player.png.meta diff --git a/Assets/Group1/enemy.png b/Assets/Group1/Sprites/SpeedBooster.png similarity index 100% rename from Assets/Group1/enemy.png rename to Assets/Group1/Sprites/SpeedBooster.png diff --git a/Assets/Group1/Sprites/SpeedBooster.png.meta b/Assets/Group1/Sprites/SpeedBooster.png.meta new file mode 100644 index 00000000..2a0e6ae7 --- /dev/null +++ b/Assets/Group1/Sprites/SpeedBooster.png.meta @@ -0,0 +1,98 @@ +fileFormatVersion: 2 +guid: dbbfd62221409ce4fb9432aef8762019 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 0 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 3 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 4 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 4 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: + - - {x: 0, y: 2} + - {x: -1.7320508, y: -1.0000001} + - {x: 1.7320509, y: -0.9999998} + physicsShape: + - - {x: 0, y: 2} + - {x: -1.7320508, y: -1.0000001} + - {x: 1.7320509, y: -0.9999998} + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Group1/Sprites/enemy.png b/Assets/Group1/Sprites/enemy.png new file mode 100644 index 0000000000000000000000000000000000000000..8eb1b1ecc13b6e1d2375151866134cd7a040340c GIT binary patch literal 78 zcmeAS@N?(olHy`uVBq!ia0vp^EFjFm1|(O0oL2{=L_J*`LpWrU|M0W$cr!i aF)*;jval%k