diff --git a/ShipShooter/Assets/Enemies/-Enemy2-RigidBody.prefab b/ShipShooter/Assets/Enemies/-Enemy2-RigidBody.prefab index d3d6a70e..0b3102b5 100644 Binary files a/ShipShooter/Assets/Enemies/-Enemy2-RigidBody.prefab and b/ShipShooter/Assets/Enemies/-Enemy2-RigidBody.prefab differ diff --git a/ShipShooter/Assets/Enemies/Legosteroid_Enemy.prefab b/ShipShooter/Assets/Enemies/Legosteroid_Enemy.prefab new file mode 100644 index 00000000..78670f09 Binary files /dev/null and b/ShipShooter/Assets/Enemies/Legosteroid_Enemy.prefab differ diff --git a/ShipShooter/Assets/Enemies/Legosteroid_Enemy.prefab.meta b/ShipShooter/Assets/Enemies/Legosteroid_Enemy.prefab.meta new file mode 100644 index 00000000..692b4815 --- /dev/null +++ b/ShipShooter/Assets/Enemies/Legosteroid_Enemy.prefab.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 9e9ee8d10a3b084429f83f15b563a14d +timeCreated: 1447127955 +licenseType: Free +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/ShipShooter/Assets/Legos/Legosteroid.prefab b/ShipShooter/Assets/Legos/Legosteroid.prefab new file mode 100644 index 00000000..71893e1f Binary files /dev/null and b/ShipShooter/Assets/Legos/Legosteroid.prefab differ diff --git a/ShipShooter/Assets/Legos/Legosteroid.prefab.meta b/ShipShooter/Assets/Legos/Legosteroid.prefab.meta new file mode 100644 index 00000000..762395ef --- /dev/null +++ b/ShipShooter/Assets/Legos/Legosteroid.prefab.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: a1b01409c659908498e47d4c104bc39c +timeCreated: 1447124660 +licenseType: Free +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/ShipShooter/Assets/Scenes/GameScene.unity b/ShipShooter/Assets/Scenes/GameScene.unity index afde90a3..6d18d820 100644 Binary files a/ShipShooter/Assets/Scenes/GameScene.unity and b/ShipShooter/Assets/Scenes/GameScene.unity differ diff --git a/ShipShooter/Assets/Scripts/Enemy2.cs b/ShipShooter/Assets/Scripts/Enemy2.cs index 66491120..8fffc42b 100644 --- a/ShipShooter/Assets/Scripts/Enemy2.cs +++ b/ShipShooter/Assets/Scripts/Enemy2.cs @@ -25,7 +25,7 @@ public class Enemy2 : MonoBehaviour { { if (collision.gameObject.tag == "Bullet") { - Destroy(gameObject); + health = health - 1; } } diff --git a/ShipShooter/Assets/Scripts/EnemySpawner.cs b/ShipShooter/Assets/Scripts/EnemySpawner.cs index 6997da5b..aa062a12 100644 --- a/ShipShooter/Assets/Scripts/EnemySpawner.cs +++ b/ShipShooter/Assets/Scripts/EnemySpawner.cs @@ -142,6 +142,15 @@ public class EnemySpawner : MonoBehaviour { MidSpawnEdges(); yield return new WaitForSeconds(2f); + EdgeSpawn(); + EdgeSpawnIn(); + yield return new WaitForSeconds(2f); + + EdgeSpawnLast(); + MidSpawnMids(); + EdgeSpawnLast(); + yield return new WaitForSeconds(2f); + Debug.Log("enumerator Ends"); diff --git a/ShipShooter/Assets/Scripts/Legosteroid.cs b/ShipShooter/Assets/Scripts/Legosteroid.cs index 593a978a..74e676e1 100644 --- a/ShipShooter/Assets/Scripts/Legosteroid.cs +++ b/ShipShooter/Assets/Scripts/Legosteroid.cs @@ -3,9 +3,49 @@ using System.Collections; public class Legosteroid : MonoBehaviour { - public gameObject legosteroid; - public gameObject piece1; - public gameObject piece2; - public gameObject piece3; - public gameObject piece4; + public GameObject legosteroid; + public GameObject piece1; + public GameObject piece2; + public GameObject piece3; + public GameObject piece4; + + public GameObject brick1; + public GameObject brick2; + public GameObject brick3; + public GameObject brick4; + + void Awake() + { + + } + + void OnCollisionEnter(Collision collision) + { + if (collision.gameObject.tag == "Bullet") + { + brick1 = (GameObject)Instantiate(piece1, new Vector3(gameObject.transform.position.x + 1, gameObject.transform.position.y - 2, 5), Quaternion.identity); + brick2 = (GameObject)Instantiate(piece2, new Vector3(gameObject.transform.position.x - 2, gameObject.transform.position.y + 1, 5), Quaternion.identity); + brick3 = (GameObject)Instantiate(piece3, new Vector3(gameObject.transform.position.x - 1.4f, gameObject.transform.position.y + 2, 5), Quaternion.identity); + brick4 = (GameObject)Instantiate(piece4, new Vector3(gameObject.transform.position.x + 3, gameObject.transform.position.y + 1, 5), Quaternion.identity); + + iTween.MoveTo(brick1, new Vector3(brick1.transform.position.x + 20, brick1.transform.position.y - 17, 5), 10); + iTween.MoveTo(brick2, new Vector3(brick1.transform.position.x - 22, brick1.transform.position.y + 35, 5), 10); + iTween.MoveTo(brick3, new Vector3(brick1.transform.position.x - 35, brick1.transform.position.y - 22, 5), 10); + iTween.MoveTo(brick4, new Vector3(brick1.transform.position.x + 40, brick1.transform.position.y + 20, 5), 10); + Destroy(gameObject); + } + if (brick1.transform.position.z != 5) + brick1.transform.position = new Vector3(brick1.transform.position.x, brick1.transform.position.y, 5); + if (brick2.transform.position.z != 5) + brick2.transform.position = new Vector3(brick2.transform.position.x, brick2.transform.position.y, 5); + if (brick3.transform.position.z != 5) + brick3.transform.position = new Vector3(brick3.transform.position.x, brick3.transform.position.y, 5); + if (brick4.transform.position.z != 5) + brick4.transform.position = new Vector3(brick4.transform.position.x, brick4.transform.position.y, 5); + } + + void Update() + { + gameObject.transform.eulerAngles = new Vector3(gameObject.transform.eulerAngles.x + 5, gameObject.transform.eulerAngles.y, gameObject.transform.eulerAngles.z); + } } diff --git a/ShipShooter/Assets/Scripts/LegosteroidSpawner.cs b/ShipShooter/Assets/Scripts/LegosteroidSpawner.cs new file mode 100644 index 00000000..4887111e --- /dev/null +++ b/ShipShooter/Assets/Scripts/LegosteroidSpawner.cs @@ -0,0 +1,20 @@ +using UnityEngine; +using System.Collections; + +public class LegosteroidSpawner : MonoBehaviour { + + // Use this for initialization + void Start () { + + } + + IEnumerator AsteroidSpawn() + { + yield return new WaitForSeconds(0.2f); + } + + // Update is called once per frame + void Update () { + + } +} diff --git a/ShipShooter/Assets/Scripts/LegosteroidSpawner.cs.meta b/ShipShooter/Assets/Scripts/LegosteroidSpawner.cs.meta new file mode 100644 index 00000000..a92425ec --- /dev/null +++ b/ShipShooter/Assets/Scripts/LegosteroidSpawner.cs.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: 3b675e32b2714ae4c9cbd27c958fdee7 +timeCreated: 1447129704 +licenseType: Free +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/ShipShooter/Assets/Scripts/OnDestroy.cs b/ShipShooter/Assets/Scripts/OnDestroy.cs new file mode 100644 index 00000000..6279ae37 --- /dev/null +++ b/ShipShooter/Assets/Scripts/OnDestroy.cs @@ -0,0 +1,19 @@ +using UnityEngine; +using System.Collections; + +public class OnDestroy : MonoBehaviour { + + + void OnCollisionEnter(Collision collision) + { + if (collision.gameObject.tag == "Bullet") + { + Destroy(gameObject); + + } + } + // Update is called once per frame + void Update () { + + } +} diff --git a/ShipShooter/Assets/Scripts/OnDestroy.cs.meta b/ShipShooter/Assets/Scripts/OnDestroy.cs.meta new file mode 100644 index 00000000..b4f73dee --- /dev/null +++ b/ShipShooter/Assets/Scripts/OnDestroy.cs.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: 80e7573a34a1ac44b9aaffad33cbf596 +timeCreated: 1447126543 +licenseType: Free +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/ShipShooter/Library/CurrentLayout.dwlt b/ShipShooter/Library/CurrentLayout.dwlt index 60715c5f..d829bd9f 100644 Binary files a/ShipShooter/Library/CurrentLayout.dwlt and b/ShipShooter/Library/CurrentLayout.dwlt differ diff --git a/ShipShooter/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll.mdb b/ShipShooter/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll.mdb index c283da44..a9783bb5 100644 Binary files a/ShipShooter/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll.mdb and b/ShipShooter/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll.mdb differ diff --git a/ShipShooter/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb b/ShipShooter/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb index 700fee6a..0e16aac8 100644 Binary files a/ShipShooter/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb and b/ShipShooter/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb differ diff --git a/ShipShooter/Library/ScriptAssemblies/BuiltinAssemblies.stamp b/ShipShooter/Library/ScriptAssemblies/BuiltinAssemblies.stamp new file mode 100644 index 00000000..d2c33d72 --- /dev/null +++ b/ShipShooter/Library/ScriptAssemblies/BuiltinAssemblies.stamp @@ -0,0 +1,2 @@ +0000.56264290.0000 +0000.562642ae.0000 \ No newline at end of file diff --git a/ShipShooter/Library/assetDatabase3 b/ShipShooter/Library/assetDatabase3 index 1f8df302..c8e0848b 100644 Binary files a/ShipShooter/Library/assetDatabase3 and b/ShipShooter/Library/assetDatabase3 differ diff --git a/ShipShooter/Library/expandedItems b/ShipShooter/Library/expandedItems index 2cada958..2978c224 100644 Binary files a/ShipShooter/Library/expandedItems and b/ShipShooter/Library/expandedItems differ diff --git a/ShipShooter/Library/metadata/00/00000000000000004000000000000000 b/ShipShooter/Library/metadata/00/00000000000000004000000000000000 index 3a663f1a..ece00330 100644 Binary files a/ShipShooter/Library/metadata/00/00000000000000004000000000000000 and b/ShipShooter/Library/metadata/00/00000000000000004000000000000000 differ diff --git a/ShipShooter/Library/metadata/3b/3b675e32b2714ae4c9cbd27c958fdee7 b/ShipShooter/Library/metadata/3b/3b675e32b2714ae4c9cbd27c958fdee7 new file mode 100644 index 00000000..123590ac Binary files /dev/null and b/ShipShooter/Library/metadata/3b/3b675e32b2714ae4c9cbd27c958fdee7 differ diff --git a/ShipShooter/Library/metadata/3b/3b675e32b2714ae4c9cbd27c958fdee7.info b/ShipShooter/Library/metadata/3b/3b675e32b2714ae4c9cbd27c958fdee7.info new file mode 100644 index 00000000..cc19c25f Binary files /dev/null and b/ShipShooter/Library/metadata/3b/3b675e32b2714ae4c9cbd27c958fdee7.info differ diff --git a/ShipShooter/Library/metadata/59/5906a6a77aa99d442a84c7cffa7b6507 b/ShipShooter/Library/metadata/59/5906a6a77aa99d442a84c7cffa7b6507 index 54e8ce40..6d86ed23 100644 Binary files a/ShipShooter/Library/metadata/59/5906a6a77aa99d442a84c7cffa7b6507 and b/ShipShooter/Library/metadata/59/5906a6a77aa99d442a84c7cffa7b6507 differ diff --git a/ShipShooter/Library/metadata/66/664b40cee94497647a1815c7bd525a6c b/ShipShooter/Library/metadata/66/664b40cee94497647a1815c7bd525a6c index 47dacbeb..8c5f779b 100644 Binary files a/ShipShooter/Library/metadata/66/664b40cee94497647a1815c7bd525a6c and b/ShipShooter/Library/metadata/66/664b40cee94497647a1815c7bd525a6c differ diff --git a/ShipShooter/Library/metadata/80/80e7573a34a1ac44b9aaffad33cbf596 b/ShipShooter/Library/metadata/80/80e7573a34a1ac44b9aaffad33cbf596 new file mode 100644 index 00000000..9e48fa88 Binary files /dev/null and b/ShipShooter/Library/metadata/80/80e7573a34a1ac44b9aaffad33cbf596 differ diff --git a/ShipShooter/Library/metadata/80/80e7573a34a1ac44b9aaffad33cbf596.info b/ShipShooter/Library/metadata/80/80e7573a34a1ac44b9aaffad33cbf596.info new file mode 100644 index 00000000..bf3764ce Binary files /dev/null and b/ShipShooter/Library/metadata/80/80e7573a34a1ac44b9aaffad33cbf596.info differ diff --git a/ShipShooter/Library/metadata/9e/9e9ee8d10a3b084429f83f15b563a14d b/ShipShooter/Library/metadata/9e/9e9ee8d10a3b084429f83f15b563a14d new file mode 100644 index 00000000..f246c1a4 Binary files /dev/null and b/ShipShooter/Library/metadata/9e/9e9ee8d10a3b084429f83f15b563a14d differ diff --git a/ShipShooter/Library/metadata/9e/9e9ee8d10a3b084429f83f15b563a14d.info b/ShipShooter/Library/metadata/9e/9e9ee8d10a3b084429f83f15b563a14d.info new file mode 100644 index 00000000..77b800ec Binary files /dev/null and b/ShipShooter/Library/metadata/9e/9e9ee8d10a3b084429f83f15b563a14d.info differ diff --git a/ShipShooter/Library/metadata/a1/a1b01409c659908498e47d4c104bc39c b/ShipShooter/Library/metadata/a1/a1b01409c659908498e47d4c104bc39c new file mode 100644 index 00000000..41ebee0f Binary files /dev/null and b/ShipShooter/Library/metadata/a1/a1b01409c659908498e47d4c104bc39c differ diff --git a/ShipShooter/Library/metadata/a1/a1b01409c659908498e47d4c104bc39c.info b/ShipShooter/Library/metadata/a1/a1b01409c659908498e47d4c104bc39c.info new file mode 100644 index 00000000..42d4f182 Binary files /dev/null and b/ShipShooter/Library/metadata/a1/a1b01409c659908498e47d4c104bc39c.info differ diff --git a/ShipShooter/Library/metadata/f7/f7772ef56e6010145ace7cd4ac93f07d b/ShipShooter/Library/metadata/f7/f7772ef56e6010145ace7cd4ac93f07d index 5ae01618..228b6ab8 100644 Binary files a/ShipShooter/Library/metadata/f7/f7772ef56e6010145ace7cd4ac93f07d and b/ShipShooter/Library/metadata/f7/f7772ef56e6010145ace7cd4ac93f07d differ diff --git a/ShipShooter/ShipShooter.CSharp.csproj b/ShipShooter/ShipShooter.CSharp.csproj index bae9a557..c46ba7b7 100644 --- a/ShipShooter/ShipShooter.CSharp.csproj +++ b/ShipShooter/ShipShooter.CSharp.csproj @@ -74,6 +74,8 @@ + +