Merge pull request #33 from AvaPL/PawelC

Added audio.
AvaPL · May 10, 2019 · 71eadbd · 71eadbd
2 parents 0e8fba4 + c853919
commit 71eadbd
Show file tree

Hide file tree

Showing 28 changed files with 1,638 additions and 158 deletions.
diff --git a/Checkers/Assets/Animations/GameOverPanelExitAnimation.anim b/Checkers/Assets/Animations/GameOverPanelExitAnimation.anim
@@ -507,6 +507,13 @@ AnimationClip:
   m_HasGenericRootTransform: 0
   m_HasMotionFloatCurves: 0
   m_Events:
+  - time: 0
+    functionName: FadeGameMusic
+    data: 
+    objectReferenceParameter: {fileID: 0}
+    floatParameter: 0
+    intParameter: 0
+    messageOptions: 0
   - time: 1
     functionName: LoadMenuScene
     data: 

diff --git a/Checkers/Assets/Animations/TitleScreenExitAnimation.anim b/Checkers/Assets/Animations/TitleScreenExitAnimation.anim
@@ -355,6 +355,13 @@ AnimationClip:
   m_HasGenericRootTransform: 0
   m_HasMotionFloatCurves: 0
   m_Events:
+  - time: 0
+    functionName: FadeMenuMusic
+    data: 
+    objectReferenceParameter: {fileID: 0}
+    floatParameter: 0
+    intParameter: 0
+    messageOptions: 0
   - time: 1
     functionName: LoadPlayScene
     data: 

diff --git a/Checkers/Assets/Audio.meta b/Checkers/Assets/Audio.meta
diff --git a/Checkers/Assets/Audio/GameMusic.mp3 b/Checkers/Assets/Audio/GameMusic.mp3
diff --git a/Checkers/Assets/Audio/GameMusic.mp3.meta b/Checkers/Assets/Audio/GameMusic.mp3.meta
diff --git a/Checkers/Assets/Audio/MenuMusic.mp3 b/Checkers/Assets/Audio/MenuMusic.mp3
diff --git a/Checkers/Assets/Audio/MenuMusic.mp3.meta b/Checkers/Assets/Audio/MenuMusic.mp3.meta
diff --git a/Checkers/Assets/Audio/PawnAndSlider.mp3 b/Checkers/Assets/Audio/PawnAndSlider.mp3
diff --git a/Checkers/Assets/Audio/PawnAndSlider.mp3.meta b/Checkers/Assets/Audio/PawnAndSlider.mp3.meta
diff --git a/Checkers/Assets/Audio/Promotion.mp3 b/Checkers/Assets/Audio/Promotion.mp3
diff --git a/Checkers/Assets/Audio/Promotion.mp3.meta b/Checkers/Assets/Audio/Promotion.mp3.meta
diff --git a/Checkers/Assets/Audio/UIButton.mp3 b/Checkers/Assets/Audio/UIButton.mp3
diff --git a/Checkers/Assets/Audio/UIButton.mp3.meta b/Checkers/Assets/Audio/UIButton.mp3.meta