1 files changed, 8 insertions, 50 deletions

diff --git a/SurvivalTest/Assets/Scripts/Test/TestPeaceMaker.cs b/SurvivalTest/Assets/Scripts/Test/TestPeaceMaker.cs
index 7226ac9..86b781b 100644
--- a/SurvivalTest/Assets/Scripts/Test/TestPeaceMaker.cs
+++ b/SurvivalTest/Assets/Scripts/Test/TestPeaceMaker.cs
@@ -23,6 +23,13 @@ public class TestPeaceMaker : CrewScript
 		}
 	}
 
+	public override Transform arrow
+	{
+		get
+		{
+			return m_Arrow.transform;
+		}
+	}
 
 	public override Transform launchPoint
 	{
@@ -53,7 +60,6 @@ public class TestPeaceMaker : CrewScript
 
 	private SpriteRenderer m_SpriteRenderer;
 	private TopDownTransform m_Coord;
-	private Coroutine m_CoFire;
 
 	private Vector3 m_PreMouse;
 
@@ -92,7 +98,7 @@ public class TestPeaceMaker : CrewScript
 
 		SetAim();
 
-		bool isFire = Fire();
+		bool isFire = PlayerManager.Instance.isFire;
 
 		CameraFollow();
 
@@ -204,52 +210,4 @@ public class TestPeaceMaker : CrewScript
 		return target;
 	}
 
-	bool Fire()
-	{
-		if (Input.GetButtonDown("Fire1") || (Input.GetAxis("GunTrigger") == 1))
-		{
-			if (m_CoFire == null)
-			{
-				m_CoFire = StartCoroutine(coFire(0.1f));
-			}
-		}
-		if (!Input.GetButton("Fire1") && (Input.GetAxis("GunTrigger") == 0))
-		{
-			if(m_CoFire != null)
-			{
-				StopCoroutine(m_CoFire);
-				m_CoFire = null;
-			}
-			return false;
-		}
-		return true;
-	}
-
-	IEnumerator coFire(float interval)
-	{
-		while (true)
-		{
-			CreateBullet(TestMathHelper.Rotate(m_AimDirection, -10 * Mathf.Deg2Rad), 12f, 2f);
-			yield return new WaitForSeconds(interval / 3f);
-
-			CreateBullet(m_AimDirection, 12f, 2f);
-			yield return new WaitForSeconds(interval / 3f);
-
-			CreateBullet(TestMathHelper.Rotate(m_AimDirection, 10 * Mathf.Deg2Rad), 12f, 2f);
-			yield return new WaitForSeconds(interval / 3f);
-		}
-	}
-
-	TestPeaceMakerBullet CreateBullet(Vector2 dir, float speed, float lifeTime)
-	{
-		TestPeaceMakerBullet bullet = Instantiate<TestPeaceMakerBullet>(m_Bullet);
-
-		bullet.transform.position = m_Arrow.transform.position + new Vector3(m_AimDirection.x, m_AimDirection.y, 0) * -0.3f;
-
-		bullet.Set(dir, speed, lifeTime);
-		bullet.gameObject.SetActive(true);
-
-		return bullet;
-	}
-
 }