From f33f917f5eb00a463bb270b603292bd5c99a4b7f Mon Sep 17 00:00:00 2001 From: Naliwe GS Date: Mon, 24 Oct 2016 15:20:25 +0200 Subject: [PATCH] Added simple generation --- Assets/Prefabs/Bird.prefab | Bin 0 -> 7472 bytes Assets/Prefabs/Bird.prefab.meta | 8 ++++++++ Assets/Prefabs/Cloud.prefab | Bin 0 -> 6656 bytes Assets/Prefabs/Cloud.prefab.meta | 8 ++++++++ Assets/Prefabs/Tholuen.prefab | Bin 0 -> 7448 bytes Assets/Prefabs/Tholuen.prefab.meta | 8 ++++++++ Assets/Scenes/Main.unity | Bin 45760 -> 0 bytes Assets/Scripts/Collectible.cs | 5 +++++ Assets/Scripts/GameController.cs | 22 +++++++++++----------- Assets/Scripts/Model.meta | 9 --------- Assets/Scripts/Player.cs | 2 ++ Assets/Scripts/SimpleEnnemy.cs | 7 +++++-- Assets/Scripts/Spawner.cs | 43 +++++++++++++++++++++++++++++++++++++++++++ Assets/Scripts/Spawner.cs.meta | 12 ++++++++++++ 14 files changed, 102 insertions(+), 22 deletions(-) create mode 100644 Assets/Prefabs/Bird.prefab create mode 100644 Assets/Prefabs/Bird.prefab.meta create mode 100644 Assets/Prefabs/Cloud.prefab create mode 100644 Assets/Prefabs/Cloud.prefab.meta create mode 100644 Assets/Prefabs/Tholuen.prefab create mode 100644 Assets/Prefabs/Tholuen.prefab.meta delete mode 100644 Assets/Scripts/Model.meta create mode 100644 Assets/Scripts/Spawner.cs create mode 100644 Assets/Scripts/Spawner.cs.meta diff --git a/Assets/Prefabs/Bird.prefab b/Assets/Prefabs/Bird.prefab new file mode 100644 index 0000000..73b8a03 Binary files /dev/null and b/Assets/Prefabs/Bird.prefab differ diff --git a/Assets/Prefabs/Bird.prefab.meta b/Assets/Prefabs/Bird.prefab.meta new file mode 100644 index 0000000..1504069 --- /dev/null +++ b/Assets/Prefabs/Bird.prefab.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 67ef126a7ce40434caffe1a9ac2eb7f0 +timeCreated: 1477303258 +licenseType: Free +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Cloud.prefab b/Assets/Prefabs/Cloud.prefab new file mode 100644 index 0000000..7a764e6 Binary files /dev/null and b/Assets/Prefabs/Cloud.prefab differ diff --git a/Assets/Prefabs/Cloud.prefab.meta b/Assets/Prefabs/Cloud.prefab.meta new file mode 100644 index 0000000..561e488 --- /dev/null +++ b/Assets/Prefabs/Cloud.prefab.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: dad1063b37800dd4f836d3673c4b3956 +timeCreated: 1477303253 +licenseType: Free +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Tholuen.prefab b/Assets/Prefabs/Tholuen.prefab new file mode 100644 index 0000000..522cb7f Binary files /dev/null and b/Assets/Prefabs/Tholuen.prefab differ diff --git a/Assets/Prefabs/Tholuen.prefab.meta b/Assets/Prefabs/Tholuen.prefab.meta new file mode 100644 index 0000000..3e7bb47 --- /dev/null +++ b/Assets/Prefabs/Tholuen.prefab.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: c632e4ae2f6870d4ba2bde7b02807416 +timeCreated: 1477303248 +licenseType: Free +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/Main.unity b/Assets/Scenes/Main.unity index f0527ca..abb1b2e 100644 Binary files a/Assets/Scenes/Main.unity and b/Assets/Scenes/Main.unity differ diff --git a/Assets/Scripts/Collectible.cs b/Assets/Scripts/Collectible.cs index 0682508..bb63eac 100644 --- a/Assets/Scripts/Collectible.cs +++ b/Assets/Scripts/Collectible.cs @@ -1,10 +1,14 @@ using UnityEngine; using System.Collections; +using Assets.Scripts; public class Collectible : MonoBehaviour { + private GameObject _player; + void Start() { + _player = GameObject.FindWithTag("Player"); } void Update() @@ -14,5 +18,6 @@ public class Collectible : MonoBehaviour void OnTriggerEnter2D(Collider2D other) { gameObject.SetActive(false); + _player.GetComponent().Score += 10; } } \ No newline at end of file diff --git a/Assets/Scripts/GameController.cs b/Assets/Scripts/GameController.cs index 9437aea..64cd759 100644 --- a/Assets/Scripts/GameController.cs +++ b/Assets/Scripts/GameController.cs @@ -37,20 +37,20 @@ namespace Assets.Scripts void Start() { - _map = new Map(128, 128); + // _map = new Map(128, 128); - _pooledActors = new ObjectPool(PoolSize); - _pooledProjectiles = new ObjectPool(PoolSize); - _pooledWalls = new ObjectPool(PoolSize); + // _pooledActors = new ObjectPool(PoolSize); + // _pooledProjectiles = new ObjectPool(PoolSize); + // _pooledWalls = new ObjectPool(PoolSize); - _ca = new CellularAutomaton(_map, TileType.Wall) {CanGrowRule = CADelegates.CanGrow}; - _tiles = new GameObject[_map.Columns*_map.Rows]; + // _ca = new CellularAutomaton(_map, TileType.Wall) {CanGrowRule = CADelegates.CanGrow}; + // _tiles = new GameObject[_map.Columns*_map.Rows]; - for (uint i = 0; i < _map.Columns*_map.Rows; i++) - { - _tiles[i] = (GameObject) Instantiate(Wall, new Vector3(0, 0, 0), Quaternion.identity); - _tiles[i].SetActive(false); - } + // for (uint i = 0; i < _map.Columns*_map.Rows; i++) + // { + // _tiles[i] = (GameObject) Instantiate(Wall, new Vector3(0, 0, 0), Quaternion.identity); + // _tiles[i].SetActive(false); + // } } void Update() diff --git a/Assets/Scripts/Model.meta b/Assets/Scripts/Model.meta deleted file mode 100644 index cb91f3e..0000000 --- a/Assets/Scripts/Model.meta +++ /dev/null @@ -1,9 +0,0 @@ -fileFormatVersion: 2 -guid: c56230d4575634b8896a178b68e9a055 -folderAsset: yes -timeCreated: 1477229352 -licenseType: Free -DefaultImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Player.cs b/Assets/Scripts/Player.cs index b1d39b9..7686fb3 100644 --- a/Assets/Scripts/Player.cs +++ b/Assets/Scripts/Player.cs @@ -6,6 +6,8 @@ namespace Assets.Scripts { private Transform _pos; + public int Score = 0; + void Start() { _pos = GetComponent(); diff --git a/Assets/Scripts/SimpleEnnemy.cs b/Assets/Scripts/SimpleEnnemy.cs index ccb8c14..7dcc0cf 100644 --- a/Assets/Scripts/SimpleEnnemy.cs +++ b/Assets/Scripts/SimpleEnnemy.cs @@ -2,21 +2,24 @@ using UnityEngine; using UnityEngine.UI; using System.Collections; +using Assets.Scripts; public class SimpleEnnemy : MonoBehaviour { private Transform _position; + private GameObject _player; public float Speed = 2f; void Start () { _position = GetComponent(); + _player = GameObject.FindWithTag("Player"); } void Update () { - _position.Translate(new Vector3(Speed * Time.deltaTime, 0, 0)); + _position.Translate(new Vector3(Speed * Time.deltaTime * -1, 0, 0)); if (_position.position.x < Camera.main.ScreenToWorldPoint(new Vector3(0, 0, 0)).x) { @@ -26,8 +29,8 @@ public class SimpleEnnemy : MonoBehaviour void OnTriggerEnter2D(Collider2D other) { - Debug.Log("Entered"); gameObject.SetActive(false); + //GetScores(); TODO: Successfully get scores from API } diff --git a/Assets/Scripts/Spawner.cs b/Assets/Scripts/Spawner.cs new file mode 100644 index 0000000..8eb518f --- /dev/null +++ b/Assets/Scripts/Spawner.cs @@ -0,0 +1,43 @@ +using UnityEngine; +using System.Collections; + +public class Spawner : MonoBehaviour +{ + public GameObject BasicEnemy; + public GameObject StaticEnemy; + public GameObject Toluen; + + private float _timer; + private System.Random _rand; + private float _rightBorder; + + void Start () + { + _timer = 0f; + _rand = new System.Random(); + } + + void Update () + { + _timer += Time.deltaTime; + _rightBorder = Camera.main.ScreenToWorldPoint(new Vector3(Screen.width, Screen.height, 0)).x + 2; + + if (_timer >= 2f) + { + Spawn(); + _timer = 0f; + } + } + + private void Spawn() + { + var r = _rand.Next(100); + + if (r < 20) + Instantiate(Toluen, new Vector3(_rightBorder, _rand.Next(9), 0), Quaternion.identity); + else if (r < 50) + Instantiate(BasicEnemy, new Vector3(_rightBorder, _rand.Next(9), 0), Quaternion.identity); + else + Instantiate(StaticEnemy, new Vector3(_rightBorder, _rand.Next(9), 0), Quaternion.identity); + } +} diff --git a/Assets/Scripts/Spawner.cs.meta b/Assets/Scripts/Spawner.cs.meta new file mode 100644 index 0000000..85b83d1 --- /dev/null +++ b/Assets/Scripts/Spawner.cs.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: f3fbc0c4389f2bd42b026337e56b2b32 +timeCreated: 1477302039 +licenseType: Free +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: -- libgit2 0.27.0