diff --git a/GodsTrials/Assets/Scenes/Cielo.unity b/GodsTrials/Assets/Scenes/Cielo.unity index 1f9f2a0..c3cdc4b 100644 --- a/GodsTrials/Assets/Scenes/Cielo.unity +++ b/GodsTrials/Assets/Scenes/Cielo.unity @@ -1833,8 +1833,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d6ff00a30f610564e88279a1cd279b5a, type: 3} m_Name: m_EditorClassIdentifier: - "da\xF1o": {fileID: 454572353} - dolor: {fileID: 8300000, guid: 30802f62299ac7e40aed01b993919546, type: 3} + dano: {fileID: 0} + dolor: {fileID: 1255433607} hercules: {fileID: 454572338} vida: 3 animatorController: {fileID: 454572339} @@ -13819,6 +13819,7 @@ GameObject: - component: {fileID: 1255433604} - component: {fileID: 1255433603} - component: {fileID: 1255433606} + - component: {fileID: 1255433607} m_Layer: 0 m_Name: AudioManager m_TagString: Untagged @@ -14129,6 +14130,102 @@ AudioSource: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 +--- !u!82 &1255433607 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1255433602} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 8300000, guid: 30802f62299ac7e40aed01b993919546, type: 3} + m_PlayOnAwake: 0 + m_Volume: 0.4 + m_Pitch: 1 + Loop: 0 + Mute: 0 + Spatialize: 0 + SpatializePostEffects: 0 + Priority: 128 + DopplerLevel: 1 + MinDistance: 1 + MaxDistance: 500 + Pan2D: 0 + rolloffMode: 0 + BypassEffects: 0 + BypassListenerEffects: 0 + BypassReverbZones: 0 + rolloffCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + panLevelCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + spreadCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + reverbZoneMixCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 --- !u!1001 &1316718261 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/GodsTrials/Assets/Scenes/CinematicaFinal.unity b/GodsTrials/Assets/Scenes/CinematicaFinal.unity index bd443f5..bcfc8ed 100644 --- a/GodsTrials/Assets/Scenes/CinematicaFinal.unity +++ b/GodsTrials/Assets/Scenes/CinematicaFinal.unity @@ -968,6 +968,134 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 98c793649efa4884b8f022d7767dae99, type: 3} +--- !u!1 &808901356 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 808901358} + - component: {fileID: 808901357} + m_Layer: 0 + m_Name: AudioManager + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!82 &808901357 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 808901356} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 8300000, guid: f128e17dc5fa8dd42a8d7f52af2de6fc, type: 3} + m_PlayOnAwake: 1 + m_Volume: 0.2 + m_Pitch: 1 + Loop: 1 + Mute: 0 + Spatialize: 0 + SpatializePostEffects: 0 + Priority: 128 + DopplerLevel: 1 + MinDistance: 1 + MaxDistance: 500 + Pan2D: 0 + rolloffMode: 0 + BypassEffects: 0 + BypassListenerEffects: 0 + BypassReverbZones: 0 + rolloffCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + panLevelCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + spreadCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + reverbZoneMixCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 +--- !u!4 &808901358 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 808901356} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -1.0422044, y: -0.67406684, z: -9.829295} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &827484752 GameObject: m_ObjectHideFlags: 0 @@ -3016,3 +3144,4 @@ SceneRoots: - {fileID: 887081578} - {fileID: 1909292738} - {fileID: 1764558239} + - {fileID: 808901358} diff --git a/GodsTrials/Assets/Scenes/Infierno.unity b/GodsTrials/Assets/Scenes/Infierno.unity index 68a8225..5b9bf28 100644 --- a/GodsTrials/Assets/Scenes/Infierno.unity +++ b/GodsTrials/Assets/Scenes/Infierno.unity @@ -8510,8 +8510,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d6ff00a30f610564e88279a1cd279b5a, type: 3} m_Name: m_EditorClassIdentifier: - "da\xF1o": {fileID: 778598596} - dolor: {fileID: 8300000, guid: 30802f62299ac7e40aed01b993919546, type: 3} + dano: {fileID: 0} + dolor: {fileID: 1510944605} hercules: {fileID: 778598587} vida: 3 animatorController: {fileID: 778598589} @@ -12966,6 +12966,7 @@ GameObject: - component: {fileID: 1510944603} - component: {fileID: 1510944602} - component: {fileID: 1510944604} + - component: {fileID: 1510944605} m_Layer: 0 m_Name: AudioManager m_TagString: Untagged @@ -13180,6 +13181,102 @@ AudioSource: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 +--- !u!82 &1510944605 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1510944601} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 8300000, guid: 30802f62299ac7e40aed01b993919546, type: 3} + m_PlayOnAwake: 0 + m_Volume: 0.4 + m_Pitch: 1 + Loop: 0 + Mute: 0 + Spatialize: 0 + SpatializePostEffects: 0 + Priority: 128 + DopplerLevel: 1 + MinDistance: 1 + MaxDistance: 500 + Pan2D: 0 + rolloffMode: 0 + BypassEffects: 0 + BypassListenerEffects: 0 + BypassReverbZones: 0 + rolloffCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + panLevelCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + spreadCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + reverbZoneMixCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 --- !u!1001 &1533590325 PrefabInstance: m_ObjectHideFlags: 0 diff --git "a/GodsTrials/Assets/Scenes/Monta\303\261a.unity" "b/GodsTrials/Assets/Scenes/Monta\303\261a.unity" index 35e8bc0..d238d4a 100644 --- "a/GodsTrials/Assets/Scenes/Monta\303\261a.unity" +++ "b/GodsTrials/Assets/Scenes/Monta\303\261a.unity" @@ -2252,7 +2252,7 @@ MonoBehaviour: Collider: {fileID: 114865074} LHead: {fileID: 212399042} LHead2: {fileID: 1240972471} - clip: {fileID: 1748734225} + clip: {fileID: 1748734228} --- !u!61 &114865076 BoxCollider2D: m_ObjectHideFlags: 0 @@ -78534,7 +78534,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: dano: {fileID: 0} - dolor: {fileID: 8300000, guid: 30802f62299ac7e40aed01b993919546, type: 3} + dolor: {fileID: 1748734227} hercules: {fileID: 1174641664} vida: 3 animatorController: {fileID: 1174641666} @@ -89007,6 +89007,8 @@ GameObject: m_Component: - component: {fileID: 1748734226} - component: {fileID: 1748734225} + - component: {fileID: 1748734227} + - component: {fileID: 1748734228} m_Layer: 0 m_Name: AudioManager m_TagString: Untagged @@ -89125,6 +89127,198 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!82 &1748734227 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1748734224} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 8300000, guid: 30802f62299ac7e40aed01b993919546, type: 3} + m_PlayOnAwake: 0 + m_Volume: 0.4 + m_Pitch: 1 + Loop: 0 + Mute: 0 + Spatialize: 0 + SpatializePostEffects: 0 + Priority: 128 + DopplerLevel: 1 + MinDistance: 1 + MaxDistance: 500 + Pan2D: 0 + rolloffMode: 0 + BypassEffects: 0 + BypassListenerEffects: 0 + BypassReverbZones: 0 + rolloffCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + panLevelCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + spreadCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + reverbZoneMixCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 +--- !u!82 &1748734228 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1748734224} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 8300000, guid: e0e12944db8061849bfdada2f568bacf, type: 3} + m_PlayOnAwake: 0 + m_Volume: 0.8 + m_Pitch: 1 + Loop: 0 + Mute: 0 + Spatialize: 0 + SpatializePostEffects: 0 + Priority: 128 + DopplerLevel: 1 + MinDistance: 1 + MaxDistance: 500 + Pan2D: 0 + rolloffMode: 0 + BypassEffects: 0 + BypassListenerEffects: 0 + BypassReverbZones: 0 + rolloffCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + panLevelCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + spreadCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + reverbZoneMixCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 --- !u!1001 &1753702426 PrefabInstance: m_ObjectHideFlags: 0 @@ -96800,7 +96994,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2636078505748438533, guid: 98c793649efa4884b8f022d7767dae99, type: 3} propertyPath: m_LocalPosition.y - value: -5 + value: -3.57 objectReference: {fileID: 0} - target: {fileID: 2636078505748438533, guid: 98c793649efa4884b8f022d7767dae99, type: 3} propertyPath: m_LocalPosition.z diff --git a/GodsTrials/Assets/Scripts/DanoFlechas.cs b/GodsTrials/Assets/Scripts/DanoFlechas.cs index 577e947..3cb7556 100644 --- a/GodsTrials/Assets/Scripts/DanoFlechas.cs +++ b/GodsTrials/Assets/Scripts/DanoFlechas.cs @@ -28,6 +28,7 @@ private void OnTriggerEnter2D(Collider2D bola)//si lo que toca el objeto tiene v vida = bola.gameObject.GetComponent(); if (vida != null) { + vida.DanoCupido(); Destroy(gameObject); } diff --git a/GodsTrials/Assets/Scripts/VidaSystem.cs b/GodsTrials/Assets/Scripts/VidaSystem.cs index 68810a5..615c3df 100644 --- a/GodsTrials/Assets/Scripts/VidaSystem.cs +++ b/GodsTrials/Assets/Scripts/VidaSystem.cs @@ -8,7 +8,7 @@ public class VidaSystem : MonoBehaviour [SerializeField] private AudioSource dano; [SerializeField] - private AudioClip dolor; + private AudioSource dolor; private LevelChange morir; [SerializeField] private GameObject hercules; @@ -74,7 +74,7 @@ public void MuerteCompleta() } public void Dano() { - dano.PlayOneShot(dolor); + dolor.Play(); animatorController.Dano(); barravida.DanoTres(); vida--; @@ -87,10 +87,11 @@ public void Dano() public void DanoCupido()//para los cupidos modificado por Jule { - dano.PlayOneShot(dolor); + dolor.Play(); animatorController.Dano(); barravida.DanoSiete(); vida-=vidacupido; + Debug.Log("pene"); if (vida <= 0) { Destroy(hercules); @@ -100,7 +101,7 @@ public void DanoCupido()//para los cupidos modificado por Jule public void DanoPiedra()//para los cupidos modificado por Jule { - dano.PlayOneShot(dolor); + dolor.Play(); animatorController.Dano(); barravida.DanoDos(); vida -= vidapiedra; diff --git a/GodsTrials/Assets/Sound/Coro Celestial (Efecto de Sonido) Heavenly Choir Sound Effect_UJjBT2Zjq8M (mp3cut.net).mp3 b/GodsTrials/Assets/Sound/Coro Celestial (Efecto de Sonido) Heavenly Choir Sound Effect_UJjBT2Zjq8M (mp3cut.net).mp3 new file mode 100644 index 0000000..0c84e63 Binary files /dev/null and b/GodsTrials/Assets/Sound/Coro Celestial (Efecto de Sonido) Heavenly Choir Sound Effect_UJjBT2Zjq8M (mp3cut.net).mp3 differ diff --git a/GodsTrials/Assets/Sound/Coro Celestial (Efecto de Sonido) Heavenly Choir Sound Effect_UJjBT2Zjq8M (mp3cut.net).mp3.meta b/GodsTrials/Assets/Sound/Coro Celestial (Efecto de Sonido) Heavenly Choir Sound Effect_UJjBT2Zjq8M (mp3cut.net).mp3.meta new file mode 100644 index 0000000..c66c39a --- /dev/null +++ b/GodsTrials/Assets/Sound/Coro Celestial (Efecto de Sonido) Heavenly Choir Sound Effect_UJjBT2Zjq8M (mp3cut.net).mp3.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: f128e17dc5fa8dd42a8d7f52af2de6fc +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: