added some sound

.gitignore

@@ -39,3 +39,4 @@ IronToad_UnityProject/Library/
 IronToad_UnityProject/Temp/ProcessJobs/e9a6970f79cd12d8b075e7d72f1b07cb.bakert
 IronToad_UnityProject/Temp/UnityLockfile
 IronToad_UnityProject/Temp/
+IronToad_UnityProject/Build/TestBuild01_Data/

IronToad_UnityProject/Assets/Art/Models/Materials/Group48238Mat.mat.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: a9ac0ea32767bfe42aa7ce6753104e25
+timeCreated: 1485053650
+licenseType: Free
+NativeFormatImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

IronToad_UnityProject/Assets/Art/Models/Materials/mat_rockBoulder.mat.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 17ee00c36b59c344e83556e5bed577b6
+timeCreated: 1485052411
+licenseType: Free
+NativeFormatImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

IronToad_UnityProject/Assets/Art/Models/Materials/textures/circle-MAT.png.meta

@@ -0,0 +1,76 @@
+fileFormatVersion: 2
+guid: 9a81218b321cc42eba4dd59f9b513146
+timeCreated: 1485051858
+licenseType: Pro
+TextureImporter:
+  fileIDToRecycleName: {}
+  serializedVersion: 4
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    filterMode: -1
+    aniso: -1
+    mipBias: -1
+    wrapMode: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spritePixelsToUnits: 100
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  - buildTarget: Standalone
+    maxTextureSize: 2048
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+  spritePackingTag: 
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

IronToad_UnityProject/Assets/Art/Models/Materials/textures/splash-sprite.mat.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: eb66aff512dcb4d07a63d2a8ecd24bde
+timeCreated: 1485051885
+licenseType: Pro
+NativeFormatImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

IronToad_UnityProject/Assets/Art/Models/textures/low_rock_default_C.png.meta

@@ -0,0 +1,68 @@
+fileFormatVersion: 2
+guid: 8108a8c7021f51f40b59580b43dbfd2a
+timeCreated: 1485052499
+licenseType: Free
+TextureImporter:
+  fileIDToRecycleName: {}
+  serializedVersion: 4
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 1
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    filterMode: -1
+    aniso: -1
+    mipBias: -1
+    wrapMode: -1
+  nPOTScale: 1
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 0
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spritePixelsToUnits: 100
+  alphaUsage: 1
+  alphaIsTransparency: 0
+  spriteTessellationDetail: -1
+  textureType: 0
+  textureShape: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+  spritePackingTag: 
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

IronToad_UnityProject/Assets/Art/Models/textures/low_rock_default_D.png.meta

@@ -0,0 +1,68 @@
+fileFormatVersion: 2
+guid: 9b0ec7c3400bea04c94e9bd4d17a0ffc
+timeCreated: 1485052499
+licenseType: Free
+TextureImporter:
+  fileIDToRecycleName: {}
+  serializedVersion: 4
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 1
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    filterMode: -1
+    aniso: -1
+    mipBias: -1
+    wrapMode: -1
+  nPOTScale: 1
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 0
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spritePixelsToUnits: 100
+  alphaUsage: 1
+  alphaIsTransparency: 0
+  spriteTessellationDetail: -1
+  textureType: 0
+  textureShape: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+  spritePackingTag: 
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

IronToad_UnityProject/Assets/Art/Models/textures/low_rock_default_N.png.meta

@@ -0,0 +1,76 @@
+fileFormatVersion: 2
+guid: 42574f2ff1b9d00479fce7fa9823e0ad
+timeCreated: 1485052499
+licenseType: Free
+TextureImporter:
+  fileIDToRecycleName: {}
+  serializedVersion: 4
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 1
+    sRGBTexture: 0
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    filterMode: -1
+    aniso: -1
+    mipBias: -1
+    wrapMode: -1
+  nPOTScale: 1
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 0
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spritePixelsToUnits: 100
+  alphaUsage: 1
+  alphaIsTransparency: 0
+  spriteTessellationDetail: -1
+  textureType: 1
+  textureShape: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  - buildTarget: Standalone
+    maxTextureSize: 2048
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+  spritePackingTag: 
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

IronToad_UnityProject/Assets/Art/particle effects/splash.prefab.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 15855eec8f44a48169b15f54f2988b2e
+timeCreated: 1485052510
+licenseType: Pro
+NativeFormatImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

IronToad_UnityProject/Assets/Prefabs/catapult-projectile.prefab.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: ff24e35626d4349e7be883de5e03e5b1
+timeCreated: 1485036737
+licenseType: Pro
+NativeFormatImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

