From f063ae7a405f9ea0f9e148e60753065bd3d8bcb2 Mon Sep 17 00:00:00 2001 From: atomlg <58149549+atomlg@users.noreply.github.com> Date: Mon, 23 Aug 2021 08:04:52 +0300 Subject: [PATCH 1/4] 23.08 --- .idea/.idea.SHK-Unity/.idea/.gitignore | 13 + .idea/.idea.SHK-Unity/.idea/encodings.xml | 4 + .idea/.idea.SHK-Unity/.idea/indexLayout.xml | 31 + .idea/.idea.SHK-Unity/.idea/riderModule.iml | 7 + .idea/.idea.SHK-Unity/.idea/vcs.xml | 6 + Assets/Group1/Scripts/GameController.cs | 38 - Assets/Group1/Scripts/NewBehaviourScript1.cs | 65 -- Assets/Group1/Scripts/e.cs | 22 - Assets/Prefabs.meta | 8 + Assets/Prefabs/Enemy.prefab | 111 +++ Assets/Prefabs/Enemy.prefab.meta | 7 + Assets/Prefabs/Player.prefab | 99 +++ Assets/Prefabs/Player.prefab.meta | 7 + Assets/{Group1 => }/Scenes.meta | 0 .../{Group1 => }/Scenes/KillAllEnemies.unity | 659 ++++++++---------- .../Scenes/KillAllEnemies.unity.meta | 0 Assets/{Group1 => }/Scripts.meta | 0 Assets/Scripts/Bootstrapper.cs | 13 + .../Bootstrapper.cs.meta} | 2 +- Assets/Scripts/EnemiesSpawner.cs | 52 ++ Assets/Scripts/EnemiesSpawner.cs.meta | 11 + Assets/Scripts/EnemyHealth.cs | 13 + Assets/Scripts/EnemyHealth.cs.meta | 11 + Assets/Scripts/EnemyMovement.cs | 37 + .../EnemyMovement.cs.meta} | 0 Assets/Scripts/FadeScreen.cs | 26 + Assets/Scripts/FadeScreen.cs.meta | 11 + Assets/Scripts/PlayerMovement.cs | 62 ++ .../PlayerMovement.cs.meta} | 0 Assets/Scripts/PlayerSpawner.cs | 20 + Assets/Scripts/PlayerSpawner.cs.meta | 11 + Assets/{Group1.meta => Sprites.meta} | 0 .../{Group1/Player.png => Sprites/Enemy.png} | Bin .../enemy.png.meta => Sprites/Enemy.png.meta} | 0 .../{Group1/enemy.png => Sprites/Player.png} | Bin Assets/{Group1 => Sprites}/Player.png.meta | 0 Logs/Packages-Update.log | 25 + Packages/manifest.json | 21 +- Packages/packages-lock.json | 377 ++++++++++ ProjectSettings/EditorSettings.asset | 20 +- ProjectSettings/PackageManagerSettings.asset | 38 + ProjectSettings/ProjectVersion.txt | 3 +- ProjectSettings/XRSettings.asset | 10 + 43 files changed, 1355 insertions(+), 485 deletions(-) create mode 100644 .idea/.idea.SHK-Unity/.idea/.gitignore create mode 100644 .idea/.idea.SHK-Unity/.idea/encodings.xml create mode 100644 .idea/.idea.SHK-Unity/.idea/indexLayout.xml create mode 100644 .idea/.idea.SHK-Unity/.idea/riderModule.iml create mode 100644 .idea/.idea.SHK-Unity/.idea/vcs.xml delete mode 100644 Assets/Group1/Scripts/GameController.cs delete mode 100644 Assets/Group1/Scripts/NewBehaviourScript1.cs delete mode 100644 Assets/Group1/Scripts/e.cs create mode 100644 Assets/Prefabs.meta create mode 100644 Assets/Prefabs/Enemy.prefab create mode 100644 Assets/Prefabs/Enemy.prefab.meta create mode 100644 Assets/Prefabs/Player.prefab create mode 100644 Assets/Prefabs/Player.prefab.meta rename Assets/{Group1 => }/Scenes.meta (100%) rename Assets/{Group1 => }/Scenes/KillAllEnemies.unity (63%) rename Assets/{Group1 => }/Scenes/KillAllEnemies.unity.meta (100%) rename Assets/{Group1 => }/Scripts.meta (100%) create mode 100644 Assets/Scripts/Bootstrapper.cs rename Assets/{Group1/Scripts/GameController.cs.meta => Scripts/Bootstrapper.cs.meta} (83%) create mode 100644 Assets/Scripts/EnemiesSpawner.cs create mode 100644 Assets/Scripts/EnemiesSpawner.cs.meta create mode 100644 Assets/Scripts/EnemyHealth.cs create mode 100644 Assets/Scripts/EnemyHealth.cs.meta create mode 100644 Assets/Scripts/EnemyMovement.cs rename Assets/{Group1/Scripts/e.cs.meta => Scripts/EnemyMovement.cs.meta} (100%) create mode 100644 Assets/Scripts/FadeScreen.cs create mode 100644 Assets/Scripts/FadeScreen.cs.meta create mode 100644 Assets/Scripts/PlayerMovement.cs rename Assets/{Group1/Scripts/NewBehaviourScript1.cs.meta => Scripts/PlayerMovement.cs.meta} (100%) create mode 100644 Assets/Scripts/PlayerSpawner.cs create mode 100644 Assets/Scripts/PlayerSpawner.cs.meta rename Assets/{Group1.meta => Sprites.meta} (100%) rename Assets/{Group1/Player.png => Sprites/Enemy.png} (100%) rename Assets/{Group1/enemy.png.meta => Sprites/Enemy.png.meta} (100%) rename Assets/{Group1/enemy.png => Sprites/Player.png} (100%) rename Assets/{Group1 => Sprites}/Player.png.meta (100%) create mode 100644 Logs/Packages-Update.log create mode 100644 Packages/packages-lock.json create mode 100644 ProjectSettings/PackageManagerSettings.asset create mode 100644 ProjectSettings/XRSettings.asset diff --git a/.idea/.idea.SHK-Unity/.idea/.gitignore b/.idea/.idea.SHK-Unity/.idea/.gitignore new file mode 100644 index 00000000..73d84aaa --- /dev/null +++ b/.idea/.idea.SHK-Unity/.idea/.gitignore @@ -0,0 +1,13 @@ +# Default ignored files +/shelf/ +/workspace.xml +# Rider ignored files +/contentModel.xml +/projectSettingsUpdater.xml +/modules.xml +/.idea.SHK-Unity.iml +# Datasource local storage ignored files +/../../../../../../../:\Unity\Repository\SHK-Unity\.idea\.idea.SHK-Unity\.idea/dataSources/ +/dataSources.local.xml +# Editor-based HTTP Client requests +/httpRequests/ diff --git a/.idea/.idea.SHK-Unity/.idea/encodings.xml b/.idea/.idea.SHK-Unity/.idea/encodings.xml new file mode 100644 index 00000000..df87cf95 --- /dev/null +++ b/.idea/.idea.SHK-Unity/.idea/encodings.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/.idea/.idea.SHK-Unity/.idea/indexLayout.xml b/.idea/.idea.SHK-Unity/.idea/indexLayout.xml new file mode 100644 index 00000000..f6519a45 --- /dev/null +++ b/.idea/.idea.SHK-Unity/.idea/indexLayout.xml @@ -0,0 +1,31 @@ + + + + + + Library/PackageCache/com.unity.ads@3.6.1 + Library/PackageCache/com.unity.analytics@3.3.5 + Library/PackageCache/com.unity.collab-proxy@1.2.16 + Library/PackageCache/com.unity.ext.nunit@1.0.6 + Library/PackageCache/com.unity.ide.rider@1.1.4 + Library/PackageCache/com.unity.ide.vscode@1.2.3 + Library/PackageCache/com.unity.multiplayer-hlapi@1.0.8 + Library/PackageCache/com.unity.purchasing@2.2.1 + Library/PackageCache/com.unity.test-framework@1.1.22 + Library/PackageCache/com.unity.textmeshpro@2.0.1 + Library/PackageCache/com.unity.timeline@1.2.6 + Library/PackageCache/com.unity.xr.legacyinputhelpers@2.1.7 + Library/PackageCache/nuget.mono-cecil@0.1.6-preview + Packages + ProjectSettings + + + .git + .idea + Library + Logs + Temp + obj + + + \ No newline at end of file diff --git a/.idea/.idea.SHK-Unity/.idea/riderModule.iml b/.idea/.idea.SHK-Unity/.idea/riderModule.iml new file mode 100644 index 00000000..1a4e0d95 --- /dev/null +++ b/.idea/.idea.SHK-Unity/.idea/riderModule.iml @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/.idea/.idea.SHK-Unity/.idea/vcs.xml b/.idea/.idea.SHK-Unity/.idea/vcs.xml new file mode 100644 index 00000000..94a25f7f --- /dev/null +++ b/.idea/.idea.SHK-Unity/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file 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/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/Prefabs.meta b/Assets/Prefabs.meta new file mode 100644 index 00000000..9ceb3284 --- /dev/null +++ b/Assets/Prefabs.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: c8136b106e81ce84cbf7555633dcbe2b +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Enemy.prefab b/Assets/Prefabs/Enemy.prefab new file mode 100644 index 00000000..b29f35f2 --- /dev/null +++ b/Assets/Prefabs/Enemy.prefab @@ -0,0 +1,111 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &2290174922703930031 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2290174922703930025} + - component: {fileID: 2290174922703930030} + - component: {fileID: 2290174922703930027} + - component: {fileID: 3316847255587597011} + m_Layer: 0 + m_Name: Enemy + m_TagString: Enemy + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2290174922703930025 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2290174922703930031} + 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: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &2290174922703930030 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2290174922703930031} + 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 &2290174922703930027 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2290174922703930031} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 65f7df4705b7dae48944a39b48934484, type: 3} + m_Name: + m_EditorClassIdentifier: + _maxDistanceDelta: 2 + _randomOffset: 4 +--- !u!114 &3316847255587597011 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2290174922703930031} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: eaa4e470fe434f243a5b2134594d8711, type: 3} + m_Name: + m_EditorClassIdentifier: diff --git a/Assets/Prefabs/Enemy.prefab.meta b/Assets/Prefabs/Enemy.prefab.meta new file mode 100644 index 00000000..5a79083b --- /dev/null +++ b/Assets/Prefabs/Enemy.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: eef479b691bd395488cb4bd4bd3589a6 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Player.prefab b/Assets/Prefabs/Player.prefab new file mode 100644 index 00000000..be74a82b --- /dev/null +++ b/Assets/Prefabs/Player.prefab @@ -0,0 +1,99 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &2762679525644574709 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2762679525644574711} + - component: {fileID: 2762679525644574710} + - component: {fileID: 2762679525644574704} + m_Layer: 0 + m_Name: Player + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2762679525644574711 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2762679525644574709} + 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 &2762679525644574710 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2762679525644574709} + 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: 5 + m_Sprite: {fileID: 21300000, guid: e3d497cf399ca0d42af41c518d283eb2, type: 3} + m_Color: {r: 0.008547783, g: 1, b: 0, 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 &2762679525644574704 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2762679525644574709} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: dede9e7d6741aea4cb07b98da83cc6a8, type: 3} + m_Name: + m_EditorClassIdentifier: + _speed: 4 + _hasMaxSpeed: 1 + _time: 10 diff --git a/Assets/Prefabs/Player.prefab.meta b/Assets/Prefabs/Player.prefab.meta new file mode 100644 index 00000000..70b90809 --- /dev/null +++ b/Assets/Prefabs/Player.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: d03ad9c5cb1251c4380d4b2ac52f7245 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Group1/Scenes.meta b/Assets/Scenes.meta similarity index 100% rename from Assets/Group1/Scenes.meta rename to Assets/Scenes.meta diff --git a/Assets/Group1/Scenes/KillAllEnemies.unity b/Assets/Scenes/KillAllEnemies.unity similarity index 63% rename from Assets/Group1/Scenes/KillAllEnemies.unity rename to Assets/Scenes/KillAllEnemies.unity index 21adfb9b..6952ac1a 100644 --- a/Assets/Group1/Scenes/KillAllEnemies.unity +++ b/Assets/Scenes/KillAllEnemies.unity @@ -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 &154555030 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -120,89 +129,27 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 141422279} - - component: {fileID: 141422278} - - component: {fileID: 141422277} + - component: {fileID: 154555031} m_Layer: 0 - m_Name: enemy - m_TagString: Enemy + m_Name: SpawnPosition (2) + m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!114 &141422277 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 141422275} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 65f7df4705b7dae48944a39b48934484, 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 +--- !u!4 &154555031 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_GameObject: {fileID: 154555030} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 3.59, y: 3.09, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 4 + m_Father: {fileID: 676249776} + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &170076733 GameObject: @@ -229,12 +176,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 +193,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 +218,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 @@ -283,7 +253,6 @@ GameObject: m_Component: - component: {fileID: 534669905} - component: {fileID: 534669904} - - component: {fileID: 534669903} - component: {fileID: 534669906} m_Layer: 0 m_Name: Main Camera @@ -292,14 +261,6 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!81 &534669903 -AudioListener: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 534669902} - m_Enabled: 1 --- !u!20 &534669904 Camera: m_ObjectHideFlags: 0 @@ -312,9 +273,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 @@ -363,18 +325,134 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 534669902} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: cd6d0074e725a114e850d2e604fe4b0d, type: 3} m_Name: m_EditorClassIdentifier: go: {fileID: 1054253062} - a: {fileID: 1761935009} + a: {fileID: 0} B: - - {fileID: 2083640146} - - {fileID: 1754708960} - - {fileID: 141422275} - - {fileID: 1578050036} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} +--- !u!1 &598960688 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 598960689} + m_Layer: 0 + m_Name: SpawnPosition + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &598960689 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 598960688} + 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: 1958228847} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &676249775 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 676249776} + - component: {fileID: 676249777} + m_Layer: 0 + m_Name: SpawnPositions + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &676249776 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 676249775} + 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: + - {fileID: 1787019937} + - {fileID: 1280972011} + - {fileID: 154555031} + - {fileID: 683715099} + m_Father: {fileID: 1742641678} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &676249777 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 676249775} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0c16e6cda133ee549b82619298c60b6c, type: 3} + m_Name: + m_EditorClassIdentifier: + _spawnPositions: + - {fileID: 1787019937} + - {fileID: 1280972011} + - {fileID: 154555031} + - {fileID: 683715099} + _enemyTemplate: {fileID: 2290174922703930031, guid: eef479b691bd395488cb4bd4bd3589a6, + type: 3} + _parent: {fileID: 1703565173} + _playerSpawner: {fileID: 1958228846} +--- !u!1 &683715098 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 683715099} + m_Layer: 0 + m_Name: SpawnPosition (3) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &683715099 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 683715098} + 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: 676249776} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1054253062 GameObject: m_ObjectHideFlags: 0 @@ -385,13 +463,14 @@ GameObject: m_Component: - component: {fileID: 1054253064} - component: {fileID: 1054253063} + - component: {fileID: 1054253065} m_Layer: 0 - m_Name: New Sprite + m_Name: FadeScreen m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!212 &1054253063 SpriteRenderer: m_ObjectHideFlags: 0 @@ -399,13 +478,14 @@ SpriteRenderer: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1054253062} - m_Enabled: 1 + m_Enabled: 0 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: @@ -417,6 +497,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,101 +533,52 @@ Transform: m_LocalScale: {x: 25, y: 25, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 7 + m_RootOrder: 4 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 +--- !u!114 &1054253065 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1578050036} + m_GameObject: {fileID: 1054253062} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 65f7df4705b7dae48944a39b48934484, type: 3} + m_Script: {fileID: 11500000, guid: 2b5faf64ff72d334fba320a5d05de280, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!212 &1578050039 -SpriteRenderer: + _enemiesSpawner: {fileID: 1742641679} +--- !u!1 &1280972010 +GameObject: 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 + serializedVersion: 6 + m_Component: + - component: {fileID: 1280972011} + m_Layer: 0 + m_Name: SpawnPosition (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1280972011 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_GameObject: {fileID: 1280972010} + 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: 5 + m_Father: {fileID: 676249776} + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1754708960 +--- !u!1 &1548554234 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -554,91 +586,74 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1754708964} - - component: {fileID: 1754708963} - - component: {fileID: 1754708962} + - component: {fileID: 1548554235} + - component: {fileID: 1548554236} m_Layer: 0 - m_Name: enemy - m_TagString: Enemy + m_Name: Bootstrapper + m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!114 &1754708962 +--- !u!4 &1548554235 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1548554234} + 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: 5 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1548554236 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1754708960} + m_GameObject: {fileID: 1548554234} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 65f7df4705b7dae48944a39b48934484, type: 3} + m_Script: {fileID: 11500000, guid: c31bf9ebb1c6a844c9945d6b415c324b, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!212 &1754708963 -SpriteRenderer: + _enemiesSpawner: {fileID: 1742641679} + _playerSpawner: {fileID: 1958228846} +--- !u!1 &1703565172 +GameObject: 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 + serializedVersion: 6 + m_Component: + - component: {fileID: 1703565173} + m_Layer: 0 + m_Name: Enemies + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1703565173 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1754708960} + m_GameObject: {fileID: 1703565172} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 3.59, y: 0.71, z: 0} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 3 + m_Father: {fileID: 1742641678} + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1761935009 +--- !u!1 &1742641677 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -646,94 +661,53 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1761935011} - - component: {fileID: 1761935010} - - component: {fileID: 1761935012} + - component: {fileID: 1742641678} + - component: {fileID: 1742641679} m_Layer: 0 - m_Name: New Sprite (1) + m_Name: EnemiesSpawner m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!212 &1761935010 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - 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: 5 - m_Sprite: {fileID: 21300000, guid: e3d497cf399ca0d42af41c518d283eb2, type: 3} - m_Color: {r: 0.008547783, g: 1, b: 0, 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 &1761935011 +--- !u!4 &1742641678 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1761935009} + m_GameObject: {fileID: 1742641677} 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_Children: + - {fileID: 676249776} + - {fileID: 1703565173} m_Father: {fileID: 0} - m_RootOrder: 6 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1761935012 +--- !u!114 &1742641679 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1761935009} + m_GameObject: {fileID: 1742641677} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: dede9e7d6741aea4cb07b98da83cc6a8, type: 3} + m_Script: {fileID: 11500000, guid: 0c16e6cda133ee549b82619298c60b6c, type: 3} m_Name: m_EditorClassIdentifier: - spEed: 4 - timer: 0 - time: 0 ---- !u!1 &2083640146 + _spawnPositions: + - {fileID: 1787019937} + - {fileID: 1280972011} + - {fileID: 154555031} + - {fileID: 683715099} + _enemyTemplate: {fileID: 2290174922703930031, guid: eef479b691bd395488cb4bd4bd3589a6, + type: 3} + _parent: {fileID: 1703565173} + _playerSpawner: {fileID: 1958228846} +--- !u!1 &1787019936 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -741,87 +715,74 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 2083640148} - - component: {fileID: 2083640147} - - component: {fileID: 2083640150} + - component: {fileID: 1787019937} m_Layer: 0 - m_Name: enemy - m_TagString: Enemy + m_Name: SpawnPosition + 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 &1787019937 Transform: 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_GameObject: {fileID: 1787019936} + 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_Father: {fileID: 676249776} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &2083640150 +--- !u!1 &1958228845 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1958228847} + - component: {fileID: 1958228846} + m_Layer: 0 + m_Name: PlayerSpawner + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1958228846 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2083640146} + m_GameObject: {fileID: 1958228845} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 65f7df4705b7dae48944a39b48934484, type: 3} + m_Script: {fileID: 11500000, guid: 85171ab0d35869147a19ac9656f2d1b2, type: 3} m_Name: m_EditorClassIdentifier: + _playerTemplate: {fileID: 2762679525644574709, guid: d03ad9c5cb1251c4380d4b2ac52f7245, + type: 3} + _spawnPosition: {fileID: 598960689} + _parent: {fileID: 1958228847} + _enemiesSpawner: {fileID: 1742641679} +--- !u!4 &1958228847 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1958228845} + 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: + - {fileID: 598960689} + m_Father: {fileID: 0} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/Assets/Group1/Scenes/KillAllEnemies.unity.meta b/Assets/Scenes/KillAllEnemies.unity.meta similarity index 100% rename from Assets/Group1/Scenes/KillAllEnemies.unity.meta rename to Assets/Scenes/KillAllEnemies.unity.meta diff --git a/Assets/Group1/Scripts.meta b/Assets/Scripts.meta similarity index 100% rename from Assets/Group1/Scripts.meta rename to Assets/Scripts.meta diff --git a/Assets/Scripts/Bootstrapper.cs b/Assets/Scripts/Bootstrapper.cs new file mode 100644 index 00000000..eca3d53a --- /dev/null +++ b/Assets/Scripts/Bootstrapper.cs @@ -0,0 +1,13 @@ +using UnityEngine; + +public class Bootstrapper : MonoBehaviour +{ + [SerializeField] private EnemiesSpawner _enemiesSpawner; + [SerializeField] private PlayerSpawner _playerSpawner; + + private void Start() + { + _enemiesSpawner.Init(); + _playerSpawner.Init(); + } +} diff --git a/Assets/Group1/Scripts/GameController.cs.meta b/Assets/Scripts/Bootstrapper.cs.meta similarity index 83% rename from Assets/Group1/Scripts/GameController.cs.meta rename to Assets/Scripts/Bootstrapper.cs.meta index e9cd6afe..11032ba3 100644 --- a/Assets/Group1/Scripts/GameController.cs.meta +++ b/Assets/Scripts/Bootstrapper.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: cd6d0074e725a114e850d2e604fe4b0d +guid: c31bf9ebb1c6a844c9945d6b415c324b MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/Scripts/EnemiesSpawner.cs b/Assets/Scripts/EnemiesSpawner.cs new file mode 100644 index 00000000..1312a57d --- /dev/null +++ b/Assets/Scripts/EnemiesSpawner.cs @@ -0,0 +1,52 @@ +using System; +using UnityEngine; + +public class EnemiesSpawner : MonoBehaviour +{ + private int _enemiesCount; + private Transform _player; + + [SerializeField] private Transform[] _spawnPositions; + [SerializeField] private GameObject _enemyTemplate; + [SerializeField] private Transform _parent; + [SerializeField] private PlayerSpawner _playerSpawner; + + public event Action OnEnemyDied; + public event Action OnAllEnemiesDied; + + public void Init() + { + _enemiesCount = _spawnPositions.Length; + _playerSpawner.OnPlayerSpawned += OnPlayerSpawned; + } + + private void OnPlayerSpawned(Transform player) + { + _player = player; + _playerSpawner.OnPlayerSpawned -= OnPlayerSpawned; + SpawnEnemies(); + } + + private void SpawnEnemies() + { + for (int i = 0; i < _spawnPositions.Length; i++) + { + GameObject enemy = Instantiate(_enemyTemplate, _spawnPositions[i].position, Quaternion.identity, _parent); + EnemyHealth enemyHealth = enemy.GetComponent(); + enemyHealth.OnDied += OnDied; + EnemyMovement enemyMovement = enemy.GetComponent(); + enemyMovement.Init(_player); + } + } + + private void OnDied(EnemyHealth enemyHealth) + { + enemyHealth.OnDied -= OnDied; + _enemiesCount--; + OnEnemyDied?.Invoke(enemyHealth); + if (_enemiesCount == 0) + { + OnAllEnemiesDied?.Invoke(); + } + } +} diff --git a/Assets/Scripts/EnemiesSpawner.cs.meta b/Assets/Scripts/EnemiesSpawner.cs.meta new file mode 100644 index 00000000..7323e5ce --- /dev/null +++ b/Assets/Scripts/EnemiesSpawner.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 0c16e6cda133ee549b82619298c60b6c +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/EnemyHealth.cs b/Assets/Scripts/EnemyHealth.cs new file mode 100644 index 00000000..f6a58fae --- /dev/null +++ b/Assets/Scripts/EnemyHealth.cs @@ -0,0 +1,13 @@ +using System; +using UnityEngine; + +public class EnemyHealth : MonoBehaviour +{ + public event Action OnDied; + + public void Die() + { + OnDied?.Invoke(this); + Destroy(gameObject); + } +} diff --git a/Assets/Scripts/EnemyHealth.cs.meta b/Assets/Scripts/EnemyHealth.cs.meta new file mode 100644 index 00000000..1c48328d --- /dev/null +++ b/Assets/Scripts/EnemyHealth.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: eaa4e470fe434f243a5b2134594d8711 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/EnemyMovement.cs b/Assets/Scripts/EnemyMovement.cs new file mode 100644 index 00000000..4acc4e54 --- /dev/null +++ b/Assets/Scripts/EnemyMovement.cs @@ -0,0 +1,37 @@ +using UnityEngine; + +[RequireComponent(typeof(EnemyHealth))] +public class EnemyMovement : MonoBehaviour +{ + private Vector3 _moveTarget; + private Transform _player; + private EnemyHealth _enemyHealth; + + [SerializeField] private float _maxDistanceDelta = 2f; + [SerializeField] private float _randomOffset = 4f; + [SerializeField] private float _minDistance = 0.2f; + + public void Init(Transform player) + { + _enemyHealth = GetComponent(); + _moveTarget = Random.insideUnitCircle * _randomOffset; + _player = player; + } + + private void Update() + { + if (transform.position == _moveTarget) + _moveTarget = Random.insideUnitCircle * _randomOffset; + else + transform.position = + Vector3.MoveTowards(transform.position, _moveTarget, _maxDistanceDelta * Time.deltaTime); + + if (_player != null) + { + if (Vector3.Distance(_player.position, transform.position) < _minDistance) + { + _enemyHealth.Die(); + } + } + } +} \ No newline at end of file diff --git a/Assets/Group1/Scripts/e.cs.meta b/Assets/Scripts/EnemyMovement.cs.meta similarity index 100% rename from Assets/Group1/Scripts/e.cs.meta rename to Assets/Scripts/EnemyMovement.cs.meta diff --git a/Assets/Scripts/FadeScreen.cs b/Assets/Scripts/FadeScreen.cs new file mode 100644 index 00000000..0c7c5c1b --- /dev/null +++ b/Assets/Scripts/FadeScreen.cs @@ -0,0 +1,26 @@ +using System; +using UnityEngine; + +[RequireComponent(typeof(SpriteRenderer))] +public class FadeScreen : MonoBehaviour +{ + private SpriteRenderer _spriteRenderer; + + [SerializeField] private EnemiesSpawner _enemiesSpawner; + + private void Awake() + { + _spriteRenderer = GetComponent(); + } + + private void OnEnable() + { + _enemiesSpawner.OnAllEnemiesDied += ShowFade; + } + + private void ShowFade() + { + _spriteRenderer.enabled = true; + _enemiesSpawner.OnAllEnemiesDied -= ShowFade; + } +} \ No newline at end of file diff --git a/Assets/Scripts/FadeScreen.cs.meta b/Assets/Scripts/FadeScreen.cs.meta new file mode 100644 index 00000000..caf35f76 --- /dev/null +++ b/Assets/Scripts/FadeScreen.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 2b5faf64ff72d334fba320a5d05de280 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/PlayerMovement.cs b/Assets/Scripts/PlayerMovement.cs new file mode 100644 index 00000000..93c7ab6e --- /dev/null +++ b/Assets/Scripts/PlayerMovement.cs @@ -0,0 +1,62 @@ +using UnityEngine; + +public class PlayerMovement : MonoBehaviour +{ + private const string HorizontalAxisName = "Horizontal"; + private const string VerticalAxisName = "Vertical"; + + private float _currentTime; + private EnemiesSpawner _enemiesSpawner; + + [SerializeField] private float _speed = 4f; + [SerializeField] private bool _hasMaxSpeed = true; + [SerializeField] private float _originTime = 2f; + + public void Init(EnemiesSpawner enemiesSpawner) + { + _enemiesSpawner = enemiesSpawner; + _enemiesSpawner.OnEnemyDied += OnEnemyDied; + _enemiesSpawner.OnAllEnemiesDied += OnAllEnemiesDied; + _currentTime = _originTime; + } + + private void Update() + { + if (_hasMaxSpeed) + { + _currentTime -= Time.deltaTime; + if (_currentTime < 0) + { + _hasMaxSpeed = false; + _speed /= 2; + } + } + + float horizontal = Input.GetAxis(HorizontalAxisName); + float vertical = Input.GetAxis(VerticalAxisName); + + transform.Translate(horizontal * _speed * Time.deltaTime, vertical * _speed * Time.deltaTime, 0); + } + + private void OnAllEnemiesDied() + { + _enemiesSpawner.OnEnemyDied -= OnEnemyDied; + _enemiesSpawner.OnAllEnemiesDied -= OnAllEnemiesDied; + enabled = false; + } + + private void OnEnemyDied(EnemyHealth obj) + { + if (!_hasMaxSpeed) + { + ResetSpeed(); + } + } + + private void ResetSpeed() + { + _speed *= 2; + _hasMaxSpeed = true; + _currentTime = _originTime; + } +} \ No newline at end of file diff --git a/Assets/Group1/Scripts/NewBehaviourScript1.cs.meta b/Assets/Scripts/PlayerMovement.cs.meta similarity index 100% rename from Assets/Group1/Scripts/NewBehaviourScript1.cs.meta rename to Assets/Scripts/PlayerMovement.cs.meta diff --git a/Assets/Scripts/PlayerSpawner.cs b/Assets/Scripts/PlayerSpawner.cs new file mode 100644 index 00000000..1ec23d55 --- /dev/null +++ b/Assets/Scripts/PlayerSpawner.cs @@ -0,0 +1,20 @@ +using System; +using UnityEngine; + +public class PlayerSpawner : MonoBehaviour +{ + [SerializeField] private GameObject _playerTemplate; + [SerializeField] private Transform _spawnPosition; + [SerializeField] private Transform _parent; + [SerializeField] private EnemiesSpawner _enemiesSpawner; + + public event Action OnPlayerSpawned; + + public void Init() + { + GameObject player = Instantiate(_playerTemplate, _spawnPosition.transform.position, Quaternion.identity, _parent); + PlayerMovement playerMovement = player.GetComponent(); + playerMovement.Init(_enemiesSpawner); + OnPlayerSpawned?.Invoke(player.transform); + } +} \ No newline at end of file diff --git a/Assets/Scripts/PlayerSpawner.cs.meta b/Assets/Scripts/PlayerSpawner.cs.meta new file mode 100644 index 00000000..1e4a1cb5 --- /dev/null +++ b/Assets/Scripts/PlayerSpawner.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 85171ab0d35869147a19ac9656f2d1b2 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Group1.meta b/Assets/Sprites.meta similarity index 100% rename from Assets/Group1.meta rename to Assets/Sprites.meta diff --git a/Assets/Group1/Player.png b/Assets/Sprites/Enemy.png similarity index 100% rename from Assets/Group1/Player.png rename to Assets/Sprites/Enemy.png diff --git a/Assets/Group1/enemy.png.meta b/Assets/Sprites/Enemy.png.meta similarity index 100% rename from Assets/Group1/enemy.png.meta rename to Assets/Sprites/Enemy.png.meta diff --git a/Assets/Group1/enemy.png b/Assets/Sprites/Player.png similarity index 100% rename from Assets/Group1/enemy.png rename to Assets/Sprites/Player.png diff --git a/Assets/Group1/Player.png.meta b/Assets/Sprites/Player.png.meta similarity index 100% rename from Assets/Group1/Player.png.meta rename to Assets/Sprites/Player.png.meta diff --git a/Logs/Packages-Update.log b/Logs/Packages-Update.log new file mode 100644 index 00000000..c438a721 --- /dev/null +++ b/Logs/Packages-Update.log @@ -0,0 +1,25 @@ + +=== Sun Aug 22 19:31:19 2021 + +Packages were changed. +Update Mode: updateDependencies + +The following packages were added: + com.unity.2d.sprite@1.0.0 + com.unity.2d.tilemap@1.0.0 + com.unity.ide.rider@1.1.4 + com.unity.ide.vscode@1.2.3 + com.unity.modules.androidjni@1.0.0 + com.unity.multiplayer-hlapi@1.0.8 + com.unity.test-framework@1.1.22 + com.unity.timeline@1.2.6 + com.unity.ugui@1.0.0 + com.unity.xr.legacyinputhelpers@2.1.7 +The following packages were updated: + com.unity.ads from version 2.0.8 to 3.6.1 + com.unity.analytics from version 3.2.2 to 3.3.5 + com.unity.collab-proxy from version 1.2.15 to 1.2.16 + com.unity.purchasing from version 2.0.3 to 2.2.1 + com.unity.textmeshpro from version 1.3.0 to 2.0.1 +The following packages were removed: + com.unity.package-manager-ui@2.0.7 diff --git a/Packages/manifest.json b/Packages/manifest.json index 8392bea1..1ac04c1d 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.6.1", + "com.unity.analytics": "3.3.5", + "com.unity.collab-proxy": "1.2.16", + "com.unity.ide.rider": "1.1.4", + "com.unity.ide.vscode": "1.2.3", + "com.unity.multiplayer-hlapi": "1.0.8", + "com.unity.purchasing": "2.2.1", + "com.unity.test-framework": "1.1.22", + "com.unity.textmeshpro": "2.0.1", + "com.unity.timeline": "1.2.6", + "com.unity.ugui": "1.0.0", + "com.unity.xr.legacyinputhelpers": "2.1.7", "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..8c5f812e --- /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.6.1", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.ugui": "1.0.0" + }, + "url": "https://packages.unity.com" + }, + "com.unity.analytics": { + "version": "3.3.5", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.ugui": "1.0.0" + }, + "url": "https://packages.unity.com" + }, + "com.unity.collab-proxy": { + "version": "1.2.16", + "depth": 0, + "source": "registry", + "dependencies": {}, + "url": "https://packages.unity.com" + }, + "com.unity.ext.nunit": { + "version": "1.0.6", + "depth": 1, + "source": "registry", + "dependencies": {}, + "url": "https://packages.unity.com" + }, + "com.unity.ide.rider": { + "version": "1.1.4", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.test-framework": "1.1.1" + }, + "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.multiplayer-hlapi": { + "version": "1.0.8", + "depth": 0, + "source": "registry", + "dependencies": { + "nuget.mono-cecil": "0.1.6-preview" + }, + "url": "https://packages.unity.com" + }, + "com.unity.purchasing": { + "version": "2.2.1", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.ugui": "1.0.0" + }, + "url": "https://packages.unity.com" + }, + "com.unity.test-framework": { + "version": "1.1.22", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.ext.nunit": "1.0.6", + "com.unity.modules.imgui": "1.0.0", + "com.unity.modules.jsonserialize": "1.0.0" + }, + "url": "https://packages.unity.com" + }, + "com.unity.textmeshpro": { + "version": "2.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.7", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.modules.vr": "1.0.0", + "com.unity.modules.xr": "1.0.0" + }, + "url": "https://packages.unity.com" + }, + "nuget.mono-cecil": { + "version": "0.1.6-preview", + "depth": 1, + "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.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/EditorSettings.asset b/ProjectSettings/EditorSettings.asset index 29dea529..5162e19f 100644 --- a/ProjectSettings/EditorSettings.asset +++ b/ProjectSettings/EditorSettings.asset @@ -3,19 +3,33 @@ --- !u!159 &1 EditorSettings: m_ObjectHideFlags: 0 - serializedVersion: 7 + serializedVersion: 9 m_ExternalVersionControlSupport: Visible Meta Files m_SerializationMode: 2 m_LineEndingsForNewScripts: 2 m_DefaultBehaviorMode: 0 + m_PrefabRegularEnvironment: {fileID: 0} + m_PrefabUIEnvironment: {fileID: 0} m_SpritePackerMode: 0 m_SpritePackerPaddingPower: 1 m_EtcTextureCompressorBehavior: 1 m_EtcTextureFastCompressor: 1 m_EtcTextureNormalCompressor: 2 m_EtcTextureBestCompressor: 4 - m_ProjectGenerationIncludedExtensions: txt;xml;fnt;cd + m_ProjectGenerationIncludedExtensions: txt;xml;fnt;cd;asmref m_ProjectGenerationRootNamespace: - m_UserGeneratedProjectSuffix: m_CollabEditorSettings: inProgressEnabled: 1 + m_EnableTextureStreamingInEditMode: 1 + m_EnableTextureStreamingInPlayMode: 1 + m_AsyncShaderCompilation: 1 + m_EnterPlayModeOptionsEnabled: 0 + m_EnterPlayModeOptions: 3 + m_ShowLightmapResolutionOverlay: 1 + m_UseLegacyProbeSampleCount: 1 + m_AssetPipelineMode: 1 + m_CacheServerMode: 0 + m_CacheServerEndpoint: + m_CacheServerNamespacePrefix: default + m_CacheServerEnableDownload: 1 + m_CacheServerEnableUpload: 1 diff --git a/ProjectSettings/PackageManagerSettings.asset b/ProjectSettings/PackageManagerSettings.asset new file mode 100644 index 00000000..6920e3ad --- /dev/null +++ b/ProjectSettings/PackageManagerSettings.asset @@ -0,0 +1,38 @@ +%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_ScopedRegistriesSettingsExpanded: 1 + oneTimeWarningShown: 0 + m_Registries: + - m_Id: main + m_Name: + m_Url: https://packages.unity.com + m_Scopes: [] + m_IsDefault: 1 + m_UserSelectedRegistryName: + m_UserAddingNewScopedRegistry: 0 + m_RegistryInfoDraft: + m_ErrorMessage: + m_Original: + m_Id: + m_Name: + m_Url: + m_Scopes: [] + m_IsDefault: 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..e8a0ab94 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1 +1,2 @@ -m_EditorVersion: 2018.3.14f1 +m_EditorVersion: 2019.4.20f1 +m_EditorVersionWithRevision: 2019.4.20f1 (6dd1c08eedfa) 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 From 7df95bca638acc646834ded07803d5cc38ec5e80 Mon Sep 17 00:00:00 2001 From: atomlg <58149549+atomlg@users.noreply.github.com> Date: Thu, 26 Aug 2021 22:48:49 +0300 Subject: [PATCH 2/4] 26.08 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Исправления замечаний --- Assets/Scripts/Bootstrapper.cs | 4 +- Assets/Scripts/DistanceChecking.cs | 34 ++++++++++++++++ Assets/Scripts/DistanceChecking.cs.meta | 11 +++++ Assets/Scripts/EnemiesSpawner.cs | 39 +++++++++--------- Assets/Scripts/EnemyHealth.cs | 4 +- Assets/Scripts/EnemyMovement.cs | 35 +++++++--------- Assets/Scripts/FadeScreen.cs | 17 ++++---- Assets/Scripts/PlayerMovement.cs | 53 +++++++++++++++---------- Assets/Scripts/PlayerSpawner.cs | 10 +++-- 9 files changed, 131 insertions(+), 76 deletions(-) create mode 100644 Assets/Scripts/DistanceChecking.cs create mode 100644 Assets/Scripts/DistanceChecking.cs.meta diff --git a/Assets/Scripts/Bootstrapper.cs b/Assets/Scripts/Bootstrapper.cs index eca3d53a..928e6dcc 100644 --- a/Assets/Scripts/Bootstrapper.cs +++ b/Assets/Scripts/Bootstrapper.cs @@ -4,10 +4,12 @@ public class Bootstrapper : MonoBehaviour { [SerializeField] private EnemiesSpawner _enemiesSpawner; [SerializeField] private PlayerSpawner _playerSpawner; + [SerializeField] private DistanceChecking _distanceChecking; private void Start() { - _enemiesSpawner.Init(); _playerSpawner.Init(); + _enemiesSpawner.Init(); + _distanceChecking.Init(_playerSpawner, _enemiesSpawner); } } diff --git a/Assets/Scripts/DistanceChecking.cs b/Assets/Scripts/DistanceChecking.cs new file mode 100644 index 00000000..192a0745 --- /dev/null +++ b/Assets/Scripts/DistanceChecking.cs @@ -0,0 +1,34 @@ +using System; +using System.Collections.Generic; +using UnityEngine; + +public class DistanceChecking : MonoBehaviour +{ + [SerializeField] private float _minDistance = 0.2f; + + private Transform _player; + private EnemiesSpawner _enemiesSpawner; + private List _enemies; + + public void Init(PlayerSpawner playerSpawner, EnemiesSpawner enemiesSpawner) + { + _player = playerSpawner.Player.transform; + _enemies = enemiesSpawner.Enemies; + } + + private void Update() + { + for (int i = 0; i < _enemies.Count; i++) + { + var enemy = _enemies[i]; + if (Vector3.Distance(_player.position, enemy.transform.position) < _minDistance) + { + if (enemy.TryGetComponent(out EnemyHealth enemyHealth)) + enemyHealth.Die(); + + else + throw new ArgumentNullException("EnemyHealth"); + } + } + } +} \ No newline at end of file diff --git a/Assets/Scripts/DistanceChecking.cs.meta b/Assets/Scripts/DistanceChecking.cs.meta new file mode 100644 index 00000000..f32b29a4 --- /dev/null +++ b/Assets/Scripts/DistanceChecking.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: b10643edb027fd1428c0de690731c300 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/EnemiesSpawner.cs b/Assets/Scripts/EnemiesSpawner.cs index 1312a57d..46632bce 100644 --- a/Assets/Scripts/EnemiesSpawner.cs +++ b/Assets/Scripts/EnemiesSpawner.cs @@ -1,29 +1,25 @@ using System; +using System.Collections.Generic; using UnityEngine; public class EnemiesSpawner : MonoBehaviour { - private int _enemiesCount; - private Transform _player; - [SerializeField] private Transform[] _spawnPositions; [SerializeField] private GameObject _enemyTemplate; [SerializeField] private Transform _parent; [SerializeField] private PlayerSpawner _playerSpawner; - public event Action OnEnemyDied; - public event Action OnAllEnemiesDied; + private List _enemies; + private int _enemiesCount; + + public List Enemies => _enemies; + public event Action EnemyDied; + public event Action AllEnemiesDied; public void Init() { + _enemies = new List(); _enemiesCount = _spawnPositions.Length; - _playerSpawner.OnPlayerSpawned += OnPlayerSpawned; - } - - private void OnPlayerSpawned(Transform player) - { - _player = player; - _playerSpawner.OnPlayerSpawned -= OnPlayerSpawned; SpawnEnemies(); } @@ -32,21 +28,24 @@ private void SpawnEnemies() for (int i = 0; i < _spawnPositions.Length; i++) { GameObject enemy = Instantiate(_enemyTemplate, _spawnPositions[i].position, Quaternion.identity, _parent); - EnemyHealth enemyHealth = enemy.GetComponent(); - enemyHealth.OnDied += OnDied; - EnemyMovement enemyMovement = enemy.GetComponent(); - enemyMovement.Init(_player); + _enemies.Add(enemy); + if(enemy.TryGetComponent(out EnemyHealth enemyHealth)) + enemyHealth.Died += Died; + else + throw new ArgumentNullException("EnemyHealth"); } } - private void OnDied(EnemyHealth enemyHealth) + private void Died(EnemyHealth enemyHealth) { - enemyHealth.OnDied -= OnDied; _enemiesCount--; - OnEnemyDied?.Invoke(enemyHealth); + enemyHealth.Died -= Died; + _enemies.Remove(enemyHealth.gameObject); + EnemyDied?.Invoke(enemyHealth); + if (_enemiesCount == 0) { - OnAllEnemiesDied?.Invoke(); + AllEnemiesDied?.Invoke(); } } } diff --git a/Assets/Scripts/EnemyHealth.cs b/Assets/Scripts/EnemyHealth.cs index f6a58fae..e88773ec 100644 --- a/Assets/Scripts/EnemyHealth.cs +++ b/Assets/Scripts/EnemyHealth.cs @@ -3,11 +3,11 @@ public class EnemyHealth : MonoBehaviour { - public event Action OnDied; + public event Action Died; public void Die() { - OnDied?.Invoke(this); + Died?.Invoke(this); Destroy(gameObject); } } diff --git a/Assets/Scripts/EnemyMovement.cs b/Assets/Scripts/EnemyMovement.cs index 4acc4e54..e8c4dd68 100644 --- a/Assets/Scripts/EnemyMovement.cs +++ b/Assets/Scripts/EnemyMovement.cs @@ -3,35 +3,30 @@ [RequireComponent(typeof(EnemyHealth))] public class EnemyMovement : MonoBehaviour { - private Vector3 _moveTarget; - private Transform _player; - private EnemyHealth _enemyHealth; - [SerializeField] private float _maxDistanceDelta = 2f; [SerializeField] private float _randomOffset = 4f; [SerializeField] private float _minDistance = 0.2f; - - public void Init(Transform player) + + private Vector3 _targetPosition; + private EnemyHealth _enemyHealth; + + public void Init() { _enemyHealth = GetComponent(); - _moveTarget = Random.insideUnitCircle * _randomOffset; - _player = player; + UpdateTargetPosition(); } private void Update() { - if (transform.position == _moveTarget) - _moveTarget = Random.insideUnitCircle * _randomOffset; - else - transform.position = - Vector3.MoveTowards(transform.position, _moveTarget, _maxDistanceDelta * Time.deltaTime); + if (transform.position == _targetPosition) + UpdateTargetPosition(); + + transform.position = + Vector3.MoveTowards(transform.position, _targetPosition, _maxDistanceDelta * Time.deltaTime); + } - if (_player != null) - { - if (Vector3.Distance(_player.position, transform.position) < _minDistance) - { - _enemyHealth.Die(); - } - } + private void UpdateTargetPosition() + { + _targetPosition = Random.insideUnitCircle * _randomOffset; } } \ No newline at end of file diff --git a/Assets/Scripts/FadeScreen.cs b/Assets/Scripts/FadeScreen.cs index 0c7c5c1b..7ea8abee 100644 --- a/Assets/Scripts/FadeScreen.cs +++ b/Assets/Scripts/FadeScreen.cs @@ -1,13 +1,12 @@ -using System; -using UnityEngine; +using UnityEngine; [RequireComponent(typeof(SpriteRenderer))] public class FadeScreen : MonoBehaviour { - private SpriteRenderer _spriteRenderer; - [SerializeField] private EnemiesSpawner _enemiesSpawner; - + + private SpriteRenderer _spriteRenderer; + private void Awake() { _spriteRenderer = GetComponent(); @@ -15,12 +14,16 @@ private void Awake() private void OnEnable() { - _enemiesSpawner.OnAllEnemiesDied += ShowFade; + _enemiesSpawner.AllEnemiesDied += ShowFade; + } + + private void OnDisable() + { + _enemiesSpawner.AllEnemiesDied -= ShowFade; } private void ShowFade() { _spriteRenderer.enabled = true; - _enemiesSpawner.OnAllEnemiesDied -= ShowFade; } } \ No newline at end of file diff --git a/Assets/Scripts/PlayerMovement.cs b/Assets/Scripts/PlayerMovement.cs index 93c7ab6e..cc5818f5 100644 --- a/Assets/Scripts/PlayerMovement.cs +++ b/Assets/Scripts/PlayerMovement.cs @@ -4,59 +4,68 @@ public class PlayerMovement : MonoBehaviour { private const string HorizontalAxisName = "Horizontal"; private const string VerticalAxisName = "Vertical"; - + + [SerializeField] private float _speedChangingValue = 2f; + [SerializeField] private float _originSpeed = 4f; + [SerializeField] private float _originTime = 5f; + + private float _currentSpeed; private float _currentTime; private EnemiesSpawner _enemiesSpawner; - [SerializeField] private float _speed = 4f; - [SerializeField] private bool _hasMaxSpeed = true; - [SerializeField] private float _originTime = 2f; public void Init(EnemiesSpawner enemiesSpawner) { _enemiesSpawner = enemiesSpawner; - _enemiesSpawner.OnEnemyDied += OnEnemyDied; - _enemiesSpawner.OnAllEnemiesDied += OnAllEnemiesDied; + _enemiesSpawner.EnemyDied += EnemyDied; + _enemiesSpawner.AllEnemiesDied += AllEnemiesDied; _currentTime = _originTime; + _currentSpeed = _originSpeed; } private void Update() { - if (_hasMaxSpeed) + if (CanChangeSpeed()) { _currentTime -= Time.deltaTime; if (_currentTime < 0) { - _hasMaxSpeed = false; - _speed /= 2; + SetCurrentSpeed(-_speedChangingValue); + ResetCurrentTime(); } } - + float horizontal = Input.GetAxis(HorizontalAxisName); float vertical = Input.GetAxis(VerticalAxisName); - transform.Translate(horizontal * _speed * Time.deltaTime, vertical * _speed * Time.deltaTime, 0); + transform.Translate(horizontal * _currentSpeed * Time.deltaTime, vertical * _currentSpeed * Time.deltaTime, 0); } - private void OnAllEnemiesDied() + private void AllEnemiesDied() { - _enemiesSpawner.OnEnemyDied -= OnEnemyDied; - _enemiesSpawner.OnAllEnemiesDied -= OnAllEnemiesDied; + _enemiesSpawner.EnemyDied -= EnemyDied; + _enemiesSpawner.AllEnemiesDied -= AllEnemiesDied; enabled = false; } - private void OnEnemyDied(EnemyHealth obj) + private void EnemyDied(EnemyHealth obj) { - if (!_hasMaxSpeed) - { - ResetSpeed(); - } + SetCurrentSpeed(_speedChangingValue); + ResetCurrentTime(); } - private void ResetSpeed() + private void SetCurrentSpeed(float speed) + { + _currentSpeed += speed; + } + + private void ResetCurrentTime() { - _speed *= 2; - _hasMaxSpeed = true; _currentTime = _originTime; } + + private bool CanChangeSpeed() + { + return _currentTime > 0 && _currentSpeed > 0; + } } \ No newline at end of file diff --git a/Assets/Scripts/PlayerSpawner.cs b/Assets/Scripts/PlayerSpawner.cs index 1ec23d55..52d91e09 100644 --- a/Assets/Scripts/PlayerSpawner.cs +++ b/Assets/Scripts/PlayerSpawner.cs @@ -8,13 +8,15 @@ public class PlayerSpawner : MonoBehaviour [SerializeField] private Transform _parent; [SerializeField] private EnemiesSpawner _enemiesSpawner; - public event Action OnPlayerSpawned; + public GameObject Player { get; private set; } + + public event Action Spawned; public void Init() { - GameObject player = Instantiate(_playerTemplate, _spawnPosition.transform.position, Quaternion.identity, _parent); - PlayerMovement playerMovement = player.GetComponent(); + Player = Instantiate(_playerTemplate, _spawnPosition.transform.position, Quaternion.identity, _parent); + PlayerMovement playerMovement = Player.GetComponent(); playerMovement.Init(_enemiesSpawner); - OnPlayerSpawned?.Invoke(player.transform); + Spawned?.Invoke(Player.transform); } } \ No newline at end of file From d5442f9396fd264d941f4981efb4a210a9d17c31 Mon Sep 17 00:00:00 2001 From: atomlg <58149549+atomlg@users.noreply.github.com> Date: Thu, 26 Aug 2021 22:53:49 +0300 Subject: [PATCH 3/4] Update KillAllEnemies.unity --- Assets/Scenes/KillAllEnemies.unity | 52 ++++++++++++++++++++++++++---- 1 file changed, 45 insertions(+), 7 deletions(-) diff --git a/Assets/Scenes/KillAllEnemies.unity b/Assets/Scenes/KillAllEnemies.unity index 6952ac1a..3fe767f3 100644 --- a/Assets/Scenes/KillAllEnemies.unity +++ b/Assets/Scenes/KillAllEnemies.unity @@ -243,6 +243,50 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} +--- !u!1 &215720471 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 215720473} + - component: {fileID: 215720472} + m_Layer: 0 + m_Name: DistanceCheking + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &215720472 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 215720471} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b10643edb027fd1428c0de690731c300, type: 3} + m_Name: + m_EditorClassIdentifier: + _minDistance: 0.2 +--- !u!4 &215720473 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 215720471} + 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: 6 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &534669902 GameObject: m_ObjectHideFlags: 0 @@ -330,13 +374,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: cd6d0074e725a114e850d2e604fe4b0d, type: 3} m_Name: m_EditorClassIdentifier: - go: {fileID: 1054253062} - a: {fileID: 0} - B: - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} --- !u!1 &598960688 GameObject: m_ObjectHideFlags: 0 @@ -623,6 +660,7 @@ MonoBehaviour: m_EditorClassIdentifier: _enemiesSpawner: {fileID: 1742641679} _playerSpawner: {fileID: 1958228846} + _distanceChecking: {fileID: 215720472} --- !u!1 &1703565172 GameObject: m_ObjectHideFlags: 0 From c5eae2753dab49658b8569eb74a04edb66fb5965 Mon Sep 17 00:00:00 2001 From: atomlg <58149549+atomlg@users.noreply.github.com> Date: Thu, 26 Aug 2021 22:54:18 +0300 Subject: [PATCH 4/4] Update KillAllEnemies.unity --- Assets/Scenes/KillAllEnemies.unity | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/Assets/Scenes/KillAllEnemies.unity b/Assets/Scenes/KillAllEnemies.unity index 3fe767f3..63938c97 100644 --- a/Assets/Scenes/KillAllEnemies.unity +++ b/Assets/Scenes/KillAllEnemies.unity @@ -297,7 +297,6 @@ GameObject: m_Component: - component: {fileID: 534669905} - component: {fileID: 534669904} - - component: {fileID: 534669906} m_Layer: 0 m_Name: Main Camera m_TagString: MainCamera @@ -362,18 +361,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: 0 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: cd6d0074e725a114e850d2e604fe4b0d, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &598960688 GameObject: m_ObjectHideFlags: 0