diff --git a/IronToad_UnityProject/Assets/Scripts/Catapult.cs b/IronToad_UnityProject/Assets/Scripts/Catapult.cs index dd85e0c..0bbbe93 100644 --- a/IronToad_UnityProject/Assets/Scripts/Catapult.cs +++ b/IronToad_UnityProject/Assets/Scripts/Catapult.cs @@ -43,7 +43,7 @@ public class Catapult : MonoBehaviour public void searchlightStateChanged() { - LeanTween.cancel(splineObjectTranslate.ObjectToManipulate.parent.gameObject, true); + LeanTween.cancel(splineObjectTranslate.ObjectToManipulate.gameObject, true); if (Searchlight.state == Searchlight.SearchState.Chasing) launchBoulder(); } @@ -57,7 +57,7 @@ public class Catapult : MonoBehaviour } isLaunching = true; - LeanTween.delayedCall(splineObjectTranslate.ObjectToManipulate.parent.gameObject, timeBetweenLaunches, ()=>{ + LeanTween.delayedCall(splineObjectTranslate.ObjectToManipulate.gameObject, timeBetweenLaunches, ()=>{ if (Searchlight.state != Searchlight.SearchState.Chasing) { isLaunching = false; diff --git a/IronToad_UnityProject/Assets/Scripts/HeavyObject.cs b/IronToad_UnityProject/Assets/Scripts/HeavyObject.cs index 1f05bbd..406e681 100644 --- a/IronToad_UnityProject/Assets/Scripts/HeavyObject.cs +++ b/IronToad_UnityProject/Assets/Scripts/HeavyObject.cs @@ -9,6 +9,7 @@ public abstract class HeavyObject : WaterObject { public float splashPower; public override void OnWaterEnter(WaterController water) { + Debug.Log ("creating wave"); water.CreateWave (transform.position, splashRadius, splashPower); } diff --git a/IronToad_UnityProject/Assets/Scripts/WaterController.cs b/IronToad_UnityProject/Assets/Scripts/WaterController.cs index 68bd92c..48d504f 100644 --- a/IronToad_UnityProject/Assets/Scripts/WaterController.cs +++ b/IronToad_UnityProject/Assets/Scripts/WaterController.cs @@ -53,7 +53,6 @@ public class WaterController : MonoBehaviour { Collider[] colliders = Physics.OverlapSphere(point, radius); foreach (Collider hit in colliders) { - Debug.Log(hit.name); BuoyantObject hitScript = hit.gameObject.GetComponent(); if (hitScript != null) { Debug.DrawLine(point, hit.transform.position, Color.blue, 1); diff --git a/IronToad_UnityProject/Assets/Sound.meta b/IronToad_UnityProject/Assets/Sound.meta deleted file mode 100644 index fbea538..0000000 --- a/IronToad_UnityProject/Assets/Sound.meta +++ /dev/null @@ -1,9 +0,0 @@ -fileFormatVersion: 2 -guid: 844c4f25011b45348a5db5bc5b4f956e -folderAsset: yes -timeCreated: 1485039717 -licenseType: Pro -DefaultImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/IronToad_UnityProject/Assets/_Scenes/GreyBox_Prototype.unity b/IronToad_UnityProject/Assets/_Scenes/GreyBox_Prototype.unity index 9462bbc..0bdeb76 100644 Binary files a/IronToad_UnityProject/Assets/_Scenes/GreyBox_Prototype.unity and b/IronToad_UnityProject/Assets/_Scenes/GreyBox_Prototype.unity differ