a

aps16104 · May 6, 2020 · 450ba91 · 450ba91
1 parent cadde25
commit 450ba91
Show file tree

Hide file tree

Showing 22 changed files with 30 additions and 88 deletions.
diff --git a/Platformer/Assets/Enemy2.cs b/Platformer/Assets/Enemy2.cs
@@ -76,7 +76,7 @@ public class Enemy2 : MonoBehaviour
         slider.value = CalculateHealth();
 
         //Hurt Animation
-        SoundManagerScript.PlaySound("GhostHurt");
+        SoundManagerScript.PlaySound("WizardHurt");
         if (currentHealth <= 0)
         {
             Instantiate(score, new Vector3(ghost.position.x, ghost.position.y, ghost.position.z), Quaternion.identity);
@@ -100,7 +100,7 @@ public class Enemy2 : MonoBehaviour
             TakeDamage(Shurikendamage);
             healthBarUI.SetActive(true);
             slider.value = CalculateHealth();
-            SoundManagerScript.PlaySound("GhostHurt");
+            SoundManagerScript.PlaySound("WizardHurt");
         }
 
     }

diff --git a/Platformer/Assets/Resources/WizardHurt.wav b/Platformer/Assets/Resources/WizardHurt.wav
diff --git a/Platformer/Assets/Resources/WizardHurt.wav.meta b/Platformer/Assets/Resources/WizardHurt.wav.meta
diff --git a/Platformer/Assets/Scripts/SoundManagerScript.cs b/Platformer/Assets/Scripts/SoundManagerScript.cs
@@ -4,7 +4,7 @@ using UnityEngine;
 
 public class SoundManagerScript : MonoBehaviour
 {
-    public static AudioClip Collectsound, Jumpsound, Swordsound, Diesound, Throwsound, Hurtsound, Heartsound, GhsotHurtSound, Keysound, teleportSound, evilLaughSound, BeeHitSound, KnightHurtSound;
+    public static AudioClip Collectsound, Jumpsound, Swordsound, Diesound, Throwsound, Hurtsound, Heartsound, GhsotHurtSound, Keysound, teleportSound, evilLaughSound, BeeHitSound, KnightHurtSound,WizardHurtSound;
     static AudioSource audioSrc;
 
     public AudioClip otherClip;
@@ -26,6 +26,7 @@ public class SoundManagerScript : MonoBehaviour
         evilLaughSound = Resources.Load<AudioClip>("Evil Laugh");
         BeeHitSound = Resources.Load<AudioClip>("BeeHit");
         KnightHurtSound = Resources.Load<AudioClip>("KnightHurt");
+        WizardHurtSound = Resources.Load<AudioClip>("WizardHurt");
 
 
 
@@ -79,6 +80,9 @@ public class SoundManagerScript : MonoBehaviour
             case "KnightHurt":
                 audioSrc.PlayOneShot(KnightHurtSound);
                 break;
+            case "WizardHurt":
+                audioSrc.PlayOneShot(WizardHurtSound);
+                break;
 
         }
     }

diff --git a/Platformer/Assets/_Scenes/Level1.unity b/Platformer/Assets/_Scenes/Level1.unity
@@ -1022880,7 +1022880,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1919620925}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: -49, y: -1.19, z: 0}
+  m_LocalPosition: {x: -49.4, y: -1.22, z: 0}
   m_LocalScale: {x: 0.67200005, y: 0.75, z: 1}
   m_Children:
   - {fileID: 1729492402}

diff --git a/Platformer/Builds/Final/Build/Final.data.unityweb b/Platformer/Builds/Final/Build/Final.data.unityweb
diff --git a/Platformer/Builds/Final/Build/Final.json b/Platformer/Builds/Final/Build/Final.json
diff --git a/Platformer/Builds/Final/Build/Final.wasm.code.unityweb b/Platformer/Builds/Final/Build/Final.wasm.code.unityweb
diff --git a/Platformer/Builds/Final/Build/Final.wasm.framework.unityweb b/Platformer/Builds/Final/Build/Final.wasm.framework.unityweb
diff --git a/Platformer/Builds/Final/Build/UnityLoader.js b/Platformer/Builds/Final/Build/UnityLoader.js
diff --git a/Platformer/Builds/Final/TemplateData/UnityProgress.js b/Platformer/Builds/Final/TemplateData/UnityProgress.js
diff --git a/Platformer/Builds/Final/TemplateData/favicon.ico b/Platformer/Builds/Final/TemplateData/favicon.ico
diff --git a/Platformer/Builds/Final/TemplateData/fullscreen.png b/Platformer/Builds/Final/TemplateData/fullscreen.png
diff --git a/Platformer/Builds/Final/TemplateData/progressEmpty.Dark.png b/Platformer/Builds/Final/TemplateData/progressEmpty.Dark.png
diff --git a/Platformer/Builds/Final/TemplateData/progressEmpty.Light.png b/Platformer/Builds/Final/TemplateData/progressEmpty.Light.png
diff --git a/Platformer/Builds/Final/TemplateData/progressFull.Dark.png b/Platformer/Builds/Final/TemplateData/progressFull.Dark.png
diff --git a/Platformer/Builds/Final/TemplateData/progressFull.Light.png b/Platformer/Builds/Final/TemplateData/progressFull.Light.png
diff --git a/Platformer/Builds/Final/TemplateData/progressLogo.Dark.png b/Platformer/Builds/Final/TemplateData/progressLogo.Dark.png
diff --git a/Platformer/Builds/Final/TemplateData/progressLogo.Light.png b/Platformer/Builds/Final/TemplateData/progressLogo.Light.png
diff --git a/Platformer/Builds/Final/TemplateData/style.css b/Platformer/Builds/Final/TemplateData/style.css
diff --git a/Platformer/Builds/Final/TemplateData/webgl-logo.png b/Platformer/Builds/Final/TemplateData/webgl-logo.png
diff --git a/Platformer/Builds/Final/index.html b/Platformer/Builds/Final/index.html