From 6dde074367e5632bf4a7617d3c7a3228a72fc231 Mon Sep 17 00:00:00 2001 From: eheimburg <74330250+eheimburg@users.noreply.github.com> Date: Sun, 21 Mar 2021 22:11:14 -0400 Subject: [PATCH 1/9] Volume slider [GOMPS-373] Adds a little slider for volume to the bottom-left of each UI screen. Stores this volume setting in PlayerPrefs. Since we don't have an icon for volume handy in the release branch, it's just labeled with the word "Volume", but it's set up in a prefab that should let us change that to a speaker icon without having to alter the scenes again. Because different UI screens have different scaling, it's hard to get the volume slider into the EXACT same spot on each screen without manually repositioning child elements -- and I wanted to avoid overriding any child-element positions, because because we want to replace the label with an icon later. So I changed the in-scene scale of the slider a little bit to make it approximately the same size and position on each screen. When final art is in, we can tweak position on each screen to get them to line up more precisely. --- .../BossRoom/Prefabs/UI/VolumeSlider.prefab | 519 ++++++++++++++++++ .../Prefabs/UI/VolumeSlider.prefab.meta | 7 + Assets/BossRoom/Scenes/BossRoom.unity | 4 +- Assets/BossRoom/Scenes/CharSelect.unity | 4 +- Assets/BossRoom/Scenes/MainMenu.unity | 4 +- Assets/BossRoom/Scenes/PostGame.unity | 4 +- Assets/BossRoom/Scripts/Client/ClientPrefs.cs | 19 + .../Scripts/Client/ClientPrefs.cs.meta | 11 + .../BossRoom/Scripts/Client/UI/StartupUI.cs | 1 + .../Scripts/Client/UI/UIVolumeControl.cs | 48 ++ .../Scripts/Client/UI/UIVolumeControl.cs.meta | 11 + 11 files changed, 624 insertions(+), 8 deletions(-) create mode 100644 Assets/BossRoom/Prefabs/UI/VolumeSlider.prefab create mode 100644 Assets/BossRoom/Prefabs/UI/VolumeSlider.prefab.meta create mode 100644 Assets/BossRoom/Scripts/Client/ClientPrefs.cs create mode 100644 Assets/BossRoom/Scripts/Client/ClientPrefs.cs.meta create mode 100644 Assets/BossRoom/Scripts/Client/UI/UIVolumeControl.cs create mode 100644 Assets/BossRoom/Scripts/Client/UI/UIVolumeControl.cs.meta diff --git a/Assets/BossRoom/Prefabs/UI/VolumeSlider.prefab b/Assets/BossRoom/Prefabs/UI/VolumeSlider.prefab new file mode 100644 index 000000000..8fd74df72 --- /dev/null +++ b/Assets/BossRoom/Prefabs/UI/VolumeSlider.prefab @@ -0,0 +1,519 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &1297333277375993656 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1297333277375993659} + - component: {fileID: 1297333277375993637} + - component: {fileID: 1297333277375993658} + m_Layer: 5 + m_Name: Label + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1297333277375993659 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1297333277375993656} + 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: 5932003814159250390} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 0, y: 20} + m_SizeDelta: {x: 160, y: 20} + m_Pivot: {x: 0, y: 1} +--- !u!222 &1297333277375993637 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1297333277375993656} + m_CullTransparentMesh: 1 +--- !u!114 &1297333277375993658 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1297333277375993656} + 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: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 14 + m_FontStyle: 1 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 40 + m_Alignment: 0 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: Volume +--- !u!1 &1297333277447937739 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1297333277447937738} + m_Layer: 5 + m_Name: VolumeSlider + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1297333277447937738 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1297333277447937739} + 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: 5932003814159250390} + m_Father: {fileID: 0} + 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: 0, y: 0} + m_Pivot: {x: 0, y: 0} +--- !u!1 &1297333277523758273 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1297333277523758272} + 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 &1297333277523758272 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1297333277523758273} + 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: 1297333279406300616} + m_Father: {fileID: 5932003814159250390} + 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 &1297333278463969177 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1297333278463969176} + - component: {fileID: 1297333278463969178} + - component: {fileID: 1297333278463969179} + m_Layer: 5 + m_Name: Handle + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1297333278463969176 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1297333278463969177} + 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: 1297333279295125932} + 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 &1297333278463969178 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1297333278463969177} + m_CullTransparentMesh: 1 +--- !u!114 &1297333278463969179 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1297333278463969177} + 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_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 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 &1297333278660116911 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1297333278660116910} + - component: {fileID: 1297333278660116904} + - component: {fileID: 1297333278660116905} + m_Layer: 5 + m_Name: Background + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1297333278660116910 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1297333278660116911} + 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: 5932003814159250390} + 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 &1297333278660116904 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1297333278660116911} + m_CullTransparentMesh: 1 +--- !u!114 &1297333278660116905 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1297333278660116911} + 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_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 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 &1297333279295125933 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1297333279295125932} + 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 &1297333279295125932 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1297333279295125933} + 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: 1297333278463969176} + m_Father: {fileID: 5932003814159250390} + 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 &1297333279406300617 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1297333279406300616} + - component: {fileID: 1297333279406300618} + - component: {fileID: 1297333279406300619} + m_Layer: 5 + m_Name: Fill + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1297333279406300616 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1297333279406300617} + 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: 1297333277523758272} + 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 &1297333279406300618 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1297333279406300617} + m_CullTransparentMesh: 1 +--- !u!114 &1297333279406300619 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1297333279406300617} + 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_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 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 &5932003814159250391 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5932003814159250390} + - component: {fileID: 5932003814159250409} + - component: {fileID: 1172562498119714283} + m_Layer: 5 + m_Name: VolumeSlider + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5932003814159250390 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5932003814159250391} + 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: 1297333278660116910} + - {fileID: 1297333277523758272} + - {fileID: 1297333279295125932} + - {fileID: 1297333277375993659} + m_Father: {fileID: 1297333277447937738} + 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: 30, y: 10} + m_SizeDelta: {x: 160, y: 20} + m_Pivot: {x: 0, y: 0} +--- !u!114 &5932003814159250409 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5932003814159250391} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 67db9e8f0e2ae9c40bc1e2b64352a6b4, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + 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: 1297333278463969179} + m_FillRect: {fileID: 1297333279406300616} + m_HandleRect: {fileID: 1297333278463969176} + m_Direction: 0 + m_MinValue: 0 + m_MaxValue: 1 + m_WholeNumbers: 0 + m_Value: 0 + m_OnValueChanged: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &1172562498119714283 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5932003814159250391} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 102c5e03f55bcba42903a3d49db09aef, type: 3} + m_Name: + m_EditorClassIdentifier: + m_VolumeSlider: {fileID: 5932003814159250409} diff --git a/Assets/BossRoom/Prefabs/UI/VolumeSlider.prefab.meta b/Assets/BossRoom/Prefabs/UI/VolumeSlider.prefab.meta new file mode 100644 index 000000000..73d94dae2 --- /dev/null +++ b/Assets/BossRoom/Prefabs/UI/VolumeSlider.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: d163056211811a144bbf083671381793 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/BossRoom/Scenes/BossRoom.unity b/Assets/BossRoom/Scenes/BossRoom.unity index 6c367d18b..d9b5000b6 100644 --- a/Assets/BossRoom/Scenes/BossRoom.unity +++ b/Assets/BossRoom/Scenes/BossRoom.unity @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1c4efffd4e19f57e334af5e7f66abff6a1a713c385864a4bf9019b1c250e8955 -size 140907 +oid sha256:0162f126402f28d5b91c592c3caa1981eb83708c7b05d5943a53e826eb6b2091 +size 145759 diff --git a/Assets/BossRoom/Scenes/CharSelect.unity b/Assets/BossRoom/Scenes/CharSelect.unity index 993d67424..2a63647ea 100644 --- a/Assets/BossRoom/Scenes/CharSelect.unity +++ b/Assets/BossRoom/Scenes/CharSelect.unity @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:49f4b8326856c4ca18ff7eb2b867aa22e6226f61a198519b9903723ad96ff647 -size 180973 +oid sha256:f7cf70772d9ea2ecb67aee752c930f5e1678c411cb151be15f52a83f954f3ca2 +size 186362 diff --git a/Assets/BossRoom/Scenes/MainMenu.unity b/Assets/BossRoom/Scenes/MainMenu.unity index 5b3b045f8..4d9cd6e16 100644 --- a/Assets/BossRoom/Scenes/MainMenu.unity +++ b/Assets/BossRoom/Scenes/MainMenu.unity @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8bfaec7eab23696295a495e54bbab784a26d89ec04a2f6143b30d442be657893 -size 38743 +oid sha256:29567f179f87df85f0b75ec2799a9720dbc47a20353290a1d4761fd06a65494c +size 43617 diff --git a/Assets/BossRoom/Scenes/PostGame.unity b/Assets/BossRoom/Scenes/PostGame.unity index 39a594658..530f3c96c 100644 --- a/Assets/BossRoom/Scenes/PostGame.unity +++ b/Assets/BossRoom/Scenes/PostGame.unity @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:64a4184a01b6890606bd419078a59a22fd1a48cea2112371faf171c8d6784e55 -size 43996 +oid sha256:a3ab892d75e4dd2f07e4449b815b4e3079198cd326810cbf5382eb88f5aeb5f9 +size 48884 diff --git a/Assets/BossRoom/Scripts/Client/ClientPrefs.cs b/Assets/BossRoom/Scripts/Client/ClientPrefs.cs new file mode 100644 index 000000000..f4d35bcba --- /dev/null +++ b/Assets/BossRoom/Scripts/Client/ClientPrefs.cs @@ -0,0 +1,19 @@ +using UnityEngine; + +/// +/// Singleton class which saves/loads local-client settings. +/// (This is just a wrapper around the PlayerPrefs system, +/// so that all the calls are in the same place.) +/// +public class ClientPrefs +{ + public static float GetMasterVolume() + { + return PlayerPrefs.GetFloat("MasterVolume", 1); + } + + public static void SetMasterVolume(float volume) + { + PlayerPrefs.SetFloat("MasterVolume", volume); + } +} diff --git a/Assets/BossRoom/Scripts/Client/ClientPrefs.cs.meta b/Assets/BossRoom/Scripts/Client/ClientPrefs.cs.meta new file mode 100644 index 000000000..ab7eed452 --- /dev/null +++ b/Assets/BossRoom/Scripts/Client/ClientPrefs.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 7c9efd627253a5b4c8c5ab1ae629aa8e +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/BossRoom/Scripts/Client/UI/StartupUI.cs b/Assets/BossRoom/Scripts/Client/UI/StartupUI.cs index 3daa10b28..fcd322150 100644 --- a/Assets/BossRoom/Scripts/Client/UI/StartupUI.cs +++ b/Assets/BossRoom/Scripts/Client/UI/StartupUI.cs @@ -10,6 +10,7 @@ public class StartupUI : MonoBehaviour { void Start() { + AudioListener.volume = ClientPrefs.GetMasterVolume(); SceneManager.LoadScene("MainMenu"); } } diff --git a/Assets/BossRoom/Scripts/Client/UI/UIVolumeControl.cs b/Assets/BossRoom/Scripts/Client/UI/UIVolumeControl.cs new file mode 100644 index 000000000..ef9a042c3 --- /dev/null +++ b/Assets/BossRoom/Scripts/Client/UI/UIVolumeControl.cs @@ -0,0 +1,48 @@ +using UnityEngine; +using UnityEngine.UI; + +/// +/// Controls a master-volume Slider. +/// +public class UIVolumeControl : MonoBehaviour +{ + [SerializeField] + private Slider m_VolumeSlider; + + private void OnEnable() + { + m_VolumeSlider.onValueChanged.AddListener(OnVolumeSliderChanged); + } + + private void OnDisable() + { + m_VolumeSlider.onValueChanged.RemoveListener(OnVolumeSliderChanged); + } + + private void Update() + { + // we want to make sure the slider is 100% accurate at all times, even if it gets changed + // from some other UI screen rather than our slider. (Most games have a "settings" window where things + // like master volume can also be configured.) So we constantly check to see if the volume has changed. + // (This also initializes the slider to the correct value at startup... otherwise we would do this in OnEnable()) + if (AudioListener.volume != m_VolumeSlider.value) + { + m_VolumeSlider.value = AudioListener.volume; + } + } + + private void OnVolumeSliderChanged(float newValue) + { + AudioListener.volume = newValue; + ClientPrefs.SetMasterVolume(newValue); + } + +#if UNITY_EDITOR + private void OnValidate() + { + // default assumption is that if there's a Slider on our GameObject, we probably want to use it! + if (m_VolumeSlider == null) + m_VolumeSlider = GetComponent(); + } +#endif +} diff --git a/Assets/BossRoom/Scripts/Client/UI/UIVolumeControl.cs.meta b/Assets/BossRoom/Scripts/Client/UI/UIVolumeControl.cs.meta new file mode 100644 index 000000000..0c8d33ee7 --- /dev/null +++ b/Assets/BossRoom/Scripts/Client/UI/UIVolumeControl.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 102c5e03f55bcba42903a3d49db09aef +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: From 851a1168ce0416f0b3f3e9c1bc12c4f358bfc8ef Mon Sep 17 00:00:00 2001 From: eheimburg <74330250+eheimburg@users.noreply.github.com> Date: Sun, 21 Mar 2021 22:19:40 -0400 Subject: [PATCH 2/9] moving another PlayerPrefs call to my wrapper class --- Assets/BossRoom/Scripts/Client/ClientPrefs.cs | 19 ++++++++++++++++++ .../Scripts/Client/Net/ClientGameNetPortal.cs | 20 +------------------ 2 files changed, 20 insertions(+), 19 deletions(-) diff --git a/Assets/BossRoom/Scripts/Client/ClientPrefs.cs b/Assets/BossRoom/Scripts/Client/ClientPrefs.cs index f4d35bcba..28c489a0f 100644 --- a/Assets/BossRoom/Scripts/Client/ClientPrefs.cs +++ b/Assets/BossRoom/Scripts/Client/ClientPrefs.cs @@ -16,4 +16,23 @@ public static void SetMasterVolume(float volume) { PlayerPrefs.SetFloat("MasterVolume", volume); } + + /// + /// Either loads a Guid string from Unity preferences, or creates one and checkpoints it, then returns it. + /// + /// The Guid that uniquely identifies this client install, in string form. + public static string GetGuid() + { + if (PlayerPrefs.HasKey("client_guid")) + { + return PlayerPrefs.GetString("client_guid"); + } + + var guid = System.Guid.NewGuid(); + var guidString = guid.ToString(); + + PlayerPrefs.SetString("client_guid", guidString); + return guidString; + } + } diff --git a/Assets/BossRoom/Scripts/Client/Net/ClientGameNetPortal.cs b/Assets/BossRoom/Scripts/Client/Net/ClientGameNetPortal.cs index 5f45d6a65..2ede34163 100644 --- a/Assets/BossRoom/Scripts/Client/Net/ClientGameNetPortal.cs +++ b/Assets/BossRoom/Scripts/Client/Net/ClientGameNetPortal.cs @@ -75,24 +75,6 @@ private void OnDisconnectOrTimeout(ulong clientID) } } - /// - /// Either loads a Guid string from Unity preferences, or creates one and checkpoints it, then returns it. - /// - /// The Guid that uniquely identifies this client install, in string form. - private static string GetOrCreateGuid() - { - if (PlayerPrefs.HasKey("client_guid")) - { - return PlayerPrefs.GetString("client_guid"); - } - - var guid = System.Guid.NewGuid(); - var guidString = guid.ToString(); - - PlayerPrefs.SetString("client_guid", guidString); - return guidString; - } - /// /// Wraps the invocation of NetworkManager.StartClient, including our GUID as the payload. /// @@ -151,7 +133,7 @@ public static void StartClientRelayMode(GameNetPortal portal, string roomName) private static void ConnectClient(GameNetPortal portal) { - var clientGuid = GetOrCreateGuid(); + var clientGuid = ClientPrefs.GetGuid(); //var payload = $"client_guid={clientGuid}\n"; //minimal format where key=value pairs are separated by newlines. //payload += $"client_scene={UnityEngine.SceneManagement.SceneManager.GetActiveScene().buildIndex}\n"; //payload += $"player_name={portal.PlayerName}\n"; From 1c3eaf00094cd0b406b7d03a02b6354e9b074f21 Mon Sep 17 00:00:00 2001 From: eheimburg <74330250+eheimburg@users.noreply.github.com> Date: Sun, 21 Mar 2021 23:00:59 -0400 Subject: [PATCH 3/9] forgot to put new classes in namespaces --- Assets/BossRoom/Scripts/Client/ClientPrefs.cs | 55 +++++++------- .../BossRoom/Scripts/Client/UI/StartupUI.cs | 2 +- .../Scripts/Client/UI/UIVolumeControl.cs | 71 ++++++++++--------- 3 files changed, 67 insertions(+), 61 deletions(-) diff --git a/Assets/BossRoom/Scripts/Client/ClientPrefs.cs b/Assets/BossRoom/Scripts/Client/ClientPrefs.cs index 28c489a0f..4071cc07d 100644 --- a/Assets/BossRoom/Scripts/Client/ClientPrefs.cs +++ b/Assets/BossRoom/Scripts/Client/ClientPrefs.cs @@ -1,38 +1,41 @@ using UnityEngine; -/// -/// Singleton class which saves/loads local-client settings. -/// (This is just a wrapper around the PlayerPrefs system, -/// so that all the calls are in the same place.) -/// -public class ClientPrefs +namespace BossRoom.Client { - public static float GetMasterVolume() - { - return PlayerPrefs.GetFloat("MasterVolume", 1); - } - - public static void SetMasterVolume(float volume) - { - PlayerPrefs.SetFloat("MasterVolume", volume); - } - /// - /// Either loads a Guid string from Unity preferences, or creates one and checkpoints it, then returns it. + /// Singleton class which saves/loads local-client settings. + /// (This is just a wrapper around the PlayerPrefs system, + /// so that all the calls are in the same place.) /// - /// The Guid that uniquely identifies this client install, in string form. - public static string GetGuid() + public class ClientPrefs { - if (PlayerPrefs.HasKey("client_guid")) + public static float GetMasterVolume() + { + return PlayerPrefs.GetFloat("MasterVolume", 1); + } + + public static void SetMasterVolume(float volume) { - return PlayerPrefs.GetString("client_guid"); + PlayerPrefs.SetFloat("MasterVolume", volume); } - var guid = System.Guid.NewGuid(); - var guidString = guid.ToString(); + /// + /// Either loads a Guid string from Unity preferences, or creates one and checkpoints it, then returns it. + /// + /// The Guid that uniquely identifies this client install, in string form. + public static string GetGuid() + { + if (PlayerPrefs.HasKey("client_guid")) + { + return PlayerPrefs.GetString("client_guid"); + } - PlayerPrefs.SetString("client_guid", guidString); - return guidString; - } + var guid = System.Guid.NewGuid(); + var guidString = guid.ToString(); + PlayerPrefs.SetString("client_guid", guidString); + return guidString; + } + + } } diff --git a/Assets/BossRoom/Scripts/Client/UI/StartupUI.cs b/Assets/BossRoom/Scripts/Client/UI/StartupUI.cs index fcd322150..4f66aa543 100644 --- a/Assets/BossRoom/Scripts/Client/UI/StartupUI.cs +++ b/Assets/BossRoom/Scripts/Client/UI/StartupUI.cs @@ -1,7 +1,7 @@ using UnityEngine; using UnityEngine.SceneManagement; -namespace BossRoom.Visual +namespace BossRoom.Client { /// /// Provides backing logic for any UI before MainMenu stage. Mostly we just load main menu diff --git a/Assets/BossRoom/Scripts/Client/UI/UIVolumeControl.cs b/Assets/BossRoom/Scripts/Client/UI/UIVolumeControl.cs index ef9a042c3..82ddfa130 100644 --- a/Assets/BossRoom/Scripts/Client/UI/UIVolumeControl.cs +++ b/Assets/BossRoom/Scripts/Client/UI/UIVolumeControl.cs @@ -1,48 +1,51 @@ using UnityEngine; using UnityEngine.UI; -/// -/// Controls a master-volume Slider. -/// -public class UIVolumeControl : MonoBehaviour +namespace BossRoom.Client { - [SerializeField] - private Slider m_VolumeSlider; - - private void OnEnable() + /// + /// Controls a master-volume Slider. + /// + public class UIVolumeControl : MonoBehaviour { - m_VolumeSlider.onValueChanged.AddListener(OnVolumeSliderChanged); - } + [SerializeField] + private Slider m_VolumeSlider; - private void OnDisable() - { - m_VolumeSlider.onValueChanged.RemoveListener(OnVolumeSliderChanged); - } + private void OnEnable() + { + m_VolumeSlider.onValueChanged.AddListener(OnVolumeSliderChanged); + } - private void Update() - { - // we want to make sure the slider is 100% accurate at all times, even if it gets changed - // from some other UI screen rather than our slider. (Most games have a "settings" window where things - // like master volume can also be configured.) So we constantly check to see if the volume has changed. - // (This also initializes the slider to the correct value at startup... otherwise we would do this in OnEnable()) - if (AudioListener.volume != m_VolumeSlider.value) + private void OnDisable() { - m_VolumeSlider.value = AudioListener.volume; + m_VolumeSlider.onValueChanged.RemoveListener(OnVolumeSliderChanged); } - } - private void OnVolumeSliderChanged(float newValue) - { - AudioListener.volume = newValue; - ClientPrefs.SetMasterVolume(newValue); - } + private void Update() + { + // we want to make sure the slider is 100% accurate at all times, even if it gets changed + // from some other UI screen rather than our slider. (Most games have a "settings" window where things + // like master volume can also be configured.) So we constantly check to see if the volume has changed. + // (This also initializes the slider to the correct value at startup... otherwise we would do this in OnEnable()) + if (AudioListener.volume != m_VolumeSlider.value) + { + m_VolumeSlider.value = AudioListener.volume; + } + } + + private void OnVolumeSliderChanged(float newValue) + { + AudioListener.volume = newValue; + ClientPrefs.SetMasterVolume(newValue); + } #if UNITY_EDITOR - private void OnValidate() - { - // default assumption is that if there's a Slider on our GameObject, we probably want to use it! - if (m_VolumeSlider == null) - m_VolumeSlider = GetComponent(); - } + private void OnValidate() + { + // default assumption is that if there's a Slider on our GameObject, we probably want to use it! + if (m_VolumeSlider == null) + m_VolumeSlider = GetComponent(); + } #endif + } } From f2f3a2978eb5e8441f6ec604f69dbaee41e81459 Mon Sep 17 00:00:00 2001 From: eheimburg <74330250+eheimburg@users.noreply.github.com> Date: Mon, 22 Mar 2021 00:19:28 -0400 Subject: [PATCH 4/9] Change music-manager's AudioSource volume from 1.0 to 0.8 --- Assets/BossRoom/Scenes/Startup.unity | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Assets/BossRoom/Scenes/Startup.unity b/Assets/BossRoom/Scenes/Startup.unity index f046b32e2..774a780b0 100644 --- a/Assets/BossRoom/Scenes/Startup.unity +++ b/Assets/BossRoom/Scenes/Startup.unity @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d9cc8bb46d086cc1a1f1671211de0a8f6ce38ce96a9accc5f03ca41b2f836f84 -size 20090 +oid sha256:3e25b6406f53a0158b1f32f3689b8b436f8b52202c78bd0064bc2982744c7493 +size 20119 From 4743746d209c8028d8474989bfa92523e761762f Mon Sep 17 00:00:00 2001 From: eheimburg <74330250+eheimburg@users.noreply.github.com> Date: Mon, 22 Mar 2021 00:32:26 -0400 Subject: [PATCH 5/9] Changed volume dropoff for all the sound-effect AudioPlayers --- .../Prefabs/CharGFX/BossGraphics.prefab | 152 +++++++++++++----- .../Prefabs/CharGFX/ImpGraphics.prefab | 152 +++++++++++++----- .../Prefabs/CharGFX/PlayerGraphics.prefab | 150 ++++++++++++----- 3 files changed, 346 insertions(+), 108 deletions(-) diff --git a/Assets/BossRoom/Prefabs/CharGFX/BossGraphics.prefab b/Assets/BossRoom/Prefabs/CharGFX/BossGraphics.prefab index 1c1c50618..81d895f60 100644 --- a/Assets/BossRoom/Prefabs/CharGFX/BossGraphics.prefab +++ b/Assets/BossRoom/Prefabs/CharGFX/BossGraphics.prefab @@ -2002,9 +2002,6 @@ MonoBehaviour: TargetReticule: {fileID: 0} ReticuleFriendlyMat: {fileID: 0} ReticuleHostileMat: {fileID: 0} - MinZoomDistance: 3 - MaxZoomDistance: 30 - ZoomSpeed: 3 --- !u!114 &4538447335436592133 MonoBehaviour: m_ObjectHideFlags: 0 @@ -2070,10 +2067,10 @@ AudioSource: SpatializePostEffects: 0 Priority: 128 DopplerLevel: 1 - MinDistance: 1 + MinDistance: 10 MaxDistance: 100 Pan2D: 0 - rolloffMode: 0 + rolloffMode: 2 BypassEffects: 0 BypassListenerEffects: 0 BypassReverbZones: 0 @@ -2081,23 +2078,50 @@ AudioSource: serializedVersion: 2 m_Curve: - serializedVersion: 3 - time: 0 + time: 0.1 value: 1 - inSlope: 0 - outSlope: 0 + inSlope: -10.0039835 + outSlope: -10.0039835 tangentMode: 0 weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.2 + value: 0.5 + inSlope: -2.5009959 + outSlope: -2.5009959 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.4 + value: 0.25 + inSlope: -0.62524897 + outSlope: -0.62524897 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.7163666 + value: 0.05203247 + inSlope: -0.15631224 + outSlope: -0.15631224 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 - serializedVersion: 3 time: 1 value: 0 - inSlope: 0 - outSlope: 0 + inSlope: -0.10003988 + outSlope: -0.10003988 tangentMode: 0 weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 + inWeight: 0 + outWeight: 0 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -2166,10 +2190,10 @@ AudioSource: SpatializePostEffects: 0 Priority: 128 DopplerLevel: 1 - MinDistance: 1 + MinDistance: 10 MaxDistance: 100 Pan2D: 0 - rolloffMode: 0 + rolloffMode: 2 BypassEffects: 0 BypassListenerEffects: 0 BypassReverbZones: 0 @@ -2177,23 +2201,50 @@ AudioSource: serializedVersion: 2 m_Curve: - serializedVersion: 3 - time: 0 + time: 0.1 value: 1 - inSlope: 0 - outSlope: 0 + inSlope: -10.0039835 + outSlope: -10.0039835 tangentMode: 0 weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.2 + value: 0.5 + inSlope: -2.5009959 + outSlope: -2.5009959 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.4 + value: 0.25 + inSlope: -0.62524897 + outSlope: -0.62524897 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.7163666 + value: 0.05203247 + inSlope: -0.15631224 + outSlope: -0.15631224 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 - serializedVersion: 3 time: 1 value: 0 - inSlope: 0 - outSlope: 0 + inSlope: -0.10003988 + outSlope: -0.10003988 tangentMode: 0 weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 + inWeight: 0 + outWeight: 0 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -2262,6 +2313,8 @@ MonoBehaviour: m_WalkFootstepVolume: 1 m_RunFootstepAudioClip: {fileID: 8300000, guid: 81079ef149d08774ab3eadab80944fa0, type: 3} m_RunFootstepVolume: 1 + m_WalkingPoint: 0.6 + m_SilentPoint: 0.3 --- !u!82 &-2129752889114835779 AudioSource: m_ObjectHideFlags: 0 @@ -2282,10 +2335,10 @@ AudioSource: SpatializePostEffects: 0 Priority: 128 DopplerLevel: 1 - MinDistance: 1 + MinDistance: 10 MaxDistance: 100 Pan2D: 0 - rolloffMode: 0 + rolloffMode: 2 BypassEffects: 0 BypassListenerEffects: 0 BypassReverbZones: 0 @@ -2293,23 +2346,50 @@ AudioSource: serializedVersion: 2 m_Curve: - serializedVersion: 3 - time: 0 + time: 0.1 value: 1 - inSlope: 0 - outSlope: 0 + inSlope: -10.0039835 + outSlope: -10.0039835 tangentMode: 0 weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.2 + value: 0.5 + inSlope: -2.5009959 + outSlope: -2.5009959 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.4 + value: 0.25 + inSlope: -0.62524897 + outSlope: -0.62524897 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.7163666 + value: 0.05203247 + inSlope: -0.15631224 + outSlope: -0.15631224 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 - serializedVersion: 3 time: 1 value: 0 - inSlope: 0 - outSlope: 0 + inSlope: -0.10003988 + outSlope: -0.10003988 tangentMode: 0 weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 + inWeight: 0 + outWeight: 0 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 diff --git a/Assets/BossRoom/Prefabs/CharGFX/ImpGraphics.prefab b/Assets/BossRoom/Prefabs/CharGFX/ImpGraphics.prefab index c9672719a..2ca87e33c 100644 --- a/Assets/BossRoom/Prefabs/CharGFX/ImpGraphics.prefab +++ b/Assets/BossRoom/Prefabs/CharGFX/ImpGraphics.prefab @@ -1136,9 +1136,6 @@ MonoBehaviour: TargetReticule: {fileID: 0} ReticuleFriendlyMat: {fileID: 0} ReticuleHostileMat: {fileID: 0} - MinZoomDistance: 3 - MaxZoomDistance: 30 - ZoomSpeed: 3 --- !u!114 &8005647249789065143 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1186,10 +1183,10 @@ AudioSource: SpatializePostEffects: 0 Priority: 128 DopplerLevel: 1 - MinDistance: 1 + MinDistance: 10 MaxDistance: 100 Pan2D: 0 - rolloffMode: 0 + rolloffMode: 2 BypassEffects: 0 BypassListenerEffects: 0 BypassReverbZones: 0 @@ -1197,23 +1194,50 @@ AudioSource: serializedVersion: 2 m_Curve: - serializedVersion: 3 - time: 0 + time: 0.1 value: 1 - inSlope: 0 - outSlope: 0 + inSlope: -10.0039835 + outSlope: -10.0039835 tangentMode: 0 weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.2 + value: 0.5 + inSlope: -2.5009959 + outSlope: -2.5009959 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.4 + value: 0.25 + inSlope: -0.62524897 + outSlope: -0.62524897 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.7163666 + value: 0.05203247 + inSlope: -0.15631224 + outSlope: -0.15631224 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 - serializedVersion: 3 time: 1 value: 0 - inSlope: 0 - outSlope: 0 + inSlope: -0.10003988 + outSlope: -0.10003988 tangentMode: 0 weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 + inWeight: 0 + outWeight: 0 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -1282,10 +1306,10 @@ AudioSource: SpatializePostEffects: 0 Priority: 128 DopplerLevel: 1 - MinDistance: 1 + MinDistance: 10 MaxDistance: 100 Pan2D: 0 - rolloffMode: 0 + rolloffMode: 2 BypassEffects: 0 BypassListenerEffects: 0 BypassReverbZones: 0 @@ -1293,23 +1317,50 @@ AudioSource: serializedVersion: 2 m_Curve: - serializedVersion: 3 - time: 0 + time: 0.1 value: 1 - inSlope: 0 - outSlope: 0 + inSlope: -10.0039835 + outSlope: -10.0039835 tangentMode: 0 weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.2 + value: 0.5 + inSlope: -2.5009959 + outSlope: -2.5009959 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.4 + value: 0.25 + inSlope: -0.62524897 + outSlope: -0.62524897 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.7163666 + value: 0.05203247 + inSlope: -0.15631224 + outSlope: -0.15631224 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 - serializedVersion: 3 time: 1 value: 0 - inSlope: 0 - outSlope: 0 + inSlope: -0.10003988 + outSlope: -0.10003988 tangentMode: 0 weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 + inWeight: 0 + outWeight: 0 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -1378,6 +1429,8 @@ MonoBehaviour: m_WalkFootstepVolume: 0.8 m_RunFootstepAudioClip: {fileID: 8300000, guid: 6ad4d1d63bc70494bbc9172ae70bcdd0, type: 3} m_RunFootstepVolume: 0.8 + m_WalkingPoint: 0.6 + m_SilentPoint: 0.3 --- !u!82 &-8995571906845300287 AudioSource: m_ObjectHideFlags: 0 @@ -1398,10 +1451,10 @@ AudioSource: SpatializePostEffects: 0 Priority: 128 DopplerLevel: 1 - MinDistance: 1 + MinDistance: 10 MaxDistance: 100 Pan2D: 0 - rolloffMode: 0 + rolloffMode: 2 BypassEffects: 0 BypassListenerEffects: 0 BypassReverbZones: 0 @@ -1409,23 +1462,50 @@ AudioSource: serializedVersion: 2 m_Curve: - serializedVersion: 3 - time: 0 + time: 0.1 value: 1 - inSlope: 0 - outSlope: 0 + inSlope: -10.0039835 + outSlope: -10.0039835 tangentMode: 0 weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.2 + value: 0.5 + inSlope: -2.5009959 + outSlope: -2.5009959 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.4 + value: 0.25 + inSlope: -0.62524897 + outSlope: -0.62524897 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.7163666 + value: 0.05203247 + inSlope: -0.15631224 + outSlope: -0.15631224 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 - serializedVersion: 3 time: 1 value: 0 - inSlope: 0 - outSlope: 0 + inSlope: -0.10003988 + outSlope: -0.10003988 tangentMode: 0 weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 + inWeight: 0 + outWeight: 0 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 diff --git a/Assets/BossRoom/Prefabs/CharGFX/PlayerGraphics.prefab b/Assets/BossRoom/Prefabs/CharGFX/PlayerGraphics.prefab index 80cd91a02..30ee98c7e 100644 --- a/Assets/BossRoom/Prefabs/CharGFX/PlayerGraphics.prefab +++ b/Assets/BossRoom/Prefabs/CharGFX/PlayerGraphics.prefab @@ -1191,9 +1191,6 @@ MonoBehaviour: TargetReticule: {fileID: 3697322597467218969, guid: 546d1949af792c245b0861507d25a349, type: 3} ReticuleFriendlyMat: {fileID: 2100000, guid: 0bc9c70c830bca44dbddfbc5c49830f8, type: 2} ReticuleHostileMat: {fileID: 2100000, guid: 06ea36c997b09a943b6f5ea691093c21, type: 2} - MinZoomDistance: 3 - MaxZoomDistance: 30 - ZoomSpeed: 3 --- !u!114 &579958722332811098 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1521,10 +1518,10 @@ AudioSource: SpatializePostEffects: 0 Priority: 128 DopplerLevel: 1 - MinDistance: 1 + MinDistance: 10 MaxDistance: 100 Pan2D: 0 - rolloffMode: 0 + rolloffMode: 2 BypassEffects: 0 BypassListenerEffects: 0 BypassReverbZones: 0 @@ -1532,23 +1529,50 @@ AudioSource: serializedVersion: 2 m_Curve: - serializedVersion: 3 - time: 0 + time: 0.1 value: 1 - inSlope: 0 - outSlope: 0 + inSlope: -10.0039835 + outSlope: -10.0039835 tangentMode: 0 weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.2 + value: 0.5 + inSlope: -2.5009959 + outSlope: -2.5009959 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.4 + value: 0.25 + inSlope: -0.62524897 + outSlope: -0.62524897 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.7163666 + value: 0.05203247 + inSlope: -0.15631224 + outSlope: -0.15631224 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 - serializedVersion: 3 time: 1 value: 0 - inSlope: 0 - outSlope: 0 + inSlope: -0.10003988 + outSlope: -0.10003988 tangentMode: 0 weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 + inWeight: 0 + outWeight: 0 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -1617,10 +1641,10 @@ AudioSource: SpatializePostEffects: 0 Priority: 128 DopplerLevel: 1 - MinDistance: 1 + MinDistance: 10 MaxDistance: 100 Pan2D: 0 - rolloffMode: 0 + rolloffMode: 2 BypassEffects: 0 BypassListenerEffects: 0 BypassReverbZones: 0 @@ -1628,23 +1652,50 @@ AudioSource: serializedVersion: 2 m_Curve: - serializedVersion: 3 - time: 0 + time: 0.1 value: 1 - inSlope: 0 - outSlope: 0 + inSlope: -10.0039835 + outSlope: -10.0039835 tangentMode: 0 weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.2 + value: 0.5 + inSlope: -2.5009959 + outSlope: -2.5009959 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.4 + value: 0.25 + inSlope: -0.62524897 + outSlope: -0.62524897 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.7163666 + value: 0.05203247 + inSlope: -0.15631224 + outSlope: -0.15631224 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 - serializedVersion: 3 time: 1 value: 0 - inSlope: 0 - outSlope: 0 + inSlope: -0.10003988 + outSlope: -0.10003988 tangentMode: 0 weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 + inWeight: 0 + outWeight: 0 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -1735,10 +1786,10 @@ AudioSource: SpatializePostEffects: 0 Priority: 128 DopplerLevel: 1 - MinDistance: 1 + MinDistance: 10 MaxDistance: 100 Pan2D: 0 - rolloffMode: 0 + rolloffMode: 2 BypassEffects: 0 BypassListenerEffects: 0 BypassReverbZones: 0 @@ -1746,23 +1797,50 @@ AudioSource: serializedVersion: 2 m_Curve: - serializedVersion: 3 - time: 0 + time: 0.1 value: 1 - inSlope: 0 - outSlope: 0 + inSlope: -10.0039835 + outSlope: -10.0039835 tangentMode: 0 weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.2 + value: 0.5 + inSlope: -2.5009959 + outSlope: -2.5009959 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.4 + value: 0.25 + inSlope: -0.62524897 + outSlope: -0.62524897 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.7163666 + value: 0.05203247 + inSlope: -0.15631224 + outSlope: -0.15631224 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 - serializedVersion: 3 time: 1 value: 0 - inSlope: 0 - outSlope: 0 + inSlope: -0.10003988 + outSlope: -0.10003988 tangentMode: 0 weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 + inWeight: 0 + outWeight: 0 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 From 2c371b0b85bb50ebf5b55b74edbb74b2434475cb Mon Sep 17 00:00:00 2001 From: eheimburg <74330250+eheimburg@users.noreply.github.com> Date: Tue, 23 Mar 2021 21:52:25 -0400 Subject: [PATCH 6/9] Reverting scenes, refactoring into a separate canvas Reverted the Startup scene, then added the new prefab to it. The other scenes should all be unchanged from pre-patch now. Hopefully. (git was giving strange error messages about BossRoom.unity, but in any case, there SHOULD be no changes in this PR to any scene except Startup) --- .../Prefabs/UI/SettingsPanelCanvas.prefab | 1536 +++++++++++++++++ ...b.meta => SettingsPanelCanvas.prefab.meta} | 2 +- .../BossRoom/Prefabs/UI/VolumeSlider.prefab | 519 ------ Assets/BossRoom/Scenes/BossRoom.unity | 4 +- Assets/BossRoom/Scenes/MainMenu.unity | 4 +- Assets/BossRoom/Scenes/PostGame.unity | 4 +- Assets/BossRoom/Scenes/Startup.unity | 4 +- .../Scripts/Client/Audio/ClientMusicPlayer.cs | 7 +- Assets/BossRoom/Scripts/Client/ClientPrefs.cs | 15 +- .../Scripts/Client/UI/UISettingsCanvas.cs | 32 + ...ntrol.cs.meta => UISettingsCanvas.cs.meta} | 2 +- .../Scripts/Client/UI/UISettingsPanel.cs | 45 + .../Scripts/Client/UI/UISettingsPanel.cs.meta | 11 + .../Scripts/Client/UI/UIVolumeControl.cs | 51 - 14 files changed, 1654 insertions(+), 582 deletions(-) create mode 100644 Assets/BossRoom/Prefabs/UI/SettingsPanelCanvas.prefab rename Assets/BossRoom/Prefabs/UI/{VolumeSlider.prefab.meta => SettingsPanelCanvas.prefab.meta} (74%) delete mode 100644 Assets/BossRoom/Prefabs/UI/VolumeSlider.prefab create mode 100644 Assets/BossRoom/Scripts/Client/UI/UISettingsCanvas.cs rename Assets/BossRoom/Scripts/Client/UI/{UIVolumeControl.cs.meta => UISettingsCanvas.cs.meta} (83%) create mode 100644 Assets/BossRoom/Scripts/Client/UI/UISettingsPanel.cs create mode 100644 Assets/BossRoom/Scripts/Client/UI/UISettingsPanel.cs.meta delete mode 100644 Assets/BossRoom/Scripts/Client/UI/UIVolumeControl.cs diff --git a/Assets/BossRoom/Prefabs/UI/SettingsPanelCanvas.prefab b/Assets/BossRoom/Prefabs/UI/SettingsPanelCanvas.prefab new file mode 100644 index 000000000..3ae603d22 --- /dev/null +++ b/Assets/BossRoom/Prefabs/UI/SettingsPanelCanvas.prefab @@ -0,0 +1,1536 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &294265329686786383 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 294265329686786380} + - component: {fileID: 294265329686786379} + - component: {fileID: 294265329686786381} + - component: {fileID: 294265329686786376} + - component: {fileID: 294265329686786378} + m_Layer: 5 + m_Name: Settings Button + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &294265329686786380 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 294265329686786383} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -3} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 294265330276786217} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -50, y: -50} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 1, y: 1} +--- !u!222 &294265329686786379 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 294265329686786383} + m_CullTransparentMesh: 1 +--- !u!114 &294265329686786381 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 294265329686786383} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + 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: 294265329686786378} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 294265330276786214} + m_TargetAssemblyTypeName: BossRoom.Visual.UISettingsCanvas, BossRoom.Client + m_MethodName: OnClickSettingsButton + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 1 + m_CallState: 2 +--- !u!23 &294265329686786376 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 294265329686786383} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10100, guid: 0000000000000000e000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!114 &294265329686786378 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 294265329686786383} + 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: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 150 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 1 + m_MaxSize: 300 + m_Alignment: 1 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 + m_LineSpacing: 1 + m_Text: '*' +--- !u!1 &294265330276786221 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 294265330276786217} + - component: {fileID: 294265330276786216} + - component: {fileID: 294265330276786219} + - component: {fileID: 294265330276786218} + - component: {fileID: 294265330276786214} + m_Layer: 5 + m_Name: SettingsPanelCanvas + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &294265330276786217 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 294265330276786221} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0, y: 0, z: 0} + m_Children: + - {fileID: 294265329686786380} + - {fileID: 6417648243838381818} + m_Father: {fileID: 0} + 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: 0, y: 0} + m_Pivot: {x: 0, y: 0} +--- !u!223 &294265330276786216 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 294265330276786221} + m_Enabled: 1 + serializedVersion: 3 + m_RenderMode: 0 + m_Camera: {fileID: 0} + m_PlaneDistance: 100 + m_PixelPerfect: 0 + m_ReceivesEvents: 1 + m_OverrideSorting: 0 + m_OverridePixelPerfect: 0 + m_SortingBucketNormalizedSize: 0 + m_AdditionalShaderChannelsFlag: -1 + m_SortingLayerID: 0 + m_SortingOrder: 1 + m_TargetDisplay: 0 +--- !u!114 &294265330276786219 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 294265330276786221} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} + m_Name: + m_EditorClassIdentifier: + m_UiScaleMode: 1 + m_ReferencePixelsPerUnit: 100 + m_ScaleFactor: 1 + m_ReferenceResolution: {x: 1920, y: 1080} + m_ScreenMatchMode: 0 + m_MatchWidthOrHeight: 0.506 + m_PhysicalUnit: 3 + m_FallbackScreenDPI: 96 + m_DefaultSpriteDPI: 96 + m_DynamicPixelsPerUnit: 1 + m_PresetInfoIsWorld: 0 +--- !u!114 &294265330276786218 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 294265330276786221} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreReversedGraphics: 1 + m_BlockingObjects: 0 + m_BlockingMask: + serializedVersion: 2 + m_Bits: 4294967295 +--- !u!114 &294265330276786214 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 294265330276786221} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 190bc18b6f6f06340acb887d88806593, type: 3} + m_Name: + m_EditorClassIdentifier: + m_SettingsPanelRoot: {fileID: 6417648243838381817} +--- !u!1 &1506346423198533188 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2227472444765891633} + - component: {fileID: 2414734412583563701} + - component: {fileID: 6547266572445463372} + m_Layer: 5 + m_Name: Label + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2227472444765891633 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1506346423198533188} + 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: 7297531496490972690} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 0, y: 30} + m_SizeDelta: {x: 300, y: 30} + m_Pivot: {x: 0, y: 1} +--- !u!222 &2414734412583563701 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1506346423198533188} + m_CullTransparentMesh: 1 +--- !u!114 &6547266572445463372 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1506346423198533188} + 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.8705883, g: 0.77647066, b: 0.23529413, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 24 + m_FontStyle: 1 + m_BestFit: 0 + m_MinSize: 0 + m_MaxSize: 40 + m_Alignment: 0 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: Music Volume +--- !u!1 &1591034540787035143 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1591034540787035142} + 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 &1591034540787035142 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1591034540787035143} + 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: 1591034541050051854} + m_Father: {fileID: 6217156373103072016} + 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 &1591034540966426622 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1591034540966426621} + - component: {fileID: 1591034540966426595} + - component: {fileID: 1591034540966426620} + m_Layer: 5 + m_Name: Label + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1591034540966426621 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1591034540966426622} + 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: 6217156373103072016} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 0, y: 30} + m_SizeDelta: {x: 300, y: 30} + m_Pivot: {x: 0, y: 1} +--- !u!222 &1591034540966426595 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1591034540966426622} + m_CullTransparentMesh: 1 +--- !u!114 &1591034540966426620 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1591034540966426622} + 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.8705883, g: 0.77647066, b: 0.23529413, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 24 + m_FontStyle: 1 + m_BestFit: 0 + m_MinSize: 0 + m_MaxSize: 40 + m_Alignment: 0 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: Overall Volume +--- !u!1 &1591034541050051855 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1591034541050051854} + - component: {fileID: 1591034541050051852} + - component: {fileID: 1591034541050051853} + m_Layer: 5 + m_Name: Fill + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1591034541050051854 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1591034541050051855} + 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: 1591034540787035142} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 10, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1591034541050051852 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1591034541050051855} + m_CullTransparentMesh: 1 +--- !u!114 &1591034541050051853 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1591034541050051855} + 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: 0.8705883, g: 0.7725491, b: 0.23529413, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 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 &1591034541194713451 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1591034541194713450} + 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 &1591034541194713450 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1591034541194713451} + 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: 1591034541991487326} + m_Father: {fileID: 6217156373103072016} + 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 &1591034541830594921 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1591034541830594920} + - component: {fileID: 1591034541830594926} + - component: {fileID: 1591034541830594927} + m_Layer: 5 + m_Name: Background + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1591034541830594920 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1591034541830594921} + 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: 6217156373103072016} + 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 &1591034541830594926 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1591034541830594921} + m_CullTransparentMesh: 1 +--- !u!114 &1591034541830594927 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1591034541830594921} + 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: 0.5411765, g: 0.4784314, b: 0.13725491, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 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 &1591034541991487327 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1591034541991487326} + - component: {fileID: 1591034541991487324} + - component: {fileID: 1591034541991487325} + m_Layer: 5 + m_Name: Handle + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1591034541991487326 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1591034541991487327} + 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: 1591034541194713450} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 20, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1591034541991487324 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1591034541991487327} + m_CullTransparentMesh: 1 +--- !u!114 &1591034541991487325 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1591034541991487327} + 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: 0.8941177, g: 0.7960785, b: 0.24313727, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 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 &2761684784459841459 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6107605981620209842} + 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 &6107605981620209842 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2761684784459841459} + 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: 6005602306300149307} + m_Father: {fileID: 7297531496490972690} + 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 &3469506610704103633 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4002968350005051780} + - component: {fileID: 8414562357340933144} + - component: {fileID: 7299152758545453838} + m_Layer: 5 + m_Name: Background + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4002968350005051780 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3469506610704103633} + 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: 7297531496490972690} + 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 &8414562357340933144 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3469506610704103633} + m_CullTransparentMesh: 1 +--- !u!114 &7299152758545453838 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3469506610704103633} + 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: 0.5411765, g: 0.4784314, b: 0.13725491, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 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 &4064014833027966017 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2274705493899115683} + - component: {fileID: 530431915584875006} + - component: {fileID: 902388754323165985} + m_Layer: 5 + m_Name: SettingsLabel + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2274705493899115683 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4064014833027966017} + 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: 6417648243838381818} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: -15} + m_SizeDelta: {x: 0, y: 100} + m_Pivot: {x: 0.5, y: 1} +--- !u!222 &530431915584875006 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4064014833027966017} + m_CullTransparentMesh: 1 +--- !u!114 &902388754323165985 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4064014833027966017} + 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.9215687, g: 0.8196079, b: 0.24705884, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 50 + m_FontStyle: 3 + m_BestFit: 1 + m_MinSize: 0 + m_MaxSize: 50 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: 'Settings + +' +--- !u!1 &5089378847094864942 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4571589763288329519} + - component: {fileID: 2042654756682179128} + - component: {fileID: 4078503332578518073} + - component: {fileID: 277858732253043606} + m_Layer: 5 + m_Name: Close Button + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4571589763288329519 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5089378847094864942} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -3} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 6417648243838381818} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 10, y: 10} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 1, y: 1} +--- !u!222 &2042654756682179128 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5089378847094864942} + m_CullTransparentMesh: 1 +--- !u!114 &4078503332578518073 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5089378847094864942} + 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_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: -6410841438199910071, guid: 1b8d595a2eaea6a41b33c3eb5d3d6a44, type: 3} + 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!114 &277858732253043606 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5089378847094864942} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + 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: 4078503332578518073} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 6417648243838381817} + m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine + m_MethodName: SetActive + m_Mode: 6 + 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 &5562462901573508095 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7817392311645474671} + - component: {fileID: 6825636071716942812} + - component: {fileID: 7428645028772329009} + m_Layer: 5 + m_Name: Handle + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7817392311645474671 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5562462901573508095} + 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: 8847124775178513431} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 20, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6825636071716942812 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5562462901573508095} + m_CullTransparentMesh: 1 +--- !u!114 &7428645028772329009 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5562462901573508095} + 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: 0.8941177, g: 0.7960785, b: 0.24313727, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 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 &6154749339973089473 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7297531496490972690} + - component: {fileID: 7818796052053811380} + m_Layer: 5 + m_Name: MusicVolume + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7297531496490972690 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6154749339973089473} + 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: 4002968350005051780} + - {fileID: 6107605981620209842} + - {fileID: 8847124775178513431} + - {fileID: 2227472444765891633} + m_Father: {fileID: 6417648243838381818} + m_RootOrder: 3 + 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: 0, y: -99.1} + m_SizeDelta: {x: -100, y: 40} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &7818796052053811380 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6154749339973089473} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 67db9e8f0e2ae9c40bc1e2b64352a6b4, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + 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: 7428645028772329009} + m_FillRect: {fileID: 6005602306300149307} + m_HandleRect: {fileID: 7817392311645474671} + m_Direction: 0 + m_MinValue: 0 + m_MaxValue: 1 + m_WholeNumbers: 0 + m_Value: 0 + m_OnValueChanged: + m_PersistentCalls: + m_Calls: [] +--- !u!1 &6217156373103072017 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6217156373103072016} + - component: {fileID: 6217156373103072047} + m_Layer: 5 + m_Name: MasterVolume + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6217156373103072016 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6217156373103072017} + 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: 1591034541830594920} + - {fileID: 1591034540787035142} + - {fileID: 1591034541194713450} + - {fileID: 1591034540966426621} + m_Father: {fileID: 6417648243838381818} + m_RootOrder: 1 + 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: 0, y: 0} + m_SizeDelta: {x: -100, y: 40} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &6217156373103072047 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6217156373103072017} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 67db9e8f0e2ae9c40bc1e2b64352a6b4, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + 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: 1591034541991487325} + m_FillRect: {fileID: 1591034541050051854} + m_HandleRect: {fileID: 1591034541991487326} + m_Direction: 0 + m_MinValue: 0 + m_MaxValue: 1 + m_WholeNumbers: 0 + m_Value: 0 + m_OnValueChanged: + m_PersistentCalls: + m_Calls: [] +--- !u!1 &6417648243838381817 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6417648243838381818} + - component: {fileID: 6417648243838381820} + - component: {fileID: 6417648243838381819} + - component: {fileID: 6417648243838381814} + m_Layer: 5 + m_Name: SettingsPanel + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &6417648243838381818 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6417648243838381817} + 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: 2274705493899115683} + - {fileID: 6217156373103072016} + - {fileID: 4571589763288329519} + - {fileID: 7297531496490972690} + m_Father: {fileID: 294265330276786217} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -164, y: -160} + m_SizeDelta: {x: 500, y: 300} + m_Pivot: {x: 1, y: 1} +--- !u!222 &6417648243838381820 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6417648243838381817} + m_CullTransparentMesh: 1 +--- !u!114 &6417648243838381819 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6417648243838381817} + 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_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 222f76e9081efb6428be38c0e10f7bde, type: 3} + 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!114 &6417648243838381814 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6417648243838381817} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d3fad71d1b21b8545815ca408165e739, type: 3} + m_Name: + m_EditorClassIdentifier: + m_MasterVolumeSlider: {fileID: 6217156373103072047} + m_MusicVolumeSlider: {fileID: 7818796052053811380} +--- !u!1 &6892085633112661758 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6005602306300149307} + - component: {fileID: 8234121805529873855} + - component: {fileID: 8455013274254323185} + m_Layer: 5 + m_Name: Fill + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6005602306300149307 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6892085633112661758} + 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: 6107605981620209842} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 10, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8234121805529873855 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6892085633112661758} + m_CullTransparentMesh: 1 +--- !u!114 &8455013274254323185 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6892085633112661758} + 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: 0.8705883, g: 0.7725491, b: 0.23529413, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 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 &7379689433403748103 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8847124775178513431} + 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 &8847124775178513431 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7379689433403748103} + 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: 7817392311645474671} + m_Father: {fileID: 7297531496490972690} + 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} diff --git a/Assets/BossRoom/Prefabs/UI/VolumeSlider.prefab.meta b/Assets/BossRoom/Prefabs/UI/SettingsPanelCanvas.prefab.meta similarity index 74% rename from Assets/BossRoom/Prefabs/UI/VolumeSlider.prefab.meta rename to Assets/BossRoom/Prefabs/UI/SettingsPanelCanvas.prefab.meta index 73d94dae2..5af86c66b 100644 --- a/Assets/BossRoom/Prefabs/UI/VolumeSlider.prefab.meta +++ b/Assets/BossRoom/Prefabs/UI/SettingsPanelCanvas.prefab.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: d163056211811a144bbf083671381793 +guid: 92e4be25f4f9a694a85129911fdc765b PrefabImporter: externalObjects: {} userData: diff --git a/Assets/BossRoom/Prefabs/UI/VolumeSlider.prefab b/Assets/BossRoom/Prefabs/UI/VolumeSlider.prefab deleted file mode 100644 index 8fd74df72..000000000 --- a/Assets/BossRoom/Prefabs/UI/VolumeSlider.prefab +++ /dev/null @@ -1,519 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1 &1297333277375993656 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1297333277375993659} - - component: {fileID: 1297333277375993637} - - component: {fileID: 1297333277375993658} - m_Layer: 5 - m_Name: Label - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1297333277375993659 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1297333277375993656} - 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: 5932003814159250390} - m_RootOrder: 3 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: 20} - m_SizeDelta: {x: 160, y: 20} - m_Pivot: {x: 0, y: 1} ---- !u!222 &1297333277375993637 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1297333277375993656} - m_CullTransparentMesh: 1 ---- !u!114 &1297333277375993658 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1297333277375993656} - 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: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 14 - m_FontStyle: 1 - m_BestFit: 0 - m_MinSize: 10 - m_MaxSize: 40 - m_Alignment: 0 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: Volume ---- !u!1 &1297333277447937739 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1297333277447937738} - m_Layer: 5 - m_Name: VolumeSlider - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1297333277447937738 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1297333277447937739} - 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: 5932003814159250390} - m_Father: {fileID: 0} - 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: 0, y: 0} - m_Pivot: {x: 0, y: 0} ---- !u!1 &1297333277523758273 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1297333277523758272} - 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 &1297333277523758272 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1297333277523758273} - 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: 1297333279406300616} - m_Father: {fileID: 5932003814159250390} - 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 &1297333278463969177 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1297333278463969176} - - component: {fileID: 1297333278463969178} - - component: {fileID: 1297333278463969179} - m_Layer: 5 - m_Name: Handle - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1297333278463969176 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1297333278463969177} - 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: 1297333279295125932} - 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 &1297333278463969178 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1297333278463969177} - m_CullTransparentMesh: 1 ---- !u!114 &1297333278463969179 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1297333278463969177} - 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_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 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 &1297333278660116911 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1297333278660116910} - - component: {fileID: 1297333278660116904} - - component: {fileID: 1297333278660116905} - m_Layer: 5 - m_Name: Background - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1297333278660116910 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1297333278660116911} - 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: 5932003814159250390} - 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 &1297333278660116904 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1297333278660116911} - m_CullTransparentMesh: 1 ---- !u!114 &1297333278660116905 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1297333278660116911} - 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_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 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 &1297333279295125933 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1297333279295125932} - 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 &1297333279295125932 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1297333279295125933} - 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: 1297333278463969176} - m_Father: {fileID: 5932003814159250390} - 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 &1297333279406300617 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1297333279406300616} - - component: {fileID: 1297333279406300618} - - component: {fileID: 1297333279406300619} - m_Layer: 5 - m_Name: Fill - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1297333279406300616 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1297333279406300617} - 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: 1297333277523758272} - 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 &1297333279406300618 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1297333279406300617} - m_CullTransparentMesh: 1 ---- !u!114 &1297333279406300619 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1297333279406300617} - 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_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 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 &5932003814159250391 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 5932003814159250390} - - component: {fileID: 5932003814159250409} - - component: {fileID: 1172562498119714283} - m_Layer: 5 - m_Name: VolumeSlider - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &5932003814159250390 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5932003814159250391} - 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: 1297333278660116910} - - {fileID: 1297333277523758272} - - {fileID: 1297333279295125932} - - {fileID: 1297333277375993659} - m_Father: {fileID: 1297333277447937738} - 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: 30, y: 10} - m_SizeDelta: {x: 160, y: 20} - m_Pivot: {x: 0, y: 0} ---- !u!114 &5932003814159250409 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5932003814159250391} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 67db9e8f0e2ae9c40bc1e2b64352a6b4, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Navigation: - m_Mode: 3 - m_WrapAround: 0 - 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: 1297333278463969179} - m_FillRect: {fileID: 1297333279406300616} - m_HandleRect: {fileID: 1297333278463969176} - m_Direction: 0 - m_MinValue: 0 - m_MaxValue: 1 - m_WholeNumbers: 0 - m_Value: 0 - m_OnValueChanged: - m_PersistentCalls: - m_Calls: [] ---- !u!114 &1172562498119714283 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5932003814159250391} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 102c5e03f55bcba42903a3d49db09aef, type: 3} - m_Name: - m_EditorClassIdentifier: - m_VolumeSlider: {fileID: 5932003814159250409} diff --git a/Assets/BossRoom/Scenes/BossRoom.unity b/Assets/BossRoom/Scenes/BossRoom.unity index d9b5000b6..6c367d18b 100644 --- a/Assets/BossRoom/Scenes/BossRoom.unity +++ b/Assets/BossRoom/Scenes/BossRoom.unity @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0162f126402f28d5b91c592c3caa1981eb83708c7b05d5943a53e826eb6b2091 -size 145759 +oid sha256:1c4efffd4e19f57e334af5e7f66abff6a1a713c385864a4bf9019b1c250e8955 +size 140907 diff --git a/Assets/BossRoom/Scenes/MainMenu.unity b/Assets/BossRoom/Scenes/MainMenu.unity index 4d9cd6e16..5b3b045f8 100644 --- a/Assets/BossRoom/Scenes/MainMenu.unity +++ b/Assets/BossRoom/Scenes/MainMenu.unity @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:29567f179f87df85f0b75ec2799a9720dbc47a20353290a1d4761fd06a65494c -size 43617 +oid sha256:8bfaec7eab23696295a495e54bbab784a26d89ec04a2f6143b30d442be657893 +size 38743 diff --git a/Assets/BossRoom/Scenes/PostGame.unity b/Assets/BossRoom/Scenes/PostGame.unity index 530f3c96c..39a594658 100644 --- a/Assets/BossRoom/Scenes/PostGame.unity +++ b/Assets/BossRoom/Scenes/PostGame.unity @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a3ab892d75e4dd2f07e4449b815b4e3079198cd326810cbf5382eb88f5aeb5f9 -size 48884 +oid sha256:64a4184a01b6890606bd419078a59a22fd1a48cea2112371faf171c8d6784e55 +size 43996 diff --git a/Assets/BossRoom/Scenes/Startup.unity b/Assets/BossRoom/Scenes/Startup.unity index 774a780b0..22617b75e 100644 --- a/Assets/BossRoom/Scenes/Startup.unity +++ b/Assets/BossRoom/Scenes/Startup.unity @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3e25b6406f53a0158b1f32f3689b8b436f8b52202c78bd0064bc2982744c7493 -size 20119 +oid sha256:57c5d00aad2778da4bf04b8917e0215778ccd1e768cb03b34b137d189430b329 +size 25047 diff --git a/Assets/BossRoom/Scripts/Client/Audio/ClientMusicPlayer.cs b/Assets/BossRoom/Scripts/Client/Audio/ClientMusicPlayer.cs index f8a68a97e..a80e0e19e 100644 --- a/Assets/BossRoom/Scripts/Client/Audio/ClientMusicPlayer.cs +++ b/Assets/BossRoom/Scripts/Client/Audio/ClientMusicPlayer.cs @@ -71,9 +71,14 @@ private void Awake() { throw new System.Exception("Multiple ClientMuscPlayers!"); } - m_source = GetComponent(); DontDestroyOnLoad(gameObject); Instance = this; + m_source.volume = ClientPrefs.GetMusicVolume(); + } + + public void SetMusicVolume(float volume) + { + m_source.volume = volume; } } } diff --git a/Assets/BossRoom/Scripts/Client/ClientPrefs.cs b/Assets/BossRoom/Scripts/Client/ClientPrefs.cs index 4071cc07d..4609901a9 100644 --- a/Assets/BossRoom/Scripts/Client/ClientPrefs.cs +++ b/Assets/BossRoom/Scripts/Client/ClientPrefs.cs @@ -9,9 +9,12 @@ namespace BossRoom.Client /// public class ClientPrefs { + private const float k_DefaultMasterVolume = 1; + private const float k_DefaultMusicVolume = 0.8f; + public static float GetMasterVolume() { - return PlayerPrefs.GetFloat("MasterVolume", 1); + return PlayerPrefs.GetFloat("MasterVolume", k_DefaultMasterVolume); } public static void SetMasterVolume(float volume) @@ -19,6 +22,16 @@ public static void SetMasterVolume(float volume) PlayerPrefs.SetFloat("MasterVolume", volume); } + public static float GetMusicVolume() + { + return PlayerPrefs.GetFloat("MusicVolume", k_DefaultMusicVolume); + } + + public static void SetMusicVolume(float volume) + { + PlayerPrefs.SetFloat("MusicVolume", volume); + } + /// /// Either loads a Guid string from Unity preferences, or creates one and checkpoints it, then returns it. /// diff --git a/Assets/BossRoom/Scripts/Client/UI/UISettingsCanvas.cs b/Assets/BossRoom/Scripts/Client/UI/UISettingsCanvas.cs new file mode 100644 index 000000000..05216ab4b --- /dev/null +++ b/Assets/BossRoom/Scripts/Client/UI/UISettingsCanvas.cs @@ -0,0 +1,32 @@ +using UnityEngine; + +namespace BossRoom.Visual +{ + /// + /// Controls the special Canvas that has the settings icon and the settings window. + /// The window itself is controlled by UISettingsPanel; the button is controlled here. + /// + public class UISettingsCanvas : MonoBehaviour + { + [SerializeField] + private GameObject m_SettingsPanelRoot; + + void Awake() + { + // the settings canvas should exist in all scenes! + DontDestroyOnLoad(gameObject); + + // hide the settings window at startup (this is just to handle the common case where an artist forgets to disable the window in the prefab) + m_SettingsPanelRoot.SetActive(false); + } + + /// + /// Called directly by the settings button in the UI prefab + /// + public void OnClickSettingsButton() + { + m_SettingsPanelRoot.SetActive(!m_SettingsPanelRoot.activeSelf); + } + + } +} diff --git a/Assets/BossRoom/Scripts/Client/UI/UIVolumeControl.cs.meta b/Assets/BossRoom/Scripts/Client/UI/UISettingsCanvas.cs.meta similarity index 83% rename from Assets/BossRoom/Scripts/Client/UI/UIVolumeControl.cs.meta rename to Assets/BossRoom/Scripts/Client/UI/UISettingsCanvas.cs.meta index 0c8d33ee7..5e56f7f53 100644 --- a/Assets/BossRoom/Scripts/Client/UI/UIVolumeControl.cs.meta +++ b/Assets/BossRoom/Scripts/Client/UI/UISettingsCanvas.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 102c5e03f55bcba42903a3d49db09aef +guid: 190bc18b6f6f06340acb887d88806593 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/BossRoom/Scripts/Client/UI/UISettingsPanel.cs b/Assets/BossRoom/Scripts/Client/UI/UISettingsPanel.cs new file mode 100644 index 000000000..ea89c1581 --- /dev/null +++ b/Assets/BossRoom/Scripts/Client/UI/UISettingsPanel.cs @@ -0,0 +1,45 @@ +using UnityEngine; +using UnityEngine.UI; + +namespace BossRoom.Client +{ + + public class UISettingsPanel : MonoBehaviour + { + [SerializeField] + private Slider m_MasterVolumeSlider; + + [SerializeField] + private Slider m_MusicVolumeSlider; + + private void OnEnable() + { + // Note that we initialize the slider BEFORE we listen for changes (so we don't get notified of our own change!) + m_MasterVolumeSlider.value = ClientPrefs.GetMasterVolume(); + m_MasterVolumeSlider.onValueChanged.AddListener(OnMasterVolumeSliderChanged); + + // initialize music slider similarly. + m_MusicVolumeSlider.value = ClientPrefs.GetMusicVolume(); + m_MusicVolumeSlider.onValueChanged.AddListener(OnMusicVolumeSliderChanged); + } + + private void OnDisable() + { + m_MasterVolumeSlider.onValueChanged.RemoveListener(OnMasterVolumeSliderChanged); + m_MusicVolumeSlider.onValueChanged.RemoveListener(OnMusicVolumeSliderChanged); + } + + private void OnMasterVolumeSliderChanged(float newValue) + { + AudioListener.volume = newValue; + ClientPrefs.SetMasterVolume(newValue); + } + + private void OnMusicVolumeSliderChanged(float newValue) + { + ClientMusicPlayer.Instance.SetMusicVolume(newValue); + ClientPrefs.SetMusicVolume(newValue); + } + } + +} diff --git a/Assets/BossRoom/Scripts/Client/UI/UISettingsPanel.cs.meta b/Assets/BossRoom/Scripts/Client/UI/UISettingsPanel.cs.meta new file mode 100644 index 000000000..b736153c4 --- /dev/null +++ b/Assets/BossRoom/Scripts/Client/UI/UISettingsPanel.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: d3fad71d1b21b8545815ca408165e739 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/BossRoom/Scripts/Client/UI/UIVolumeControl.cs b/Assets/BossRoom/Scripts/Client/UI/UIVolumeControl.cs deleted file mode 100644 index 82ddfa130..000000000 --- a/Assets/BossRoom/Scripts/Client/UI/UIVolumeControl.cs +++ /dev/null @@ -1,51 +0,0 @@ -using UnityEngine; -using UnityEngine.UI; - -namespace BossRoom.Client -{ - /// - /// Controls a master-volume Slider. - /// - public class UIVolumeControl : MonoBehaviour - { - [SerializeField] - private Slider m_VolumeSlider; - - private void OnEnable() - { - m_VolumeSlider.onValueChanged.AddListener(OnVolumeSliderChanged); - } - - private void OnDisable() - { - m_VolumeSlider.onValueChanged.RemoveListener(OnVolumeSliderChanged); - } - - private void Update() - { - // we want to make sure the slider is 100% accurate at all times, even if it gets changed - // from some other UI screen rather than our slider. (Most games have a "settings" window where things - // like master volume can also be configured.) So we constantly check to see if the volume has changed. - // (This also initializes the slider to the correct value at startup... otherwise we would do this in OnEnable()) - if (AudioListener.volume != m_VolumeSlider.value) - { - m_VolumeSlider.value = AudioListener.volume; - } - } - - private void OnVolumeSliderChanged(float newValue) - { - AudioListener.volume = newValue; - ClientPrefs.SetMasterVolume(newValue); - } - -#if UNITY_EDITOR - private void OnValidate() - { - // default assumption is that if there's a Slider on our GameObject, we probably want to use it! - if (m_VolumeSlider == null) - m_VolumeSlider = GetComponent(); - } -#endif - } -} From 2e89bfd44c6a7d7d41b30ed9b1fcb8f7a16d5c5a Mon Sep 17 00:00:00 2001 From: eheimburg <74330250+eheimburg@users.noreply.github.com> Date: Tue, 23 Mar 2021 21:54:11 -0400 Subject: [PATCH 7/9] Missed a revert --- Assets/BossRoom/Scenes/CharSelect.unity | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Assets/BossRoom/Scenes/CharSelect.unity b/Assets/BossRoom/Scenes/CharSelect.unity index 2a63647ea..993d67424 100644 --- a/Assets/BossRoom/Scenes/CharSelect.unity +++ b/Assets/BossRoom/Scenes/CharSelect.unity @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f7cf70772d9ea2ecb67aee752c930f5e1678c411cb151be15f52a83f954f3ca2 -size 186362 +oid sha256:49f4b8326856c4ca18ff7eb2b867aa22e6226f61a198519b9903723ad96ff647 +size 180973 From 14779d0cf47a854c27f32cea6d530c656b0d8271 Mon Sep 17 00:00:00 2001 From: eheimburg <74330250+eheimburg@users.noreply.github.com> Date: Wed, 24 Mar 2021 21:07:33 -0400 Subject: [PATCH 8/9] Replaced asterisk with Image, refined raycast targets --- .../Prefabs/UI/SettingsPanelCanvas.prefab | 44 +++++++++---------- 1 file changed, 20 insertions(+), 24 deletions(-) diff --git a/Assets/BossRoom/Prefabs/UI/SettingsPanelCanvas.prefab b/Assets/BossRoom/Prefabs/UI/SettingsPanelCanvas.prefab index 3ae603d22..5a59b4c45 100644 --- a/Assets/BossRoom/Prefabs/UI/SettingsPanelCanvas.prefab +++ b/Assets/BossRoom/Prefabs/UI/SettingsPanelCanvas.prefab @@ -12,7 +12,7 @@ GameObject: - component: {fileID: 294265329686786379} - component: {fileID: 294265329686786381} - component: {fileID: 294265329686786376} - - component: {fileID: 294265329686786378} + - component: {fileID: 1727683541821915747} m_Layer: 5 m_Name: Settings Button m_TagString: Untagged @@ -87,7 +87,7 @@ MonoBehaviour: m_SelectedTrigger: Selected m_DisabledTrigger: Disabled m_Interactable: 1 - m_TargetGraphic: {fileID: 294265329686786378} + m_TargetGraphic: {fileID: 1727683541821915747} m_OnClick: m_PersistentCalls: m_Calls: @@ -144,7 +144,7 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!114 &294265329686786378 +--- !u!114 &1727683541821915747 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -153,7 +153,7 @@ MonoBehaviour: m_GameObject: {fileID: 294265329686786383} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} @@ -164,20 +164,16 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 150 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 1 - m_MaxSize: 300 - m_Alignment: 1 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 1 - m_VerticalOverflow: 1 - m_LineSpacing: 1 - m_Text: '*' + m_Sprite: {fileID: -5838772972447684026, guid: 1b8d595a2eaea6a41b33c3eb5d3d6a44, type: 3} + m_Type: 0 + m_PreserveAspect: 1 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!1 &294265330276786221 GameObject: m_ObjectHideFlags: 0 @@ -352,7 +348,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 0.8705883, g: 0.77647066, b: 0.23529413, a: 1} - m_RaycastTarget: 1 + m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: @@ -467,7 +463,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 0.8705883, g: 0.77647066, b: 0.23529413, a: 1} - m_RaycastTarget: 1 + m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: @@ -658,7 +654,7 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 0.5411765, g: 0.4784314, b: 0.13725491, a: 1} m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_RaycastPadding: {x: -30, y: -20, z: -30, w: -20} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -844,7 +840,7 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 0.5411765, g: 0.4784314, b: 0.13725491, a: 1} m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_RaycastPadding: {x: -30, y: -20, z: -30, w: -20} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -918,7 +914,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 0.9215687, g: 0.8196079, b: 0.24705884, a: 1} - m_RaycastTarget: 1 + m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: @@ -1393,7 +1389,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 + m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: From 09c3591f003a9fb6cb5d78ec65298f78a3061d4e Mon Sep 17 00:00:00 2001 From: eheimburg <74330250+eheimburg@users.noreply.github.com> Date: Wed, 24 Mar 2021 21:12:09 -0400 Subject: [PATCH 9/9] Removed obsolete Mesh component from button --- .../Prefabs/UI/SettingsPanelCanvas.prefab | 42 ------------------- 1 file changed, 42 deletions(-) diff --git a/Assets/BossRoom/Prefabs/UI/SettingsPanelCanvas.prefab b/Assets/BossRoom/Prefabs/UI/SettingsPanelCanvas.prefab index 5a59b4c45..d46b325b8 100644 --- a/Assets/BossRoom/Prefabs/UI/SettingsPanelCanvas.prefab +++ b/Assets/BossRoom/Prefabs/UI/SettingsPanelCanvas.prefab @@ -11,7 +11,6 @@ GameObject: - component: {fileID: 294265329686786380} - component: {fileID: 294265329686786379} - component: {fileID: 294265329686786381} - - component: {fileID: 294265329686786376} - component: {fileID: 1727683541821915747} m_Layer: 5 m_Name: Settings Button @@ -103,47 +102,6 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 1 m_CallState: 2 ---- !u!23 &294265329686786376 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 294265329686786383} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 10100, guid: 0000000000000000e000000000000000, type: 0} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!114 &1727683541821915747 MonoBehaviour: m_ObjectHideFlags: 0