* test

3 files changed, 20 insertions, 17 deletions

diff --git a/AlienSurvival/Assets/Scripts/Test/TestBeamBullet.cs b/AlienSurvival/Assets/Scripts/Test/TestBeamBullet.cs
index d5d0476..17d0005 100644
--- a/AlienSurvival/Assets/Scripts/Test/TestBeamBullet.cs
+++ b/AlienSurvival/Assets/Scripts/Test/TestBeamBullet.cs
@@ -15,7 +15,10 @@ public class TestBeamBullet : MonoBehaviour
 
 	void Dead()
 	{
-		GameObject.Destroy(this.gameObject);
+		if (this.gameObject)
+		{
+			GameObject.Destroy(this.gameObject);
+		}
 	}
 
     // Update is called once per frame
@@ -28,25 +31,21 @@ public class TestBeamBullet : MonoBehaviour
 
 	private void OnTriggerEnter2D(Collider2D collision)
 	{
-		GameObject go = collision.attachedRigidbody.gameObject;
+		GameObject go = collision.gameObject;
 
-		if(go.CompareTag("device"))
+		if (!go.CompareTag("enemy"))
 		{
 			return;
 		}
+		
+		GameObject.Destroy( collision.gameObject);  
 
-		if(go.CompareTag("bullet"))
+		//this.gameObject.SetActive(false);
+
+		if (this.gameObject)
 		{
-			return;
+			GameObject.Destroy(this.gameObject);
 		}
-
-		//Debug.Log("hit");
-
-		GameObject.Destroy( collision.attachedRigidbody.gameObject);
-
-		this.gameObject.SetActive(false);
-
-		GameObject.Destroy(this.gameObject);
 	}
 
 }
diff --git a/AlienSurvival/Assets/Scripts/Test/TestMirror.cs b/AlienSurvival/Assets/Scripts/Test/TestMirror.cs
index 25ea3db..832c785 100644
--- a/AlienSurvival/Assets/Scripts/Test/TestMirror.cs
+++ b/AlienSurvival/Assets/Scripts/Test/TestMirror.cs
@@ -8,7 +8,7 @@ public class TestMirror : MonoBehaviour
 
 	private void OnTriggerEnter2D(Collider2D collision)
 	{
-		GameObject go = collision.attachedRigidbody.gameObject;
+		GameObject go = collision.gameObject;
 		if (go && go.CompareTag("bullet") && !m_Mirrored.Contains(go))
 		{
 			//Debug.Log("mirror");
@@ -21,7 +21,7 @@ public class TestMirror : MonoBehaviour
 
 	private void OnTriggerExit2D(Collider2D collision)
 	{
-		GameObject go = collision.attachedRigidbody.gameObject;
+		GameObject go = collision.gameObject;
 		if (go && go.CompareTag("bullet") && m_Mirrored.Contains(go))
 		{
 			m_Mirrored.Remove(go);
diff --git a/AlienSurvival/Assets/Scripts/Test/TestSeperator.cs b/AlienSurvival/Assets/Scripts/Test/TestSeperator.cs
index 4f96379..d1819c0 100644
--- a/AlienSurvival/Assets/Scripts/Test/TestSeperator.cs
+++ b/AlienSurvival/Assets/Scripts/Test/TestSeperator.cs
@@ -8,16 +8,20 @@ public class TestSeperator : MonoBehaviour
 
 	private void OnTriggerEnter2D(Collider2D collision)
 	{
-		GameObject go = collision.attachedRigidbody.gameObject;
+		GameObject go = collision.gameObject;
 		if (go && go.CompareTag("bullet") && !m_Seperated.Contains(go))
 		{
 			//Debug.Log("seperate");
 
 			TestBeamBullet bullet1 = TestBeamBullet.Instantiate(go.GetComponent<TestBeamBullet>());
 			bullet1.direction = Quaternion.Euler(0,0, 30) * bullet1.direction;
+			bullet1.enabled = true;
+			bullet1.gameObject.SetActive(true);
 
 			TestBeamBullet bullet2 = TestBeamBullet.Instantiate(go.GetComponent<TestBeamBullet>());
 			bullet2.direction = Quaternion.Euler(0, 0, -30) * bullet2.direction;
+			bullet2.enabled = true;
+			bullet2.gameObject.SetActive(true);
 
 			m_Seperated.Add(go);
 			m_Seperated.Add(bullet1.gameObject);
@@ -27,7 +31,7 @@ public class TestSeperator : MonoBehaviour
 
 	private void OnTriggerExit2D(Collider2D collision)
 	{
-		GameObject go = collision.attachedRigidbody.gameObject;
+		GameObject go = collision.gameObject;
 		if (go.CompareTag("bullet") && m_Seperated.Contains(go))
 		{
 			m_Seperated.Remove(go);