From 2a29007a64d030fa06c0be95477c3e1a42834305 Mon Sep 17 00:00:00 2001 From: Rustamchuk Date: Thu, 15 Jul 2021 13:57:40 +0300 Subject: [PATCH 1/2] Refactoring! --- Assets/Group1/Prefabs.meta | 8 + Assets/Group1/Prefabs/Booster.prefab | 99 ++ Assets/Group1/Prefabs/Booster.prefab.meta | 7 + Assets/Group1/Scenes/KillAllEnemies.unity | 1050 ++++++++++++++--- Assets/Group1/Scripts/Enemy.cs | 15 + Assets/Group1/Scripts/Enemy.cs.meta | 11 + Assets/Group1/Scripts/GameController.cs | 38 - Assets/Group1/Scripts/NewBehaviourScript1.cs | 65 - Assets/Group1/Scripts/PlayerMover.cs | 38 + ...ourScript1.cs.meta => PlayerMover.cs.meta} | 0 Assets/Group1/Scripts/RandomCircleMover.cs | 29 + .../{e.cs.meta => RandomCircleMover.cs.meta} | 0 Assets/Group1/Scripts/SpeedBooster.cs | 41 + Assets/Group1/Scripts/SpeedBooster.cs.meta | 11 + Assets/Group1/Scripts/WinActivator.cs | 17 + ...ontroller.cs.meta => WinActivator.cs.meta} | 0 Assets/Group1/Scripts/e.cs | 22 - Assets/Group1/Sprites.meta | 8 + Assets/Group1/{ => Sprites}/Player.png | Bin Assets/Group1/{ => Sprites}/Player.png.meta | 0 Assets/Group1/{ => Sprites}/enemy.png | Bin Assets/Group1/{ => Sprites}/enemy.png.meta | 0 Packages/manifest.json | 21 +- Packages/packages-lock.json | 377 ++++++ ProjectSettings/PackageManagerSettings.asset | 43 + ProjectSettings/ProjectVersion.txt | 3 +- ProjectSettings/VersionControlSettings.asset | 8 + ProjectSettings/XRSettings.asset | 10 + UserSettings/EditorUserSettings.asset | 19 + 29 files changed, 1656 insertions(+), 284 deletions(-) create mode 100644 Assets/Group1/Prefabs.meta create mode 100644 Assets/Group1/Prefabs/Booster.prefab create mode 100644 Assets/Group1/Prefabs/Booster.prefab.meta create mode 100644 Assets/Group1/Scripts/Enemy.cs create mode 100644 Assets/Group1/Scripts/Enemy.cs.meta delete mode 100644 Assets/Group1/Scripts/GameController.cs delete mode 100644 Assets/Group1/Scripts/NewBehaviourScript1.cs create mode 100644 Assets/Group1/Scripts/PlayerMover.cs rename Assets/Group1/Scripts/{NewBehaviourScript1.cs.meta => PlayerMover.cs.meta} (100%) create mode 100644 Assets/Group1/Scripts/RandomCircleMover.cs rename Assets/Group1/Scripts/{e.cs.meta => RandomCircleMover.cs.meta} (100%) create mode 100644 Assets/Group1/Scripts/SpeedBooster.cs create mode 100644 Assets/Group1/Scripts/SpeedBooster.cs.meta create mode 100644 Assets/Group1/Scripts/WinActivator.cs rename Assets/Group1/Scripts/{GameController.cs.meta => WinActivator.cs.meta} (100%) 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/{ => Sprites}/enemy.png (100%) rename Assets/Group1/{ => Sprites}/enemy.png.meta (100%) create mode 100644 Packages/packages-lock.json create mode 100644 ProjectSettings/PackageManagerSettings.asset create mode 100644 ProjectSettings/VersionControlSettings.asset create mode 100644 ProjectSettings/XRSettings.asset create mode 100644 UserSettings/EditorUserSettings.asset diff --git a/Assets/Group1/Prefabs.meta b/Assets/Group1/Prefabs.meta new file mode 100644 index 00000000..408ad99c --- /dev/null +++ b/Assets/Group1/Prefabs.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 4ac26cf5d911ee944909dccdfb9cb283 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Group1/Prefabs/Booster.prefab b/Assets/Group1/Prefabs/Booster.prefab new file mode 100644 index 00000000..a940a22b --- /dev/null +++ b/Assets/Group1/Prefabs/Booster.prefab @@ -0,0 +1,99 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &1631550745323094516 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1275918524057785591} + - component: {fileID: 83807878294131042} + - component: {fileID: 707709746529934882} + m_Layer: 0 + m_Name: Booster + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1275918524057785591 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1631550745323094516} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0.262, y: -0.742, z: 0.15457831} + m_LocalScale: {x: 0.63584065, y: 0.63584065, z: 0.63584065} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &83807878294131042 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1631550745323094516} + 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_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: 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: 5 + m_Sprite: {fileID: 21300000, guid: e3d497cf399ca0d42af41c518d283eb2, type: 3} + m_Color: {r: 0, g: 0.079506874, 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 &707709746529934882 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1631550745323094516} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c83ebb82e76cbdd498caf53f7671a74d, type: 3} + m_Name: + m_EditorClassIdentifier: + _multiplyValue: 2 + _duration: 5 diff --git a/Assets/Group1/Prefabs/Booster.prefab.meta b/Assets/Group1/Prefabs/Booster.prefab.meta new file mode 100644 index 00000000..d3037988 --- /dev/null +++ b/Assets/Group1/Prefabs/Booster.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 1dc505c47b2720445b807922917cebd1 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Group1/Scenes/KillAllEnemies.unity b/Assets/Group1/Scenes/KillAllEnemies.unity index 21adfb9b..3039ba77 100644 --- a/Assets/Group1/Scenes/KillAllEnemies.unity +++ b/Assets/Group1/Scenes/KillAllEnemies.unity @@ -43,7 +43,7 @@ RenderSettings: --- !u!157 &3 LightmapSettings: m_ObjectHideFlags: 0 - serializedVersion: 11 + serializedVersion: 12 m_GIWorkflowMode: 0 m_GISettings: serializedVersion: 2 @@ -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,9 +94,11 @@ 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 + m_LightingSettings: {fileID: 1672094998} --- !u!196 &4 NavMeshSettings: serializedVersion: 2 @@ -109,10 +118,12 @@ NavMeshSettings: manualTileSize: 0 tileSize: 256 accuratePlacement: 0 + maxJobWorkers: 0 + preserveTilesOutsideBounds: 0 debug: m_Flags: 0 m_NavMeshData: {fileID: 0} ---- !u!1 &141422275 +--- !u!1 &57597620 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -120,35 +131,128 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 141422279} - - component: {fileID: 141422278} - - component: {fileID: 141422277} + - component: {fileID: 57597621} + - component: {fileID: 57597626} + - component: {fileID: 57597625} + - component: {fileID: 57597623} + - component: {fileID: 57597622} + - component: {fileID: 57597624} m_Layer: 0 - m_Name: enemy - m_TagString: Enemy + m_Name: Enemy + m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!114 &141422277 +--- !u!4 &57597621 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 57597620} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 4.02, y: -0.83, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 66414369} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &57597622 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 141422275} + m_GameObject: {fileID: 57597620} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 218f17a929b2a8443a68567a22295cef, type: 3} + m_Name: + m_EditorClassIdentifier: + Died: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 534669906} + m_TargetAssemblyTypeName: WinActivator, Assembly-CSharp + m_MethodName: DeleteEnemy + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 +--- !u!61 &57597623 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 57597620} + 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 + serializedVersion: 2 + m_Size: {x: 1, y: 1} + m_EdgeRadius: 0 +--- !u!50 &57597624 +Rigidbody2D: + serializedVersion: 4 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 57597620} + m_BodyType: 1 + m_Simulated: 1 + m_UseFullKinematicContacts: 0 + m_UseAutoMass: 0 + m_Mass: 1 + m_LinearDrag: 0 + m_AngularDrag: 0.05 + m_GravityScale: 1 + m_Material: {fileID: 0} + m_Interpolate: 0 + m_SleepingMode: 1 + m_CollisionDetection: 0 + m_Constraints: 0 +--- !u!114 &57597625 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 57597620} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 65f7df4705b7dae48944a39b48934484, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!212 &141422278 + _radius: 0 + _speed: 0 +--- !u!212 &57597626 SpriteRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 141422275} + m_GameObject: {fileID: 57597620} m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 @@ -156,6 +260,8 @@ SpriteRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -167,6 +273,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 @@ -178,7 +285,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 0 + m_SortingOrder: 1 m_Sprite: {fileID: 21300000, guid: c393ddce902166c4fb0e2130d216d549, type: 3} m_Color: {r: 0.9056604, g: 0.2947668, b: 0.2947668, a: 1} m_FlipX: 0 @@ -190,17 +297,37 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!4 &141422279 +--- !u!1 &66414368 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 66414369} + m_Layer: 0 + m_Name: Enemies + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &66414369 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 141422275} + m_GameObject: {fileID: 66414368} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 3.59, y: 3.09, z: 0} + m_LocalPosition: {x: -8.338853, y: -0.9288856, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] + m_Children: + - {fileID: 57597621} + - {fileID: 1695991726} + - {fileID: 1194024793} + - {fileID: 311969716} m_Father: {fileID: 0} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -229,12 +356,14 @@ Light: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 170076733} m_Enabled: 1 - serializedVersion: 8 + serializedVersion: 10 m_Type: 1 + m_Shape: 0 m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1} m_Intensity: 1 m_Range: 10 m_SpotAngle: 30 + m_InnerSpotAngle: 21.80208 m_CookieSize: 10 m_Shadows: m_Type: 2 @@ -244,6 +373,24 @@ Light: m_Bias: 0.05 m_NormalBias: 0.4 m_NearPlane: 0.2 + m_CullingMatrixOverride: + e00: 1 + e01: 0 + e02: 0 + e03: 0 + e10: 0 + e11: 1 + e12: 0 + e13: 0 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + m_UseCullingMatrixOverride: 0 m_Cookie: {fileID: 0} m_DrawHalo: 0 m_Flare: {fileID: 0} @@ -251,12 +398,15 @@ Light: m_CullingMask: serializedVersion: 2 m_Bits: 4294967295 + m_RenderingLayerMask: 1 m_Lightmapping: 1 m_LightShadowCasterMode: 0 m_AreaSize: {x: 1, y: 1} m_BounceIntensity: 1 m_ColorTemperature: 6570 m_UseColorTemperature: 0 + m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} + m_UseBoundingSphereOverride: 0 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!4 &170076735 @@ -273,6 +423,208 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} +--- !u!1 &291521767 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1631550745323094516, guid: 1dc505c47b2720445b807922917cebd1, + type: 3} + m_PrefabInstance: {fileID: 6370868884747489583} + m_PrefabAsset: {fileID: 0} +--- !u!4 &291521768 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1275918524057785591, guid: 1dc505c47b2720445b807922917cebd1, + type: 3} + m_PrefabInstance: {fileID: 6370868884747489583} + m_PrefabAsset: {fileID: 0} +--- !u!58 &291521769 +CircleCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 291521767} + 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.00000047683716} + serializedVersion: 2 + m_Radius: 0.5 +--- !u!1 &311969715 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 311969716} + - component: {fileID: 311969721} + - component: {fileID: 311969720} + - component: {fileID: 311969718} + - component: {fileID: 311969717} + - component: {fileID: 311969719} + m_Layer: 0 + m_Name: Enemy (3) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &311969716 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 311969715} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 11.55, y: 1.45, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 66414369} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &311969717 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 311969715} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 218f17a929b2a8443a68567a22295cef, type: 3} + m_Name: + m_EditorClassIdentifier: + Died: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 534669906} + m_TargetAssemblyTypeName: WinActivator, Assembly-CSharp + m_MethodName: DeleteEnemy + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 +--- !u!61 &311969718 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 311969715} + 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 + serializedVersion: 2 + m_Size: {x: 1, y: 1} + m_EdgeRadius: 0 +--- !u!50 &311969719 +Rigidbody2D: + serializedVersion: 4 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 311969715} + m_BodyType: 1 + m_Simulated: 1 + m_UseFullKinematicContacts: 0 + m_UseAutoMass: 0 + m_Mass: 1 + m_LinearDrag: 0 + m_AngularDrag: 0.05 + m_GravityScale: 1 + m_Material: {fileID: 0} + m_Interpolate: 0 + m_SleepingMode: 1 + m_CollisionDetection: 0 + m_Constraints: 0 +--- !u!114 &311969720 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 311969715} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 65f7df4705b7dae48944a39b48934484, type: 3} + m_Name: + m_EditorClassIdentifier: + _radius: 0 + _speed: 0 +--- !u!212 &311969721 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 311969715} + 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_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: 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: 1 + 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!1 &534669902 GameObject: m_ObjectHideFlags: 0 @@ -312,9 +664,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 @@ -368,13 +721,40 @@ MonoBehaviour: 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} + _enemies: + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + _winScreen: {fileID: 1054253062} +--- !u!1 &862836468 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1631550745323094516, guid: 1dc505c47b2720445b807922917cebd1, + type: 3} + m_PrefabInstance: {fileID: 1966840299} + m_PrefabAsset: {fileID: 0} +--- !u!4 &862836469 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1275918524057785591, guid: 1dc505c47b2720445b807922917cebd1, + type: 3} + m_PrefabInstance: {fileID: 1966840299} + m_PrefabAsset: {fileID: 0} +--- !u!58 &862836470 +CircleCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 862836468} + 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.00000047683716} + serializedVersion: 2 + m_Radius: 0.5 --- !u!1 &1054253062 GameObject: m_ObjectHideFlags: 0 @@ -386,7 +766,7 @@ GameObject: - component: {fileID: 1054253064} - component: {fileID: 1054253063} m_Layer: 0 - m_Name: New Sprite + m_Name: WinScreen m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -406,6 +786,8 @@ SpriteRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -417,6 +799,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 @@ -452,9 +835,9 @@ Transform: m_LocalScale: {x: 25, y: 25, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 7 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1578050036 +--- !u!1 &1194024792 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -462,35 +845,128 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1578050040} - - component: {fileID: 1578050039} - - component: {fileID: 1578050038} + - component: {fileID: 1194024793} + - component: {fileID: 1194024798} + - component: {fileID: 1194024797} + - component: {fileID: 1194024795} + - component: {fileID: 1194024794} + - component: {fileID: 1194024796} m_Layer: 0 - m_Name: enemy - m_TagString: Enemy + m_Name: Enemy (2) + m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!114 &1578050038 +--- !u!4 &1194024793 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1194024792} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 4.04, y: 1.43, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 66414369} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1194024794 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1194024792} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 218f17a929b2a8443a68567a22295cef, type: 3} + m_Name: + m_EditorClassIdentifier: + Died: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 534669906} + m_TargetAssemblyTypeName: WinActivator, Assembly-CSharp + m_MethodName: DeleteEnemy + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 +--- !u!61 &1194024795 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1194024792} + 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 + serializedVersion: 2 + m_Size: {x: 1, y: 1} + m_EdgeRadius: 0 +--- !u!50 &1194024796 +Rigidbody2D: + serializedVersion: 4 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1194024792} + m_BodyType: 1 + m_Simulated: 1 + m_UseFullKinematicContacts: 0 + m_UseAutoMass: 0 + m_Mass: 1 + m_LinearDrag: 0 + m_AngularDrag: 0.05 + m_GravityScale: 1 + m_Material: {fileID: 0} + m_Interpolate: 0 + m_SleepingMode: 1 + m_CollisionDetection: 0 + m_Constraints: 0 +--- !u!114 &1194024797 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1578050036} + m_GameObject: {fileID: 1194024792} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 65f7df4705b7dae48944a39b48934484, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!212 &1578050039 + _radius: 0 + _speed: 0 +--- !u!212 &1194024798 SpriteRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1578050036} + m_GameObject: {fileID: 1194024792} m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 @@ -498,6 +974,8 @@ SpriteRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -509,6 +987,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 @@ -520,7 +999,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 0 + m_SortingOrder: 1 m_Sprite: {fileID: 21300000, guid: c393ddce902166c4fb0e2130d216d549, type: 3} m_Color: {r: 0.9056604, g: 0.2947668, b: 0.2947668, a: 1} m_FlipX: 0 @@ -532,21 +1011,68 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!4 &1578050040 -Transform: +--- !u!850595691 &1672094998 +LightingSettings: 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_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1754708960 + m_Name: Settings.lighting + serializedVersion: 2 + m_GIWorkflowMode: 0 + m_EnableBakedLightmaps: 1 + m_EnableRealtimeLightmaps: 0 + m_RealtimeEnvironmentLighting: 1 + m_BounceScale: 1 + m_AlbedoBoost: 1 + m_IndirectOutputScale: 1 + m_UsingShadowmask: 1 + m_BakeBackend: 1 + m_LightmapMaxSize: 512 + m_BakeResolution: 10 + m_Padding: 2 + m_TextureCompression: 1 + m_AO: 0 + m_AOMaxDistance: 1 + m_CompAOExponent: 1 + m_CompAOExponentDirect: 0 + m_ExtractAO: 0 + m_MixedBakeMode: 2 + m_LightmapsBakeMode: 1 + m_FilterMode: 1 + m_LightmapParameters: {fileID: 0} + m_ExportTrainingData: 0 + m_TrainingDataDestination: TrainingData + m_RealtimeResolution: 2 + m_ForceWhiteAlbedo: 0 + m_ForceUpdates: 0 + m_FinalGather: 0 + m_FinalGatherRayCount: 256 + m_FinalGatherFiltering: 1 + m_PVRCulling: 1 + m_PVRSampling: 1 + m_PVRDirectSampleCount: 32 + m_PVRSampleCount: 256 + m_PVREnvironmentSampleCount: 256 + m_PVREnvironmentReferencePointCount: 2048 + m_LightProbeSampleCountMultiplier: 4 + m_PVRBounces: 2 + m_PVRRussianRouletteStartBounce: 2 + m_PVREnvironmentMIS: 0 + m_PVRFilteringMode: 2 + m_PVRDenoiserTypeDirect: 0 + m_PVRDenoiserTypeIndirect: 0 + m_PVRDenoiserTypeAO: 0 + m_PVRFilterTypeDirect: 0 + m_PVRFilterTypeIndirect: 0 + m_PVRFilterTypeAO: 0 + m_PVRFilteringGaussRadiusDirect: 1 + m_PVRFilteringGaussRadiusIndirect: 5 + m_PVRFilteringGaussRadiusAO: 2 + m_PVRFilteringAtrousPositionSigmaDirect: 0.5 + m_PVRFilteringAtrousPositionSigmaIndirect: 2 + m_PVRFilteringAtrousPositionSigmaAO: 1 +--- !u!1 &1695991725 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -554,35 +1080,128 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1754708964} - - component: {fileID: 1754708963} - - component: {fileID: 1754708962} + - component: {fileID: 1695991726} + - component: {fileID: 1695991731} + - component: {fileID: 1695991730} + - component: {fileID: 1695991728} + - component: {fileID: 1695991727} + - component: {fileID: 1695991729} m_Layer: 0 - m_Name: enemy - m_TagString: Enemy + m_Name: Enemy (1) + m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!114 &1754708962 +--- !u!4 &1695991726 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1695991725} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 4.04, y: 3.83, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 66414369} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1695991727 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1695991725} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 218f17a929b2a8443a68567a22295cef, type: 3} + m_Name: + m_EditorClassIdentifier: + Died: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 534669906} + m_TargetAssemblyTypeName: WinActivator, Assembly-CSharp + m_MethodName: DeleteEnemy + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 +--- !u!61 &1695991728 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1695991725} + 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 + serializedVersion: 2 + m_Size: {x: 1, y: 1} + m_EdgeRadius: 0 +--- !u!50 &1695991729 +Rigidbody2D: + serializedVersion: 4 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1695991725} + m_BodyType: 1 + m_Simulated: 1 + m_UseFullKinematicContacts: 0 + m_UseAutoMass: 0 + m_Mass: 1 + m_LinearDrag: 0 + m_AngularDrag: 0.05 + m_GravityScale: 1 + m_Material: {fileID: 0} + m_Interpolate: 0 + m_SleepingMode: 1 + m_CollisionDetection: 0 + m_Constraints: 0 +--- !u!114 &1695991730 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1754708960} + m_GameObject: {fileID: 1695991725} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 65f7df4705b7dae48944a39b48934484, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!212 &1754708963 + _radius: 0 + _speed: 0 +--- !u!212 &1695991731 SpriteRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1754708960} + m_GameObject: {fileID: 1695991725} m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 @@ -590,6 +1209,8 @@ SpriteRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -601,6 +1222,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 @@ -612,7 +1234,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 0 + m_SortingOrder: 1 m_Sprite: {fileID: 21300000, guid: c393ddce902166c4fb0e2130d216d549, type: 3} m_Color: {r: 0.9056604, g: 0.2947668, b: 0.2947668, a: 1} m_FlipX: 0 @@ -624,20 +1246,6 @@ SpriteRenderer: 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 @@ -649,8 +1257,10 @@ GameObject: - component: {fileID: 1761935011} - component: {fileID: 1761935010} - component: {fileID: 1761935012} + - component: {fileID: 1761935013} + - component: {fileID: 1761935014} m_Layer: 0 - m_Name: New Sprite (1) + m_Name: Hero m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -670,6 +1280,8 @@ SpriteRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -681,6 +1293,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 +1329,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 6 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1761935012 MonoBehaviour: @@ -730,10 +1343,124 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: dede9e7d6741aea4cb07b98da83cc6a8, type: 3} m_Name: m_EditorClassIdentifier: - spEed: 4 - timer: 0 - time: 0 ---- !u!1 &2083640146 + _speed: 4 +--- !u!58 &1761935013 +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: 1 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + serializedVersion: 2 + m_Radius: 0.5 +--- !u!50 &1761935014 +Rigidbody2D: + serializedVersion: 4 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + 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: 1 + m_Material: {fileID: 0} + m_Interpolate: 0 + m_SleepingMode: 1 + m_CollisionDetection: 0 + m_Constraints: 0 +--- !u!1001 &1966840299 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 2129577118} + m_Modifications: + - target: {fileID: 83807878294131042, guid: 1dc505c47b2720445b807922917cebd1, + type: 3} + propertyPath: m_SortingOrder + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 707709746529934882, guid: 1dc505c47b2720445b807922917cebd1, + type: 3} + propertyPath: _multiplyValue + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 1275918524057785591, guid: 1dc505c47b2720445b807922917cebd1, + type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1275918524057785591, guid: 1dc505c47b2720445b807922917cebd1, + type: 3} + propertyPath: m_LocalPosition.x + value: 0.262 + objectReference: {fileID: 0} + - target: {fileID: 1275918524057785591, guid: 1dc505c47b2720445b807922917cebd1, + type: 3} + propertyPath: m_LocalPosition.y + value: 3.22 + objectReference: {fileID: 0} + - target: {fileID: 1275918524057785591, guid: 1dc505c47b2720445b807922917cebd1, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1275918524057785591, guid: 1dc505c47b2720445b807922917cebd1, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1275918524057785591, guid: 1dc505c47b2720445b807922917cebd1, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1275918524057785591, guid: 1dc505c47b2720445b807922917cebd1, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1275918524057785591, guid: 1dc505c47b2720445b807922917cebd1, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1275918524057785591, guid: 1dc505c47b2720445b807922917cebd1, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1275918524057785591, guid: 1dc505c47b2720445b807922917cebd1, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1275918524057785591, guid: 1dc505c47b2720445b807922917cebd1, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1631550745323094516, guid: 1dc505c47b2720445b807922917cebd1, + type: 3} + propertyPath: m_Name + value: Booster (1) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 1dc505c47b2720445b807922917cebd1, type: 3} +--- !u!1 &2129577117 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -741,87 +1468,106 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 2083640148} - - component: {fileID: 2083640147} - - component: {fileID: 2083640150} + - component: {fileID: 2129577118} m_Layer: 0 - m_Name: enemy - m_TagString: Enemy + m_Name: SpeedBoosters + m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!212 &2083640147 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2083640146} - 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 +--- !u!4 &2129577118 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2083640146} + m_GameObject: {fileID: 2129577117} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -3.13, y: 0.71, z: 0} + m_LocalPosition: {x: -0.08, y: 0.56, z: -0.15457831} m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] + m_Children: + - {fileID: 291521768} + - {fileID: 862836469} m_Father: {fileID: 0} - m_RootOrder: 2 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &2083640150 -MonoBehaviour: +--- !u!1001 &6370868884747489583 +PrefabInstance: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2083640146} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 65f7df4705b7dae48944a39b48934484, type: 3} - m_Name: - m_EditorClassIdentifier: + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 2129577118} + m_Modifications: + - target: {fileID: 83807878294131042, guid: 1dc505c47b2720445b807922917cebd1, + type: 3} + propertyPath: m_SortingOrder + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 707709746529934882, guid: 1dc505c47b2720445b807922917cebd1, + type: 3} + propertyPath: _multiplyValue + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 1275918524057785591, guid: 1dc505c47b2720445b807922917cebd1, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1275918524057785591, guid: 1dc505c47b2720445b807922917cebd1, + type: 3} + propertyPath: m_LocalPosition.x + value: -2.59 + objectReference: {fileID: 0} + - target: {fileID: 1275918524057785591, guid: 1dc505c47b2720445b807922917cebd1, + type: 3} + propertyPath: m_LocalPosition.y + value: -3.16 + objectReference: {fileID: 0} + - target: {fileID: 1275918524057785591, guid: 1dc505c47b2720445b807922917cebd1, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1275918524057785591, guid: 1dc505c47b2720445b807922917cebd1, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1275918524057785591, guid: 1dc505c47b2720445b807922917cebd1, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1275918524057785591, guid: 1dc505c47b2720445b807922917cebd1, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1275918524057785591, guid: 1dc505c47b2720445b807922917cebd1, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1275918524057785591, guid: 1dc505c47b2720445b807922917cebd1, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1275918524057785591, guid: 1dc505c47b2720445b807922917cebd1, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1275918524057785591, guid: 1dc505c47b2720445b807922917cebd1, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1631550745323094516, guid: 1dc505c47b2720445b807922917cebd1, + type: 3} + propertyPath: m_Name + value: Booster + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 1dc505c47b2720445b807922917cebd1, type: 3} diff --git a/Assets/Group1/Scripts/Enemy.cs b/Assets/Group1/Scripts/Enemy.cs new file mode 100644 index 00000000..55c57b1b --- /dev/null +++ b/Assets/Group1/Scripts/Enemy.cs @@ -0,0 +1,15 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.Events; + +public class Enemy : MonoBehaviour +{ + public UnityEvent Died; + + public void Die() + { + Died.Invoke(); + Destroy(gameObject); + } +} diff --git a/Assets/Group1/Scripts/Enemy.cs.meta b/Assets/Group1/Scripts/Enemy.cs.meta new file mode 100644 index 00000000..700e1816 --- /dev/null +++ b/Assets/Group1/Scripts/Enemy.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 218f17a929b2a8443a68567a22295cef +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: 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/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/PlayerMover.cs b/Assets/Group1/Scripts/PlayerMover.cs new file mode 100644 index 00000000..675f3eb1 --- /dev/null +++ b/Assets/Group1/Scripts/PlayerMover.cs @@ -0,0 +1,38 @@ +using UnityEngine; +using System.Collections; + +public class PlayerMover : MonoBehaviour +{ + [SerializeField] private float _speed; + + private void Update() + { + 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 MultiplySpeed(float value) + { + _speed *= value; + } + + public void ShareSpeed(float value) + { + _speed /= value; + } + + private void OnTriggerEnter2D(Collider2D collision) + { + if (collision.gameObject.TryGetComponent(out Enemy enemy)) + enemy.Die(); + } +} diff --git a/Assets/Group1/Scripts/NewBehaviourScript1.cs.meta b/Assets/Group1/Scripts/PlayerMover.cs.meta similarity index 100% rename from Assets/Group1/Scripts/NewBehaviourScript1.cs.meta rename to Assets/Group1/Scripts/PlayerMover.cs.meta diff --git a/Assets/Group1/Scripts/RandomCircleMover.cs b/Assets/Group1/Scripts/RandomCircleMover.cs new file mode 100644 index 00000000..a160f35c --- /dev/null +++ b/Assets/Group1/Scripts/RandomCircleMover.cs @@ -0,0 +1,29 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class RandomCircleMover : MonoBehaviour +{ + [SerializeField] private float _radius; + [SerializeField] private float _speed; + + private Vector3 _targetPosition; + + private void Start() + { + ChangeTargetPosition(); + } + + private void Update() + { + if (transform.position == _targetPosition) + ChangeTargetPosition(); + + transform.position = Vector3.MoveTowards(transform.position, _targetPosition, _speed * Time.deltaTime); + } + + private void ChangeTargetPosition() + { + _targetPosition = Random.insideUnitCircle * _radius; + } +} diff --git a/Assets/Group1/Scripts/e.cs.meta b/Assets/Group1/Scripts/RandomCircleMover.cs.meta similarity index 100% rename from Assets/Group1/Scripts/e.cs.meta rename to Assets/Group1/Scripts/RandomCircleMover.cs.meta diff --git a/Assets/Group1/Scripts/SpeedBooster.cs b/Assets/Group1/Scripts/SpeedBooster.cs new file mode 100644 index 00000000..ccdf97db --- /dev/null +++ b/Assets/Group1/Scripts/SpeedBooster.cs @@ -0,0 +1,41 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class SpeedBooster : MonoBehaviour +{ + [SerializeField] private float _multiplyValue; + [SerializeField] private float _duration; + + private PlayerMover _player; + private bool _isBoosted = false; + private float _passTime; + + private void Update() + { + if (_isBoosted) + { + _passTime += Time.deltaTime; + + if (_duration <= _passTime) + { + _player.ShareSpeed(_multiplyValue); + + _passTime = 0; + + _isBoosted = false; + } + } + } + + private void OnTriggerEnter2D(Collider2D collision) + { + if (collision.TryGetComponent(out PlayerMover player)) + { + _player = player; + + _player.MultiplySpeed(_multiplyValue); + _isBoosted = true; + } + } +} diff --git a/Assets/Group1/Scripts/SpeedBooster.cs.meta b/Assets/Group1/Scripts/SpeedBooster.cs.meta new file mode 100644 index 00000000..de81011d --- /dev/null +++ b/Assets/Group1/Scripts/SpeedBooster.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: c83ebb82e76cbdd498caf53f7671a74d +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Group1/Scripts/WinActivator.cs b/Assets/Group1/Scripts/WinActivator.cs new file mode 100644 index 00000000..95a73e50 --- /dev/null +++ b/Assets/Group1/Scripts/WinActivator.cs @@ -0,0 +1,17 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class WinActivator : MonoBehaviour +{ + [SerializeField] private List _enemies; + [SerializeField] private GameObject _winScreen; + + public void DeleteEnemy() + { + _enemies.RemoveAt(0); + + if (_enemies.Count == 0) + _winScreen.SetActive(true); + } +} diff --git a/Assets/Group1/Scripts/GameController.cs.meta b/Assets/Group1/Scripts/WinActivator.cs.meta similarity index 100% rename from Assets/Group1/Scripts/GameController.cs.meta rename to Assets/Group1/Scripts/WinActivator.cs.meta 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..bde9c3b5 --- /dev/null +++ b/Assets/Group1/Sprites.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 17cfbdc10c22c6b44b4ee21529bf102f +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/enemy.png similarity index 100% rename from Assets/Group1/enemy.png rename to Assets/Group1/Sprites/enemy.png diff --git a/Assets/Group1/enemy.png.meta b/Assets/Group1/Sprites/enemy.png.meta similarity index 100% rename from Assets/Group1/enemy.png.meta rename to Assets/Group1/Sprites/enemy.png.meta diff --git a/Packages/manifest.json b/Packages/manifest.json index 8392bea1..c4cf9287 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -1,12 +1,21 @@ { "dependencies": { - "com.unity.ads": "2.0.8", - "com.unity.analytics": "3.2.2", - "com.unity.collab-proxy": "1.2.15", - "com.unity.package-manager-ui": "2.0.7", - "com.unity.purchasing": "2.0.3", - "com.unity.textmeshpro": "1.3.0", + "com.unity.2d.sprite": "1.0.0", + "com.unity.2d.tilemap": "1.0.0", + "com.unity.ads": "3.5.0", + "com.unity.analytics": "3.5.3", + "com.unity.collab-proxy": "1.3.9", + "com.unity.ide.rider": "1.2.1", + "com.unity.ide.visualstudio": "2.0.3", + "com.unity.ide.vscode": "1.2.3", + "com.unity.purchasing": "2.1.1", + "com.unity.test-framework": "1.1.18", + "com.unity.textmeshpro": "3.0.1", + "com.unity.timeline": "1.2.6", + "com.unity.ugui": "1.0.0", + "com.unity.xr.legacyinputhelpers": "2.1.4", "com.unity.modules.ai": "1.0.0", + "com.unity.modules.androidjni": "1.0.0", "com.unity.modules.animation": "1.0.0", "com.unity.modules.assetbundle": "1.0.0", "com.unity.modules.audio": "1.0.0", diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json new file mode 100644 index 00000000..aaafb855 --- /dev/null +++ b/Packages/packages-lock.json @@ -0,0 +1,377 @@ +{ + "dependencies": { + "com.unity.2d.sprite": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.2d.tilemap": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.ads": { + "version": "3.5.0", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.ugui": "1.0.0" + }, + "url": "https://packages.unity.com" + }, + "com.unity.analytics": { + "version": "3.5.3", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.ugui": "1.0.0" + }, + "url": "https://packages.unity.com" + }, + "com.unity.collab-proxy": { + "version": "1.3.9", + "depth": 0, + "source": "registry", + "dependencies": {}, + "url": "https://packages.unity.com" + }, + "com.unity.ext.nunit": { + "version": "1.0.0", + "depth": 1, + "source": "registry", + "dependencies": {}, + "url": "https://packages.unity.com" + }, + "com.unity.ide.rider": { + "version": "1.2.1", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.test-framework": "1.1.1" + }, + "url": "https://packages.unity.com" + }, + "com.unity.ide.visualstudio": { + "version": "2.0.3", + "depth": 0, + "source": "registry", + "dependencies": {}, + "url": "https://packages.unity.com" + }, + "com.unity.ide.vscode": { + "version": "1.2.3", + "depth": 0, + "source": "registry", + "dependencies": {}, + "url": "https://packages.unity.com" + }, + "com.unity.purchasing": { + "version": "2.1.1", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.ugui": "1.0.0" + }, + "url": "https://packages.unity.com" + }, + "com.unity.test-framework": { + "version": "1.1.18", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.ext.nunit": "1.0.0", + "com.unity.modules.imgui": "1.0.0", + "com.unity.modules.jsonserialize": "1.0.0" + }, + "url": "https://packages.unity.com" + }, + "com.unity.textmeshpro": { + "version": "3.0.1", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.ugui": "1.0.0" + }, + "url": "https://packages.unity.com" + }, + "com.unity.timeline": { + "version": "1.2.6", + "depth": 0, + "source": "registry", + "dependencies": {}, + "url": "https://packages.unity.com" + }, + "com.unity.ugui": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.ui": "1.0.0", + "com.unity.modules.imgui": "1.0.0" + } + }, + "com.unity.xr.legacyinputhelpers": { + "version": "2.1.4", + "depth": 0, + "source": "registry", + "dependencies": {}, + "url": "https://packages.unity.com" + }, + "com.unity.modules.ai": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.androidjni": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.animation": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.assetbundle": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.audio": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.cloth": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.physics": "1.0.0" + } + }, + "com.unity.modules.director": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.audio": "1.0.0", + "com.unity.modules.animation": "1.0.0" + } + }, + "com.unity.modules.imageconversion": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.imgui": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.jsonserialize": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.particlesystem": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.physics": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.physics2d": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.screencapture": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.imageconversion": "1.0.0" + } + }, + "com.unity.modules.subsystems": { + "version": "1.0.0", + "depth": 1, + "source": "builtin", + "dependencies": { + "com.unity.modules.jsonserialize": "1.0.0" + } + }, + "com.unity.modules.terrain": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.terrainphysics": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.physics": "1.0.0", + "com.unity.modules.terrain": "1.0.0" + } + }, + "com.unity.modules.tilemap": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.physics2d": "1.0.0" + } + }, + "com.unity.modules.ui": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.uielements": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.ui": "1.0.0", + "com.unity.modules.imgui": "1.0.0", + "com.unity.modules.jsonserialize": "1.0.0", + "com.unity.modules.uielementsnative": "1.0.0" + } + }, + "com.unity.modules.uielementsnative": { + "version": "1.0.0", + "depth": 1, + "source": "builtin", + "dependencies": { + "com.unity.modules.ui": "1.0.0", + "com.unity.modules.imgui": "1.0.0", + "com.unity.modules.jsonserialize": "1.0.0" + } + }, + "com.unity.modules.umbra": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.unityanalytics": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.unitywebrequest": "1.0.0", + "com.unity.modules.jsonserialize": "1.0.0" + } + }, + "com.unity.modules.unitywebrequest": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.unitywebrequestassetbundle": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.assetbundle": "1.0.0", + "com.unity.modules.unitywebrequest": "1.0.0" + } + }, + "com.unity.modules.unitywebrequestaudio": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.unitywebrequest": "1.0.0", + "com.unity.modules.audio": "1.0.0" + } + }, + "com.unity.modules.unitywebrequesttexture": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.unitywebrequest": "1.0.0", + "com.unity.modules.imageconversion": "1.0.0" + } + }, + "com.unity.modules.unitywebrequestwww": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.unitywebrequest": "1.0.0", + "com.unity.modules.unitywebrequestassetbundle": "1.0.0", + "com.unity.modules.unitywebrequestaudio": "1.0.0", + "com.unity.modules.audio": "1.0.0", + "com.unity.modules.assetbundle": "1.0.0", + "com.unity.modules.imageconversion": "1.0.0" + } + }, + "com.unity.modules.vehicles": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.physics": "1.0.0" + } + }, + "com.unity.modules.video": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.audio": "1.0.0", + "com.unity.modules.ui": "1.0.0", + "com.unity.modules.unitywebrequest": "1.0.0" + } + }, + "com.unity.modules.vr": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.jsonserialize": "1.0.0", + "com.unity.modules.physics": "1.0.0", + "com.unity.modules.xr": "1.0.0" + } + }, + "com.unity.modules.wind": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.xr": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.physics": "1.0.0", + "com.unity.modules.jsonserialize": "1.0.0", + "com.unity.modules.subsystems": "1.0.0" + } + } + } +} diff --git a/ProjectSettings/PackageManagerSettings.asset b/ProjectSettings/PackageManagerSettings.asset new file mode 100644 index 00000000..be4a7974 --- /dev/null +++ b/ProjectSettings/PackageManagerSettings.asset @@ -0,0 +1,43 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &1 +MonoBehaviour: + m_ObjectHideFlags: 61 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 13964, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_EnablePreviewPackages: 0 + m_EnablePackageDependencies: 0 + m_AdvancedSettingsExpanded: 1 + m_ScopedRegistriesSettingsExpanded: 1 + oneTimeWarningShown: 0 + m_Registries: + - m_Id: main + m_Name: + m_Url: https://packages.unity.com + m_Scopes: [] + m_IsDefault: 1 + m_Capabilities: 7 + m_UserSelectedRegistryName: + m_UserAddingNewScopedRegistry: 0 + m_RegistryInfoDraft: + m_ErrorMessage: + m_Original: + m_Id: + m_Name: + m_Url: + m_Scopes: [] + m_IsDefault: 0 + m_Capabilities: 0 + m_Modified: 0 + m_Name: + m_Url: + m_Scopes: + - + m_SelectedScopeIndex: 0 diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index 6dfd6c14..51a7d561 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1 +1,2 @@ -m_EditorVersion: 2018.3.14f1 +m_EditorVersion: 2020.1.13f1 +m_EditorVersionWithRevision: 2020.1.13f1 (5e24f28bfbc0) diff --git a/ProjectSettings/VersionControlSettings.asset b/ProjectSettings/VersionControlSettings.asset new file mode 100644 index 00000000..dca28814 --- /dev/null +++ b/ProjectSettings/VersionControlSettings.asset @@ -0,0 +1,8 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!890905787 &1 +VersionControlSettings: + m_ObjectHideFlags: 0 + m_Mode: Visible Meta Files + m_CollabEditorSettings: + inProgressEnabled: 1 diff --git a/ProjectSettings/XRSettings.asset b/ProjectSettings/XRSettings.asset new file mode 100644 index 00000000..482590c1 --- /dev/null +++ b/ProjectSettings/XRSettings.asset @@ -0,0 +1,10 @@ +{ + "m_SettingKeys": [ + "VR Device Disabled", + "VR Device User Alert" + ], + "m_SettingValues": [ + "False", + "False" + ] +} \ No newline at end of file diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset new file mode 100644 index 00000000..4681d1d2 --- /dev/null +++ b/UserSettings/EditorUserSettings.asset @@ -0,0 +1,19 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!162 &1 +EditorUserSettings: + m_ObjectHideFlags: 0 + serializedVersion: 4 + m_ConfigSettings: + vcSharedLogLevel: + value: 0d5e400f0650 + flags: 0 + m_VCAutomaticAdd: 1 + m_VCDebugCom: 0 + m_VCDebugCmd: 0 + m_VCDebugOut: 0 + m_SemanticMergeMode: 2 + m_VCShowFailedCheckout: 1 + m_VCOverwriteFailedCheckoutAssets: 1 + m_VCOverlayIcons: 1 + m_VCAllowAsyncUpdate: 0 From e28509a113209dfc52a863d626268510777ce556 Mon Sep 17 00:00:00 2001 From: Rustamchuk Date: Mon, 16 Aug 2021 19:45:06 +0300 Subject: [PATCH 2/2] Refactoring --- Assets/Group1/Scenes/KillAllEnemies.unity | 18 ++++++++++---- Assets/Group1/Scripts/Enemy.cs | 10 ++++++-- Assets/Group1/Scripts/PlayerMover.cs | 21 ++++++++-------- Assets/Group1/Scripts/RandomCircleMover.cs | 6 ++--- Assets/Group1/Scripts/SpeedBooster.cs | 28 ++++++---------------- 5 files changed, 43 insertions(+), 40 deletions(-) diff --git a/Assets/Group1/Scenes/KillAllEnemies.unity b/Assets/Group1/Scenes/KillAllEnemies.unity index 3039ba77..5d735cc4 100644 --- a/Assets/Group1/Scenes/KillAllEnemies.unity +++ b/Assets/Group1/Scenes/KillAllEnemies.unity @@ -170,7 +170,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 218f17a929b2a8443a68567a22295cef, type: 3} m_Name: m_EditorClassIdentifier: - Died: + _died: m_PersistentCalls: m_Calls: - m_Target: {fileID: 534669906} @@ -498,7 +498,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 218f17a929b2a8443a68567a22295cef, type: 3} m_Name: m_EditorClassIdentifier: - Died: + _died: m_PersistentCalls: m_Calls: - m_Target: {fileID: 534669906} @@ -884,7 +884,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 218f17a929b2a8443a68567a22295cef, type: 3} m_Name: m_EditorClassIdentifier: - Died: + _died: m_PersistentCalls: m_Calls: - m_Target: {fileID: 534669906} @@ -1119,7 +1119,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 218f17a929b2a8443a68567a22295cef, type: 3} m_Name: m_EditorClassIdentifier: - Died: + _died: m_PersistentCalls: m_Calls: - m_Target: {fileID: 534669906} @@ -1393,6 +1393,11 @@ PrefabInstance: propertyPath: m_SortingOrder value: 2 objectReference: {fileID: 0} + - target: {fileID: 707709746529934882, guid: 1dc505c47b2720445b807922917cebd1, + type: 3} + propertyPath: _player + value: + objectReference: {fileID: 1761935012} - target: {fileID: 707709746529934882, guid: 1dc505c47b2720445b807922917cebd1, type: 3} propertyPath: _multiplyValue @@ -1504,6 +1509,11 @@ PrefabInstance: propertyPath: m_SortingOrder value: 2 objectReference: {fileID: 0} + - target: {fileID: 707709746529934882, guid: 1dc505c47b2720445b807922917cebd1, + type: 3} + propertyPath: _player + value: + objectReference: {fileID: 1761935012} - target: {fileID: 707709746529934882, guid: 1dc505c47b2720445b807922917cebd1, type: 3} propertyPath: _multiplyValue diff --git a/Assets/Group1/Scripts/Enemy.cs b/Assets/Group1/Scripts/Enemy.cs index 55c57b1b..620a5cca 100644 --- a/Assets/Group1/Scripts/Enemy.cs +++ b/Assets/Group1/Scripts/Enemy.cs @@ -5,11 +5,17 @@ public class Enemy : MonoBehaviour { - public UnityEvent Died; + [SerializeField] private UnityEvent _died; + + public event UnityAction Died + { + add => _died.AddListener(value); + remove => _died.RemoveListener(value); + } public void Die() { - Died.Invoke(); + _died.Invoke(); Destroy(gameObject); } } diff --git a/Assets/Group1/Scripts/PlayerMover.cs b/Assets/Group1/Scripts/PlayerMover.cs index 675f3eb1..7efea973 100644 --- a/Assets/Group1/Scripts/PlayerMover.cs +++ b/Assets/Group1/Scripts/PlayerMover.cs @@ -5,29 +5,30 @@ public class PlayerMover : MonoBehaviour { [SerializeField] private float _speed; - private void Update() - { - if (Input.GetKey(KeyCode.W)) - transform.Translate(0, _speed * Time.deltaTime, 0); + private float _movementX; + private float _movementY; + private bool _isMultiplied = false; - if (Input.GetKey(KeyCode.S)) - transform.Translate(0, -_speed * Time.deltaTime, 0); + public bool IsMultiplied => _isMultiplied; - if (Input.GetKey(KeyCode.A)) - transform.Translate(-_speed * Time.deltaTime, 0, 0); + private void Update() + { + _movementX = Input.GetAxis("Horizontal") * _speed * Time.deltaTime; + _movementY = Input.GetAxis("Vertical") * _speed * Time.deltaTime; - if (Input.GetKey(KeyCode.D)) - transform.Translate(_speed * Time.deltaTime, 0, 0); + transform.Translate(_movementX, _movementY, 0); } public void MultiplySpeed(float value) { _speed *= value; + _isMultiplied = true; } public void ShareSpeed(float value) { _speed /= value; + _isMultiplied = false; } private void OnTriggerEnter2D(Collider2D collision) diff --git a/Assets/Group1/Scripts/RandomCircleMover.cs b/Assets/Group1/Scripts/RandomCircleMover.cs index a160f35c..f7b0a94b 100644 --- a/Assets/Group1/Scripts/RandomCircleMover.cs +++ b/Assets/Group1/Scripts/RandomCircleMover.cs @@ -11,18 +11,18 @@ public class RandomCircleMover : MonoBehaviour private void Start() { - ChangeTargetPosition(); + FindNewTargetPosition(); } private void Update() { if (transform.position == _targetPosition) - ChangeTargetPosition(); + FindNewTargetPosition(); transform.position = Vector3.MoveTowards(transform.position, _targetPosition, _speed * Time.deltaTime); } - private void ChangeTargetPosition() + private void FindNewTargetPosition() { _targetPosition = Random.insideUnitCircle * _radius; } diff --git a/Assets/Group1/Scripts/SpeedBooster.cs b/Assets/Group1/Scripts/SpeedBooster.cs index ccdf97db..7588ddc8 100644 --- a/Assets/Group1/Scripts/SpeedBooster.cs +++ b/Assets/Group1/Scripts/SpeedBooster.cs @@ -4,38 +4,24 @@ public class SpeedBooster : MonoBehaviour { + [SerializeField] private PlayerMover _player; [SerializeField] private float _multiplyValue; [SerializeField] private float _duration; - private PlayerMover _player; - private bool _isBoosted = false; - private float _passTime; - - private void Update() + private IEnumerator Boost() { - if (_isBoosted) - { - _passTime += Time.deltaTime; + _player.MultiplySpeed(_multiplyValue); - if (_duration <= _passTime) - { - _player.ShareSpeed(_multiplyValue); - - _passTime = 0; + yield return new WaitForSeconds(_duration); - _isBoosted = false; - } - } + _player.ShareSpeed(_multiplyValue); } private void OnTriggerEnter2D(Collider2D collision) { - if (collision.TryGetComponent(out PlayerMover player)) + if (collision.TryGetComponent(out PlayerMover player) && !_player.IsMultiplied) { - _player = player; - - _player.MultiplySpeed(_multiplyValue); - _isBoosted = true; + StartCoroutine(Boost()); } } }