1 files changed, 18 insertions, 56 deletions

diff --git a/SurvivalTest/Assets/Scripts/Test/TestPeaceMaker.cs b/SurvivalTest/Assets/Scripts/Test/TestPeaceMaker.cs
index 033f198..7226ac9 100644
--- a/SurvivalTest/Assets/Scripts/Test/TestPeaceMaker.cs
+++ b/SurvivalTest/Assets/Scripts/Test/TestPeaceMaker.cs
@@ -12,11 +12,26 @@ public class TestPeaceMaker : CrewScript
 	[SerializeField] private SpriteRenderer m_Arrow;
 	[SerializeField] private float m_ArrowRadius;
 	[SerializeField] private TestPeaceMakerBullet m_Bullet;
-	[SerializeField] private TestPeaceMakerGrenade m_Grenade;
 	[SerializeField] private Vector2 m_Zoom;
-	[SerializeField] private GameObject m_LaunchVfx;
 	[SerializeField] private Transform m_LaunchPoint;
 
+	public override Vector2 aimDirection
+	{
+		get
+		{
+			return m_AimDirection;
+		}
+	}
+
+
+	public override Transform launchPoint
+	{
+		get
+		{
+			return m_LaunchPoint;
+		}
+	}
+
 	private Vector3 zoomIn
 	{
 		get
@@ -39,7 +54,6 @@ public class TestPeaceMaker : CrewScript
 	private SpriteRenderer m_SpriteRenderer;
 	private TopDownTransform m_Coord;
 	private Coroutine m_CoFire;
-	private Coroutine m_CoLaunchGrenade;
 
 	private Vector3 m_PreMouse;
 
@@ -79,11 +93,10 @@ public class TestPeaceMaker : CrewScript
 		SetAim();
 
 		bool isFire = Fire();
-		bool isGrenade = LaunchGrenade();
 
 		CameraFollow();
 
-		CameraZoom(/*isMove ||*/ isFire || isGrenade /*|| isBeam*/);
+		CameraZoom(isFire);
 	}
 
 	void CameraZoom(bool zout)
@@ -212,29 +225,6 @@ public class TestPeaceMaker : CrewScript
 		return true;
 	}
 
-	bool LaunchGrenade()
-	{
-		//if (Input.GetButtonDown("Fire2") || (Input.GetAxis("BombTrigger") == 1))
-		if (Input.GetButtonDown("Fire1") || (Input.GetAxis("GunTrigger") == 1))
-		{
-			if (m_CoLaunchGrenade == null)
-			{
-				m_CoLaunchGrenade = StartCoroutine(coLaunchGrenade(0.2f));
-			}
-		}
-		//if (!Input.GetButton("Fire2") && (Input.GetAxis("BombTrigger") == 0))
-		if (!Input.GetButton("Fire1") && (Input.GetAxis("GunTrigger") == 0))
-		{
-			if (m_CoLaunchGrenade != null)
-			{
-				StopCoroutine(m_CoLaunchGrenade);
-				m_CoLaunchGrenade = null;
-			}
-			return false;
-		}
-		return true;
-	}
-
 	IEnumerator coFire(float interval)
 	{
 		while (true)
@@ -262,32 +252,4 @@ public class TestPeaceMaker : CrewScript
 		return bullet;
 	}
 
-
-	Vector3 GetRandomLaunchGrenadeDirection()
-	{
-		Vector3 dirOnPlane = Quaternion.Euler(0, 0, Random.Range(-15f, 15f)) * new Vector3(m_AimDirection.x, m_AimDirection.y, 0);
-		dirOnPlane = dirOnPlane.normalized;
-		Vector3 dir = new Vector3(dirOnPlane.x, dirOnPlane.y, Random.Range(0f, 1f)).normalized;
-		return dir.normalized;
-	}
-
-	IEnumerator coLaunchGrenade(float interval)
-	{
-		while (true)
-		{
-			// grenade 
-			TestPeaceMakerGrenade grenade = Instantiate<TestPeaceMakerGrenade>(m_Grenade);
-			Vector3 position = m_Coord.position + new Vector3(0, 0, 1.8f);
-			grenade.Set(position, GetRandomLaunchGrenadeDirection(), Random.Range(8f, 10f));
-			grenade.gameObject.SetActive(true);
-
-			// vfx
-			GameObject eff = Instantiate<GameObject>(m_LaunchVfx, this.transform);
-			eff.transform.position = m_LaunchPoint.transform.position;
-			eff.SetActive(true);
-
-			yield return new WaitForSeconds(interval);
-		}
-	}
-
 }