IronToad_UnityProject/Assets/Prefabs/catapultExplosion.prefab.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 93e56074113fd4131820ce9d0c7d6a77
+timeCreated: 1485040026
+licenseType: Pro
+NativeFormatImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

IronToad_UnityProject/Assets/Scripts/AudioController.cs

@@ -4,6 +4,9 @@ using UnityEngine;
 
 public class AudioController : MonoBehaviour
 {
+	public Transform objectA;
+	public Transform objectB;
+
 	public AudioSource[] bgmSources;
 	public AudioSource[] ambSources;
 	public AudioSource[] sfxSources;
@@ -20,6 +23,8 @@ public class AudioController : MonoBehaviour
 
 		NotificationServer.register("fade bgm", fadeBgm);
 		NotificationServer.register("fade amb", fadeAmb);
+
+		NotificationServer.register("statechange Searchlight", searchlightStateChanged);
 	}
 
 	void Start()
@@ -31,9 +36,40 @@ public class AudioController : MonoBehaviour
 		foreach (AudioSource s in sfxSources)
 			s.volume = 0f;
 
-		NotificationServer.notify("play amb", "oceanAmbience:0.5");
+		NotificationServer.notify("play amb", "oceanAmbience:0.4");
+	}
+
+//	void Update()
+//	{
+//		doMusicMix();	
+//	}
+
+	public void doMusicMix()
+	{
+		NotificationServer.notify("play bgm", "tense:0.75");
+//		float distance = Vector3.Distance(objectA.position, objectB.position);
+//		Debug.LogWarning(distance);
+//		distance = Mathf.Clamp(1000f / distance, 0f, 1f);
+//		float tenseVol = 0.75f * distance;
+//		float spottedVol = 0.5f * (1f-distance);
+//		NotificationServer.notify("play bgm", "tense:"+tenseVol+"/spotted"+spottedVol);
+	}
+
+	public void searchlightStateChanged()
+	{
+		if (Searchlight.state == Searchlight.SearchState.Chasing)
+		{
+			NotificationServer.notify("play sfx", "shipSpotted:0.5");
+//			NotificationServer.notify("play sfx", "spottedDialogue");
+			NotificationServer.notify("play bgm", "attack:9");
+		}
+		else
+		{
+			doMusicMix();
+		}
 	}
 
