diff --git a/Assets/Scripts/AutoTarget.cs b/Assets/Scripts/AutoTarget.cs index fbad79e..0626c6a 100644 --- a/Assets/Scripts/AutoTarget.cs +++ b/Assets/Scripts/AutoTarget.cs @@ -47,13 +47,12 @@ public class AutoTarget : MonoBehaviour public Transform GetTarget(Vector3 lookingAngle) { - return GetTarget(lookingAngle, 2000); + return GetTarget(lookingAngle, 2000, minAngleRange); } - public Transform GetTarget(Vector3 lookingAngle, float range) + public Transform GetTarget(Vector3 lookingAngle, float range, float minAngle) { - Transform closest = null; - float minAngle = minAngleRange; + Transform closest = null; float rangeSq = range * range; //Debug.Log("looking direction:" + lookingAngle); @@ -63,6 +62,7 @@ public class AutoTarget : MonoBehaviour foreach (Transform t in targets) { Vector3 targetDirection = t.transform.position - transform.position; + Debug.Log(targetDirection.magnitude); if (targetDirection.sqrMagnitude > rangeSq) continue; diff --git a/Assets/Scripts/Child.cs b/Assets/Scripts/Child.cs index 0282551..4f122e9 100644 --- a/Assets/Scripts/Child.cs +++ b/Assets/Scripts/Child.cs @@ -7,7 +7,8 @@ public class Child : MonoBehaviour public float Speed = 10f; public float JumpForce = 10f; public float MaxInvulnerableTime = 2f; - public float ThrowForce = 30f; + public float ThrowForce = 30f; + public float HitForce = 3f; public float hitPushBackForce = 250f; public float yAngleVector = 9f; @@ -235,8 +236,10 @@ public class Child : MonoBehaviour public void Swing() { + if (pillow == null) return; + //1. Determine if there is someone in front - Transform t = null;//_autoTarget.GetTarget(transform.forward, 0.9f); + Transform t = _autoTarget.GetTarget(transform.forward, 1.2f, 30); if(t == null) return; @@ -246,7 +249,7 @@ public class Child : MonoBehaviour direction = direction.normalized; - t.gameObject.GetComponent().Push(direction * ThrowForce); + t.gameObject.GetComponent().Push(direction * HitForce); } diff --git a/Assets/Scripts/ChildController.cs b/Assets/Scripts/ChildController.cs index abee728..66c2792 100644 --- a/Assets/Scripts/ChildController.cs +++ b/Assets/Scripts/ChildController.cs @@ -94,11 +94,10 @@ public class ChildController : MonoBehaviour } } - //if (input.Ranges.ContainsKey("Throw")) { - // _child.Throw(); - //} + if (input.Ranges.ContainsKey("Throw")) + _child.Throw(); - if (input.Ranges.ContainsKey("Throw")) + if (input.Ranges.ContainsKey("Hit")) _child.Swing(); }