From 676ce915a56ffaea1d530433cabeca63d6ad9721 Mon Sep 17 00:00:00 2001 From: Taurus85910 <96919923@mail.ru> Date: Thu, 15 Jul 2021 10:53:44 +1000 Subject: [PATCH 1/4] =?UTF-8?q?=D0=B8=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20=D1=81=D0=BA=D1=80=D0=B8=D0=BF=D1=82?= =?UTF-8?q?=D0=BE=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/Group1/Scripts/EndScreen.cs | 25 +++++++ ...meController.cs.meta => EndScreen.cs.meta} | 0 Assets/Group1/Scripts/EnemyMovement.cs | 22 +++++++ .../{e.cs.meta => EnemyMovement.cs.meta} | 0 Assets/Group1/Scripts/GameController.cs | 38 ----------- Assets/Group1/Scripts/NewBehaviourScript1.cs | 65 ------------------- .../Scripts/NewBehaviourScript1.cs.meta | 11 ---- Assets/Group1/Scripts/e.cs | 22 ------- Packages/manifest.json | 21 ++++-- ProjectSettings/ProjectVersion.txt | 3 +- 10 files changed, 64 insertions(+), 143 deletions(-) create mode 100644 Assets/Group1/Scripts/EndScreen.cs rename Assets/Group1/Scripts/{GameController.cs.meta => EndScreen.cs.meta} (100%) create mode 100644 Assets/Group1/Scripts/EnemyMovement.cs rename Assets/Group1/Scripts/{e.cs.meta => EnemyMovement.cs.meta} (100%) delete mode 100644 Assets/Group1/Scripts/GameController.cs delete mode 100644 Assets/Group1/Scripts/NewBehaviourScript1.cs delete mode 100644 Assets/Group1/Scripts/NewBehaviourScript1.cs.meta delete mode 100644 Assets/Group1/Scripts/e.cs diff --git a/Assets/Group1/Scripts/EndScreen.cs b/Assets/Group1/Scripts/EndScreen.cs new file mode 100644 index 00000000..957e9232 --- /dev/null +++ b/Assets/Group1/Scripts/EndScreen.cs @@ -0,0 +1,25 @@ +using System; +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class EndScreen : MonoBehaviour +{ + [SerializeField] private EnemyList _enemyList; + [SerializeField] private GameObject _endScreen; + + private void OnEnable() + { + _enemyList.EnemiesDied += OnEnemiesDied; + } + + private void OnDisable() + { + _enemyList.EnemiesDied -= OnEnemiesDied; + } + + private void OnEnemiesDied() + { + _endScreen.SetActive(true); + } +} diff --git a/Assets/Group1/Scripts/GameController.cs.meta b/Assets/Group1/Scripts/EndScreen.cs.meta similarity index 100% rename from Assets/Group1/Scripts/GameController.cs.meta rename to Assets/Group1/Scripts/EndScreen.cs.meta diff --git a/Assets/Group1/Scripts/EnemyMovement.cs b/Assets/Group1/Scripts/EnemyMovement.cs new file mode 100644 index 00000000..f19fe505 --- /dev/null +++ b/Assets/Group1/Scripts/EnemyMovement.cs @@ -0,0 +1,22 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class EnemyMovement : MonoBehaviour +{ + [SerializeField] private int _radiusModifier; + [SerializeField] private int _speed; + private Vector3 _targetPosition; + + private void Start() + { + _targetPosition = Random.insideUnitCircle * _radiusModifier; + } + + private void Update() + { + transform.position = Vector3.MoveTowards(transform.position, _targetPosition, _speed * Time.deltaTime); + if (transform.position == _targetPosition) + _targetPosition = Random.insideUnitCircle * _radiusModifier; + } +} diff --git a/Assets/Group1/Scripts/e.cs.meta b/Assets/Group1/Scripts/EnemyMovement.cs.meta similarity index 100% rename from Assets/Group1/Scripts/e.cs.meta rename to Assets/Group1/Scripts/EnemyMovement.cs.meta 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/NewBehaviourScript1.cs.meta b/Assets/Group1/Scripts/NewBehaviourScript1.cs.meta deleted file mode 100644 index c96b73f8..00000000 --- a/Assets/Group1/Scripts/NewBehaviourScript1.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: dede9e7d6741aea4cb07b98da83cc6a8 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Group1/Scripts/e.cs b/Assets/Group1/Scripts/e.cs deleted file mode 100644 index 048ebf2d..00000000 --- a/Assets/Group1/Scripts/e.cs +++ /dev/null @@ -1,22 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -public class e : MonoBehaviour -{ - private Vector3 Target; - - // Start is called before the first frame update - void Start() - { - Target = Random.insideUnitCircle * 4; - } - - // Update is called once per frame - void Update() - { - transform.position = Vector3.MoveTowards(transform.position, Target, 2 * Time.deltaTime); - if (transform.position == Target) - Target = Random.insideUnitCircle * 4 ; - } -} diff --git a/Packages/manifest.json b/Packages/manifest.json index 8392bea1..69487dc0 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.2", + "com.unity.analytics": "3.5.3", + "com.unity.collab-proxy": "1.3.9", + "com.unity.ide.rider": "3.0.5", + "com.unity.ide.visualstudio": "2.0.7", + "com.unity.ide.vscode": "1.2.3", + "com.unity.purchasing": "3.0.1", + "com.unity.test-framework": "1.1.22", + "com.unity.textmeshpro": "3.0.4", + "com.unity.timeline": "1.5.2", + "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/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index 6dfd6c14..788f41e9 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1 +1,2 @@ -m_EditorVersion: 2018.3.14f1 +m_EditorVersion: 2021.1.0f1 +m_EditorVersionWithRevision: 2021.1.0f1 (61a549675243) From 16d4b26400b6d6f608ba98315fdc130f343795d9 Mon Sep 17 00:00:00 2001 From: Taurus85910 <96919923@mail.ru> Date: Thu, 15 Jul 2021 12:30:41 +1000 Subject: [PATCH 2/4] =?UTF-8?q?=D0=9D=D0=B0=D1=81=D1=82=D1=80=D0=BE=D0=B8?= =?UTF-8?q?=D0=BB=20=D1=81=D1=86=D0=B5=D0=BD=D1=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/Group1/Scenes/KillAllEnemies.unity | 1004 ++++++++++++--------- 1 file changed, 556 insertions(+), 448 deletions(-) diff --git a/Assets/Group1/Scenes/KillAllEnemies.unity b/Assets/Group1/Scenes/KillAllEnemies.unity index 21adfb9b..fa464ccb 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: 1564393706} --- !u!196 &4 NavMeshSettings: serializedVersion: 2 @@ -109,101 +118,98 @@ NavMeshSettings: manualTileSize: 0 tileSize: 256 accuratePlacement: 0 + maxJobWorkers: 0 + preserveTilesOutsideBounds: 0 debug: m_Flags: 0 m_NavMeshData: {fileID: 0} ---- !u!1 &141422275 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} +--- !u!4 &88368287 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1479046869204089059, guid: 0117035ab2331454196243fa4b148cb8, + type: 3} + m_PrefabInstance: {fileID: 140372095} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 141422279} - - component: {fileID: 141422278} - - component: {fileID: 141422277} - m_Layer: 0 - m_Name: enemy - m_TagString: Enemy - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &141422277 +--- !u!114 &88368290 stripped MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 5021935752869453668, guid: 0117035ab2331454196243fa4b148cb8, + type: 3} + m_PrefabInstance: {fileID: 140372095} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 141422275} + m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 65f7df4705b7dae48944a39b48934484, type: 3} + m_Script: {fileID: 11500000, guid: 270a80a82d5301f4d8bc05cf880f43c8, 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 -Transform: +--- !u!1001 &140372095 +PrefabInstance: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 141422275} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 3.59, y: 3.09, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 4 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 399207318} + m_Modifications: + - target: {fileID: 1479046869204089059, guid: 0117035ab2331454196243fa4b148cb8, + type: 3} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 1479046869204089059, guid: 0117035ab2331454196243fa4b148cb8, + type: 3} + propertyPath: m_LocalPosition.x + value: 6.7200003 + objectReference: {fileID: 0} + - target: {fileID: 1479046869204089059, guid: 0117035ab2331454196243fa4b148cb8, + type: 3} + propertyPath: m_LocalPosition.y + value: -0.71000004 + objectReference: {fileID: 0} + - target: {fileID: 1479046869204089059, guid: 0117035ab2331454196243fa4b148cb8, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1479046869204089059, guid: 0117035ab2331454196243fa4b148cb8, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1479046869204089059, guid: 0117035ab2331454196243fa4b148cb8, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1479046869204089059, guid: 0117035ab2331454196243fa4b148cb8, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1479046869204089059, guid: 0117035ab2331454196243fa4b148cb8, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1479046869204089059, guid: 0117035ab2331454196243fa4b148cb8, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1479046869204089059, guid: 0117035ab2331454196243fa4b148cb8, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1479046869204089059, guid: 0117035ab2331454196243fa4b148cb8, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1479046869204089071, guid: 0117035ab2331454196243fa4b148cb8, + type: 3} + propertyPath: m_Name + value: enemy (2) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 0117035ab2331454196243fa4b148cb8, type: 3} --- !u!1 &170076733 GameObject: m_ObjectHideFlags: 0 @@ -229,12 +235,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 +252,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 +277,16 @@ 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_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!4 &170076735 @@ -273,6 +303,58 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} +--- !u!1 &399207316 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 399207318} + - component: {fileID: 399207317} + m_Layer: 0 + m_Name: List + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &399207317 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 399207316} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3cb592b0f39fe8b41900cc7d0522b2ac, type: 3} + m_Name: + m_EditorClassIdentifier: + _enemies: + - {fileID: 1578050042} + - {fileID: 712273265} + - {fileID: 88368290} + - {fileID: 1922667189} +--- !u!4 &399207318 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 399207316} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -3.13, y: 0.71000004, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 1578050040} + - {fileID: 712273262} + - {fileID: 88368287} + - {fileID: 1922667186} + m_Father: {fileID: 0} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &534669902 GameObject: m_ObjectHideFlags: 0 @@ -312,9 +394,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 +451,95 @@ 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} + _enemyList: {fileID: 399207317} + _endScreen: {fileID: 1054253062} +--- !u!1001 &644535128 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 399207318} + m_Modifications: + - target: {fileID: 1479046869204089059, guid: 0117035ab2331454196243fa4b148cb8, + type: 3} + propertyPath: m_RootOrder + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 1479046869204089059, guid: 0117035ab2331454196243fa4b148cb8, + type: 3} + propertyPath: m_LocalPosition.x + value: 6.7200003 + objectReference: {fileID: 0} + - target: {fileID: 1479046869204089059, guid: 0117035ab2331454196243fa4b148cb8, + type: 3} + propertyPath: m_LocalPosition.y + value: 0.63 + objectReference: {fileID: 0} + - target: {fileID: 1479046869204089059, guid: 0117035ab2331454196243fa4b148cb8, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1479046869204089059, guid: 0117035ab2331454196243fa4b148cb8, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1479046869204089059, guid: 0117035ab2331454196243fa4b148cb8, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1479046869204089059, guid: 0117035ab2331454196243fa4b148cb8, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1479046869204089059, guid: 0117035ab2331454196243fa4b148cb8, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1479046869204089059, guid: 0117035ab2331454196243fa4b148cb8, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1479046869204089059, guid: 0117035ab2331454196243fa4b148cb8, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1479046869204089059, guid: 0117035ab2331454196243fa4b148cb8, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1479046869204089071, guid: 0117035ab2331454196243fa4b148cb8, + type: 3} + propertyPath: m_Name + value: enemy (3) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 0117035ab2331454196243fa4b148cb8, type: 3} +--- !u!4 &712273262 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1479046869204089059, guid: 0117035ab2331454196243fa4b148cb8, + type: 3} + m_PrefabInstance: {fileID: 1081590266} + m_PrefabAsset: {fileID: 0} +--- !u!114 &712273265 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 5021935752869453668, guid: 0117035ab2331454196243fa4b148cb8, + type: 3} + m_PrefabInstance: {fileID: 1081590266} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 270a80a82d5301f4d8bc05cf880f43c8, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1054253062 GameObject: m_ObjectHideFlags: 0 @@ -386,7 +551,7 @@ GameObject: - component: {fileID: 1054253064} - component: {fileID: 1054253063} m_Layer: 0 - m_Name: New Sprite + m_Name: EndScreen m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -403,9 +568,12 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -417,6 +585,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,376 +621,315 @@ 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 -MonoBehaviour: +--- !u!1001 &1081590266 +PrefabInstance: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1578050036} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 65f7df4705b7dae48944a39b48934484, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!212 &1578050039 -SpriteRenderer: + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 399207318} + m_Modifications: + - target: {fileID: 1479046869204089059, guid: 0117035ab2331454196243fa4b148cb8, + type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1479046869204089059, guid: 0117035ab2331454196243fa4b148cb8, + type: 3} + propertyPath: m_LocalPosition.x + value: -0.4599998 + objectReference: {fileID: 0} + - target: {fileID: 1479046869204089059, guid: 0117035ab2331454196243fa4b148cb8, + type: 3} + propertyPath: m_LocalPosition.y + value: -0.39000005 + objectReference: {fileID: 0} + - target: {fileID: 1479046869204089059, guid: 0117035ab2331454196243fa4b148cb8, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1479046869204089059, guid: 0117035ab2331454196243fa4b148cb8, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1479046869204089059, guid: 0117035ab2331454196243fa4b148cb8, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1479046869204089059, guid: 0117035ab2331454196243fa4b148cb8, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1479046869204089059, guid: 0117035ab2331454196243fa4b148cb8, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1479046869204089059, guid: 0117035ab2331454196243fa4b148cb8, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1479046869204089059, guid: 0117035ab2331454196243fa4b148cb8, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1479046869204089059, guid: 0117035ab2331454196243fa4b148cb8, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1479046869204089071, guid: 0117035ab2331454196243fa4b148cb8, + type: 3} + propertyPath: m_Name + value: enemy (1) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 0117035ab2331454196243fa4b148cb8, type: 3} +--- !u!850595691 &1564393706 +LightingSettings: 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 + m_Name: Settings.lighting + serializedVersion: 3 + 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: 15204, guid: 0000000000000000f000000000000000, type: 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_PVRMinBounces: 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!4 &1578050040 stripped Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1578050036} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 3.59, y: -1.34, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 5 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1754708960 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 1479046869204089059, guid: 0117035ab2331454196243fa4b148cb8, + type: 3} + m_PrefabInstance: {fileID: 1479046870379469083} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1754708964} - - component: {fileID: 1754708963} - - component: {fileID: 1754708962} - m_Layer: 0 - m_Name: enemy - m_TagString: Enemy - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &1754708962 +--- !u!114 &1578050042 stripped MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 5021935752869453668, guid: 0117035ab2331454196243fa4b148cb8, + type: 3} + m_PrefabInstance: {fileID: 1479046870379469083} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1754708960} + m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 65f7df4705b7dae48944a39b48934484, type: 3} + m_Script: {fileID: 11500000, guid: 270a80a82d5301f4d8bc05cf880f43c8, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!212 &1754708963 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1754708960} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 0 - m_SelectedEditorRenderState: 0 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_Sprite: {fileID: 21300000, guid: c393ddce902166c4fb0e2130d216d549, type: 3} - m_Color: {r: 0.9056604, g: 0.2947668, b: 0.2947668, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 1, y: 1} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 ---- !u!4 &1754708964 +--- !u!4 &1922667186 stripped 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 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 1479046869204089059, guid: 0117035ab2331454196243fa4b148cb8, + type: 3} + m_PrefabInstance: {fileID: 644535128} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1761935011} - - component: {fileID: 1761935010} - - component: {fileID: 1761935012} - m_Layer: 0 - m_Name: New Sprite (1) - 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 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1761935009} - 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!114 &1761935012 +--- !u!114 &1922667189 stripped MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 5021935752869453668, guid: 0117035ab2331454196243fa4b148cb8, + type: 3} + m_PrefabInstance: {fileID: 644535128} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1761935009} + m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: dede9e7d6741aea4cb07b98da83cc6a8, type: 3} + m_Script: {fileID: 11500000, guid: 270a80a82d5301f4d8bc05cf880f43c8, type: 3} m_Name: m_EditorClassIdentifier: - spEed: 4 - timer: 0 - time: 0 ---- !u!1 &2083640146 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2083640148} - - component: {fileID: 2083640147} - - component: {fileID: 2083640150} - m_Layer: 0 - m_Name: enemy - m_TagString: Enemy - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!212 &2083640147 -SpriteRenderer: +--- !u!1001 &1479046870379469083 +PrefabInstance: 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 -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_LocalPosition: {x: -3.13, y: 0.71, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &2083640150 -MonoBehaviour: + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 399207318} + m_Modifications: + - target: {fileID: 1479046869204089059, guid: 0117035ab2331454196243fa4b148cb8, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1479046869204089059, guid: 0117035ab2331454196243fa4b148cb8, + type: 3} + propertyPath: m_LocalPosition.x + value: 6.7200003 + objectReference: {fileID: 0} + - target: {fileID: 1479046869204089059, guid: 0117035ab2331454196243fa4b148cb8, + type: 3} + propertyPath: m_LocalPosition.y + value: -2.0500002 + objectReference: {fileID: 0} + - target: {fileID: 1479046869204089059, guid: 0117035ab2331454196243fa4b148cb8, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1479046869204089059, guid: 0117035ab2331454196243fa4b148cb8, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1479046869204089059, guid: 0117035ab2331454196243fa4b148cb8, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1479046869204089059, guid: 0117035ab2331454196243fa4b148cb8, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1479046869204089059, guid: 0117035ab2331454196243fa4b148cb8, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1479046869204089059, guid: 0117035ab2331454196243fa4b148cb8, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1479046869204089059, guid: 0117035ab2331454196243fa4b148cb8, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1479046869204089059, guid: 0117035ab2331454196243fa4b148cb8, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1479046869204089071, guid: 0117035ab2331454196243fa4b148cb8, + type: 3} + propertyPath: m_Name + value: enemy + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 0117035ab2331454196243fa4b148cb8, type: 3} +--- !u!1001 &7892762754728532570 +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: 0} + m_Modifications: + - target: {fileID: -521032789127982281, guid: c4057350c86a7a64bae779e5ee3e9fb8, + type: 3} + propertyPath: m_IsTrigger + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7892762753268704505, guid: c4057350c86a7a64bae779e5ee3e9fb8, + type: 3} + propertyPath: m_RootOrder + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 7892762753268704505, guid: c4057350c86a7a64bae779e5ee3e9fb8, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7892762753268704505, guid: c4057350c86a7a64bae779e5ee3e9fb8, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7892762753268704505, guid: c4057350c86a7a64bae779e5ee3e9fb8, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7892762753268704505, guid: c4057350c86a7a64bae779e5ee3e9fb8, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7892762753268704505, guid: c4057350c86a7a64bae779e5ee3e9fb8, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7892762753268704505, guid: c4057350c86a7a64bae779e5ee3e9fb8, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7892762753268704505, guid: c4057350c86a7a64bae779e5ee3e9fb8, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7892762753268704505, guid: c4057350c86a7a64bae779e5ee3e9fb8, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7892762753268704505, guid: c4057350c86a7a64bae779e5ee3e9fb8, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7892762753268704505, guid: c4057350c86a7a64bae779e5ee3e9fb8, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7892762753268704507, guid: c4057350c86a7a64bae779e5ee3e9fb8, + type: 3} + propertyPath: m_Name + value: Player + objectReference: {fileID: 0} + m_RemovedComponents: + - {fileID: 7892762753268704498, guid: c4057350c86a7a64bae779e5ee3e9fb8, type: 3} + m_SourcePrefab: {fileID: 100100000, guid: c4057350c86a7a64bae779e5ee3e9fb8, type: 3} From 06e71105aaa7719c62ccae4928d3d474ae56e3bd Mon Sep 17 00:00:00 2001 From: Taurus85910 <96919923@mail.ru> Date: Tue, 3 Aug 2021 10:02:13 +1000 Subject: [PATCH 3/4] =?UTF-8?q?=D0=A3=D0=B1=D1=80=D0=B0=D0=BB=20=D0=BF?= =?UTF-8?q?=D0=BE=D0=B2=D1=82=D0=BE=D1=80=D1=8F=D1=8E=D1=89=D0=B8=D0=B9?= =?UTF-8?q?=D1=81=D1=8F=20=D0=BA=D0=BE=D0=B4,=20=D1=80=D0=B5=D0=B0=D0=BB?= =?UTF-8?q?=D0=B8=D0=B7=D0=B0=D1=86=D0=B8=D1=8F=20EnemiesList=20=D1=83?= =?UTF-8?q?=D0=B6=D0=B5=20=D0=B1=D1=8B=D0=BB=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/Group1/Scripts/EndScreen.cs | 8 ++++---- Assets/Group1/Scripts/EnemyMovement.cs | 11 ++++++++--- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/Assets/Group1/Scripts/EndScreen.cs b/Assets/Group1/Scripts/EndScreen.cs index 957e9232..40088292 100644 --- a/Assets/Group1/Scripts/EndScreen.cs +++ b/Assets/Group1/Scripts/EndScreen.cs @@ -5,20 +5,20 @@ public class EndScreen : MonoBehaviour { - [SerializeField] private EnemyList _enemyList; + [SerializeField] private EnemiesList _enemiesList; [SerializeField] private GameObject _endScreen; private void OnEnable() { - _enemyList.EnemiesDied += OnEnemiesDied; + _enemiesList.EnemiesDied += OnEnemiesesDied; } private void OnDisable() { - _enemyList.EnemiesDied -= OnEnemiesDied; + _enemiesList.EnemiesDied -= OnEnemiesesDied; } - private void OnEnemiesDied() + private void OnEnemiesesDied() { _endScreen.SetActive(true); } diff --git a/Assets/Group1/Scripts/EnemyMovement.cs b/Assets/Group1/Scripts/EnemyMovement.cs index f19fe505..b5a72d6a 100644 --- a/Assets/Group1/Scripts/EnemyMovement.cs +++ b/Assets/Group1/Scripts/EnemyMovement.cs @@ -10,13 +10,18 @@ public class EnemyMovement : MonoBehaviour private void Start() { - _targetPosition = Random.insideUnitCircle * _radiusModifier; + SetTargetPosition(); } private void Update() { transform.position = Vector3.MoveTowards(transform.position, _targetPosition, _speed * Time.deltaTime); - if (transform.position == _targetPosition) - _targetPosition = Random.insideUnitCircle * _radiusModifier; + if (transform.position == _targetPosition) + SetTargetPosition(); + } + + private void SetTargetPosition() + { + _targetPosition = Random.insideUnitCircle * _radiusModifier; } } From d407882b6c20f64892d748a1cbad3d323d48e8d5 Mon Sep 17 00:00:00 2001 From: Taurus85910 <96919923@mail.ru> Date: Sat, 21 Aug 2021 00:03:05 +1000 Subject: [PATCH 4/4] =?UTF-8?q?=D0=B8=D0=B7=D0=BC=D0=B5=D0=BD=D0=B8=D0=BB?= =?UTF-8?q?=20=D0=BD=D0=B0=D0=B7=D0=B2=D0=B0=D0=BD=D0=B8=D1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/Group1/Scripts/EnemyMovement.cs | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Assets/Group1/Scripts/EnemyMovement.cs b/Assets/Group1/Scripts/EnemyMovement.cs index b5a72d6a..f1885f9f 100644 --- a/Assets/Group1/Scripts/EnemyMovement.cs +++ b/Assets/Group1/Scripts/EnemyMovement.cs @@ -6,22 +6,22 @@ public class EnemyMovement : MonoBehaviour { [SerializeField] private int _radiusModifier; [SerializeField] private int _speed; - private Vector3 _targetPosition; + private Vector3 _target; private void Start() { - SetTargetPosition(); + ChangeTargetPosition(); } private void Update() { - transform.position = Vector3.MoveTowards(transform.position, _targetPosition, _speed * Time.deltaTime); - if (transform.position == _targetPosition) - SetTargetPosition(); + transform.position = Vector3.MoveTowards(transform.position, _target, _speed * Time.deltaTime); + if (transform.position == _target) + ChangeTargetPosition(); } - private void SetTargetPosition() + private void ChangeTargetPosition() { - _targetPosition = Random.insideUnitCircle * _radiusModifier; + _target = Random.insideUnitCircle * _radiusModifier; } }