Browse Source

Boulders make ripples

master
ATC522-011\IGDA 7 years ago
parent
commit
9e05d01f89
5 changed files with 3 additions and 12 deletions
  1. +2
    -2
      IronToad_UnityProject/Assets/Scripts/Catapult.cs
  2. +1
    -0
      IronToad_UnityProject/Assets/Scripts/HeavyObject.cs
  3. +0
    -1
      IronToad_UnityProject/Assets/Scripts/WaterController.cs
  4. +0
    -9
      IronToad_UnityProject/Assets/Sound.meta
  5. BIN
      IronToad_UnityProject/Assets/_Scenes/GreyBox_Prototype.unity

+ 2
- 2
IronToad_UnityProject/Assets/Scripts/Catapult.cs View File

@ -43,7 +43,7 @@ public class Catapult : MonoBehaviour
public void searchlightStateChanged() public void searchlightStateChanged()
{ {
LeanTween.cancel(splineObjectTranslate.ObjectToManipulate.parent.gameObject, true);
LeanTween.cancel(splineObjectTranslate.ObjectToManipulate.gameObject, true);
if (Searchlight.state == Searchlight.SearchState.Chasing) if (Searchlight.state == Searchlight.SearchState.Chasing)
launchBoulder(); launchBoulder();
} }
@ -57,7 +57,7 @@ public class Catapult : MonoBehaviour
} }
isLaunching = true; isLaunching = true;
LeanTween.delayedCall(splineObjectTranslate.ObjectToManipulate.parent.gameObject, timeBetweenLaunches, ()=>{
LeanTween.delayedCall(splineObjectTranslate.ObjectToManipulate.gameObject, timeBetweenLaunches, ()=>{
if (Searchlight.state != Searchlight.SearchState.Chasing) if (Searchlight.state != Searchlight.SearchState.Chasing)
{ {
isLaunching = false; isLaunching = false;

+ 1
- 0
IronToad_UnityProject/Assets/Scripts/HeavyObject.cs View File

@ -9,6 +9,7 @@ public abstract class HeavyObject : WaterObject {
public float splashPower; public float splashPower;
public override void OnWaterEnter(WaterController water) { public override void OnWaterEnter(WaterController water) {
Debug.Log ("creating wave");
water.CreateWave (transform.position, splashRadius, splashPower); water.CreateWave (transform.position, splashRadius, splashPower);
} }

+ 0
- 1
IronToad_UnityProject/Assets/Scripts/WaterController.cs View File

@ -53,7 +53,6 @@ public class WaterController : MonoBehaviour {
Collider[] colliders = Physics.OverlapSphere(point, radius); Collider[] colliders = Physics.OverlapSphere(point, radius);
foreach (Collider hit in colliders) { foreach (Collider hit in colliders) {
Debug.Log(hit.name);
BuoyantObject hitScript = hit.gameObject.GetComponent<BuoyantObject>(); BuoyantObject hitScript = hit.gameObject.GetComponent<BuoyantObject>();
if (hitScript != null) { if (hitScript != null) {
Debug.DrawLine(point, hit.transform.position, Color.blue, 1); Debug.DrawLine(point, hit.transform.position, Color.blue, 1);

+ 0
- 9
IronToad_UnityProject/Assets/Sound.meta View File

@ -1,9 +0,0 @@
fileFormatVersion: 2
guid: 844c4f25011b45348a5db5bc5b4f956e
folderAsset: yes
timeCreated: 1485039717
licenseType: Pro
DefaultImporter:
userData:
assetBundleName:
assetBundleVariant:

BIN
IronToad_UnityProject/Assets/_Scenes/GreyBox_Prototype.unity View File


Loading…
Cancel
Save