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 90% rename from Assets/Group1/Scenes/KillAllEnemies.unity rename to Assets/Level/Scenes/KillAllEnemies.unity index 21adfb9b..f633fc8e 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 @@ -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 @@ -197,12 +198,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 +369,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 +387,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 +448,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 +467,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 @@ -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 @@ -539,12 +541,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 +560,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 @@ -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 @@ -631,12 +634,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 +652,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 +720,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 +734,57 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: dede9e7d6741aea4cb07b98da83cc6a8, type: 3} m_Name: m_EditorClassIdentifier: - spEed: 4 - timer: 0 - time: 0 + _timePassed: 0 + _elapsedTime: 1 + _game: {fileID: 534669906} +--- !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: 3 +--- !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 +797,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 +858,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: @@ -825,3 +877,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 65f7df4705b7dae48944a39b48934484, type: 3} m_Name: m_EditorClassIdentifier: + _radius: 4 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..2c4f0a0d --- /dev/null +++ b/Assets/Level/Scripts/Enemy/Enemy.cs @@ -0,0 +1,26 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class Enemy : MonoBehaviour +{ + [SerializeField] private int _radius; + private Vector3 _target; + + private void Start() + { + 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) + SetTarget(); + } +} 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/Game.cs b/Assets/Level/Scripts/General/Game.cs new file mode 100644 index 00000000..c2855fe7 --- /dev/null +++ b/Assets/Level/Scripts/General/Game.cs @@ -0,0 +1,30 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class Game : MonoBehaviour +{ + private const string Message = "SendMessage"; + + [SerializeField] private GameObject _endObject; + [SerializeField] private GameObject _player; + [SerializeField] private GameObject[] _enemies; + + public void End() + { + _endObject.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/Game.cs.meta similarity index 100% rename from Assets/Group1/Scripts/GameController.cs.meta rename to Assets/Level/Scripts/General/Game.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..0a4eaf5a --- /dev/null +++ b/Assets/Level/Scripts/Player/Player.cs @@ -0,0 +1,57 @@ +using UnityEngine; +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"; + + 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) + { + _game.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..39bfb06c --- /dev/null +++ b/Assets/Level/Scripts/Player/PlayerMover.cs @@ -0,0 +1,18 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +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(HorizontalAxis), Input.GetAxis(VerticalAxis), 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