+
 	public void playAmb(object audioNameObj)
 	{
 		string audioName = audioNameObj as string;
@@ -65,7 +101,7 @@ public class AudioController : MonoBehaviour
 			if (s.isPlaying)
 			{
 				LeanTween.cancel(s.gameObject);
-				LeanTween.value(s.gameObject, s.volume, 0f, 0.5f).setOnUpdate((float val)=>{
+				LeanTween.value(s.gameObject, s.volume, 0f, 1f).setOnUpdate((float val)=>{
 					s.volume = val;
 				}).setOnComplete(()=>{
 					s.Stop();
@@ -78,7 +114,7 @@ public class AudioController : MonoBehaviour
 				foundEmpty = true;
 				s.clip = clip;
 				s.Play();
-				LeanTween.value(s.gameObject, s.volume, volume, 0.5f).setOnUpdate((float val)=>{
+				LeanTween.value(s.gameObject, s.volume, volume, 1f).setOnUpdate((float val)=>{
 					s.volume = val;
 				}).setIgnoreTimeScale(true);
 			}
@@ -156,6 +192,7 @@ public class AudioController : MonoBehaviour
 			return;
 
 		AudioSource foundEmpty = null;
+		int timeSamples = 0;
 		foreach (AudioSource s in bgmSources)
 		{
 			if (s.clip != null && s.clip == clip)
@@ -165,8 +202,9 @@ public class AudioController : MonoBehaviour
 			}
 			else if (s.isPlaying)
 			{
+				timeSamples = s.timeSamples;
 				LeanTween.cancel(s.gameObject);
-				LeanTween.value(s.gameObject, s.volume, 0f, 0.5f).setOnUpdate((float val)=>{
+				LeanTween.value(s.gameObject, s.volume, 0f, 1f).setOnUpdate((float val)=>{
 					s.volume = val;
 				}).setOnComplete(()=>{
 					s.Stop();
@@ -183,15 +221,16 @@ public class AudioController : MonoBehaviour
 		{
 			LeanTween.cancel(foundEmpty.gameObject);
 			foundEmpty.clip = clip;
+			foundEmpty.timeSamples = timeSamples;
 			foundEmpty.Play();
-			LeanTween.value(foundEmpty.gameObject, foundEmpty.volume, volume, 0.5f).setOnUpdate((float val)=>{
+			LeanTween.value(foundEmpty.gameObject, foundEmpty.volume, volume, 1f).setOnUpdate((float val)=>{
 				foundEmpty.volume = val;
 			}).setIgnoreTimeScale(true);
 		}
 		else if (foundEmpty != null && foundEmpty.isPlaying)
 		{
 			LeanTween.cancel(foundEmpty.gameObject);
-			LeanTween.value(foundEmpty.gameObject, foundEmpty.volume, volume, 0.5f).setOnUpdate((float val)=>{
+			LeanTween.value(foundEmpty.gameObject, foundEmpty.volume, volume, 1f).setOnUpdate((float val)=>{
 				foundEmpty.volume = val;
 			}).setIgnoreTimeScale(true);
 		}
@@ -204,7 +243,7 @@ public class AudioController : MonoBehaviour
 			if (s.isPlaying)
 			{
 				LeanTween.cancel(s.gameObject);
-				LeanTween.value(s.gameObject, s.volume, 0f, 0.5f).setOnUpdate((float val)=>{
+				LeanTween.value(s.gameObject, s.volume, 0f, 1f).setOnUpdate((float val)=>{
 					s.volume = val;
 				}).setOnComplete(()=>{
 					s.Stop();
@@ -221,7 +260,7 @@ public class AudioController : MonoBehaviour
 			if (s.isPlaying)
 			{
 				LeanTween.cancel(s.gameObject);
-				LeanTween.value(s.gameObject, s.volume, 0f, 0.5f).setOnUpdate((float val)=>{
+				LeanTween.value(s.gameObject, s.volume, 0f, 1f).setOnUpdate((float val)=>{
 					s.volume = val;
 				}).setOnComplete(()=>{
 					s.Stop();

IronToad_UnityProject/Assets/Scripts/Boulder.cs

@@ -4,8 +4,9 @@ using UnityEngine;
 
 public class Boulder : HeavyObject
 {
-
-
+    public GameObject splash;
+    public GameObject Explosion;
+    
 	public override void OnWaterStay(WaterController water,float waveHeight)
 	{
 	}
@@ -13,4 +14,17 @@ public class Boulder : HeavyObject
 	public override void OnWaterExit(WaterController water)
 	{
 	}
+
+    void OnTriggerEnter(Collider other) {
+        if (other.gameObject.CompareTag("Water")) {
+            Destroy(Instantiate(splash, transform.position,Quaternion.identity), 2.5f);
+        }else {
+            Destroy(Instantiate(Explosion, transform.position, Quaternion.identity), 6);
+        }
+    }
+
+
+
+
+
 }

IronToad_UnityProject/Assets/Scripts/WaterController.cs

@@ -13,7 +13,7 @@ public class WaterController : MonoBehaviour {
     public float waveSpeed = 1;
     public float maxWaveHeight = 2;
 
-    private readonly float scaleConstant = 50f;
+    private readonly float scaleConstant = 75f;
 
     public GameObject rippleEffect;
 

IronToad_UnityProject/Assets/Sound.meta~9aa76cf59aefcb5184922037951a67f20abdf40d

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

IronToad_UnityProject/Assets/Sound.meta~9aa76cf59aefcb5184922037951a67f20abdf40d.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 4f48e22f51b6449849bfe949e93bd014
+timeCreated: 1485054810
+licenseType: Free
+DefaultImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

IronToad_UnityProject/Assets/Sound/Music.meta~9aa76cf59aefcb5184922037951a67f20abdf40d

@@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: 1715d56e0d2b68246a82993db31014ab
+folderAsset: yes
+timeCreated: 1485038927
+licenseType: Free
+DefaultImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

IronToad_UnityProject/Assets/Sound/Music.meta~9aa76cf59aefcb5184922037951a67f20abdf40d.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: cfbf35b0592f24a209aa5903d6a661ed
+timeCreated: 1485054811
+licenseType: Free
+DefaultImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

IronToad_UnityProject/Assets/Sound/SFX.meta~9aa76cf59aefcb5184922037951a67f20abdf40d

@@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: de5a3adcedb96f64183518ac89622ade
+folderAsset: yes
+timeCreated: 1485038927
+licenseType: Free
+DefaultImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

IronToad_UnityProject/Assets/Sound/SFX.meta~9aa76cf59aefcb5184922037951a67f20abdf40d.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: e7fc7bcf373334aaba07b2047921a343
+timeCreated: 1485054811
+licenseType: Free
+DefaultImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: