Geri/TRORB
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Musica menú

Browse source
This commit is contained in:
Gerard Gascón 2023-03-05 20:36:13 +01:00
parent 39597cfdff
commit 7504706c26
18 changed files with 420 additions and 157 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
Assets/Audio/Music/gameOver.mp3 (Stored with Git LFS) Normal file
View file

Binary file not shown.

22
Assets/Audio/Music/gameOver.mp3.meta Normal file
View file

@ -0,0 +1,22 @@
fileFormatVersion: 2
guid: 7ad8095769c191d4b8b32ff4457745db
AudioImporter:
externalObjects: {}
serializedVersion: 6
defaultSettings:
loadType: 0
sampleRateSetting: 0
sampleRateOverride: 44100
compressionFormat: 1
quality: 0.59999996
conversionMode: 0
platformSettingOverrides: {}
forceToMono: 0
normalize: 1
preloadAudioData: 1
loadInBackground: 0
ambisonic: 0
3D: 1
userData:
assetBundleName:
assetBundleVariant:

BIN
Assets/Audio/Music/menu.wav (Stored with Git LFS) Normal file
View file

Binary file not shown.

22
Assets/Audio/Music/menu.wav.meta Normal file
View file

@ -0,0 +1,22 @@
fileFormatVersion: 2
guid: 6525d245e5e1be040852edaeeb9923bc
AudioImporter:
externalObjects: {}
serializedVersion: 6
defaultSettings:
loadType: 0
sampleRateSetting: 0
sampleRateOverride: 44100
compressionFormat: 1
quality: 0.59999996
conversionMode: 0
platformSettingOverrides: {}
forceToMono: 0
normalize: 1
preloadAudioData: 1
loadInBackground: 0
ambisonic: 0
3D: 1
userData:
assetBundleName:
assetBundleVariant:

BIN
Assets/Audio/Music/victoria.wav (Stored with Git LFS) Normal file
View file

Binary file not shown.

22
Assets/Audio/Music/victoria.wav.meta Normal file
View file

@ -0,0 +1,22 @@
fileFormatVersion: 2
guid: 3e348e8acc8161d499c279e87ab9f5bb
AudioImporter:
externalObjects: {}
serializedVersion: 6
defaultSettings:
loadType: 0
sampleRateSetting: 0
sampleRateOverride: 44100
compressionFormat: 1
quality: 0.59999996
conversionMode: 0
platformSettingOverrides: {}
forceToMono: 0
normalize: 1
preloadAudioData: 1
loadInBackground: 0
ambisonic: 0
3D: 1
userData:
assetBundleName:
assetBundleVariant:

5
Assets/Scenes/Game.unity
View file

@ -4360,8 +4360,8 @@ Camera:
serializedVersion: 2
x: 0.06953437
y: 0
width: 0.8611618
height: 1.0003641
width: 0.86053514
height: 0.999636
near clip plane: 0.3
far clip plane: 1000
field of view: 60
@ -37910,6 +37910,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 775b962b28fe0d149927748937e2e8c2, type: 3}
m_Name:
m_EditorClassIdentifier:
stopMusic: 1
--- !u!1 &1703826472
GameObject:
m_ObjectHideFlags: 0

18
Assets/Scenes/MainMenu.unity
View file

@ -828,6 +828,7 @@ GameObject:
- component: {fileID: 338094509}
- component: {fileID: 338094508}
- component: {fileID: 338094513}
- component: {fileID: 338094514}
m_Layer: 0
m_Name: Canvas
m_TagString: Untagged
@ -968,6 +969,19 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 775b962b28fe0d149927748937e2e8c2, type: 3}
m_Name:
m_EditorClassIdentifier:
stopMusic: 0
--- !u!114 &338094514
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 338094507}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 23f106f043aa58846875bf806d6377cd, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &406352228
GameObject:
m_ObjectHideFlags: 0
@ -4485,8 +4499,8 @@ Camera:
serializedVersion: 2
x: 0.06953437
y: 0
width: 0.8611618
height: 1.0003641
width: 0.86053514
height: 0.999636
near clip plane: 0.3
far clip plane: 1000
field of view: 60

2
Assets/Scripts/Cutscene.cs
View file

