From cf41dfe4a4ec0c862ebfd52dfd4c6c972e05e31e Mon Sep 17 00:00:00 2001 From: Jens Pitkanen Date: Tue, 21 Apr 2020 03:10:32 +0300 Subject: [PATCH] Add diary volume slider --- Assets/Audio Mixers/MainMixer.mixer | 46 ++- Assets/Prefabs/UI/Pause Menu.prefab | 507 ++++++++++++++++++++++++++++ Assets/Scripts/AudioMaster.cs | 1 + Assets/Scripts/Options.cs | 2 + Assets/Scripts/PauseMenu.cs | 2 + 5 files changed, 557 insertions(+), 1 deletion(-) diff --git a/Assets/Audio Mixers/MainMixer.mixer b/Assets/Audio Mixers/MainMixer.mixer index f7de85c..d1dbaf2 100644 --- a/Assets/Audio Mixers/MainMixer.mixer +++ b/Assets/Audio Mixers/MainMixer.mixer @@ -1,5 +1,25 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!243 &-8989905642984639358 +AudioMixerGroupController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Speech Master + m_AudioMixer: {fileID: 24100000} + m_GroupID: 6961d089bee042245b1a41fd433dd5b1 + m_Children: + - {fileID: -6189427169395524444} + m_Volume: da78777609f75db4482d8f0c2a6597d7 + m_Pitch: 8710acaef54c47f41bac5d0f158b32da + m_Send: 00000000000000000000000000000000 + m_Effects: + - {fileID: -2794510273671228723} + m_UserColorIndex: 0 + m_Mute: 0 + m_Solo: 0 + m_BypassEffects: 0 --- !u!243 &-8678847571685279384 AudioMixerGroupController: m_ObjectHideFlags: 0 @@ -95,7 +115,7 @@ AudioMixerGroupController: - {fileID: -267709887311468707} - {fileID: -2967980135314984734} - {fileID: 586271417499195193} - - {fileID: -6189427169395524444} + - {fileID: -8989905642984639358} m_Volume: 3b873ffd7476b574ab79c605a05a50ff m_Pitch: db09271ae0508dd4fab1979ce5ca6572 m_Send: 00000000000000000000000000000000 @@ -229,6 +249,20 @@ AudioMixerGroupController: m_Mute: 0 m_Solo: 0 m_BypassEffects: 0 +--- !u!244 &-2794510273671228723 +AudioMixerEffectController: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_EffectID: 31e6804d72c7f624c8580f26c2ded311 + m_EffectName: Attenuation + m_MixLevel: d8c19103019cab245b17a1f55f5e959d + m_Parameters: [] + m_SendTarget: {fileID: 0} + m_EnableWetMix: 0 + m_Bypass: 0 --- !u!243 &-860412736225255873 AudioMixerGroupController: m_ObjectHideFlags: 0 @@ -309,6 +343,8 @@ AudioMixerController: name: Footstep Volume - guid: 1dc5725402baaca40b189e10927dfd5f name: Master Volume + - guid: da78777609f75db4482d8f0c2a6597d7 + name: Diary Volume m_AudioMixerGroupViews: - guids: - cce571dfddcbc694fa5856a9866157f8 @@ -321,6 +357,7 @@ AudioMixerController: - e98388ceee042154bb13e28dbe91c9a1 - f26d1353f522d5a4abfb02f874e440de - ac0a65986de6a5b45bdff4b59428473c + - 6961d089bee042245b1a41fd433dd5b1 name: View m_CurrentViewIndex: 0 m_TargetSnapshot: {fileID: -3105936107480203619} @@ -531,12 +568,19 @@ AudioMixerSnapshotController: m_AudioMixer: {fileID: 24100000} m_SnapshotID: 99acc46f1b1d7c24b861966f8835044d m_FloatValues: + 7e859151406ed7e4e9cb0d5fd212f8c8: 0.44 118a95e1adc69904c92cc8ba0d5d3b78: 4 + b8d08d16e05e69142b6d004d94c8cfc9: 0 9f37ae073eb26e54f93d6ea7c5e77b1b: 2000 + d3315d995104d364ab05091350d51b94: 3.4 d3d28f4b939c15c4fb46575e1562c52b: 9 + 8abcd1dbe0a90d24c82e3c8fe1b5b768: 15.7 + 7d112fbca2a5dd8459f2c00b517f7bac: 0.52900004 fd01f6bdeaa870c4688fa6fcad7c3e41: 0 3b873ffd7476b574ab79c605a05a50ff: 0 fb93bc0e4abea1d4e840f1f2832ba33d: 6 + a1407a7e6f887dd4eac4400887eda079: 3481 + a4d77b9ef282ebe4eb06eb9cc341881d: 0.175 m_TransitionOverrides: {} --- !u!244 &8562860506994544243 AudioMixerEffectController: diff --git a/Assets/Prefabs/UI/Pause Menu.prefab b/Assets/Prefabs/UI/Pause Menu.prefab index 02d4e0d..e3823f5 100644 --- a/Assets/Prefabs/UI/Pause Menu.prefab +++ b/Assets/Prefabs/UI/Pause Menu.prefab @@ -202,6 +202,79 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &283442631472425950 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6576731660997411131} + - component: {fileID: 3505689875038582991} + - component: {fileID: 8942176798855340490} + m_Layer: 5 + m_Name: Handle + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6576731660997411131 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 283442631472425950} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 5794751097729928868} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 20, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3505689875038582991 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 283442631472425950} + m_CullTransparentMesh: 0 +--- !u!114 &8942176798855340490 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 283442631472425950} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10913, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!1 &480563255366051109 GameObject: m_ObjectHideFlags: 0 @@ -275,6 +348,79 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &528799584277748196 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4249983716973098219} + - component: {fileID: 7343118748057594425} + - component: {fileID: 7215141689834398240} + m_Layer: 5 + m_Name: Fill + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4249983716973098219 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 528799584277748196} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 3608333074441045429} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 10, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7343118748057594425 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 528799584277748196} + m_CullTransparentMesh: 0 +--- !u!114 &7215141689834398240 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 528799584277748196} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!1 &813381614657329159 GameObject: m_ObjectHideFlags: 0 @@ -835,6 +981,106 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &1773706722322677207 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4996311027558172407} + - component: {fileID: 274723588017056589} + m_Layer: 5 + m_Name: Diary Volume Slider + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4996311027558172407 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1773706722322677207} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 1155705187412121073} + - {fileID: 3608333074441045429} + - {fileID: 5794751097729928868} + m_Father: {fileID: 4169741984815117888} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 0.5} + m_AnchorMax: {x: 1, y: 0.5} + m_AnchoredPosition: {x: -20, y: 0} + m_SizeDelta: {x: 120, y: 20} + m_Pivot: {x: 1, y: 0.5} +--- !u!114 &274723588017056589 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1773706722322677207} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 67db9e8f0e2ae9c40bc1e2b64352a6b4, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 8942176798855340490} + m_FillRect: {fileID: 4249983716973098219} + m_HandleRect: {fileID: 6576731660997411131} + m_Direction: 0 + m_MinValue: 0 + m_MaxValue: 1 + m_WholeNumbers: 0 + m_Value: 0 + m_OnValueChanged: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 2837007226937140173} + m_MethodName: set_DiaryVolume + 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 &2029229704042365824 GameObject: m_ObjectHideFlags: 0 @@ -1163,6 +1409,79 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &2683761058120144728 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1155705187412121073} + - component: {fileID: 8663728924035750405} + - component: {fileID: 875536458030768813} + m_Layer: 5 + m_Name: Background + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1155705187412121073 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2683761058120144728} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 4996311027558172407} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0.25} + m_AnchorMax: {x: 1, y: 0.75} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8663728924035750405 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2683761058120144728} + m_CullTransparentMesh: 0 +--- !u!114 &875536458030768813 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2683761058120144728} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!1 &2845582780012059681 GameObject: m_ObjectHideFlags: 0 @@ -1413,6 +1732,43 @@ MonoBehaviour: m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: Invert mouselook +--- !u!1 &3143050994043451443 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4169741984815117888} + m_Layer: 5 + m_Name: Diary Volume + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4169741984815117888 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3143050994043451443} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 7746964408723638739} + - {fileID: 4996311027558172407} + m_Father: {fileID: 2316617036968199621} + m_RootOrder: 7 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 1, y: 0.5} + m_AnchoredPosition: {x: 25, y: -150} + m_SizeDelta: {x: -25, y: 50} + m_Pivot: {x: 0, y: 1} --- !u!1 &3149377277045041841 GameObject: m_ObjectHideFlags: 0 @@ -1904,6 +2260,42 @@ MonoBehaviour: m_BoolArgument: 0 m_CallState: 2 m_IsOn: 1 +--- !u!1 &3869138455765445100 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3608333074441045429} + m_Layer: 5 + m_Name: Fill Area + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3608333074441045429 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3869138455765445100} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 4249983716973098219} + m_Father: {fileID: 4996311027558172407} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0.25} + m_AnchorMax: {x: 1, y: 0.75} + m_AnchoredPosition: {x: -5, y: 0} + m_SizeDelta: {x: -20, y: 0} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &3965616981564124319 GameObject: m_ObjectHideFlags: 0 @@ -2707,6 +3099,7 @@ MonoBehaviour: CampfireVolume: {fileID: 5289447238612992950} AmbientVolume: {fileID: 1021974734450698777} FootstepVolume: {fileID: 2556321602946883678} + DiaryVolume: {fileID: 274723588017056589} --- !u!114 &2837007226937140173 MonoBehaviour: m_ObjectHideFlags: 0 @@ -2790,6 +3183,7 @@ RectTransform: - {fileID: 6081099778283769688} - {fileID: 519962654072447509} - {fileID: 4127888187077662439} + - {fileID: 4169741984815117888} m_Father: {fileID: 6755247300797306272} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -3430,6 +3824,119 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 60} m_SizeDelta: {x: 0, y: 50} m_Pivot: {x: 0, y: 1} +--- !u!1 &7526026049420645828 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5794751097729928868} + m_Layer: 5 + m_Name: Handle Slide Area + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5794751097729928868 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7526026049420645828} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 6576731660997411131} + m_Father: {fileID: 4996311027558172407} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: -20, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &7550596833605079706 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7746964408723638739} + - component: {fileID: 407172430100279174} + - component: {fileID: 356309705880212246} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7746964408723638739 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7550596833605079706} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 4169741984815117888} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: 20, y: 0} + m_SizeDelta: {x: 285, y: 36} + m_Pivot: {x: 0, y: 0.5} +--- !u!222 &407172430100279174 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7550596833605079706} + m_CullTransparentMesh: 0 +--- !u!114 &356309705880212246 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7550596833605079706} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.93333334, g: 0.93333334, b: 0.93333334, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 12800000, guid: a0bb3d007c7133149bd1682bd93b776f, type: 3} + m_FontSize: 24 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 2 + m_MaxSize: 40 + m_Alignment: 3 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: Diary volume --- !u!1 &7687380768820522851 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/AudioMaster.cs b/Assets/Scripts/AudioMaster.cs index d3bae6c..bd0ee4e 100644 --- a/Assets/Scripts/AudioMaster.cs +++ b/Assets/Scripts/AudioMaster.cs @@ -28,6 +28,7 @@ public class AudioMaster : MonoBehaviour { Mixer.SetFloat("Campfire Volume", ConvertRatioToDecibel(Options.CampfireVolume)); Mixer.SetFloat("Ambient Volume", ConvertRatioToDecibel(Options.AmbientVolume)); Mixer.SetFloat("Footstep Volume", ConvertRatioToDecibel(Options.FootstepVolume)); + Mixer.SetFloat("Diary Volume", ConvertRatioToDecibel(Options.DiaryVolume)); } private float ConvertRatioToDecibel(float x) { diff --git a/Assets/Scripts/Options.cs b/Assets/Scripts/Options.cs index 2468833..29c2a74 100644 --- a/Assets/Scripts/Options.cs +++ b/Assets/Scripts/Options.cs @@ -9,6 +9,7 @@ public class Options : MonoBehaviour { public float CampfireVolume { get; set; } public float AmbientVolume { get; set; } public float FootstepVolume { get; set; } + public float DiaryVolume { get; set; } private void Awake() { InvertMouseX = false; @@ -19,5 +20,6 @@ public class Options : MonoBehaviour { CampfireVolume = 1f; AmbientVolume = 1f; FootstepVolume = 1f; + DiaryVolume = 1f; } } diff --git a/Assets/Scripts/PauseMenu.cs b/Assets/Scripts/PauseMenu.cs index f2ec37d..dbe7d1e 100644 --- a/Assets/Scripts/PauseMenu.cs +++ b/Assets/Scripts/PauseMenu.cs @@ -14,6 +14,7 @@ public class PauseMenu : MonoBehaviour { public Slider CampfireVolume; public Slider AmbientVolume; public Slider FootstepVolume; + public Slider DiaryVolume; private CanvasGroup Canvas; private bool Paused { @@ -35,6 +36,7 @@ public class PauseMenu : MonoBehaviour { CampfireVolume.value = Options.CampfireVolume; AmbientVolume.value = Options.AmbientVolume; FootstepVolume.value = Options.FootstepVolume; + DiaryVolume.value = Options.DiaryVolume; } private void Update() {