From a03a0ba7c48a76a420ac92a0151fe71aefbc6687 Mon Sep 17 00:00:00 2001 From: Pavel Ol Date: Mon, 14 Jun 2021 23:04:53 +0300 Subject: [PATCH 1/6] First commit with refactoring --- Assets/Group1/Scripts/GameController.cs | 38 ------ Assets/Group1/Scripts/NewBehaviourScript1.cs | 65 ---------- Assets/Group1/Scripts/e.cs | 22 ---- Assets/{Group1.meta => Level.meta} | 0 Assets/{Group1/Player.png => Level/Enemy.png} | Bin .../enemy.png.meta => Level/Enemy.png.meta} | 0 Assets/{Group1/enemy.png => Level/Player.png} | Bin Assets/{Group1 => Level}/Player.png.meta | 0 Assets/{Group1 => Level}/Scenes.meta | 0 .../Scenes/KillAllEnemies.unity | 114 +++++++++++++----- .../Scenes/KillAllEnemies.unity.meta | 0 Assets/{Group1 => Level}/Scripts.meta | 0 Assets/Level/Scripts/Enemy.meta | 8 ++ Assets/Level/Scripts/Enemy/Enemy.cs | 20 +++ .../Scripts/Enemy/Enemy.cs.meta} | 0 Assets/Level/Scripts/General.meta | 8 ++ .../Level/Scripts/General/GameController.cs | 36 ++++++ .../Scripts/General}/GameController.cs.meta | 0 Assets/Level/Scripts/Player.meta | 8 ++ Assets/Level/Scripts/Player/Player.cs | 53 ++++++++ .../Scripts/Player/Player.cs.meta} | 0 Assets/Level/Scripts/Player/PlayerMover.cs | 16 +++ .../Level/Scripts/Player/PlayerMover.cs.meta | 11 ++ Logs/Packages-Update.log | 11 ++ Packages/manifest.json | 8 +- ProjectSettings/ProjectVersion.txt | 2 +- 26 files changed, 257 insertions(+), 163 deletions(-) delete mode 100644 Assets/Group1/Scripts/GameController.cs delete mode 100644 Assets/Group1/Scripts/NewBehaviourScript1.cs delete mode 100644 Assets/Group1/Scripts/e.cs rename Assets/{Group1.meta => Level.meta} (100%) rename Assets/{Group1/Player.png => Level/Enemy.png} (100%) rename Assets/{Group1/enemy.png.meta => Level/Enemy.png.meta} (100%) rename Assets/{Group1/enemy.png => Level/Player.png} (100%) rename Assets/{Group1 => Level}/Player.png.meta (100%) rename Assets/{Group1 => Level}/Scenes.meta (100%) rename Assets/{Group1 => Level}/Scenes/KillAllEnemies.unity (91%) rename Assets/{Group1 => Level}/Scenes/KillAllEnemies.unity.meta (100%) rename Assets/{Group1 => Level}/Scripts.meta (100%) create mode 100644 Assets/Level/Scripts/Enemy.meta create mode 100644 Assets/Level/Scripts/Enemy/Enemy.cs rename Assets/{Group1/Scripts/e.cs.meta => Level/Scripts/Enemy/Enemy.cs.meta} (100%) create mode 100644 Assets/Level/Scripts/General.meta create mode 100644 Assets/Level/Scripts/General/GameController.cs rename Assets/{Group1/Scripts => Level/Scripts/General}/GameController.cs.meta (100%) create mode 100644 Assets/Level/Scripts/Player.meta create mode 100644 Assets/Level/Scripts/Player/Player.cs rename Assets/{Group1/Scripts/NewBehaviourScript1.cs.meta => Level/Scripts/Player/Player.cs.meta} (100%) create mode 100644 Assets/Level/Scripts/Player/PlayerMover.cs create mode 100644 Assets/Level/Scripts/Player/PlayerMover.cs.meta create mode 100644 Logs/Packages-Update.log 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/Group1.meta b/Assets/Level.meta similarity index 100% rename from Assets/Group1.meta rename to Assets/Level.meta diff --git a/Assets/Group1/Player.png b/Assets/Level/Enemy.png similarity index 100% rename from Assets/Group1/Player.png rename to Assets/Level/Enemy.png diff --git a/Assets/Group1/enemy.png.meta b/Assets/Level/Enemy.png.meta similarity index 100% rename from Assets/Group1/enemy.png.meta rename to Assets/Level/Enemy.png.meta diff --git a/Assets/Group1/enemy.png b/Assets/Level/Player.png similarity index 100% rename from Assets/Group1/enemy.png rename to Assets/Level/Player.png diff --git a/Assets/Group1/Player.png.meta b/Assets/Level/Player.png.meta similarity index 100% rename from Assets/Group1/Player.png.meta rename to Assets/Level/Player.png.meta diff --git a/Assets/Group1/Scenes.meta b/Assets/Level/Scenes.meta similarity index 100% rename from Assets/Group1/Scenes.meta rename to Assets/Level/Scenes.meta diff --git a/Assets/Group1/Scenes/KillAllEnemies.unity b/Assets/Level/Scenes/KillAllEnemies.unity similarity index 91% rename from Assets/Group1/Scenes/KillAllEnemies.unity rename to Assets/Level/Scenes/KillAllEnemies.unity index 21adfb9b..5a361e59 100644 --- a/Assets/Group1/Scenes/KillAllEnemies.unity +++ b/Assets/Level/Scenes/KillAllEnemies.unity @@ -124,7 +124,7 @@ GameObject: - component: {fileID: 141422278} - component: {fileID: 141422277} m_Layer: 0 - m_Name: enemy + m_Name: Enemy m_TagString: Enemy m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -197,12 +197,12 @@ Transform: 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_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 3.6699998, y: 2.53, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 4 + m_Father: {fileID: 1844955163} + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &170076733 GameObject: @@ -368,9 +368,9 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: cd6d0074e725a114e850d2e604fe4b0d, type: 3} m_Name: m_EditorClassIdentifier: - go: {fileID: 1054253062} - a: {fileID: 1761935009} - B: + _target: {fileID: 1054253062} + _player: {fileID: 1761935009} + _enemies: - {fileID: 2083640146} - {fileID: 1754708960} - {fileID: 141422275} @@ -386,7 +386,7 @@ GameObject: - component: {fileID: 1054253064} - component: {fileID: 1054253063} m_Layer: 0 - m_Name: New Sprite + m_Name: Enemy m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -447,12 +447,12 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1054253062} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -0.08, y: 0.56, z: -0.15457831} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 25, y: 25, z: 1} m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 7 + m_Father: {fileID: 1844955163} + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1578050036 GameObject: @@ -466,7 +466,7 @@ GameObject: - component: {fileID: 1578050039} - component: {fileID: 1578050038} m_Layer: 0 - m_Name: enemy + m_Name: Enemy m_TagString: Enemy m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -539,12 +539,12 @@ Transform: 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_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 3.6699998, y: -1.9000001, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 5 + m_Father: {fileID: 1844955163} + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1754708960 GameObject: @@ -558,7 +558,7 @@ GameObject: - component: {fileID: 1754708963} - component: {fileID: 1754708962} m_Layer: 0 - m_Name: enemy + m_Name: Enemy m_TagString: Enemy m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -631,12 +631,12 @@ Transform: 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_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 3.6699998, y: 0.14999998, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 3 + m_Father: {fileID: 1844955163} + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1761935009 GameObject: @@ -649,8 +649,9 @@ GameObject: - component: {fileID: 1761935011} - component: {fileID: 1761935010} - component: {fileID: 1761935012} + - component: {fileID: 1761935013} m_Layer: 0 - m_Name: New Sprite (1) + m_Name: Player m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -716,7 +717,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 6 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1761935012 MonoBehaviour: @@ -730,9 +731,56 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: dede9e7d6741aea4cb07b98da83cc6a8, type: 3} m_Name: m_EditorClassIdentifier: - spEed: 4 - timer: 0 - time: 0 + _timePassed: 0 + _elapsedTime: 1 +--- !u!114 &1761935013 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1761935009} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d9e78d73b69c3234bad012aff766ea09, type: 3} + m_Name: + m_EditorClassIdentifier: + _speed: 4 +--- !u!1 &1844955162 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1844955163} + m_Layer: 0 + m_Name: Enemies + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1844955163 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1844955162} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -0.08, y: 0.56, z: -0.15457831} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 2083640148} + - {fileID: 1754708964} + - {fileID: 141422279} + - {fileID: 1578050040} + - {fileID: 1054253064} + m_Father: {fileID: 0} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2083640146 GameObject: m_ObjectHideFlags: 0 @@ -745,7 +793,7 @@ GameObject: - component: {fileID: 2083640147} - component: {fileID: 2083640150} m_Layer: 0 - m_Name: enemy + m_Name: Enemy m_TagString: Enemy m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -806,12 +854,12 @@ Transform: 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_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -3.0500002, y: 0.14999998, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 2 + m_Father: {fileID: 1844955163} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &2083640150 MonoBehaviour: diff --git a/Assets/Group1/Scenes/KillAllEnemies.unity.meta b/Assets/Level/Scenes/KillAllEnemies.unity.meta similarity index 100% rename from Assets/Group1/Scenes/KillAllEnemies.unity.meta rename to Assets/Level/Scenes/KillAllEnemies.unity.meta diff --git a/Assets/Group1/Scripts.meta b/Assets/Level/Scripts.meta similarity index 100% rename from Assets/Group1/Scripts.meta rename to Assets/Level/Scripts.meta diff --git a/Assets/Level/Scripts/Enemy.meta b/Assets/Level/Scripts/Enemy.meta new file mode 100644 index 00000000..d0f32bc2 --- /dev/null +++ b/Assets/Level/Scripts/Enemy.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 374e71cf0e26b0a4bb49ce0d30a3ae7e +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Level/Scripts/Enemy/Enemy.cs b/Assets/Level/Scripts/Enemy/Enemy.cs new file mode 100644 index 00000000..12c4b54a --- /dev/null +++ b/Assets/Level/Scripts/Enemy/Enemy.cs @@ -0,0 +1,20 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class Enemy : MonoBehaviour +{ + private Vector3 _target; + + private void Start() + { + _target = Random.insideUnitCircle * 4; + } + + private void Update() + { + transform.position = Vector3.MoveTowards(transform.position, _target, 2 * Time.deltaTime); + if (transform.position == _target) + _target = Random.insideUnitCircle * 4; + } +} diff --git a/Assets/Group1/Scripts/e.cs.meta b/Assets/Level/Scripts/Enemy/Enemy.cs.meta similarity index 100% rename from Assets/Group1/Scripts/e.cs.meta rename to Assets/Level/Scripts/Enemy/Enemy.cs.meta diff --git a/Assets/Level/Scripts/General.meta b/Assets/Level/Scripts/General.meta new file mode 100644 index 00000000..10a5b89e --- /dev/null +++ b/Assets/Level/Scripts/General.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 3442f0c87a7b20343bcbe6de0613d6d8 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Level/Scripts/General/GameController.cs b/Assets/Level/Scripts/General/GameController.cs new file mode 100644 index 00000000..24299ece --- /dev/null +++ b/Assets/Level/Scripts/General/GameController.cs @@ -0,0 +1,36 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class GameController : MonoBehaviour +{ + public static GameController Constroller; + private const string Message = "SendMEssage"; + + [SerializeField] private GameObject _target; + [SerializeField] private GameObject _player; + [SerializeField] private GameObject[] _enemies; + + private void Start() + { + Constroller = this; + } + + public void End() + { + _target.SetActive(true); + } + + private void Update(){ + foreach (var enemy in _enemies) + { + if (enemy == null) + continue; + + if (Vector3.Distance(_player.gameObject.gameObject.GetComponent().position, enemy.gameObject.gameObject.transform.position) < 0.2f) + { + _player.SendMessage(Message, enemy); + } + } + } +} diff --git a/Assets/Group1/Scripts/GameController.cs.meta b/Assets/Level/Scripts/General/GameController.cs.meta similarity index 100% rename from Assets/Group1/Scripts/GameController.cs.meta rename to Assets/Level/Scripts/General/GameController.cs.meta diff --git a/Assets/Level/Scripts/Player.meta b/Assets/Level/Scripts/Player.meta new file mode 100644 index 00000000..9c674761 --- /dev/null +++ b/Assets/Level/Scripts/Player.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 15f1c92fe23c6224aa070e117bdb132f +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Level/Scripts/Player/Player.cs b/Assets/Level/Scripts/Player/Player.cs new file mode 100644 index 00000000..3652b9a6 --- /dev/null +++ b/Assets/Level/Scripts/Player/Player.cs @@ -0,0 +1,53 @@ +using UnityEngine; +using System.Collections; + +[RequireComponent(typeof(PlayerMover))] +public class Player : MonoBehaviour +{ + [SerializeField] private bool _timePassed; + [SerializeField] private float _elapsedTime; + + private PlayerMover _playerMover; + private const string Enemy = "Enemy"; + private const string Speed = "speed"; + + void Start() + { + _playerMover = GetComponent(); + } + + private void Update() + { + if (_timePassed) + { + _elapsedTime -= Time.deltaTime; + if (_elapsedTime < 0) + { + _timePassed = false; + _playerMover.Speed /= 2; + } + } + + GameObject[] enemies = GameObject.FindGameObjectsWithTag(Enemy); + + if (enemies.Length == 0) + { + GameController.Constroller.End(); + enabled = false; + } + } + + public void SendMEssage(GameObject other) + { + if(other.name == Enemy) + { + Destroy(other); + } + if (other.name == Speed) + { + _playerMover.Speed *= 2; + _timePassed = true; + _elapsedTime = 2; + } + } +} diff --git a/Assets/Group1/Scripts/NewBehaviourScript1.cs.meta b/Assets/Level/Scripts/Player/Player.cs.meta similarity index 100% rename from Assets/Group1/Scripts/NewBehaviourScript1.cs.meta rename to Assets/Level/Scripts/Player/Player.cs.meta diff --git a/Assets/Level/Scripts/Player/PlayerMover.cs b/Assets/Level/Scripts/Player/PlayerMover.cs new file mode 100644 index 00000000..b8ff6a92 --- /dev/null +++ b/Assets/Level/Scripts/Player/PlayerMover.cs @@ -0,0 +1,16 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class PlayerMover : MonoBehaviour +{ + [SerializeField] private float _speed; + + public float Speed { get => _speed; set => _speed = value; } + + private void Update() + { + Vector3 movement = new Vector3(Input.GetAxis("Horizontal"), Input.GetAxis("Vertical"), 0); + transform.Translate(movement * Time.deltaTime * Speed); + } +} diff --git a/Assets/Level/Scripts/Player/PlayerMover.cs.meta b/Assets/Level/Scripts/Player/PlayerMover.cs.meta new file mode 100644 index 00000000..2754fcc9 --- /dev/null +++ b/Assets/Level/Scripts/Player/PlayerMover.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: d9e78d73b69c3234bad012aff766ea09 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Logs/Packages-Update.log b/Logs/Packages-Update.log new file mode 100644 index 00000000..30b15850 --- /dev/null +++ b/Logs/Packages-Update.log @@ -0,0 +1,11 @@ + +=== Sun May 23 18:26:40 2021 + +Packages were changed. +Update Mode: updateDependencies + +The following packages were updated: + com.unity.analytics from version 3.2.2 to 3.2.3 + com.unity.package-manager-ui from version 2.0.7 to 2.0.13 + com.unity.purchasing from version 2.0.3 to 2.2.1 + com.unity.textmeshpro from version 1.3.0 to 1.4.1 diff --git a/Packages/manifest.json b/Packages/manifest.json index 8392bea1..349d3187 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -1,11 +1,11 @@ { "dependencies": { "com.unity.ads": "2.0.8", - "com.unity.analytics": "3.2.2", + "com.unity.analytics": "3.2.3", "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.package-manager-ui": "2.0.13", + "com.unity.purchasing": "2.2.1", + "com.unity.textmeshpro": "1.4.1", "com.unity.modules.ai": "1.0.0", "com.unity.modules.animation": "1.0.0", "com.unity.modules.assetbundle": "1.0.0", diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index 6dfd6c14..95dcc9f4 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1 +1 @@ -m_EditorVersion: 2018.3.14f1 +m_EditorVersion: 2018.4.34f1 From e12ecd1ab7c08299d72e3e7c438bf9f3b34bf5fb Mon Sep 17 00:00:00 2001 From: Pavel Ol Date: Mon, 14 Jun 2021 23:34:58 +0300 Subject: [PATCH 2/6] Revert "First commit with refactoring" This reverts commit a03a0ba7c48a76a420ac92a0151fe71aefbc6687. --- Assets/{Level.meta => Group1.meta} | 0 Assets/{Level => Group1}/Player.png | Bin Assets/{Level => Group1}/Player.png.meta | 0 Assets/{Level => Group1}/Scenes.meta | 0 .../Scenes/KillAllEnemies.unity | 114 +++++------------- .../Scenes/KillAllEnemies.unity.meta | 0 Assets/{Level => Group1}/Scripts.meta | 0 Assets/Group1/Scripts/GameController.cs | 38 ++++++ .../Scripts}/GameController.cs.meta | 0 Assets/Group1/Scripts/NewBehaviourScript1.cs | 65 ++++++++++ .../Scripts/NewBehaviourScript1.cs.meta} | 0 Assets/Group1/Scripts/e.cs | 22 ++++ .../Scripts/e.cs.meta} | 0 Assets/{Level/Enemy.png => Group1/enemy.png} | Bin .../Enemy.png.meta => Group1/enemy.png.meta} | 0 Assets/Level/Scripts/Enemy.meta | 8 -- Assets/Level/Scripts/Enemy/Enemy.cs | 20 --- Assets/Level/Scripts/General.meta | 8 -- .../Level/Scripts/General/GameController.cs | 36 ------ Assets/Level/Scripts/Player.meta | 8 -- Assets/Level/Scripts/Player/Player.cs | 53 -------- Assets/Level/Scripts/Player/PlayerMover.cs | 16 --- .../Level/Scripts/Player/PlayerMover.cs.meta | 11 -- Logs/Packages-Update.log | 11 -- Packages/manifest.json | 8 +- ProjectSettings/ProjectVersion.txt | 2 +- 26 files changed, 163 insertions(+), 257 deletions(-) rename Assets/{Level.meta => Group1.meta} (100%) rename Assets/{Level => Group1}/Player.png (100%) rename Assets/{Level => Group1}/Player.png.meta (100%) rename Assets/{Level => Group1}/Scenes.meta (100%) rename Assets/{Level => Group1}/Scenes/KillAllEnemies.unity (91%) rename Assets/{Level => Group1}/Scenes/KillAllEnemies.unity.meta (100%) rename Assets/{Level => Group1}/Scripts.meta (100%) create mode 100644 Assets/Group1/Scripts/GameController.cs rename Assets/{Level/Scripts/General => Group1/Scripts}/GameController.cs.meta (100%) create mode 100644 Assets/Group1/Scripts/NewBehaviourScript1.cs rename Assets/{Level/Scripts/Player/Player.cs.meta => Group1/Scripts/NewBehaviourScript1.cs.meta} (100%) create mode 100644 Assets/Group1/Scripts/e.cs rename Assets/{Level/Scripts/Enemy/Enemy.cs.meta => Group1/Scripts/e.cs.meta} (100%) rename Assets/{Level/Enemy.png => Group1/enemy.png} (100%) rename Assets/{Level/Enemy.png.meta => Group1/enemy.png.meta} (100%) delete mode 100644 Assets/Level/Scripts/Enemy.meta delete mode 100644 Assets/Level/Scripts/Enemy/Enemy.cs delete mode 100644 Assets/Level/Scripts/General.meta delete mode 100644 Assets/Level/Scripts/General/GameController.cs delete mode 100644 Assets/Level/Scripts/Player.meta delete mode 100644 Assets/Level/Scripts/Player/Player.cs delete mode 100644 Assets/Level/Scripts/Player/PlayerMover.cs delete mode 100644 Assets/Level/Scripts/Player/PlayerMover.cs.meta delete mode 100644 Logs/Packages-Update.log diff --git a/Assets/Level.meta b/Assets/Group1.meta similarity index 100% rename from Assets/Level.meta rename to Assets/Group1.meta diff --git a/Assets/Level/Player.png b/Assets/Group1/Player.png similarity index 100% rename from Assets/Level/Player.png rename to Assets/Group1/Player.png diff --git a/Assets/Level/Player.png.meta b/Assets/Group1/Player.png.meta similarity index 100% rename from Assets/Level/Player.png.meta rename to Assets/Group1/Player.png.meta diff --git a/Assets/Level/Scenes.meta b/Assets/Group1/Scenes.meta similarity index 100% rename from Assets/Level/Scenes.meta rename to Assets/Group1/Scenes.meta diff --git a/Assets/Level/Scenes/KillAllEnemies.unity b/Assets/Group1/Scenes/KillAllEnemies.unity similarity index 91% rename from Assets/Level/Scenes/KillAllEnemies.unity rename to Assets/Group1/Scenes/KillAllEnemies.unity index 5a361e59..21adfb9b 100644 --- a/Assets/Level/Scenes/KillAllEnemies.unity +++ b/Assets/Group1/Scenes/KillAllEnemies.unity @@ -124,7 +124,7 @@ GameObject: - component: {fileID: 141422278} - component: {fileID: 141422277} m_Layer: 0 - m_Name: Enemy + m_Name: enemy m_TagString: Enemy m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -197,12 +197,12 @@ Transform: 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.6699998, y: 2.53, z: 0} + 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: 1844955163} - m_RootOrder: 2 + m_Father: {fileID: 0} + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &170076733 GameObject: @@ -368,9 +368,9 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: cd6d0074e725a114e850d2e604fe4b0d, type: 3} m_Name: m_EditorClassIdentifier: - _target: {fileID: 1054253062} - _player: {fileID: 1761935009} - _enemies: + go: {fileID: 1054253062} + a: {fileID: 1761935009} + B: - {fileID: 2083640146} - {fileID: 1754708960} - {fileID: 141422275} @@ -386,7 +386,7 @@ GameObject: - component: {fileID: 1054253064} - component: {fileID: 1054253063} m_Layer: 0 - m_Name: Enemy + m_Name: New Sprite m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -447,12 +447,12 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1054253062} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -0.08, y: 0.56, z: -0.15457831} m_LocalScale: {x: 25, y: 25, z: 1} m_Children: [] - m_Father: {fileID: 1844955163} - m_RootOrder: 4 + m_Father: {fileID: 0} + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1578050036 GameObject: @@ -466,7 +466,7 @@ GameObject: - component: {fileID: 1578050039} - component: {fileID: 1578050038} m_Layer: 0 - m_Name: Enemy + m_Name: enemy m_TagString: Enemy m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -539,12 +539,12 @@ Transform: 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.6699998, y: -1.9000001, z: 0} + 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: 1844955163} - m_RootOrder: 3 + m_Father: {fileID: 0} + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1754708960 GameObject: @@ -558,7 +558,7 @@ GameObject: - component: {fileID: 1754708963} - component: {fileID: 1754708962} m_Layer: 0 - m_Name: Enemy + m_Name: enemy m_TagString: Enemy m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -631,12 +631,12 @@ Transform: 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.6699998, y: 0.14999998, z: 0} + 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: 1844955163} - m_RootOrder: 1 + m_Father: {fileID: 0} + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1761935009 GameObject: @@ -649,9 +649,8 @@ GameObject: - component: {fileID: 1761935011} - component: {fileID: 1761935010} - component: {fileID: 1761935012} - - component: {fileID: 1761935013} m_Layer: 0 - m_Name: Player + m_Name: New Sprite (1) m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -717,7 +716,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 2 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1761935012 MonoBehaviour: @@ -731,56 +730,9 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: dede9e7d6741aea4cb07b98da83cc6a8, type: 3} m_Name: m_EditorClassIdentifier: - _timePassed: 0 - _elapsedTime: 1 ---- !u!114 &1761935013 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1761935009} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: d9e78d73b69c3234bad012aff766ea09, type: 3} - m_Name: - m_EditorClassIdentifier: - _speed: 4 ---- !u!1 &1844955162 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1844955163} - m_Layer: 0 - m_Name: Enemies - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1844955163 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1844955162} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -0.08, y: 0.56, z: -0.15457831} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 2083640148} - - {fileID: 1754708964} - - {fileID: 141422279} - - {fileID: 1578050040} - - {fileID: 1054253064} - m_Father: {fileID: 0} - m_RootOrder: 3 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + spEed: 4 + timer: 0 + time: 0 --- !u!1 &2083640146 GameObject: m_ObjectHideFlags: 0 @@ -793,7 +745,7 @@ GameObject: - component: {fileID: 2083640147} - component: {fileID: 2083640150} m_Layer: 0 - m_Name: Enemy + m_Name: enemy m_TagString: Enemy m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -854,12 +806,12 @@ Transform: 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.0500002, y: 0.14999998, z: 0} + 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: 1844955163} - m_RootOrder: 0 + m_Father: {fileID: 0} + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &2083640150 MonoBehaviour: diff --git a/Assets/Level/Scenes/KillAllEnemies.unity.meta b/Assets/Group1/Scenes/KillAllEnemies.unity.meta similarity index 100% rename from Assets/Level/Scenes/KillAllEnemies.unity.meta rename to Assets/Group1/Scenes/KillAllEnemies.unity.meta diff --git a/Assets/Level/Scripts.meta b/Assets/Group1/Scripts.meta similarity index 100% rename from Assets/Level/Scripts.meta rename to Assets/Group1/Scripts.meta diff --git a/Assets/Group1/Scripts/GameController.cs b/Assets/Group1/Scripts/GameController.cs new file mode 100644 index 00000000..6afe5356 --- /dev/null +++ b/Assets/Group1/Scripts/GameController.cs @@ -0,0 +1,38 @@ +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/Level/Scripts/General/GameController.cs.meta b/Assets/Group1/Scripts/GameController.cs.meta similarity index 100% rename from Assets/Level/Scripts/General/GameController.cs.meta rename to Assets/Group1/Scripts/GameController.cs.meta diff --git a/Assets/Group1/Scripts/NewBehaviourScript1.cs b/Assets/Group1/Scripts/NewBehaviourScript1.cs new file mode 100644 index 00000000..14bd7c3f --- /dev/null +++ b/Assets/Group1/Scripts/NewBehaviourScript1.cs @@ -0,0 +1,65 @@ +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/Level/Scripts/Player/Player.cs.meta b/Assets/Group1/Scripts/NewBehaviourScript1.cs.meta similarity index 100% rename from Assets/Level/Scripts/Player/Player.cs.meta rename to Assets/Group1/Scripts/NewBehaviourScript1.cs.meta diff --git a/Assets/Group1/Scripts/e.cs b/Assets/Group1/Scripts/e.cs new file mode 100644 index 00000000..048ebf2d --- /dev/null +++ b/Assets/Group1/Scripts/e.cs @@ -0,0 +1,22 @@ +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/Level/Scripts/Enemy/Enemy.cs.meta b/Assets/Group1/Scripts/e.cs.meta similarity index 100% rename from Assets/Level/Scripts/Enemy/Enemy.cs.meta rename to Assets/Group1/Scripts/e.cs.meta diff --git a/Assets/Level/Enemy.png b/Assets/Group1/enemy.png similarity index 100% rename from Assets/Level/Enemy.png rename to Assets/Group1/enemy.png diff --git a/Assets/Level/Enemy.png.meta b/Assets/Group1/enemy.png.meta similarity index 100% rename from Assets/Level/Enemy.png.meta rename to Assets/Group1/enemy.png.meta diff --git a/Assets/Level/Scripts/Enemy.meta b/Assets/Level/Scripts/Enemy.meta deleted file mode 100644 index d0f32bc2..00000000 --- a/Assets/Level/Scripts/Enemy.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 374e71cf0e26b0a4bb49ce0d30a3ae7e -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Level/Scripts/Enemy/Enemy.cs b/Assets/Level/Scripts/Enemy/Enemy.cs deleted file mode 100644 index 12c4b54a..00000000 --- a/Assets/Level/Scripts/Enemy/Enemy.cs +++ /dev/null @@ -1,20 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -public class Enemy : MonoBehaviour -{ - private Vector3 _target; - - private void Start() - { - _target = Random.insideUnitCircle * 4; - } - - private void Update() - { - transform.position = Vector3.MoveTowards(transform.position, _target, 2 * Time.deltaTime); - if (transform.position == _target) - _target = Random.insideUnitCircle * 4; - } -} diff --git a/Assets/Level/Scripts/General.meta b/Assets/Level/Scripts/General.meta deleted file mode 100644 index 10a5b89e..00000000 --- a/Assets/Level/Scripts/General.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 3442f0c87a7b20343bcbe6de0613d6d8 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Level/Scripts/General/GameController.cs b/Assets/Level/Scripts/General/GameController.cs deleted file mode 100644 index 24299ece..00000000 --- a/Assets/Level/Scripts/General/GameController.cs +++ /dev/null @@ -1,36 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -public class GameController : MonoBehaviour -{ - public static GameController Constroller; - private const string Message = "SendMEssage"; - - [SerializeField] private GameObject _target; - [SerializeField] private GameObject _player; - [SerializeField] private GameObject[] _enemies; - - private void Start() - { - Constroller = this; - } - - public void End() - { - _target.SetActive(true); - } - - private void Update(){ - foreach (var enemy in _enemies) - { - if (enemy == null) - continue; - - if (Vector3.Distance(_player.gameObject.gameObject.GetComponent().position, enemy.gameObject.gameObject.transform.position) < 0.2f) - { - _player.SendMessage(Message, enemy); - } - } - } -} diff --git a/Assets/Level/Scripts/Player.meta b/Assets/Level/Scripts/Player.meta deleted file mode 100644 index 9c674761..00000000 --- a/Assets/Level/Scripts/Player.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 15f1c92fe23c6224aa070e117bdb132f -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Level/Scripts/Player/Player.cs b/Assets/Level/Scripts/Player/Player.cs deleted file mode 100644 index 3652b9a6..00000000 --- a/Assets/Level/Scripts/Player/Player.cs +++ /dev/null @@ -1,53 +0,0 @@ -using UnityEngine; -using System.Collections; - -[RequireComponent(typeof(PlayerMover))] -public class Player : MonoBehaviour -{ - [SerializeField] private bool _timePassed; - [SerializeField] private float _elapsedTime; - - private PlayerMover _playerMover; - private const string Enemy = "Enemy"; - private const string Speed = "speed"; - - void Start() - { - _playerMover = GetComponent(); - } - - private void Update() - { - if (_timePassed) - { - _elapsedTime -= Time.deltaTime; - if (_elapsedTime < 0) - { - _timePassed = false; - _playerMover.Speed /= 2; - } - } - - GameObject[] enemies = GameObject.FindGameObjectsWithTag(Enemy); - - if (enemies.Length == 0) - { - GameController.Constroller.End(); - enabled = false; - } - } - - public void SendMEssage(GameObject other) - { - if(other.name == Enemy) - { - Destroy(other); - } - if (other.name == Speed) - { - _playerMover.Speed *= 2; - _timePassed = true; - _elapsedTime = 2; - } - } -} diff --git a/Assets/Level/Scripts/Player/PlayerMover.cs b/Assets/Level/Scripts/Player/PlayerMover.cs deleted file mode 100644 index b8ff6a92..00000000 --- a/Assets/Level/Scripts/Player/PlayerMover.cs +++ /dev/null @@ -1,16 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -public class PlayerMover : MonoBehaviour -{ - [SerializeField] private float _speed; - - public float Speed { get => _speed; set => _speed = value; } - - private void Update() - { - Vector3 movement = new Vector3(Input.GetAxis("Horizontal"), Input.GetAxis("Vertical"), 0); - transform.Translate(movement * Time.deltaTime * Speed); - } -} diff --git a/Assets/Level/Scripts/Player/PlayerMover.cs.meta b/Assets/Level/Scripts/Player/PlayerMover.cs.meta deleted file mode 100644 index 2754fcc9..00000000 --- a/Assets/Level/Scripts/Player/PlayerMover.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: d9e78d73b69c3234bad012aff766ea09 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Logs/Packages-Update.log b/Logs/Packages-Update.log deleted file mode 100644 index 30b15850..00000000 --- a/Logs/Packages-Update.log +++ /dev/null @@ -1,11 +0,0 @@ - -=== Sun May 23 18:26:40 2021 - -Packages were changed. -Update Mode: updateDependencies - -The following packages were updated: - com.unity.analytics from version 3.2.2 to 3.2.3 - com.unity.package-manager-ui from version 2.0.7 to 2.0.13 - com.unity.purchasing from version 2.0.3 to 2.2.1 - com.unity.textmeshpro from version 1.3.0 to 1.4.1 diff --git a/Packages/manifest.json b/Packages/manifest.json index 349d3187..8392bea1 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -1,11 +1,11 @@ { "dependencies": { "com.unity.ads": "2.0.8", - "com.unity.analytics": "3.2.3", + "com.unity.analytics": "3.2.2", "com.unity.collab-proxy": "1.2.15", - "com.unity.package-manager-ui": "2.0.13", - "com.unity.purchasing": "2.2.1", - "com.unity.textmeshpro": "1.4.1", + "com.unity.package-manager-ui": "2.0.7", + "com.unity.purchasing": "2.0.3", + "com.unity.textmeshpro": "1.3.0", "com.unity.modules.ai": "1.0.0", "com.unity.modules.animation": "1.0.0", "com.unity.modules.assetbundle": "1.0.0", diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index 95dcc9f4..6dfd6c14 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1 +1 @@ -m_EditorVersion: 2018.4.34f1 +m_EditorVersion: 2018.3.14f1 From fce8caac117119d044b588631f927c0aed504402 Mon Sep 17 00:00:00 2001 From: Pavel Ol Date: Mon, 14 Jun 2021 23:36:01 +0300 Subject: [PATCH 3/6] Revert "Revert "First commit with refactoring"" This reverts commit e12ecd1ab7c08299d72e3e7c438bf9f3b34bf5fb. --- Assets/Group1/Scripts/GameController.cs | 38 ------ Assets/Group1/Scripts/NewBehaviourScript1.cs | 65 ---------- Assets/Group1/Scripts/e.cs | 22 ---- Assets/{Group1.meta => Level.meta} | 0 Assets/{Group1/Player.png => Level/Enemy.png} | Bin .../enemy.png.meta => Level/Enemy.png.meta} | 0 Assets/{Group1/enemy.png => Level/Player.png} | Bin Assets/{Group1 => Level}/Player.png.meta | 0 Assets/{Group1 => Level}/Scenes.meta | 0 .../Scenes/KillAllEnemies.unity | 114 +++++++++++++----- .../Scenes/KillAllEnemies.unity.meta | 0 Assets/{Group1 => Level}/Scripts.meta | 0 Assets/Level/Scripts/Enemy.meta | 8 ++ Assets/Level/Scripts/Enemy/Enemy.cs | 20 +++ .../Scripts/Enemy/Enemy.cs.meta} | 0 Assets/Level/Scripts/General.meta | 8 ++ .../Level/Scripts/General/GameController.cs | 36 ++++++ .../Scripts/General}/GameController.cs.meta | 0 Assets/Level/Scripts/Player.meta | 8 ++ Assets/Level/Scripts/Player/Player.cs | 53 ++++++++ .../Scripts/Player/Player.cs.meta} | 0 Assets/Level/Scripts/Player/PlayerMover.cs | 16 +++ .../Level/Scripts/Player/PlayerMover.cs.meta | 11 ++ Logs/Packages-Update.log | 11 ++ Packages/manifest.json | 8 +- ProjectSettings/ProjectVersion.txt | 2 +- 26 files changed, 257 insertions(+), 163 deletions(-) delete mode 100644 Assets/Group1/Scripts/GameController.cs delete mode 100644 Assets/Group1/Scripts/NewBehaviourScript1.cs delete mode 100644 Assets/Group1/Scripts/e.cs rename Assets/{Group1.meta => Level.meta} (100%) rename Assets/{Group1/Player.png => Level/Enemy.png} (100%) rename Assets/{Group1/enemy.png.meta => Level/Enemy.png.meta} (100%) rename Assets/{Group1/enemy.png => Level/Player.png} (100%) rename Assets/{Group1 => Level}/Player.png.meta (100%) rename Assets/{Group1 => Level}/Scenes.meta (100%) rename Assets/{Group1 => Level}/Scenes/KillAllEnemies.unity (91%) rename Assets/{Group1 => Level}/Scenes/KillAllEnemies.unity.meta (100%) rename Assets/{Group1 => Level}/Scripts.meta (100%) create mode 100644 Assets/Level/Scripts/Enemy.meta create mode 100644 Assets/Level/Scripts/Enemy/Enemy.cs rename Assets/{Group1/Scripts/e.cs.meta => Level/Scripts/Enemy/Enemy.cs.meta} (100%) create mode 100644 Assets/Level/Scripts/General.meta create mode 100644 Assets/Level/Scripts/General/GameController.cs rename Assets/{Group1/Scripts => Level/Scripts/General}/GameController.cs.meta (100%) create mode 100644 Assets/Level/Scripts/Player.meta create mode 100644 Assets/Level/Scripts/Player/Player.cs rename Assets/{Group1/Scripts/NewBehaviourScript1.cs.meta => Level/Scripts/Player/Player.cs.meta} (100%) create mode 100644 Assets/Level/Scripts/Player/PlayerMover.cs create mode 100644 Assets/Level/Scripts/Player/PlayerMover.cs.meta create mode 100644 Logs/Packages-Update.log 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/Group1.meta b/Assets/Level.meta similarity index 100% rename from Assets/Group1.meta rename to Assets/Level.meta diff --git a/Assets/Group1/Player.png b/Assets/Level/Enemy.png similarity index 100% rename from Assets/Group1/Player.png rename to Assets/Level/Enemy.png diff --git a/Assets/Group1/enemy.png.meta b/Assets/Level/Enemy.png.meta similarity index 100% rename from Assets/Group1/enemy.png.meta rename to Assets/Level/Enemy.png.meta diff --git a/Assets/Group1/enemy.png b/Assets/Level/Player.png similarity index 100% rename from Assets/Group1/enemy.png rename to Assets/Level/Player.png diff --git a/Assets/Group1/Player.png.meta b/Assets/Level/Player.png.meta similarity index 100% rename from Assets/Group1/Player.png.meta rename to Assets/Level/Player.png.meta diff --git a/Assets/Group1/Scenes.meta b/Assets/Level/Scenes.meta similarity index 100% rename from Assets/Group1/Scenes.meta rename to Assets/Level/Scenes.meta diff --git a/Assets/Group1/Scenes/KillAllEnemies.unity b/Assets/Level/Scenes/KillAllEnemies.unity similarity index 91% rename from Assets/Group1/Scenes/KillAllEnemies.unity rename to Assets/Level/Scenes/KillAllEnemies.unity index 21adfb9b..5a361e59 100644 --- a/Assets/Group1/Scenes/KillAllEnemies.unity +++ b/Assets/Level/Scenes/KillAllEnemies.unity @@ -124,7 +124,7 @@ GameObject: - component: {fileID: 141422278} - component: {fileID: 141422277} m_Layer: 0 - m_Name: enemy + m_Name: Enemy m_TagString: Enemy m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -197,12 +197,12 @@ Transform: 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_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 3.6699998, y: 2.53, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 4 + m_Father: {fileID: 1844955163} + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &170076733 GameObject: @@ -368,9 +368,9 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: cd6d0074e725a114e850d2e604fe4b0d, type: 3} m_Name: m_EditorClassIdentifier: - go: {fileID: 1054253062} - a: {fileID: 1761935009} - B: + _target: {fileID: 1054253062} + _player: {fileID: 1761935009} + _enemies: - {fileID: 2083640146} - {fileID: 1754708960} - {fileID: 141422275} @@ -386,7 +386,7 @@ GameObject: - component: {fileID: 1054253064} - component: {fileID: 1054253063} m_Layer: 0 - m_Name: New Sprite + m_Name: Enemy m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -447,12 +447,12 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1054253062} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -0.08, y: 0.56, z: -0.15457831} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 25, y: 25, z: 1} m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 7 + m_Father: {fileID: 1844955163} + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1578050036 GameObject: @@ -466,7 +466,7 @@ GameObject: - component: {fileID: 1578050039} - component: {fileID: 1578050038} m_Layer: 0 - m_Name: enemy + m_Name: Enemy m_TagString: Enemy m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -539,12 +539,12 @@ Transform: 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_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 3.6699998, y: -1.9000001, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 5 + m_Father: {fileID: 1844955163} + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1754708960 GameObject: @@ -558,7 +558,7 @@ GameObject: - component: {fileID: 1754708963} - component: {fileID: 1754708962} m_Layer: 0 - m_Name: enemy + m_Name: Enemy m_TagString: Enemy m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -631,12 +631,12 @@ Transform: 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_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 3.6699998, y: 0.14999998, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 3 + m_Father: {fileID: 1844955163} + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1761935009 GameObject: @@ -649,8 +649,9 @@ GameObject: - component: {fileID: 1761935011} - component: {fileID: 1761935010} - component: {fileID: 1761935012} + - component: {fileID: 1761935013} m_Layer: 0 - m_Name: New Sprite (1) + m_Name: Player m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -716,7 +717,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 6 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1761935012 MonoBehaviour: @@ -730,9 +731,56 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: dede9e7d6741aea4cb07b98da83cc6a8, type: 3} m_Name: m_EditorClassIdentifier: - spEed: 4 - timer: 0 - time: 0 + _timePassed: 0 + _elapsedTime: 1 +--- !u!114 &1761935013 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1761935009} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d9e78d73b69c3234bad012aff766ea09, type: 3} + m_Name: + m_EditorClassIdentifier: + _speed: 4 +--- !u!1 &1844955162 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1844955163} + m_Layer: 0 + m_Name: Enemies + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1844955163 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1844955162} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -0.08, y: 0.56, z: -0.15457831} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 2083640148} + - {fileID: 1754708964} + - {fileID: 141422279} + - {fileID: 1578050040} + - {fileID: 1054253064} + m_Father: {fileID: 0} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2083640146 GameObject: m_ObjectHideFlags: 0 @@ -745,7 +793,7 @@ GameObject: - component: {fileID: 2083640147} - component: {fileID: 2083640150} m_Layer: 0 - m_Name: enemy + m_Name: Enemy m_TagString: Enemy m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -806,12 +854,12 @@ Transform: 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_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -3.0500002, y: 0.14999998, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 2 + m_Father: {fileID: 1844955163} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &2083640150 MonoBehaviour: diff --git a/Assets/Group1/Scenes/KillAllEnemies.unity.meta b/Assets/Level/Scenes/KillAllEnemies.unity.meta similarity index 100% rename from Assets/Group1/Scenes/KillAllEnemies.unity.meta rename to Assets/Level/Scenes/KillAllEnemies.unity.meta diff --git a/Assets/Group1/Scripts.meta b/Assets/Level/Scripts.meta similarity index 100% rename from Assets/Group1/Scripts.meta rename to Assets/Level/Scripts.meta diff --git a/Assets/Level/Scripts/Enemy.meta b/Assets/Level/Scripts/Enemy.meta new file mode 100644 index 00000000..d0f32bc2 --- /dev/null +++ b/Assets/Level/Scripts/Enemy.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 374e71cf0e26b0a4bb49ce0d30a3ae7e +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Level/Scripts/Enemy/Enemy.cs b/Assets/Level/Scripts/Enemy/Enemy.cs new file mode 100644 index 00000000..12c4b54a --- /dev/null +++ b/Assets/Level/Scripts/Enemy/Enemy.cs @@ -0,0 +1,20 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class Enemy : MonoBehaviour +{ + private Vector3 _target; + + private void Start() + { + _target = Random.insideUnitCircle * 4; + } + + private void Update() + { + transform.position = Vector3.MoveTowards(transform.position, _target, 2 * Time.deltaTime); + if (transform.position == _target) + _target = Random.insideUnitCircle * 4; + } +} diff --git a/Assets/Group1/Scripts/e.cs.meta b/Assets/Level/Scripts/Enemy/Enemy.cs.meta similarity index 100% rename from Assets/Group1/Scripts/e.cs.meta rename to Assets/Level/Scripts/Enemy/Enemy.cs.meta diff --git a/Assets/Level/Scripts/General.meta b/Assets/Level/Scripts/General.meta new file mode 100644 index 00000000..10a5b89e --- /dev/null +++ b/Assets/Level/Scripts/General.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 3442f0c87a7b20343bcbe6de0613d6d8 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Level/Scripts/General/GameController.cs b/Assets/Level/Scripts/General/GameController.cs new file mode 100644 index 00000000..24299ece --- /dev/null +++ b/Assets/Level/Scripts/General/GameController.cs @@ -0,0 +1,36 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class GameController : MonoBehaviour +{ + public static GameController Constroller; + private const string Message = "SendMEssage"; + + [SerializeField] private GameObject _target; + [SerializeField] private GameObject _player; + [SerializeField] private GameObject[] _enemies; + + private void Start() + { + Constroller = this; + } + + public void End() + { + _target.SetActive(true); + } + + private void Update(){ + foreach (var enemy in _enemies) + { + if (enemy == null) + continue; + + if (Vector3.Distance(_player.gameObject.gameObject.GetComponent().position, enemy.gameObject.gameObject.transform.position) < 0.2f) + { + _player.SendMessage(Message, enemy); + } + } + } +} diff --git a/Assets/Group1/Scripts/GameController.cs.meta b/Assets/Level/Scripts/General/GameController.cs.meta similarity index 100% rename from Assets/Group1/Scripts/GameController.cs.meta rename to Assets/Level/Scripts/General/GameController.cs.meta diff --git a/Assets/Level/Scripts/Player.meta b/Assets/Level/Scripts/Player.meta new file mode 100644 index 00000000..9c674761 --- /dev/null +++ b/Assets/Level/Scripts/Player.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 15f1c92fe23c6224aa070e117bdb132f +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Level/Scripts/Player/Player.cs b/Assets/Level/Scripts/Player/Player.cs new file mode 100644 index 00000000..3652b9a6 --- /dev/null +++ b/Assets/Level/Scripts/Player/Player.cs @@ -0,0 +1,53 @@ +using UnityEngine; +using System.Collections; + +[RequireComponent(typeof(PlayerMover))] +public class Player : MonoBehaviour +{ + [SerializeField] private bool _timePassed; + [SerializeField] private float _elapsedTime; + + private PlayerMover _playerMover; + private const string Enemy = "Enemy"; + private const string Speed = "speed"; + + void Start() + { + _playerMover = GetComponent(); + } + + private void Update() + { + if (_timePassed) + { + _elapsedTime -= Time.deltaTime; + if (_elapsedTime < 0) + { + _timePassed = false; + _playerMover.Speed /= 2; + } + } + + GameObject[] enemies = GameObject.FindGameObjectsWithTag(Enemy); + + if (enemies.Length == 0) + { + GameController.Constroller.End(); + enabled = false; + } + } + + public void SendMEssage(GameObject other) + { + if(other.name == Enemy) + { + Destroy(other); + } + if (other.name == Speed) + { + _playerMover.Speed *= 2; + _timePassed = true; + _elapsedTime = 2; + } + } +} diff --git a/Assets/Group1/Scripts/NewBehaviourScript1.cs.meta b/Assets/Level/Scripts/Player/Player.cs.meta similarity index 100% rename from Assets/Group1/Scripts/NewBehaviourScript1.cs.meta rename to Assets/Level/Scripts/Player/Player.cs.meta diff --git a/Assets/Level/Scripts/Player/PlayerMover.cs b/Assets/Level/Scripts/Player/PlayerMover.cs new file mode 100644 index 00000000..b8ff6a92 --- /dev/null +++ b/Assets/Level/Scripts/Player/PlayerMover.cs @@ -0,0 +1,16 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class PlayerMover : MonoBehaviour +{ + [SerializeField] private float _speed; + + public float Speed { get => _speed; set => _speed = value; } + + private void Update() + { + Vector3 movement = new Vector3(Input.GetAxis("Horizontal"), Input.GetAxis("Vertical"), 0); + transform.Translate(movement * Time.deltaTime * Speed); + } +} diff --git a/Assets/Level/Scripts/Player/PlayerMover.cs.meta b/Assets/Level/Scripts/Player/PlayerMover.cs.meta new file mode 100644 index 00000000..2754fcc9 --- /dev/null +++ b/Assets/Level/Scripts/Player/PlayerMover.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: d9e78d73b69c3234bad012aff766ea09 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Logs/Packages-Update.log b/Logs/Packages-Update.log new file mode 100644 index 00000000..30b15850 --- /dev/null +++ b/Logs/Packages-Update.log @@ -0,0 +1,11 @@ + +=== Sun May 23 18:26:40 2021 + +Packages were changed. +Update Mode: updateDependencies + +The following packages were updated: + com.unity.analytics from version 3.2.2 to 3.2.3 + com.unity.package-manager-ui from version 2.0.7 to 2.0.13 + com.unity.purchasing from version 2.0.3 to 2.2.1 + com.unity.textmeshpro from version 1.3.0 to 1.4.1 diff --git a/Packages/manifest.json b/Packages/manifest.json index 8392bea1..349d3187 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -1,11 +1,11 @@ { "dependencies": { "com.unity.ads": "2.0.8", - "com.unity.analytics": "3.2.2", + "com.unity.analytics": "3.2.3", "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.package-manager-ui": "2.0.13", + "com.unity.purchasing": "2.2.1", + "com.unity.textmeshpro": "1.4.1", "com.unity.modules.ai": "1.0.0", "com.unity.modules.animation": "1.0.0", "com.unity.modules.assetbundle": "1.0.0", diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index 6dfd6c14..95dcc9f4 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1 +1 @@ -m_EditorVersion: 2018.3.14f1 +m_EditorVersion: 2018.4.34f1 From 8009daed9c498e8f1aa4be22fbf781d4d442fa54 Mon Sep 17 00:00:00 2001 From: Pavel Ol Date: Mon, 14 Jun 2021 23:36:19 +0300 Subject: [PATCH 4/6] Revert "Revert "Revert "First commit with refactoring""" This reverts commit fce8caac117119d044b588631f927c0aed504402. --- Assets/{Level.meta => Group1.meta} | 0 Assets/{Level => Group1}/Player.png | Bin Assets/{Level => Group1}/Player.png.meta | 0 Assets/{Level => Group1}/Scenes.meta | 0 .../Scenes/KillAllEnemies.unity | 114 +++++------------- .../Scenes/KillAllEnemies.unity.meta | 0 Assets/{Level => Group1}/Scripts.meta | 0 Assets/Group1/Scripts/GameController.cs | 38 ++++++ .../Scripts}/GameController.cs.meta | 0 Assets/Group1/Scripts/NewBehaviourScript1.cs | 65 ++++++++++ .../Scripts/NewBehaviourScript1.cs.meta} | 0 Assets/Group1/Scripts/e.cs | 22 ++++ .../Scripts/e.cs.meta} | 0 Assets/{Level/Enemy.png => Group1/enemy.png} | Bin .../Enemy.png.meta => Group1/enemy.png.meta} | 0 Assets/Level/Scripts/Enemy.meta | 8 -- Assets/Level/Scripts/Enemy/Enemy.cs | 20 --- Assets/Level/Scripts/General.meta | 8 -- .../Level/Scripts/General/GameController.cs | 36 ------ Assets/Level/Scripts/Player.meta | 8 -- Assets/Level/Scripts/Player/Player.cs | 53 -------- Assets/Level/Scripts/Player/PlayerMover.cs | 16 --- .../Level/Scripts/Player/PlayerMover.cs.meta | 11 -- Logs/Packages-Update.log | 11 -- Packages/manifest.json | 8 +- ProjectSettings/ProjectVersion.txt | 2 +- 26 files changed, 163 insertions(+), 257 deletions(-) rename Assets/{Level.meta => Group1.meta} (100%) rename Assets/{Level => Group1}/Player.png (100%) rename Assets/{Level => Group1}/Player.png.meta (100%) rename Assets/{Level => Group1}/Scenes.meta (100%) rename Assets/{Level => Group1}/Scenes/KillAllEnemies.unity (91%) rename Assets/{Level => Group1}/Scenes/KillAllEnemies.unity.meta (100%) rename Assets/{Level => Group1}/Scripts.meta (100%) create mode 100644 Assets/Group1/Scripts/GameController.cs rename Assets/{Level/Scripts/General => Group1/Scripts}/GameController.cs.meta (100%) create mode 100644 Assets/Group1/Scripts/NewBehaviourScript1.cs rename Assets/{Level/Scripts/Player/Player.cs.meta => Group1/Scripts/NewBehaviourScript1.cs.meta} (100%) create mode 100644 Assets/Group1/Scripts/e.cs rename Assets/{Level/Scripts/Enemy/Enemy.cs.meta => Group1/Scripts/e.cs.meta} (100%) rename Assets/{Level/Enemy.png => Group1/enemy.png} (100%) rename Assets/{Level/Enemy.png.meta => Group1/enemy.png.meta} (100%) delete mode 100644 Assets/Level/Scripts/Enemy.meta delete mode 100644 Assets/Level/Scripts/Enemy/Enemy.cs delete mode 100644 Assets/Level/Scripts/General.meta delete mode 100644 Assets/Level/Scripts/General/GameController.cs delete mode 100644 Assets/Level/Scripts/Player.meta delete mode 100644 Assets/Level/Scripts/Player/Player.cs delete mode 100644 Assets/Level/Scripts/Player/PlayerMover.cs delete mode 100644 Assets/Level/Scripts/Player/PlayerMover.cs.meta delete mode 100644 Logs/Packages-Update.log diff --git a/Assets/Level.meta b/Assets/Group1.meta similarity index 100% rename from Assets/Level.meta rename to Assets/Group1.meta diff --git a/Assets/Level/Player.png b/Assets/Group1/Player.png similarity index 100% rename from Assets/Level/Player.png rename to Assets/Group1/Player.png diff --git a/Assets/Level/Player.png.meta b/Assets/Group1/Player.png.meta similarity index 100% rename from Assets/Level/Player.png.meta rename to Assets/Group1/Player.png.meta diff --git a/Assets/Level/Scenes.meta b/Assets/Group1/Scenes.meta similarity index 100% rename from Assets/Level/Scenes.meta rename to Assets/Group1/Scenes.meta diff --git a/Assets/Level/Scenes/KillAllEnemies.unity b/Assets/Group1/Scenes/KillAllEnemies.unity similarity index 91% rename from Assets/Level/Scenes/KillAllEnemies.unity rename to Assets/Group1/Scenes/KillAllEnemies.unity index 5a361e59..21adfb9b 100644 --- a/Assets/Level/Scenes/KillAllEnemies.unity +++ b/Assets/Group1/Scenes/KillAllEnemies.unity @@ -124,7 +124,7 @@ GameObject: - component: {fileID: 141422278} - component: {fileID: 141422277} m_Layer: 0 - m_Name: Enemy + m_Name: enemy m_TagString: Enemy m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -197,12 +197,12 @@ Transform: 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.6699998, y: 2.53, z: 0} + 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: 1844955163} - m_RootOrder: 2 + m_Father: {fileID: 0} + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &170076733 GameObject: @@ -368,9 +368,9 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: cd6d0074e725a114e850d2e604fe4b0d, type: 3} m_Name: m_EditorClassIdentifier: - _target: {fileID: 1054253062} - _player: {fileID: 1761935009} - _enemies: + go: {fileID: 1054253062} + a: {fileID: 1761935009} + B: - {fileID: 2083640146} - {fileID: 1754708960} - {fileID: 141422275} @@ -386,7 +386,7 @@ GameObject: - component: {fileID: 1054253064} - component: {fileID: 1054253063} m_Layer: 0 - m_Name: Enemy + m_Name: New Sprite m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -447,12 +447,12 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1054253062} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -0.08, y: 0.56, z: -0.15457831} m_LocalScale: {x: 25, y: 25, z: 1} m_Children: [] - m_Father: {fileID: 1844955163} - m_RootOrder: 4 + m_Father: {fileID: 0} + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1578050036 GameObject: @@ -466,7 +466,7 @@ GameObject: - component: {fileID: 1578050039} - component: {fileID: 1578050038} m_Layer: 0 - m_Name: Enemy + m_Name: enemy m_TagString: Enemy m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -539,12 +539,12 @@ Transform: 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.6699998, y: -1.9000001, z: 0} + 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: 1844955163} - m_RootOrder: 3 + m_Father: {fileID: 0} + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1754708960 GameObject: @@ -558,7 +558,7 @@ GameObject: - component: {fileID: 1754708963} - component: {fileID: 1754708962} m_Layer: 0 - m_Name: Enemy + m_Name: enemy m_TagString: Enemy m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -631,12 +631,12 @@ Transform: 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.6699998, y: 0.14999998, z: 0} + 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: 1844955163} - m_RootOrder: 1 + m_Father: {fileID: 0} + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1761935009 GameObject: @@ -649,9 +649,8 @@ GameObject: - component: {fileID: 1761935011} - component: {fileID: 1761935010} - component: {fileID: 1761935012} - - component: {fileID: 1761935013} m_Layer: 0 - m_Name: Player + m_Name: New Sprite (1) m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -717,7 +716,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 2 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1761935012 MonoBehaviour: @@ -731,56 +730,9 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: dede9e7d6741aea4cb07b98da83cc6a8, type: 3} m_Name: m_EditorClassIdentifier: - _timePassed: 0 - _elapsedTime: 1 ---- !u!114 &1761935013 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1761935009} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: d9e78d73b69c3234bad012aff766ea09, type: 3} - m_Name: - m_EditorClassIdentifier: - _speed: 4 ---- !u!1 &1844955162 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1844955163} - m_Layer: 0 - m_Name: Enemies - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1844955163 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1844955162} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -0.08, y: 0.56, z: -0.15457831} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 2083640148} - - {fileID: 1754708964} - - {fileID: 141422279} - - {fileID: 1578050040} - - {fileID: 1054253064} - m_Father: {fileID: 0} - m_RootOrder: 3 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + spEed: 4 + timer: 0 + time: 0 --- !u!1 &2083640146 GameObject: m_ObjectHideFlags: 0 @@ -793,7 +745,7 @@ GameObject: - component: {fileID: 2083640147} - component: {fileID: 2083640150} m_Layer: 0 - m_Name: Enemy + m_Name: enemy m_TagString: Enemy m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -854,12 +806,12 @@ Transform: 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.0500002, y: 0.14999998, z: 0} + 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: 1844955163} - m_RootOrder: 0 + m_Father: {fileID: 0} + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &2083640150 MonoBehaviour: diff --git a/Assets/Level/Scenes/KillAllEnemies.unity.meta b/Assets/Group1/Scenes/KillAllEnemies.unity.meta similarity index 100% rename from Assets/Level/Scenes/KillAllEnemies.unity.meta rename to Assets/Group1/Scenes/KillAllEnemies.unity.meta diff --git a/Assets/Level/Scripts.meta b/Assets/Group1/Scripts.meta similarity index 100% rename from Assets/Level/Scripts.meta rename to Assets/Group1/Scripts.meta diff --git a/Assets/Group1/Scripts/GameController.cs b/Assets/Group1/Scripts/GameController.cs new file mode 100644 index 00000000..6afe5356 --- /dev/null +++ b/Assets/Group1/Scripts/GameController.cs @@ -0,0 +1,38 @@ +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/Level/Scripts/General/GameController.cs.meta b/Assets/Group1/Scripts/GameController.cs.meta similarity index 100% rename from Assets/Level/Scripts/General/GameController.cs.meta rename to Assets/Group1/Scripts/GameController.cs.meta diff --git a/Assets/Group1/Scripts/NewBehaviourScript1.cs b/Assets/Group1/Scripts/NewBehaviourScript1.cs new file mode 100644 index 00000000..14bd7c3f --- /dev/null +++ b/Assets/Group1/Scripts/NewBehaviourScript1.cs @@ -0,0 +1,65 @@ +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/Level/Scripts/Player/Player.cs.meta b/Assets/Group1/Scripts/NewBehaviourScript1.cs.meta similarity index 100% rename from Assets/Level/Scripts/Player/Player.cs.meta rename to Assets/Group1/Scripts/NewBehaviourScript1.cs.meta diff --git a/Assets/Group1/Scripts/e.cs b/Assets/Group1/Scripts/e.cs new file mode 100644 index 00000000..048ebf2d --- /dev/null +++ b/Assets/Group1/Scripts/e.cs @@ -0,0 +1,22 @@ +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/Level/Scripts/Enemy/Enemy.cs.meta b/Assets/Group1/Scripts/e.cs.meta similarity index 100% rename from Assets/Level/Scripts/Enemy/Enemy.cs.meta rename to Assets/Group1/Scripts/e.cs.meta diff --git a/Assets/Level/Enemy.png b/Assets/Group1/enemy.png similarity index 100% rename from Assets/Level/Enemy.png rename to Assets/Group1/enemy.png diff --git a/Assets/Level/Enemy.png.meta b/Assets/Group1/enemy.png.meta similarity index 100% rename from Assets/Level/Enemy.png.meta rename to Assets/Group1/enemy.png.meta diff --git a/Assets/Level/Scripts/Enemy.meta b/Assets/Level/Scripts/Enemy.meta deleted file mode 100644 index d0f32bc2..00000000 --- a/Assets/Level/Scripts/Enemy.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 374e71cf0e26b0a4bb49ce0d30a3ae7e -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Level/Scripts/Enemy/Enemy.cs b/Assets/Level/Scripts/Enemy/Enemy.cs deleted file mode 100644 index 12c4b54a..00000000 --- a/Assets/Level/Scripts/Enemy/Enemy.cs +++ /dev/null @@ -1,20 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -public class Enemy : MonoBehaviour -{ - private Vector3 _target; - - private void Start() - { - _target = Random.insideUnitCircle * 4; - } - - private void Update() - { - transform.position = Vector3.MoveTowards(transform.position, _target, 2 * Time.deltaTime); - if (transform.position == _target) - _target = Random.insideUnitCircle * 4; - } -} diff --git a/Assets/Level/Scripts/General.meta b/Assets/Level/Scripts/General.meta deleted file mode 100644 index 10a5b89e..00000000 --- a/Assets/Level/Scripts/General.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 3442f0c87a7b20343bcbe6de0613d6d8 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Level/Scripts/General/GameController.cs b/Assets/Level/Scripts/General/GameController.cs deleted file mode 100644 index 24299ece..00000000 --- a/Assets/Level/Scripts/General/GameController.cs +++ /dev/null @@ -1,36 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -public class GameController : MonoBehaviour -{ - public static GameController Constroller; - private const string Message = "SendMEssage"; - - [SerializeField] private GameObject _target; - [SerializeField] private GameObject _player; - [SerializeField] private GameObject[] _enemies; - - private void Start() - { - Constroller = this; - } - - public void End() - { - _target.SetActive(true); - } - - private void Update(){ - foreach (var enemy in _enemies) - { - if (enemy == null) - continue; - - if (Vector3.Distance(_player.gameObject.gameObject.GetComponent().position, enemy.gameObject.gameObject.transform.position) < 0.2f) - { - _player.SendMessage(Message, enemy); - } - } - } -} diff --git a/Assets/Level/Scripts/Player.meta b/Assets/Level/Scripts/Player.meta deleted file mode 100644 index 9c674761..00000000 --- a/Assets/Level/Scripts/Player.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 15f1c92fe23c6224aa070e117bdb132f -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Level/Scripts/Player/Player.cs b/Assets/Level/Scripts/Player/Player.cs deleted file mode 100644 index 3652b9a6..00000000 --- a/Assets/Level/Scripts/Player/Player.cs +++ /dev/null @@ -1,53 +0,0 @@ -using UnityEngine; -using System.Collections; - -[RequireComponent(typeof(PlayerMover))] -public class Player : MonoBehaviour -{ - [SerializeField] private bool _timePassed; - [SerializeField] private float _elapsedTime; - - private PlayerMover _playerMover; - private const string Enemy = "Enemy"; - private const string Speed = "speed"; - - void Start() - { - _playerMover = GetComponent(); - } - - private void Update() - { - if (_timePassed) - { - _elapsedTime -= Time.deltaTime; - if (_elapsedTime < 0) - { - _timePassed = false; - _playerMover.Speed /= 2; - } - } - - GameObject[] enemies = GameObject.FindGameObjectsWithTag(Enemy); - - if (enemies.Length == 0) - { - GameController.Constroller.End(); - enabled = false; - } - } - - public void SendMEssage(GameObject other) - { - if(other.name == Enemy) - { - Destroy(other); - } - if (other.name == Speed) - { - _playerMover.Speed *= 2; - _timePassed = true; - _elapsedTime = 2; - } - } -} diff --git a/Assets/Level/Scripts/Player/PlayerMover.cs b/Assets/Level/Scripts/Player/PlayerMover.cs deleted file mode 100644 index b8ff6a92..00000000 --- a/Assets/Level/Scripts/Player/PlayerMover.cs +++ /dev/null @@ -1,16 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -public class PlayerMover : MonoBehaviour -{ - [SerializeField] private float _speed; - - public float Speed { get => _speed; set => _speed = value; } - - private void Update() - { - Vector3 movement = new Vector3(Input.GetAxis("Horizontal"), Input.GetAxis("Vertical"), 0); - transform.Translate(movement * Time.deltaTime * Speed); - } -} diff --git a/Assets/Level/Scripts/Player/PlayerMover.cs.meta b/Assets/Level/Scripts/Player/PlayerMover.cs.meta deleted file mode 100644 index 2754fcc9..00000000 --- a/Assets/Level/Scripts/Player/PlayerMover.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: d9e78d73b69c3234bad012aff766ea09 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Logs/Packages-Update.log b/Logs/Packages-Update.log deleted file mode 100644 index 30b15850..00000000 --- a/Logs/Packages-Update.log +++ /dev/null @@ -1,11 +0,0 @@ - -=== Sun May 23 18:26:40 2021 - -Packages were changed. -Update Mode: updateDependencies - -The following packages were updated: - com.unity.analytics from version 3.2.2 to 3.2.3 - com.unity.package-manager-ui from version 2.0.7 to 2.0.13 - com.unity.purchasing from version 2.0.3 to 2.2.1 - com.unity.textmeshpro from version 1.3.0 to 1.4.1 diff --git a/Packages/manifest.json b/Packages/manifest.json index 349d3187..8392bea1 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -1,11 +1,11 @@ { "dependencies": { "com.unity.ads": "2.0.8", - "com.unity.analytics": "3.2.3", + "com.unity.analytics": "3.2.2", "com.unity.collab-proxy": "1.2.15", - "com.unity.package-manager-ui": "2.0.13", - "com.unity.purchasing": "2.2.1", - "com.unity.textmeshpro": "1.4.1", + "com.unity.package-manager-ui": "2.0.7", + "com.unity.purchasing": "2.0.3", + "com.unity.textmeshpro": "1.3.0", "com.unity.modules.ai": "1.0.0", "com.unity.modules.animation": "1.0.0", "com.unity.modules.assetbundle": "1.0.0", diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index 95dcc9f4..6dfd6c14 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1 +1 @@ -m_EditorVersion: 2018.4.34f1 +m_EditorVersion: 2018.3.14f1 From 04b6e2a7ab36c0ca33cbf72a6438e990fad53901 Mon Sep 17 00:00:00 2001 From: Pavel Ol Date: Mon, 14 Jun 2021 23:38:04 +0300 Subject: [PATCH 5/6] Revert "Revert "Revert "Revert "First commit with refactoring"""" This reverts commit 8009daed9c498e8f1aa4be22fbf781d4d442fa54. --- Assets/Group1/Scripts/GameController.cs | 38 ------ Assets/Group1/Scripts/NewBehaviourScript1.cs | 65 ---------- Assets/Group1/Scripts/e.cs | 22 ---- Assets/{Group1.meta => Level.meta} | 0 Assets/{Group1/Player.png => Level/Enemy.png} | Bin .../enemy.png.meta => Level/Enemy.png.meta} | 0 Assets/{Group1/enemy.png => Level/Player.png} | Bin Assets/{Group1 => Level}/Player.png.meta | 0 Assets/{Group1 => Level}/Scenes.meta | 0 .../Scenes/KillAllEnemies.unity | 114 +++++++++++++----- .../Scenes/KillAllEnemies.unity.meta | 0 Assets/{Group1 => Level}/Scripts.meta | 0 Assets/Level/Scripts/Enemy.meta | 8 ++ Assets/Level/Scripts/Enemy/Enemy.cs | 20 +++ .../Scripts/Enemy/Enemy.cs.meta} | 0 Assets/Level/Scripts/General.meta | 8 ++ .../Level/Scripts/General/GameController.cs | 36 ++++++ .../Scripts/General}/GameController.cs.meta | 0 Assets/Level/Scripts/Player.meta | 8 ++ Assets/Level/Scripts/Player/Player.cs | 53 ++++++++ .../Scripts/Player/Player.cs.meta} | 0 Assets/Level/Scripts/Player/PlayerMover.cs | 16 +++ .../Level/Scripts/Player/PlayerMover.cs.meta | 11 ++ Logs/Packages-Update.log | 11 ++ Packages/manifest.json | 8 +- ProjectSettings/ProjectVersion.txt | 2 +- 26 files changed, 257 insertions(+), 163 deletions(-) delete mode 100644 Assets/Group1/Scripts/GameController.cs delete mode 100644 Assets/Group1/Scripts/NewBehaviourScript1.cs delete mode 100644 Assets/Group1/Scripts/e.cs rename Assets/{Group1.meta => Level.meta} (100%) rename Assets/{Group1/Player.png => Level/Enemy.png} (100%) rename Assets/{Group1/enemy.png.meta => Level/Enemy.png.meta} (100%) rename Assets/{Group1/enemy.png => Level/Player.png} (100%) rename Assets/{Group1 => Level}/Player.png.meta (100%) rename Assets/{Group1 => Level}/Scenes.meta (100%) rename Assets/{Group1 => Level}/Scenes/KillAllEnemies.unity (91%) rename Assets/{Group1 => Level}/Scenes/KillAllEnemies.unity.meta (100%) rename Assets/{Group1 => Level}/Scripts.meta (100%) create mode 100644 Assets/Level/Scripts/Enemy.meta create mode 100644 Assets/Level/Scripts/Enemy/Enemy.cs rename Assets/{Group1/Scripts/e.cs.meta => Level/Scripts/Enemy/Enemy.cs.meta} (100%) create mode 100644 Assets/Level/Scripts/General.meta create mode 100644 Assets/Level/Scripts/General/GameController.cs rename Assets/{Group1/Scripts => Level/Scripts/General}/GameController.cs.meta (100%) create mode 100644 Assets/Level/Scripts/Player.meta create mode 100644 Assets/Level/Scripts/Player/Player.cs rename Assets/{Group1/Scripts/NewBehaviourScript1.cs.meta => Level/Scripts/Player/Player.cs.meta} (100%) create mode 100644 Assets/Level/Scripts/Player/PlayerMover.cs create mode 100644 Assets/Level/Scripts/Player/PlayerMover.cs.meta create mode 100644 Logs/Packages-Update.log 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/Group1.meta b/Assets/Level.meta similarity index 100% rename from Assets/Group1.meta rename to Assets/Level.meta diff --git a/Assets/Group1/Player.png b/Assets/Level/Enemy.png similarity index 100% rename from Assets/Group1/Player.png rename to Assets/Level/Enemy.png diff --git a/Assets/Group1/enemy.png.meta b/Assets/Level/Enemy.png.meta similarity index 100% rename from Assets/Group1/enemy.png.meta rename to Assets/Level/Enemy.png.meta diff --git a/Assets/Group1/enemy.png b/Assets/Level/Player.png similarity index 100% rename from Assets/Group1/enemy.png rename to Assets/Level/Player.png diff --git a/Assets/Group1/Player.png.meta b/Assets/Level/Player.png.meta similarity index 100% rename from Assets/Group1/Player.png.meta rename to Assets/Level/Player.png.meta diff --git a/Assets/Group1/Scenes.meta b/Assets/Level/Scenes.meta similarity index 100% rename from Assets/Group1/Scenes.meta rename to Assets/Level/Scenes.meta diff --git a/Assets/Group1/Scenes/KillAllEnemies.unity b/Assets/Level/Scenes/KillAllEnemies.unity similarity index 91% rename from Assets/Group1/Scenes/KillAllEnemies.unity rename to Assets/Level/Scenes/KillAllEnemies.unity index 21adfb9b..5a361e59 100644 --- a/Assets/Group1/Scenes/KillAllEnemies.unity +++ b/Assets/Level/Scenes/KillAllEnemies.unity @@ -124,7 +124,7 @@ GameObject: - component: {fileID: 141422278} - component: {fileID: 141422277} m_Layer: 0 - m_Name: enemy + m_Name: Enemy m_TagString: Enemy m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -197,12 +197,12 @@ Transform: 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_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 3.6699998, y: 2.53, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 4 + m_Father: {fileID: 1844955163} + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &170076733 GameObject: @@ -368,9 +368,9 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: cd6d0074e725a114e850d2e604fe4b0d, type: 3} m_Name: m_EditorClassIdentifier: - go: {fileID: 1054253062} - a: {fileID: 1761935009} - B: + _target: {fileID: 1054253062} + _player: {fileID: 1761935009} + _enemies: - {fileID: 2083640146} - {fileID: 1754708960} - {fileID: 141422275} @@ -386,7 +386,7 @@ GameObject: - component: {fileID: 1054253064} - component: {fileID: 1054253063} m_Layer: 0 - m_Name: New Sprite + m_Name: Enemy m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -447,12 +447,12 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1054253062} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -0.08, y: 0.56, z: -0.15457831} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 25, y: 25, z: 1} m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 7 + m_Father: {fileID: 1844955163} + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1578050036 GameObject: @@ -466,7 +466,7 @@ GameObject: - component: {fileID: 1578050039} - component: {fileID: 1578050038} m_Layer: 0 - m_Name: enemy + m_Name: Enemy m_TagString: Enemy m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -539,12 +539,12 @@ Transform: 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_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 3.6699998, y: -1.9000001, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 5 + m_Father: {fileID: 1844955163} + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1754708960 GameObject: @@ -558,7 +558,7 @@ GameObject: - component: {fileID: 1754708963} - component: {fileID: 1754708962} m_Layer: 0 - m_Name: enemy + m_Name: Enemy m_TagString: Enemy m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -631,12 +631,12 @@ Transform: 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_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 3.6699998, y: 0.14999998, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 3 + m_Father: {fileID: 1844955163} + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1761935009 GameObject: @@ -649,8 +649,9 @@ GameObject: - component: {fileID: 1761935011} - component: {fileID: 1761935010} - component: {fileID: 1761935012} + - component: {fileID: 1761935013} m_Layer: 0 - m_Name: New Sprite (1) + m_Name: Player m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -716,7 +717,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 6 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1761935012 MonoBehaviour: @@ -730,9 +731,56 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: dede9e7d6741aea4cb07b98da83cc6a8, type: 3} m_Name: m_EditorClassIdentifier: - spEed: 4 - timer: 0 - time: 0 + _timePassed: 0 + _elapsedTime: 1 +--- !u!114 &1761935013 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1761935009} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d9e78d73b69c3234bad012aff766ea09, type: 3} + m_Name: + m_EditorClassIdentifier: + _speed: 4 +--- !u!1 &1844955162 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1844955163} + m_Layer: 0 + m_Name: Enemies + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1844955163 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1844955162} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -0.08, y: 0.56, z: -0.15457831} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 2083640148} + - {fileID: 1754708964} + - {fileID: 141422279} + - {fileID: 1578050040} + - {fileID: 1054253064} + m_Father: {fileID: 0} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2083640146 GameObject: m_ObjectHideFlags: 0 @@ -745,7 +793,7 @@ GameObject: - component: {fileID: 2083640147} - component: {fileID: 2083640150} m_Layer: 0 - m_Name: enemy + m_Name: Enemy m_TagString: Enemy m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -806,12 +854,12 @@ Transform: 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_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -3.0500002, y: 0.14999998, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 2 + m_Father: {fileID: 1844955163} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &2083640150 MonoBehaviour: diff --git a/Assets/Group1/Scenes/KillAllEnemies.unity.meta b/Assets/Level/Scenes/KillAllEnemies.unity.meta similarity index 100% rename from Assets/Group1/Scenes/KillAllEnemies.unity.meta rename to Assets/Level/Scenes/KillAllEnemies.unity.meta diff --git a/Assets/Group1/Scripts.meta b/Assets/Level/Scripts.meta similarity index 100% rename from Assets/Group1/Scripts.meta rename to Assets/Level/Scripts.meta diff --git a/Assets/Level/Scripts/Enemy.meta b/Assets/Level/Scripts/Enemy.meta new file mode 100644 index 00000000..d0f32bc2 --- /dev/null +++ b/Assets/Level/Scripts/Enemy.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 374e71cf0e26b0a4bb49ce0d30a3ae7e +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Level/Scripts/Enemy/Enemy.cs b/Assets/Level/Scripts/Enemy/Enemy.cs new file mode 100644 index 00000000..12c4b54a --- /dev/null +++ b/Assets/Level/Scripts/Enemy/Enemy.cs @@ -0,0 +1,20 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class Enemy : MonoBehaviour +{ + private Vector3 _target; + + private void Start() + { + _target = Random.insideUnitCircle * 4; + } + + private void Update() + { + transform.position = Vector3.MoveTowards(transform.position, _target, 2 * Time.deltaTime); + if (transform.position == _target) + _target = Random.insideUnitCircle * 4; + } +} diff --git a/Assets/Group1/Scripts/e.cs.meta b/Assets/Level/Scripts/Enemy/Enemy.cs.meta similarity index 100% rename from Assets/Group1/Scripts/e.cs.meta rename to Assets/Level/Scripts/Enemy/Enemy.cs.meta diff --git a/Assets/Level/Scripts/General.meta b/Assets/Level/Scripts/General.meta new file mode 100644 index 00000000..10a5b89e --- /dev/null +++ b/Assets/Level/Scripts/General.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 3442f0c87a7b20343bcbe6de0613d6d8 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Level/Scripts/General/GameController.cs b/Assets/Level/Scripts/General/GameController.cs new file mode 100644 index 00000000..24299ece --- /dev/null +++ b/Assets/Level/Scripts/General/GameController.cs @@ -0,0 +1,36 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class GameController : MonoBehaviour +{ + public static GameController Constroller; + private const string Message = "SendMEssage"; + + [SerializeField] private GameObject _target; + [SerializeField] private GameObject _player; + [SerializeField] private GameObject[] _enemies; + + private void Start() + { + Constroller = this; + } + + public void End() + { + _target.SetActive(true); + } + + private void Update(){ + foreach (var enemy in _enemies) + { + if (enemy == null) + continue; + + if (Vector3.Distance(_player.gameObject.gameObject.GetComponent().position, enemy.gameObject.gameObject.transform.position) < 0.2f) + { + _player.SendMessage(Message, enemy); + } + } + } +} diff --git a/Assets/Group1/Scripts/GameController.cs.meta b/Assets/Level/Scripts/General/GameController.cs.meta similarity index 100% rename from Assets/Group1/Scripts/GameController.cs.meta rename to Assets/Level/Scripts/General/GameController.cs.meta diff --git a/Assets/Level/Scripts/Player.meta b/Assets/Level/Scripts/Player.meta new file mode 100644 index 00000000..9c674761 --- /dev/null +++ b/Assets/Level/Scripts/Player.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 15f1c92fe23c6224aa070e117bdb132f +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Level/Scripts/Player/Player.cs b/Assets/Level/Scripts/Player/Player.cs new file mode 100644 index 00000000..3652b9a6 --- /dev/null +++ b/Assets/Level/Scripts/Player/Player.cs @@ -0,0 +1,53 @@ +using UnityEngine; +using System.Collections; + +[RequireComponent(typeof(PlayerMover))] +public class Player : MonoBehaviour +{ + [SerializeField] private bool _timePassed; + [SerializeField] private float _elapsedTime; + + private PlayerMover _playerMover; + private const string Enemy = "Enemy"; + private const string Speed = "speed"; + + void Start() + { + _playerMover = GetComponent(); + } + + private void Update() + { + if (_timePassed) + { + _elapsedTime -= Time.deltaTime; + if (_elapsedTime < 0) + { + _timePassed = false; + _playerMover.Speed /= 2; + } + } + + GameObject[] enemies = GameObject.FindGameObjectsWithTag(Enemy); + + if (enemies.Length == 0) + { + GameController.Constroller.End(); + enabled = false; + } + } + + public void SendMEssage(GameObject other) + { + if(other.name == Enemy) + { + Destroy(other); + } + if (other.name == Speed) + { + _playerMover.Speed *= 2; + _timePassed = true; + _elapsedTime = 2; + } + } +} diff --git a/Assets/Group1/Scripts/NewBehaviourScript1.cs.meta b/Assets/Level/Scripts/Player/Player.cs.meta similarity index 100% rename from Assets/Group1/Scripts/NewBehaviourScript1.cs.meta rename to Assets/Level/Scripts/Player/Player.cs.meta diff --git a/Assets/Level/Scripts/Player/PlayerMover.cs b/Assets/Level/Scripts/Player/PlayerMover.cs new file mode 100644 index 00000000..b8ff6a92 --- /dev/null +++ b/Assets/Level/Scripts/Player/PlayerMover.cs @@ -0,0 +1,16 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class PlayerMover : MonoBehaviour +{ + [SerializeField] private float _speed; + + public float Speed { get => _speed; set => _speed = value; } + + private void Update() + { + Vector3 movement = new Vector3(Input.GetAxis("Horizontal"), Input.GetAxis("Vertical"), 0); + transform.Translate(movement * Time.deltaTime * Speed); + } +} diff --git a/Assets/Level/Scripts/Player/PlayerMover.cs.meta b/Assets/Level/Scripts/Player/PlayerMover.cs.meta new file mode 100644 index 00000000..2754fcc9 --- /dev/null +++ b/Assets/Level/Scripts/Player/PlayerMover.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: d9e78d73b69c3234bad012aff766ea09 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Logs/Packages-Update.log b/Logs/Packages-Update.log new file mode 100644 index 00000000..30b15850 --- /dev/null +++ b/Logs/Packages-Update.log @@ -0,0 +1,11 @@ + +=== Sun May 23 18:26:40 2021 + +Packages were changed. +Update Mode: updateDependencies + +The following packages were updated: + com.unity.analytics from version 3.2.2 to 3.2.3 + com.unity.package-manager-ui from version 2.0.7 to 2.0.13 + com.unity.purchasing from version 2.0.3 to 2.2.1 + com.unity.textmeshpro from version 1.3.0 to 1.4.1 diff --git a/Packages/manifest.json b/Packages/manifest.json index 8392bea1..349d3187 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -1,11 +1,11 @@ { "dependencies": { "com.unity.ads": "2.0.8", - "com.unity.analytics": "3.2.2", + "com.unity.analytics": "3.2.3", "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.package-manager-ui": "2.0.13", + "com.unity.purchasing": "2.2.1", + "com.unity.textmeshpro": "1.4.1", "com.unity.modules.ai": "1.0.0", "com.unity.modules.animation": "1.0.0", "com.unity.modules.assetbundle": "1.0.0", diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index 6dfd6c14..95dcc9f4 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1 +1 @@ -m_EditorVersion: 2018.3.14f1 +m_EditorVersion: 2018.4.34f1 From 9b7f05fde94c16f90f7fb844685fcee54892d34f Mon Sep 17 00:00:00 2001 From: Pavel Ol Date: Sat, 10 Jul 2021 11:44:56 +0300 Subject: [PATCH 6/6] Removed singleton and made fixes according to explanation. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [SerializeField] private float _speed; public float Speed { get => _speed; set => _speed = value; } Оставил как есть, так как через SerializedField устанавливаем _speed в Unity. Через гетер и сетер модифицируем скорость. Если это не правильно решение, какое лучше использовать ? --- Assets/Level/Scenes/KillAllEnemies.unity | 7 ++++++- Assets/Level/Scripts/Enemy/Enemy.cs | 10 ++++++++-- .../Scripts/General/{GameController.cs => Game.cs} | 14 ++++---------- .../{GameController.cs.meta => Game.cs.meta} | 0 Assets/Level/Scripts/Player/Player.cs | 8 ++++++-- Assets/Level/Scripts/Player/PlayerMover.cs | 4 +++- 6 files changed, 27 insertions(+), 16 deletions(-) rename Assets/Level/Scripts/General/{GameController.cs => Game.cs} (68%) rename Assets/Level/Scripts/General/{GameController.cs.meta => Game.cs.meta} (100%) diff --git a/Assets/Level/Scenes/KillAllEnemies.unity b/Assets/Level/Scenes/KillAllEnemies.unity index 5a361e59..f633fc8e 100644 --- a/Assets/Level/Scenes/KillAllEnemies.unity +++ b/Assets/Level/Scenes/KillAllEnemies.unity @@ -142,6 +142,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 65f7df4705b7dae48944a39b48934484, type: 3} m_Name: m_EditorClassIdentifier: + _radius: 4 --- !u!212 &141422278 SpriteRenderer: m_ObjectHideFlags: 0 @@ -484,6 +485,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 65f7df4705b7dae48944a39b48934484, type: 3} m_Name: m_EditorClassIdentifier: + _radius: 4 --- !u!212 &1578050039 SpriteRenderer: m_ObjectHideFlags: 0 @@ -576,6 +578,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 65f7df4705b7dae48944a39b48934484, type: 3} m_Name: m_EditorClassIdentifier: + _radius: 4 --- !u!212 &1754708963 SpriteRenderer: m_ObjectHideFlags: 0 @@ -733,6 +736,7 @@ MonoBehaviour: m_EditorClassIdentifier: _timePassed: 0 _elapsedTime: 1 + _game: {fileID: 534669906} --- !u!114 &1761935013 MonoBehaviour: m_ObjectHideFlags: 0 @@ -745,7 +749,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d9e78d73b69c3234bad012aff766ea09, type: 3} m_Name: m_EditorClassIdentifier: - _speed: 4 + _speed: 3 --- !u!1 &1844955162 GameObject: m_ObjectHideFlags: 0 @@ -873,3 +877,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 65f7df4705b7dae48944a39b48934484, type: 3} m_Name: m_EditorClassIdentifier: + _radius: 4 diff --git a/Assets/Level/Scripts/Enemy/Enemy.cs b/Assets/Level/Scripts/Enemy/Enemy.cs index 12c4b54a..2c4f0a0d 100644 --- a/Assets/Level/Scripts/Enemy/Enemy.cs +++ b/Assets/Level/Scripts/Enemy/Enemy.cs @@ -4,17 +4,23 @@ public class Enemy : MonoBehaviour { + [SerializeField] private int _radius; private Vector3 _target; private void Start() { - _target = Random.insideUnitCircle * 4; + SetTarget(); + } + + private void SetTarget() + { + _target = Random.insideUnitCircle * _radius; } private void Update() { transform.position = Vector3.MoveTowards(transform.position, _target, 2 * Time.deltaTime); if (transform.position == _target) - _target = Random.insideUnitCircle * 4; + SetTarget(); } } diff --git a/Assets/Level/Scripts/General/GameController.cs b/Assets/Level/Scripts/General/Game.cs similarity index 68% rename from Assets/Level/Scripts/General/GameController.cs rename to Assets/Level/Scripts/General/Game.cs index 24299ece..c2855fe7 100644 --- a/Assets/Level/Scripts/General/GameController.cs +++ b/Assets/Level/Scripts/General/Game.cs @@ -2,23 +2,17 @@ using System.Collections.Generic; using UnityEngine; -public class GameController : MonoBehaviour +public class Game : MonoBehaviour { - public static GameController Constroller; - private const string Message = "SendMEssage"; + private const string Message = "SendMessage"; - [SerializeField] private GameObject _target; + [SerializeField] private GameObject _endObject; [SerializeField] private GameObject _player; [SerializeField] private GameObject[] _enemies; - private void Start() - { - Constroller = this; - } - public void End() { - _target.SetActive(true); + _endObject.SetActive(true); } private void Update(){ diff --git a/Assets/Level/Scripts/General/GameController.cs.meta b/Assets/Level/Scripts/General/Game.cs.meta similarity index 100% rename from Assets/Level/Scripts/General/GameController.cs.meta rename to Assets/Level/Scripts/General/Game.cs.meta diff --git a/Assets/Level/Scripts/Player/Player.cs b/Assets/Level/Scripts/Player/Player.cs index 3652b9a6..0a4eaf5a 100644 --- a/Assets/Level/Scripts/Player/Player.cs +++ b/Assets/Level/Scripts/Player/Player.cs @@ -2,12 +2,15 @@ using System.Collections; [RequireComponent(typeof(PlayerMover))] +[RequireComponent(typeof(Game))] public class Player : MonoBehaviour { [SerializeField] private bool _timePassed; [SerializeField] private float _elapsedTime; + [SerializeField] private Game _game; private PlayerMover _playerMover; + private const string Enemy = "Enemy"; private const string Speed = "speed"; @@ -32,17 +35,18 @@ private void Update() if (enemies.Length == 0) { - GameController.Constroller.End(); + _game.End(); enabled = false; } } - public void SendMEssage(GameObject other) + public void SendMessage(GameObject other) { if(other.name == Enemy) { Destroy(other); } + if (other.name == Speed) { _playerMover.Speed *= 2; diff --git a/Assets/Level/Scripts/Player/PlayerMover.cs b/Assets/Level/Scripts/Player/PlayerMover.cs index b8ff6a92..39bfb06c 100644 --- a/Assets/Level/Scripts/Player/PlayerMover.cs +++ b/Assets/Level/Scripts/Player/PlayerMover.cs @@ -4,13 +4,15 @@ public class PlayerMover : MonoBehaviour { + private const string HorizontalAxis = "Horizontal"; + private const string VerticalAxis = "Vertical"; [SerializeField] private float _speed; public float Speed { get => _speed; set => _speed = value; } private void Update() { - Vector3 movement = new Vector3(Input.GetAxis("Horizontal"), Input.GetAxis("Vertical"), 0); + Vector3 movement = new Vector3(Input.GetAxis(HorizontalAxis), Input.GetAxis(VerticalAxis), 0); transform.Translate(movement * Time.deltaTime * Speed); } }