diff --git a/unity_Project/Assets/Character/Character_Animation.controller b/unity_Project/Assets/Character/Character_Animation.controller index 2f61a4f..a1fcb97 100644 Binary files a/unity_Project/Assets/Character/Character_Animation.controller and b/unity_Project/Assets/Character/Character_Animation.controller differ diff --git a/unity_Project/Assets/Scripts/PlayerSounds.cs b/unity_Project/Assets/Scripts/PlayerSounds.cs index 9f1a3e0..4658a25 100644 --- a/unity_Project/Assets/Scripts/PlayerSounds.cs +++ b/unity_Project/Assets/Scripts/PlayerSounds.cs @@ -3,9 +3,10 @@ using System.Collections; public class PlayerSounds : MonoBehaviour { - public GameObject PlayerObject; //Player1 or Player2 object. Assign object component in inspector. + public GameObject PlayerObject; + private thirdPersonController playerController;//Player1 or Player2 object. Assign object component in inspector. //private Collider playerCollider; - private bool FootOnSand = true; + public bool FootOnSand = true; private AudioSource source; private float volLowRange = 0.5f; // Volume Low Range @@ -32,6 +33,10 @@ public class PlayerSounds : MonoBehaviour { source = GetComponent (); } + void Start(){ + playerController = PlayerObject.GetComponent (); + } + // FUNCTIONS: Play Sound Effects (SFX) // NOTE: Must add the events to the relevant keyframe within animation clips. @@ -50,17 +55,12 @@ public class PlayerSounds : MonoBehaviour { void CheckGround(){ //playerCollider = PlayerObject.GetComponent; - - RaycastHit FootHit; - - Ray ray = new Ray(transform.position, -Vector3.up); - - if (Physics.Raycast (ray, out FootHit, 1.3f)) { - if (FootHit.transform.tag == "sand") + Debug.Log ("groundCheck"); + RaycastHit FootHit = playerController.hit; + if (FootHit.transform.tag == "sand") FootOnSand = true; - }else{ + else FootOnSand = false; - } } diff --git a/unity_Project/Assets/Scripts/thirdPersonController.cs b/unity_Project/Assets/Scripts/thirdPersonController.cs index 91da8b3..deaee5c 100644 --- a/unity_Project/Assets/Scripts/thirdPersonController.cs +++ b/unity_Project/Assets/Scripts/thirdPersonController.cs @@ -42,6 +42,8 @@ public class thirdPersonController : MonoBehaviour { public Collider curCollider; + public RaycastHit hit; + @@ -58,7 +60,7 @@ public class thirdPersonController : MonoBehaviour { void FixedUpdate(){ - RaycastHit hit; + //RaycastHit hit; Ray ray = new Ray(transform.position, -Vector3.up); diff --git a/unity_Project/Assets/Textures.meta b/unity_Project/Assets/Textures.meta deleted file mode 100644 index 8915b1d..0000000 --- a/unity_Project/Assets/Textures.meta +++ /dev/null @@ -1,9 +0,0 @@ -fileFormatVersion: 2 -guid: 97def69cc8aa8f0458d67929f23873dd -folderAsset: yes -timeCreated: 1444371283 -licenseType: Free -DefaultImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/unity_Project/Assets/_Scenes/MainLevel.unity b/unity_Project/Assets/_Scenes/MainLevel.unity index 58fdc54..ca37812 100644 Binary files a/unity_Project/Assets/_Scenes/MainLevel.unity and b/unity_Project/Assets/_Scenes/MainLevel.unity differ