Merge branch 'master' of github.com:GameProgramming/GameProgramming

GameProgramming · Jul 12, 2012 · d181409 · d181409
2 parents fedac2c + e6ed072
commit d181409
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 0 deletions.
diff --git a/SnowFight/Assets/Players/Player.prefab b/SnowFight/Assets/Players/Player.prefab
diff --git a/SnowFight/Assets/Players/View/PlayerAnimation.js b/SnowFight/Assets/Players/View/PlayerAnimation.js
@@ -28,6 +28,8 @@ private var meshRenderers :MeshRenderer[];
 private var skinnedRenderers :SkinnedMeshRenderer[];
 private var controller :CharacterController;
 
+var healingSound : AudioClip;
+
 enum PlayerViewMode {Default, AimUp}
 private var viewMode :PlayerViewMode = PlayerViewMode.Default;
 
@@ -351,11 +353,21 @@ function OnBulletSpawnFired (bs :BulletSpawn) {
 function SetClosestBase (base :TeamBase) {
 	closestBase = base;
 	healthParticles.enableEmission = base.team == team && !playerStatus.HasFullHp();
+	if(healthParticles.enableEmission){
+		PlayAudio(healingSound);
+	}
 }
 
 function OnLand() {
 	body.SendMessage("OnRightStep");
 	body.SendMessage("OnLeftStep");
 }
 
+function PlayAudio(audio : AudioClip){
+	transform.audio.clip=audio;
+	if(!transform.audio.isPlaying){
+	    	   	transform.audio.Play();
+	}
+}
+
 @script RequireComponent (NetworkView)
diff --git a/SnowFight/Assets/Sounds/heal.wav b/SnowFight/Assets/Sounds/heal.wav
diff --git a/SnowFight/Assets/Sounds/heal.wav.meta b/SnowFight/Assets/Sounds/heal.wav.meta