@ -2,6 +2,7 @@ using System;
using System.Collections;
using System.Collections.Generic;
using MyBox;
using SimpleTools.AudioManager;
using SimpleTools.DialogueSystem;
using SimpleTools.SceneManagement;
using UnityEngine;
@ -31,6 +32,7 @@ public class Cutscene : MonoBehaviour {
_start = Time.time;
yield return new WaitForSeconds(fadeDuration);
}
AudioManager.instance.Stop("menu");
Loader.Load(2);
}

11
Assets/Scripts/MainMenu.cs Normal file
View file

@ -0,0 +1,11 @@
using System.Collections;
using System.Collections.Generic;
using SimpleTools.AudioManager;
using UnityEngine;
public class MainMenu : MonoBehaviour{
// Start is called before the first frame update
void Start(){
AudioManager.instance.Play("menu");
}
}

11
Assets/Scripts/MainMenu.cs.meta Normal file
View file

@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 23f106f043aa58846875bf806d6377cd
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

20
Assets/Scripts/Player/PlayerController.cs
View file

@ -178,6 +178,16 @@ public class PlayerController : MonoBehaviour {
ghost.Kill();
if(_stepsRoutine != null) StopCoroutine(_stepsRoutine);
fadeImage.DOFade(1, 1f);
AudioManager.instance.FadeOut("intro", 1f);
AudioManager.instance.FadeOut("azul", 1f);
AudioManager.instance.FadeOut("rojo", 1f);
AudioManager.instance.FadeOut("ambos", 1f);
AudioManager.instance.FadeOut("invertido", 1f);
AudioManager.instance.FadeOut("alta", 1f);
AudioManager.instance.FadeOut("baja", 1f);
AudioManager.instance.FadeOut("oscuro", 1f);
AudioManager.instance.FadeOut("rojo", 1f);
AudioManager.instance.FadeIn("victoria", 1f);
yield return new WaitForSeconds(1f);
AudioManager.instance.FadeOut("Viento", 1f);
Loader.Load(3);
@ -187,6 +197,16 @@ public class PlayerController : MonoBehaviour {
public void Kill(GhostController ghost) {
if (_dead || _won) return;
AudioManager.instance.PlayOneShot("Congela");
AudioManager.instance.FadeOut("intro", 1f);
AudioManager.instance.FadeOut("azul", 1f);
AudioManager.instance.FadeOut("rojo", 1f);
AudioManager.instance.FadeOut("ambos", 1f);
AudioManager.instance.FadeOut("invertido", 1f);
AudioManager.instance.FadeOut("alta", 1f);
AudioManager.instance.FadeOut("baja", 1f);
AudioManager.instance.FadeOut("oscuro", 1f);
AudioManager.instance.FadeOut("rojo", 1f);
AudioManager.instance.Play("gameOver");
ghost.Kill();
if(_stepsRoutine != null) StopCoroutine(_stepsRoutine);
group.DOFade(1, 1f);

6
Assets/Scripts/SceneLoad.cs
View file

@ -4,10 +4,12 @@ using SimpleTools.AudioManager;
using SimpleTools.SceneManagement;
using UnityEngine;
public class SceneLoad : MonoBehaviour{
public class SceneLoad : MonoBehaviour {
[SerializeField] bool stopMusic = true;
public void LoadScene(int sceneIndex) {
AudioManager.instance.StopAll();
if(stopMusic) AudioManager.instance.StopAll();
Loader.Load(sceneIndex);
}
}

27
Assets/Sounds.asset
View file

@ -195,3 +195,30 @@ MonoBehaviour:
pitchVariance: 0
loop: 0
source: {fileID: 0}
- name: gameOver
clip: {fileID: 8300000, guid: 7ad8095769c191d4b8b32ff4457745db, type: 3}
type: 0
volume: 1
volumeVariance: 0
pitch: 1
pitchVariance: 0
loop: 0
source: {fileID: 0}
- name: menu
clip: {fileID: 8300000, guid: 6525d245e5e1be040852edaeeb9923bc, type: 3}
type: 0
volume: 1
volumeVariance: 0
pitch: 1
pitchVariance: 0
loop: 1
source: {fileID: 0}
- name: victoria
clip: {fileID: 8300000, guid: 3e348e8acc8161d499c279e87ab9f5bb, type: 3}
type: 0
volume: 1
volumeVariance: 0
pitch: 1
pitchVariance: 0
loop: 1
source: {fileID: 0}