Enemies all die, Asteroid not pathed yet

smz11006 · Nov 10, 2015 · b350d64c75f9e33525e82fba3bef68b60928e022 · b350d64
1 parent 399042d
commit b350d64c75f9e33525e82fba3bef68b60928e022
diff --git a/ShipShooter/Assets/Enemies/-Enemy2-RigidBody.prefab b/ShipShooter/Assets/Enemies/-Enemy2-RigidBody.prefab
diff --git a/ShipShooter/Assets/Enemies/Legosteroid_Enemy.prefab b/ShipShooter/Assets/Enemies/Legosteroid_Enemy.prefab
diff --git a/ShipShooter/Assets/Enemies/Legosteroid_Enemy.prefab.meta b/ShipShooter/Assets/Enemies/Legosteroid_Enemy.prefab.meta
diff --git a/ShipShooter/Assets/Legos/Legosteroid.prefab b/ShipShooter/Assets/Legos/Legosteroid.prefab
diff --git a/ShipShooter/Assets/Legos/Legosteroid.prefab.meta b/ShipShooter/Assets/Legos/Legosteroid.prefab.meta
diff --git a/ShipShooter/Assets/Scenes/GameScene.unity b/ShipShooter/Assets/Scenes/GameScene.unity
diff --git a/ShipShooter/Assets/Scripts/Enemy2.cs b/ShipShooter/Assets/Scripts/Enemy2.cs
@@ -25,7 +25,7 @@ void OnCollisionEnter(Collision collision)
     {
         if (collision.gameObject.tag == "Bullet")
         {
-            Destroy(gameObject);
+            health = health - 1;
 
         }
     }

diff --git a/ShipShooter/Assets/Scripts/EnemySpawner.cs b/ShipShooter/Assets/Scripts/EnemySpawner.cs
@@ -142,6 +142,15 @@ IEnumerator EnemySpawn()
                 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
@@ -3,9 +3,49 @@
 
 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
@@ -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
diff --git a/ShipShooter/Assets/Scripts/OnDestroy.cs 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
diff --git a/ShipShooter/Library/CurrentLayout.dwlt b/ShipShooter/Library/CurrentLayout.dwlt
diff --git a/ShipShooter/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll.mdb b/ShipShooter/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll.mdb
diff --git a/ShipShooter/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb b/ShipShooter/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
diff --git a/ShipShooter/Library/ScriptAssemblies/BuiltinAssemblies.stamp b/ShipShooter/Library/ScriptAssemblies/BuiltinAssemblies.stamp
@@ -0,0 +1,2 @@
+0000.56264290.0000
+0000.562642ae.0000
diff --git a/ShipShooter/Library/assetDatabase3 b/ShipShooter/Library/assetDatabase3
diff --git a/ShipShooter/Library/expandedItems b/ShipShooter/Library/expandedItems
diff --git a/ShipShooter/Library/metadata/00/00000000000000004000000000000000 b/ShipShooter/Library/metadata/00/00000000000000004000000000000000
diff --git a/ShipShooter/Library/metadata/3b/3b675e32b2714ae4c9cbd27c958fdee7 b/ShipShooter/Library/metadata/3b/3b675e32b2714ae4c9cbd27c958fdee7
diff --git a/ShipShooter/Library/metadata/3b/3b675e32b2714ae4c9cbd27c958fdee7.info b/ShipShooter/Library/metadata/3b/3b675e32b2714ae4c9cbd27c958fdee7.info
diff --git a/ShipShooter/Library/metadata/59/5906a6a77aa99d442a84c7cffa7b6507 b/ShipShooter/Library/metadata/59/5906a6a77aa99d442a84c7cffa7b6507
diff --git a/ShipShooter/Library/metadata/66/664b40cee94497647a1815c7bd525a6c b/ShipShooter/Library/metadata/66/664b40cee94497647a1815c7bd525a6c
diff --git a/ShipShooter/Library/metadata/80/80e7573a34a1ac44b9aaffad33cbf596 b/ShipShooter/Library/metadata/80/80e7573a34a1ac44b9aaffad33cbf596
diff --git a/ShipShooter/Library/metadata/80/80e7573a34a1ac44b9aaffad33cbf596.info b/ShipShooter/Library/metadata/80/80e7573a34a1ac44b9aaffad33cbf596.info
diff --git a/ShipShooter/Library/metadata/9e/9e9ee8d10a3b084429f83f15b563a14d b/ShipShooter/Library/metadata/9e/9e9ee8d10a3b084429f83f15b563a14d
diff --git a/ShipShooter/Library/metadata/9e/9e9ee8d10a3b084429f83f15b563a14d.info b/ShipShooter/Library/metadata/9e/9e9ee8d10a3b084429f83f15b563a14d.info
diff --git a/ShipShooter/Library/metadata/a1/a1b01409c659908498e47d4c104bc39c b/ShipShooter/Library/metadata/a1/a1b01409c659908498e47d4c104bc39c
diff --git a/ShipShooter/Library/metadata/a1/a1b01409c659908498e47d4c104bc39c.info b/ShipShooter/Library/metadata/a1/a1b01409c659908498e47d4c104bc39c.info
diff --git a/ShipShooter/Library/metadata/f7/f7772ef56e6010145ace7cd4ac93f07d b/ShipShooter/Library/metadata/f7/f7772ef56e6010145ace7cd4ac93f07d
diff --git a/ShipShooter/ShipShooter.CSharp.csproj b/ShipShooter/ShipShooter.CSharp.csproj
@@ -74,6 +74,8 @@
     <Compile Include="Assets\Scripts\Enemy2.cs" />
     <Compile Include="Assets\Scripts\EnemySpawner.cs" />
     <Compile Include="Assets\Scripts\Legosteroid.cs" />
+    <Compile Include="Assets\Scripts\LegosteroidSpawner.cs" />
+    <Compile Include="Assets\Scripts\OnDestroy.cs" />
     <Compile Include="Assets\Scripts\PlayerControls.cs" />
     <Compile Include="Assets\Scripts\PlayerHealth.cs" />
     <Compile Include="Assets\iTweenEditor\Examples\StartAndStopTween.cs" />