diff --git a/Assets/Animations/Monster/Crab/CrabAnimator.controller b/Assets/Animations/Monster/Crab/CrabAnimator.controller index bbf4da5b..f6a2e29e 100644 --- a/Assets/Animations/Monster/Crab/CrabAnimator.controller +++ b/Assets/Animations/Monster/Crab/CrabAnimator.controller @@ -85,9 +85,6 @@ AnimatorStateTransition: m_PrefabAsset: {fileID: 0} m_Name: m_Conditions: - - m_ConditionMode: 2 - m_ConditionEvent: Left - m_EventTreshold: 0 - m_ConditionMode: 1 m_ConditionEvent: isChasing m_EventTreshold: 0 @@ -144,13 +141,13 @@ AnimatorController: m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 9100000} + m_Controller: {fileID: 0} - m_Name: Left m_Type: 4 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 9100000} + m_Controller: {fileID: 0} m_AnimatorLayers: - serializedVersion: 5 m_Name: Base Layer diff --git a/Assets/SaveMusicSettings.cs b/Assets/SaveMusicSettings.cs index d0f6d5ec..6117863e 100644 --- a/Assets/SaveMusicSettings.cs +++ b/Assets/SaveMusicSettings.cs @@ -10,8 +10,33 @@ public class SaveMusicSettings : MonoBehaviour private void Start() { LoadValues(); + + if (!PlayerPrefs.HasKey("musicVolume")) + { + PlayerPrefs.SetFloat("musicVolume",0.1f); + Load(); + } + else + { + Load(); + } } + public void ChangeVolume() + { + AudioListener.volume = musicSlider.value; + } + + private void Load() + { + musicSlider.value = PlayerPrefs.GetFloat("musicVolume"); + } + + private void Save() + { + PlayerPrefs.SetFloat("musicVolume", musicSlider.value); + } + public void SaveVolumeButton() { float musicValue = musicSlider.value; diff --git a/Assets/Scenes/Catacombs.unity b/Assets/Scenes/Catacombs.unity index 01293580..f9cf1a56 100644 --- a/Assets/Scenes/Catacombs.unity +++ b/Assets/Scenes/Catacombs.unity @@ -10860,6 +10860,133 @@ Tilemap: e31: 0 e32: 0 e33: 1 +--- !u!1 &363308234 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 363308236} + - component: {fileID: 363308235} + m_Layer: 0 + m_Name: AmbienceCatacombs + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!82 &363308235 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 363308234} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 8300000, guid: 363c65713c3a336439d43b0f84615632, type: 3} + m_PlayOnAwake: 1 + m_Volume: 0.1 + 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 &363308236 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 363308234} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 37.864067, y: -5.0793505, z: -14.286615} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 8 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &366805451 GameObject: m_ObjectHideFlags: 0 @@ -49162,10 +49289,10 @@ MonoBehaviour: m_OnValueChanged: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 0} - m_TargetAssemblyTypeName: SaveMusicSettings, Assembly-CSharp - m_MethodName: SaveVolumeButton - m_Mode: 1 + - m_Target: {fileID: 363308235} + m_TargetAssemblyTypeName: UnityEngine.AudioSource, UnityEngine + m_MethodName: set_volume + m_Mode: 0 m_Arguments: m_ObjectArgument: {fileID: 0} m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine @@ -52345,7 +52472,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7d979e870b57ddc469af22153ab86c9f, type: 3} m_Name: m_EditorClassIdentifier: - musicSlider: {fileID: 0} + musicSlider: {fileID: 1052797816} --- !u!114 &1452364979 MonoBehaviour: m_ObjectHideFlags: 0 @@ -52358,7 +52485,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 82139d862c485054da5412c4c0f4d926, type: 3} m_Name: m_EditorClassIdentifier: - volumeSlider: {fileID: 0} + volumeSlider: {fileID: 1094955538} --- !u!4 &1452364980 Transform: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/CaveEntrance.unity b/Assets/Scenes/CaveEntrance.unity index c45d0923..f2ca0dc1 100644 --- a/Assets/Scenes/CaveEntrance.unity +++ b/Assets/Scenes/CaveEntrance.unity @@ -24259,10 +24259,10 @@ MonoBehaviour: m_OnValueChanged: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 1739753159} - m_TargetAssemblyTypeName: SaveMusicSettings, Assembly-CSharp - m_MethodName: SaveVolumeButton - m_Mode: 1 + - m_Target: {fileID: 151898956} + m_TargetAssemblyTypeName: UnityEngine.AudioSource, UnityEngine + m_MethodName: set_volume + m_Mode: 0 m_Arguments: m_ObjectArgument: {fileID: 0} m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine @@ -24271,6 +24271,133 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 +--- !u!1 &151898955 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 151898957} + - component: {fileID: 151898956} + m_Layer: 0 + m_Name: AmbienceEntrance + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!82 &151898956 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 151898955} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 8300000, guid: dd9a22433678ff94e9a83e0700498d5f, 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 &151898957 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 151898955} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 37.864067, y: -5.0793505, z: -14.286615} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 19 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &158070407 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/Cementary.unity b/Assets/Scenes/Cementary.unity index 2c6de34a..b9fd9b7b 100644 --- a/Assets/Scenes/Cementary.unity +++ b/Assets/Scenes/Cementary.unity @@ -67649,6 +67649,133 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &129251316 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 129251318} + - component: {fileID: 129251317} + m_Layer: 0 + m_Name: AmbientCementary + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!82 &129251317 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 129251316} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 8300000, guid: beb8a51e946f8d644a2aaf0795750070, type: 3} + m_PlayOnAwake: 1 + m_Volume: 0.227 + 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 &129251318 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 129251316} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 43.29154, y: 20.76293, z: -3.827109} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 11 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &132031236 GameObject: m_ObjectHideFlags: 0 @@ -153732,6 +153859,7 @@ GameObject: m_Component: - component: {fileID: 1484827082} - component: {fileID: 1484827083} + - component: {fileID: 1484827084} m_Layer: 5 m_Name: MusicVolumeSlider m_TagString: Untagged @@ -153812,10 +153940,10 @@ MonoBehaviour: m_OnValueChanged: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 0} - m_TargetAssemblyTypeName: SaveMusicSettings, Assembly-CSharp - m_MethodName: SaveVolumeButton - m_Mode: 1 + - m_Target: {fileID: 129251317} + m_TargetAssemblyTypeName: UnityEngine.AudioSource, UnityEngine + m_MethodName: set_volume + m_Mode: 0 m_Arguments: m_ObjectArgument: {fileID: 0} m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine @@ -153823,7 +153951,20 @@ MonoBehaviour: m_FloatArgument: 0 m_StringArgument: m_BoolArgument: 0 - m_CallState: 2 + m_CallState: 1 +--- !u!114 &1484827084 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1484827081} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7d979e870b57ddc469af22153ab86c9f, type: 3} + m_Name: + m_EditorClassIdentifier: + musicSlider: {fileID: 1484827083} --- !u!1 &1487096661 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/FirstVillage.unity b/Assets/Scenes/FirstVillage.unity index 66ca141c..e7907a4c 100644 --- a/Assets/Scenes/FirstVillage.unity +++ b/Assets/Scenes/FirstVillage.unity @@ -306767,10 +306767,10 @@ MonoBehaviour: m_OnValueChanged: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 0} - m_TargetAssemblyTypeName: SaveMusicSettings, Assembly-CSharp - m_MethodName: SaveVolumeButton - m_Mode: 1 + - m_Target: {fileID: 1634632909} + m_TargetAssemblyTypeName: UnityEngine.AudioSource, UnityEngine + m_MethodName: set_volume + m_Mode: 0 m_Arguments: m_ObjectArgument: {fileID: 0} m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine @@ -495377,6 +495377,133 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &1634632908 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1634632910} + - component: {fileID: 1634632909} + m_Layer: 0 + m_Name: AmbienceFirstVillage + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!82 &1634632909 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1634632908} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 8300000, guid: fa774831b2bfccc43b711dd590ff26ec, 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 &1634632910 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1634632908} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 37.864067, y: -5.0793505, z: -14.286615} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 17 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1634996692 GameObject: m_ObjectHideFlags: 0 @@ -504082,7 +504209,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7d979e870b57ddc469af22153ab86c9f, type: 3} m_Name: m_EditorClassIdentifier: - musicSlider: {fileID: 0} + musicSlider: {fileID: 1014515939} --- !u!114 &1724582844 MonoBehaviour: m_ObjectHideFlags: 0 @@ -504095,7 +504222,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 82139d862c485054da5412c4c0f4d926, type: 3} m_Name: m_EditorClassIdentifier: - volumeSlider: {fileID: 0} + volumeSlider: {fileID: 462717739} --- !u!4 &1724582845 Transform: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/InnVillage.unity b/Assets/Scenes/InnVillage.unity index 356d497c..a3b192fb 100644 --- a/Assets/Scenes/InnVillage.unity +++ b/Assets/Scenes/InnVillage.unity @@ -5224,7 +5224,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7d979e870b57ddc469af22153ab86c9f, type: 3} m_Name: m_EditorClassIdentifier: - musicSlider: {fileID: 0} + musicSlider: {fileID: 928057045} --- !u!114 &535890418 MonoBehaviour: m_ObjectHideFlags: 0 @@ -5237,7 +5237,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 82139d862c485054da5412c4c0f4d926, type: 3} m_Name: m_EditorClassIdentifier: - volumeSlider: {fileID: 0} + volumeSlider: {fileID: 713544295} --- !u!4 &535890419 Transform: m_ObjectHideFlags: 0 @@ -19672,6 +19672,133 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &766826394 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 766826396} + - component: {fileID: 766826395} + m_Layer: 0 + m_Name: Ambienceinn + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!82 &766826395 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 766826394} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 8300000, guid: dd9a22433678ff94e9a83e0700498d5f, 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 &766826396 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 766826394} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 70.73636, y: 21.397146, z: -67.833885} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 11 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &769679941 GameObject: m_ObjectHideFlags: 0 @@ -21242,10 +21369,10 @@ MonoBehaviour: m_OnValueChanged: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 0} - m_TargetAssemblyTypeName: SaveMusicSettings, Assembly-CSharp - m_MethodName: SaveVolumeButton - m_Mode: 1 + - m_Target: {fileID: 766826395} + m_TargetAssemblyTypeName: UnityEngine.AudioSource, UnityEngine + m_MethodName: set_volume + m_Mode: 0 m_Arguments: m_ObjectArgument: {fileID: 0} m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine diff --git a/Assets/Scenes/OutsideWizardsHouse.unity b/Assets/Scenes/OutsideWizardsHouse.unity index 8e5091bc..ce40d944 100644 --- a/Assets/Scenes/OutsideWizardsHouse.unity +++ b/Assets/Scenes/OutsideWizardsHouse.unity @@ -239154,6 +239154,133 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &1118328777 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1118328779} + - component: {fileID: 1118328778} + m_Layer: 0 + m_Name: AmbienceOutsideWizardHouse + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!82 &1118328778 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1118328777} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 8300000, guid: 254736acf6353194482609db57480719, type: 3} + m_PlayOnAwake: 1 + m_Volume: 0.4 + 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 &1118328779 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1118328777} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 37.864067, y: -5.0793505, z: -14.286615} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 15 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1118660723 GameObject: m_ObjectHideFlags: 0 @@ -243394,10 +243521,10 @@ MonoBehaviour: m_OnValueChanged: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 0} - m_TargetAssemblyTypeName: SaveMusicSettings, Assembly-CSharp - m_MethodName: SaveVolumeButton - m_Mode: 1 + - m_Target: {fileID: 1118328778} + m_TargetAssemblyTypeName: UnityEngine.AudioSource, UnityEngine + m_MethodName: set_volume + m_Mode: 0 m_Arguments: m_ObjectArgument: {fileID: 0} m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine @@ -453597,7 +453724,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7d979e870b57ddc469af22153ab86c9f, type: 3} m_Name: m_EditorClassIdentifier: - musicSlider: {fileID: 0} + musicSlider: {fileID: 1155740521} --- !u!114 &1507929232 MonoBehaviour: m_ObjectHideFlags: 0 @@ -453610,7 +453737,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 82139d862c485054da5412c4c0f4d926, type: 3} m_Name: m_EditorClassIdentifier: - volumeSlider: {fileID: 0} + volumeSlider: {fileID: 1176090449} --- !u!4 &1507929233 Transform: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/SampleScene.unity b/Assets/Scenes/SampleScene.unity index 04138e55..e9e8cf17 100644 --- a/Assets/Scenes/SampleScene.unity +++ b/Assets/Scenes/SampleScene.unity @@ -490,6 +490,133 @@ MonoBehaviour: gridPosition: {x: 0, y: 0} isChasing: 0 path: [] +--- !u!1 &20573773 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 20573775} + - component: {fileID: 20573774} + m_Layer: 0 + m_Name: AmbientBackground + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!82 &20573774 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 20573773} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 8300000, guid: c9fad9f093200c64a82ac2ff9ad24e4d, type: 3} + m_PlayOnAwake: 1 + m_Volume: 0.1 + 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 &20573775 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 20573773} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 6.345227, y: 49.440952, z: -3.263591} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 21 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &23852502 GameObject: m_ObjectHideFlags: 0 @@ -43081,6 +43208,18 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 + - m_Target: {fileID: 20573774} + m_TargetAssemblyTypeName: UnityEngine.AudioSource, UnityEngine + m_MethodName: set_volume + m_Mode: 0 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 --- !u!1 &1464669568 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/WizardHouse.unity b/Assets/Scenes/WizardHouse.unity index c95d7673..e32d61d9 100644 --- a/Assets/Scenes/WizardHouse.unity +++ b/Assets/Scenes/WizardHouse.unity @@ -852,6 +852,133 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 82335663} m_CullTransparentMesh: 1 +--- !u!1 &92045334 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 92045336} + - component: {fileID: 92045335} + m_Layer: 0 + m_Name: AmbienceHouse + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!82 &92045335 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 92045334} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 8300000, guid: 321957320f6d8fc48be15a799a7216f7, type: 3} + m_PlayOnAwake: 1 + m_Volume: 1 + 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 &92045336 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 92045334} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 8.823725, y: -3.7453623, z: -0.5760119} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 12 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &93305068 GameObject: m_ObjectHideFlags: 0 @@ -22428,6 +22555,7 @@ GameObject: m_Component: - component: {fileID: 182615358} - component: {fileID: 182615359} + - component: {fileID: 182615360} m_Layer: 5 m_Name: MusicVolumeSlider m_TagString: Untagged @@ -22508,10 +22636,10 @@ MonoBehaviour: m_OnValueChanged: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 0} - m_TargetAssemblyTypeName: SaveMusicSettings, Assembly-CSharp - m_MethodName: SaveVolumeButton - m_Mode: 1 + - m_Target: {fileID: 92045335} + m_TargetAssemblyTypeName: UnityEngine.AudioSource, UnityEngine + m_MethodName: set_volume + m_Mode: 0 m_Arguments: m_ObjectArgument: {fileID: 0} m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine @@ -22520,6 +22648,19 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 +--- !u!114 &182615360 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 182615357} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 82139d862c485054da5412c4c0f4d926, type: 3} + m_Name: + m_EditorClassIdentifier: + volumeSlider: {fileID: 182615359} --- !u!1 &190376227 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Sound.meta b/Assets/Sound.meta new file mode 100644 index 00000000..61b05b6a --- /dev/null +++ b/Assets/Sound.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 66abfcd2580917f45b8f58f44c614645 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sound/Ambient music.meta b/Assets/Sound/Ambient music.meta new file mode 100644 index 00000000..76ef4db3 --- /dev/null +++ b/Assets/Sound/Ambient music.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: d1cf26363863ffe4385606f37dcbe7c9 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sound/Ambient music/catacombs.mp3 b/Assets/Sound/Ambient music/catacombs.mp3 new file mode 100644 index 00000000..d4908e2d Binary files /dev/null and b/Assets/Sound/Ambient music/catacombs.mp3 differ diff --git a/Assets/Sound/Ambient music/catacombs.mp3.meta b/Assets/Sound/Ambient music/catacombs.mp3.meta new file mode 100644 index 00000000..44dd0948 --- /dev/null +++ b/Assets/Sound/Ambient music/catacombs.mp3.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 363c65713c3a336439d43b0f84615632 +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sound/Ambient music/celtic-7136.mp3 b/Assets/Sound/Ambient music/celtic-7136.mp3 new file mode 100644 index 00000000..415ab4d3 Binary files /dev/null and b/Assets/Sound/Ambient music/celtic-7136.mp3 differ diff --git a/Assets/Sound/Ambient music/celtic-7136.mp3.meta b/Assets/Sound/Ambient music/celtic-7136.mp3.meta new file mode 100644 index 00000000..bf6456a6 --- /dev/null +++ b/Assets/Sound/Ambient music/celtic-7136.mp3.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: fa774831b2bfccc43b711dd590ff26ec +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sound/Ambient music/cinematic-handpan-100bpm-25170.mp3 b/Assets/Sound/Ambient music/cinematic-handpan-100bpm-25170.mp3 new file mode 100644 index 00000000..d1df724f Binary files /dev/null and b/Assets/Sound/Ambient music/cinematic-handpan-100bpm-25170.mp3 differ diff --git a/Assets/Sound/Ambient music/cinematic-handpan-100bpm-25170.mp3.meta b/Assets/Sound/Ambient music/cinematic-handpan-100bpm-25170.mp3.meta new file mode 100644 index 00000000..860ea783 --- /dev/null +++ b/Assets/Sound/Ambient music/cinematic-handpan-100bpm-25170.mp3.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: beb8a51e946f8d644a2aaf0795750070 +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sound/Ambient music/curious-creep-35588.mp3 b/Assets/Sound/Ambient music/curious-creep-35588.mp3 new file mode 100644 index 00000000..b8bb08dd Binary files /dev/null and b/Assets/Sound/Ambient music/curious-creep-35588.mp3 differ diff --git a/Assets/Sound/Ambient music/curious-creep-35588.mp3.meta b/Assets/Sound/Ambient music/curious-creep-35588.mp3.meta new file mode 100644 index 00000000..4e77609e --- /dev/null +++ b/Assets/Sound/Ambient music/curious-creep-35588.mp3.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 321957320f6d8fc48be15a799a7216f7 +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sound/Ambient music/medieval-75892.mp3 b/Assets/Sound/Ambient music/medieval-75892.mp3 new file mode 100644 index 00000000..7ae1a422 Binary files /dev/null and b/Assets/Sound/Ambient music/medieval-75892.mp3 differ diff --git a/Assets/Sound/Ambient music/medieval-75892.mp3.meta b/Assets/Sound/Ambient music/medieval-75892.mp3.meta new file mode 100644 index 00000000..f73ed6c8 --- /dev/null +++ b/Assets/Sound/Ambient music/medieval-75892.mp3.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: dd9a22433678ff94e9a83e0700498d5f +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sound/Ambient music/orchestral-chillout-64027.mp3 b/Assets/Sound/Ambient music/orchestral-chillout-64027.mp3 new file mode 100644 index 00000000..adaec288 Binary files /dev/null and b/Assets/Sound/Ambient music/orchestral-chillout-64027.mp3 differ diff --git a/Assets/Sound/Ambient music/orchestral-chillout-64027.mp3.meta b/Assets/Sound/Ambient music/orchestral-chillout-64027.mp3.meta new file mode 100644 index 00000000..754d5c45 --- /dev/null +++ b/Assets/Sound/Ambient music/orchestral-chillout-64027.mp3.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: c9fad9f093200c64a82ac2ff9ad24e4d +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sound/Ambient music/outside.mp3 b/Assets/Sound/Ambient music/outside.mp3 new file mode 100644 index 00000000..6a8df52e Binary files /dev/null and b/Assets/Sound/Ambient music/outside.mp3 differ diff --git a/Assets/Sound/Ambient music/outside.mp3.meta b/Assets/Sound/Ambient music/outside.mp3.meta new file mode 100644 index 00000000..783a9d9b --- /dev/null +++ b/Assets/Sound/Ambient music/outside.mp3.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 254736acf6353194482609db57480719 +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset index 85c1a919..45fb3ee5 100644 --- a/UserSettings/EditorUserSettings.asset +++ b/UserSettings/EditorUserSettings.asset @@ -6,35 +6,35 @@ EditorUserSettings: serializedVersion: 4 m_ConfigSettings: RecentlyUsedScenePath-0: - value: 22424703114646680e0b0227036c7b0518101d252266333e243d04 + value: 22424703114646680e0b0227036c72111f19352f223d667d6d1a1226ece42776f7e93ffdfe flags: 0 RecentlyUsedScenePath-1: - value: 22424703114646680e0b0227036c72111f1958072926337e38271427fb - flags: 0 - RecentlyUsedScenePath-2: - value: 22424703114646680e0b0227036c68190c160a2e042733232867083debf42d - flags: 0 - RecentlyUsedScenePath-3: - value: 22424703114646680e0b0227036c7c1102161b25212a357e38271427fb - flags: 0 - RecentlyUsedScenePath-4: - value: 22424703114646680e0b0227036c7c1100123d24383a273e2e2c5326ece92021 - flags: 0 - RecentlyUsedScenePath-5: value: 22424703114646680e0b0227036c7c151b12163e2d3a3f7e38271427fb flags: 0 - RecentlyUsedScenePath-6: - value: 22424703114646680e0b0227036c761e1821112620292135633c133af6f9 - flags: 0 - RecentlyUsedScenePath-7: - value: 22424703114646680e0b0227036c791904040c1c25242a312a2c5326ece92021 - flags: 0 - RecentlyUsedScenePath-8: + RecentlyUsedScenePath-2: value: 22424703114646680e0b0227036c6c111b07142f1f2b233e2867083debf42d flags: 0 - RecentlyUsedScenePath-9: + RecentlyUsedScenePath-3: + value: 22424703114646680e0b0227036c68190c160a2e042733232867083debf42d + flags: 0 + RecentlyUsedScenePath-4: + value: 22424703114646680e0b0227036c7c1102161b25212a357e38271427fb + flags: 0 + RecentlyUsedScenePath-5: + value: 22424703114646680e0b0227036c791904040c1c25242a312a2c5326ece92021 + flags: 0 + RecentlyUsedScenePath-6: + value: 22424703114646680e0b0227036c7c1100123d24383a273e2e2c5326ece92021 + flags: 0 + RecentlyUsedScenePath-7: value: 22424703114646680e0b0227036c70050204112e291f2f2a2c3b1920caef212be7a923e7ee2e26 flags: 0 + RecentlyUsedScenePath-8: + value: 22424703114646680e0b0227036c761e1821112620292135633c133af6f9 + flags: 0 + RecentlyUsedScenePath-9: + value: 22424703114646680e0b0227036c72111f1958072926337e38271427fb + flags: 0 vcSharedLogLevel: value: 0d5e400f0650 flags: 0