summaryrefslogtreecommitdiff
path: root/AlienSurvival/Assets/Test/Scripts/TestPeaceMaker.cs
diff options
context:
space:
mode:
Diffstat (limited to 'AlienSurvival/Assets/Test/Scripts/TestPeaceMaker.cs')
-rw-r--r--AlienSurvival/Assets/Test/Scripts/TestPeaceMaker.cs23
1 files changed, 13 insertions, 10 deletions
diff --git a/AlienSurvival/Assets/Test/Scripts/TestPeaceMaker.cs b/AlienSurvival/Assets/Test/Scripts/TestPeaceMaker.cs
index 784cde8..9e47407 100644
--- a/AlienSurvival/Assets/Test/Scripts/TestPeaceMaker.cs
+++ b/AlienSurvival/Assets/Test/Scripts/TestPeaceMaker.cs
@@ -8,7 +8,6 @@ public class TestPeaceMaker : MonoBehaviour
[SerializeField] private Transform m_Camera;
[SerializeField] private float m_Speed;
- [SerializeField] private SpriteRenderer m_Shadow;
[SerializeField] private Transform m_Centre;
[SerializeField] private SpriteRenderer m_Arrow;
[SerializeField] private float m_ArrowRadius;
@@ -35,8 +34,10 @@ public class TestPeaceMaker : MonoBehaviour
}
}
+ private TopDownShadowCaster m_Shadow;
+
private SpriteRenderer m_SpriteRenderer;
- private TestFakeHeight m_FakeHeight;
+ private TopDownTransform m_Coord;
private Coroutine m_CoFire;
private Coroutine m_CoLaunchGrenade;
@@ -56,12 +57,14 @@ public class TestPeaceMaker : MonoBehaviour
void Start()
{
m_SpriteRenderer = GetComponent<SpriteRenderer>();
- m_FakeHeight = GetComponent<TestFakeHeight>();
+ m_Coord = GetComponent<TopDownTransform>();
m_ControlMode = ControlMode.Mouse;
m_AimDirection = Vector2.zero;
m_TargetZoom = new Vector3(m_Zoom.x, m_Zoom.x, 1);
+
+ m_Shadow = GetComponent<TopDownShadowCaster>();
}
void Update()
@@ -95,8 +98,8 @@ public class TestPeaceMaker : MonoBehaviour
void CameraFollow()
{
Vector3 pos = m_Camera.position;
- pos.x = m_FakeHeight.x;
- pos.y = m_FakeHeight.y;
+ pos.x = m_Coord.x;
+ pos.y = m_Coord.y;
if (Vector3.Distance(pos, m_Camera.position) > 0.1f)
{
@@ -115,21 +118,21 @@ public class TestPeaceMaker : MonoBehaviour
{
Vector2 direction = new Vector2(x, y).normalized;
- Vector3 position = transform.position;
+ Vector3 position = m_Coord.position;
position.x += direction.x * m_Speed * Time.deltaTime;
position.y += direction.y * m_Speed * Time.deltaTime;
- transform.position = position;
+ m_Coord.position = position;
if (x > 0)
{
m_SpriteRenderer.flipX = false;
- m_Shadow.flipX = false;
+ m_Shadow.Flip(false);
}
else if (x < 0)
{
m_SpriteRenderer.flipX = true;
- m_Shadow.flipX = true;
+ m_Shadow.Flip(true);
}
}
@@ -264,7 +267,7 @@ public class TestPeaceMaker : MonoBehaviour
{
// grenade
TestPeaceMakerGrenade grenade = Instantiate<TestPeaceMakerGrenade>(m_Grenade);
- Vector3 position = m_FakeHeight.position + new Vector3(0, 0, 1.8f);
+ Vector3 position = m_Coord.position + new Vector3(0, 0, 1.8f);
grenade.Set(position, GetRandomLaunchGrenadeDirection(), Random.Range(8f, 10f));
grenade.gameObject.SetActive(true);