From 0450f898558db5e1f796fc92971a44cdbff00417 Mon Sep 17 00:00:00 2001
From: Jacktheholdy <jakob.holdinghausen@fau.de>
Date: Fri, 17 Mar 2023 11:27:42 +0100
Subject: [PATCH] Added a SoundManager Class and a Volume Slider to the options
menu that can be used to change the volume of all sounds.
---
.gitignore | 2 +
.../Prefabs/UI/NetwMenue/OptionsM.prefab | 611 +++++++++++++++++-
Assets/Scenes/Menues/LaunchMenue.unity | 40 ++
Assets/Scripts/SoundManager.cs | 52 ++
Assets/Scripts/SoundManager.cs.meta | 11 +
UserSettings/EditorUserSettings.asset | 16 +-
6 files changed, 717 insertions(+), 15 deletions(-)
create mode 100644 Assets/Scripts/SoundManager.cs
create mode 100644 Assets/Scripts/SoundManager.cs.meta
diff --git a/.gitignore b/.gitignore
index 49aab4c2..0c70a879 100644
--- a/.gitignore
+++ b/.gitignore
@@ -66,3 +66,5 @@ crashlytics-build.properties
# Ignore UserSettings
UserSettings/
+/Assets/Images/frameit_logo_512x512.png.meta
+/Assets/Images/ScreenCapture_1024x500.png.meta
diff --git a/Assets/Resources/Prefabs/UI/NetwMenue/OptionsM.prefab b/Assets/Resources/Prefabs/UI/NetwMenue/OptionsM.prefab
index bcdd744a..5d2e203b 100644
--- a/Assets/Resources/Prefabs/UI/NetwMenue/OptionsM.prefab
+++ b/Assets/Resources/Prefabs/UI/NetwMenue/OptionsM.prefab
@@ -165,7 +165,7 @@ MonoBehaviour:
m_FallbackScreenDPI: 96
m_DefaultSpriteDPI: 96
m_DynamicPixelsPerUnit: 1
- m_PresetInfoIsWorld: 1
+ m_PresetInfoIsWorld: 0
--- !u!114 &4920814527069972912
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -211,6 +211,82 @@ MonoBehaviour:
m_EditorClassIdentifier:
cursorScaler_Slider: {fileID: 4438965651533385680}
cursorScaler_SliderT: {fileID: 438921409262544105}
+--- !u!1 &104529959272257663
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 3545168087928552614}
+ - component: {fileID: 6704568759057485565}
+ - component: {fileID: 3595383080062270026}
+ m_Layer: 5
+ m_Name: Handle
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &3545168087928552614
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 104529959272257663}
+ 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_ConstrainProportionsScale: 0
+ m_Children: []
+ m_Father: {fileID: 4235414682217592855}
+ 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: 66, y: 0}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &6704568759057485565
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 104529959272257663}
+ m_CullTransparentMesh: 1
+--- !u!114 &3595383080062270026
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 104529959272257663}
+ 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: c55a4c383f1a08146a6a21a5f34d616b, 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!1 &139631975344979797
GameObject:
m_ObjectHideFlags: 0
@@ -795,6 +871,7 @@ RectTransform:
- {fileID: 2715146380416823674}
- {fileID: 1756327642273168954}
- {fileID: 2305079757327538448}
+ - {fileID: 2583494409112630945}
m_Father: {fileID: 266457293881304186}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -846,7 +923,7 @@ MonoBehaviour:
m_FallbackScreenDPI: 96
m_DefaultSpriteDPI: 96
m_DynamicPixelsPerUnit: 1
- m_PresetInfoIsWorld: 1
+ m_PresetInfoIsWorld: 0
--- !u!114 &266457293017241419
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -1094,7 +1171,7 @@ MonoBehaviour:
m_FallbackScreenDPI: 96
m_DefaultSpriteDPI: 96
m_DynamicPixelsPerUnit: 1
- m_PresetInfoIsWorld: 1
+ m_PresetInfoIsWorld: 0
--- !u!114 &266457293081967574
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -2070,7 +2147,7 @@ MonoBehaviour:
m_FallbackScreenDPI: 96
m_DefaultSpriteDPI: 96
m_DynamicPixelsPerUnit: 1
- m_PresetInfoIsWorld: 1
+ m_PresetInfoIsWorld: 0
--- !u!114 &266457293633753202
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -5278,7 +5355,7 @@ MonoBehaviour:
m_FallbackScreenDPI: 96
m_DefaultSpriteDPI: 96
m_DynamicPixelsPerUnit: 1
- m_PresetInfoIsWorld: 1
+ m_PresetInfoIsWorld: 0
--- !u!114 &266457294942239437
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -5296,6 +5373,43 @@ MonoBehaviour:
m_BlockingMask:
serializedVersion: 2
m_Bits: 4294967295
+--- !u!1 &423451300675366922
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 3406104997600660245}
+ 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 &3406104997600660245
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 423451300675366922}
+ 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_ConstrainProportionsScale: 0
+ m_Children:
+ - {fileID: 7933345339665693304}
+ m_Father: {fileID: 5499430565351211289}
+ m_RootOrder: 1
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0, y: 0.35}
+ m_AnchorMax: {x: 1, y: 0.65}
+ m_AnchoredPosition: {x: -5, y: 0}
+ m_SizeDelta: {x: -20, y: 0}
+ m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &438921409262544105
GameObject:
m_ObjectHideFlags: 0
@@ -10567,7 +10681,7 @@ MonoBehaviour:
m_FallbackScreenDPI: 96
m_DefaultSpriteDPI: 96
m_DynamicPixelsPerUnit: 1
- m_PresetInfoIsWorld: 1
+ m_PresetInfoIsWorld: 0
--- !u!114 &9121301437359881234
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -12849,6 +12963,82 @@ MonoBehaviour:
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
+--- !u!1 &6343478670586783148
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 7300389587469532295}
+ - component: {fileID: 1081180158991687977}
+ - component: {fileID: 3954081112608445770}
+ m_Layer: 5
+ m_Name: Background
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &7300389587469532295
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 6343478670586783148}
+ 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_ConstrainProportionsScale: 0
+ m_Children: []
+ m_Father: {fileID: 5499430565351211289}
+ m_RootOrder: 0
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0, y: 0.35}
+ m_AnchorMax: {x: 1, y: 0.65}
+ m_AnchoredPosition: {x: 0, y: 0}
+ m_SizeDelta: {x: 0, y: 0}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &1081180158991687977
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 6343478670586783148}
+ m_CullTransparentMesh: 1
+--- !u!114 &3954081112608445770
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 6343478670586783148}
+ 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 &6390233321289828526
GameObject:
m_ObjectHideFlags: 0
@@ -13245,6 +13435,86 @@ MonoBehaviour:
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
+--- !u!1 &6596183199388489565
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 7131184371211597973}
+ - component: {fileID: 2354321590395062772}
+ - component: {fileID: 1790589825691522731}
+ m_Layer: 5
+ m_Name: SoundVolText
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &7131184371211597973
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 6596183199388489565}
+ 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_ConstrainProportionsScale: 0
+ m_Children: []
+ m_Father: {fileID: 2583494409112630945}
+ m_RootOrder: 0
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 1, y: 1.2}
+ m_AnchoredPosition: {x: 0, y: 0}
+ m_SizeDelta: {x: 0, y: 0}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &2354321590395062772
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 6596183199388489565}
+ m_CullTransparentMesh: 1
+--- !u!114 &1790589825691522731
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 6596183199388489565}
+ 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.19607843, g: 0.19607843, b: 0.19607843, 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: 140
+ m_FontStyle: 0
+ m_BestFit: 0
+ m_MinSize: 1
+ m_MaxSize: 166
+ m_Alignment: 1
+ m_AlignByGeometry: 0
+ m_RichText: 1
+ m_HorizontalOverflow: 0
+ m_VerticalOverflow: 0
+ m_LineSpacing: 1
+ m_Text: Sound Volume
--- !u!1 &6647376744282569180
GameObject:
m_ObjectHideFlags: 0
@@ -13577,6 +13847,123 @@ MonoBehaviour:
m_EditorClassIdentifier:
backTo_GObj: {fileID: 266457293017241417}
parentM_GObj: {fileID: 266457293881304185}
+--- !u!1 &7201490909052299312
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 5499430565351211289}
+ - component: {fileID: 2852004324625462264}
+ - component: {fileID: 553581056312737112}
+ m_Layer: 5
+ m_Name: SoundVolume_Slider
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &5499430565351211289
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 7201490909052299312}
+ 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_ConstrainProportionsScale: 0
+ m_Children:
+ - {fileID: 7300389587469532295}
+ - {fileID: 3406104997600660245}
+ - {fileID: 4235414682217592855}
+ m_Father: {fileID: 2583494409112630945}
+ m_RootOrder: 1
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 1, y: 0.63000005}
+ m_AnchoredPosition: {x: -0.00012207031, y: 0}
+ m_SizeDelta: {x: 0.00027466, y: 0}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &2852004324625462264
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 7201490909052299312}
+ 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: 3595383080062270026}
+ m_FillRect: {fileID: 7933345339665693304}
+ m_HandleRect: {fileID: 3545168087928552614}
+ m_Direction: 0
+ m_MinValue: 0
+ m_MaxValue: 1
+ m_WholeNumbers: 0
+ m_Value: 0.2
+ m_OnValueChanged:
+ m_PersistentCalls:
+ m_Calls:
+ - m_Target: {fileID: 553581056312737112}
+ m_TargetAssemblyTypeName: SoundManager, Assembly-CSharp
+ m_MethodName: ChangeVolume
+ m_Mode: 1
+ 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!114 &553581056312737112
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 7201490909052299312}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 994d5a1b578342f49bee0725f09a3df7, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ volumeSlider: {fileID: 2852004324625462264}
--- !u!1 &7214124760111084724
GameObject:
m_ObjectHideFlags: 0
@@ -13876,6 +14263,88 @@ MonoBehaviour:
m_BlockingMask:
serializedVersion: 2
m_Bits: 4294967295
+--- !u!1 &7348328172909127196
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 2583494409112630945}
+ - component: {fileID: 1700835849708511064}
+ - component: {fileID: 6005894235616339080}
+ m_Layer: 5
+ m_Name: SoundVolume
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &2583494409112630945
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 7348328172909127196}
+ m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+ m_LocalPosition: {x: 0, y: 0, z: 0}
+ m_LocalScale: {x: 0.27711785, y: 0.27711785, z: 0.27711785}
+ m_ConstrainProportionsScale: 0
+ m_Children:
+ - {fileID: 7131184371211597973}
+ - {fileID: 5499430565351211289}
+ m_Father: {fileID: 266457293017241418}
+ m_RootOrder: 8
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0.1, y: 0.3}
+ m_AnchorMax: {x: 0.5, y: 0.5}
+ m_AnchoredPosition: {x: 610, y: 155}
+ m_SizeDelta: {x: 483.83994, y: 182.75699}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &1700835849708511064
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 7348328172909127196}
+ m_CullTransparentMesh: 1
+--- !u!114 &6005894235616339080
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 7348328172909127196}
+ m_Enabled: 0
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, 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: 30
+ m_FontStyle: 0
+ m_BestFit: 0
+ m_MinSize: 3
+ m_MaxSize: 40
+ m_Alignment: 0
+ m_AlignByGeometry: 0
+ m_RichText: 1
+ m_HorizontalOverflow: 0
+ m_VerticalOverflow: 0
+ m_LineSpacing: 1
+ m_Text:
--- !u!1 &7531123298323220689
GameObject:
m_ObjectHideFlags: 0
@@ -15592,7 +16061,7 @@ MonoBehaviour:
m_FallbackScreenDPI: 96
m_DefaultSpriteDPI: 96
m_DynamicPixelsPerUnit: 1
- m_PresetInfoIsWorld: 1
+ m_PresetInfoIsWorld: 0
--- !u!114 &5954451699260976016
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -15943,6 +16412,82 @@ MonoBehaviour:
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: Touch-Control Options
+--- !u!1 &8644824690227385941
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 7933345339665693304}
+ - component: {fileID: 8124492382014077882}
+ - component: {fileID: 278455661706750475}
+ m_Layer: 5
+ m_Name: Fill
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &7933345339665693304
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 8644824690227385941}
+ 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_ConstrainProportionsScale: 0
+ m_Children: []
+ m_Father: {fileID: 3406104997600660245}
+ 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 &8124492382014077882
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 8644824690227385941}
+ m_CullTransparentMesh: 1
+--- !u!114 &278455661706750475
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 8644824690227385941}
+ 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 &8702967903516298016
GameObject:
m_ObjectHideFlags: 0
@@ -16434,6 +16979,43 @@ MonoBehaviour:
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: Touchmodes XX
+--- !u!1 &9114356783217646186
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 4235414682217592855}
+ 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 &4235414682217592855
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 9114356783217646186}
+ 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_ConstrainProportionsScale: 0
+ m_Children:
+ - {fileID: 3545168087928552614}
+ m_Father: {fileID: 5499430565351211289}
+ 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 &9160568381832827122
GameObject:
m_ObjectHideFlags: 0
@@ -16785,6 +17367,11 @@ PrefabInstance:
propertyPath: parentM_GObj
value:
objectReference: {fileID: 220600721669129657}
+ - target: {fileID: 6999102527998034399, guid: 386732dae91d6c546ac0f02745d283dc,
+ type: 3}
+ propertyPath: m_AnchoredPosition.y
+ value: -0.000030517578
+ objectReference: {fileID: 0}
- target: {fileID: 9012457569728381634, guid: 386732dae91d6c546ac0f02745d283dc,
type: 3}
propertyPath: m_Name
@@ -16921,6 +17508,16 @@ PrefabInstance:
propertyPath: m_Name
value: NetwokOptM_MnCtrl
objectReference: {fileID: 0}
+ - target: {fileID: 6804933134010575747, guid: 2c2cf35f8e593ea44b2050d129ee23a4,
+ type: 3}
+ propertyPath: m_IsActive
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 6804933134010575759, guid: 2c2cf35f8e593ea44b2050d129ee23a4,
+ type: 3}
+ propertyPath: m_PresetInfoIsWorld
+ value: 0
+ objectReference: {fileID: 0}
- target: {fileID: 6804933135040138869, guid: 2c2cf35f8e593ea44b2050d129ee23a4,
type: 3}
propertyPath: backTo_GObj
diff --git a/Assets/Scenes/Menues/LaunchMenue.unity b/Assets/Scenes/Menues/LaunchMenue.unity
index 0b6e02cb..56c38538 100644
--- a/Assets/Scenes/Menues/LaunchMenue.unity
+++ b/Assets/Scenes/Menues/LaunchMenue.unity
@@ -1893,6 +1893,16 @@ PrefabInstance:
propertyPath: m_RootOrder
value: 0
objectReference: {fileID: 0}
+ - target: {fileID: 2869114312252178222, guid: d55296411d4f39e43804eb54bbc798fc,
+ type: 3}
+ propertyPath: m_AnchorMax.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2869114312252178222, guid: d55296411d4f39e43804eb54bbc798fc,
+ type: 3}
+ propertyPath: m_AnchorMax.y
+ value: 0
+ objectReference: {fileID: 0}
- target: {fileID: 3039527528659726532, guid: d55296411d4f39e43804eb54bbc798fc,
type: 3}
propertyPath: m_PresetInfoIsWorld
@@ -2668,6 +2678,21 @@ PrefabInstance:
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
+ - target: {fileID: 5841362490193351677, guid: d55296411d4f39e43804eb54bbc798fc,
+ type: 3}
+ propertyPath: m_FontData.m_MaxSize
+ value: 149
+ objectReference: {fileID: 0}
+ - target: {fileID: 5841362490193351677, guid: d55296411d4f39e43804eb54bbc798fc,
+ type: 3}
+ propertyPath: m_FontData.m_FontSize
+ value: 140
+ objectReference: {fileID: 0}
+ - target: {fileID: 5841362490193351677, guid: d55296411d4f39e43804eb54bbc798fc,
+ type: 3}
+ propertyPath: m_FontData.m_Alignment
+ value: 1
+ objectReference: {fileID: 0}
- target: {fileID: 6039154815366894334, guid: d55296411d4f39e43804eb54bbc798fc,
type: 3}
propertyPath: m_AnchorMax.y
@@ -2753,6 +2778,21 @@ PrefabInstance:
propertyPath: m_PresetInfoIsWorld
value: 0
objectReference: {fileID: 0}
+ - target: {fileID: 8717619082247649776, guid: d55296411d4f39e43804eb54bbc798fc,
+ type: 3}
+ propertyPath: m_AnchorMax.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 8717619082247649776, guid: d55296411d4f39e43804eb54bbc798fc,
+ type: 3}
+ propertyPath: m_AnchorMax.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 8717619082247649776, guid: d55296411d4f39e43804eb54bbc798fc,
+ type: 3}
+ propertyPath: m_AnchorMin.x
+ value: 0
+ objectReference: {fileID: 0}
- target: {fileID: 8954018117256822208, guid: d55296411d4f39e43804eb54bbc798fc,
type: 3}
propertyPath: m_AnchorMax.y
diff --git a/Assets/Scripts/SoundManager.cs b/Assets/Scripts/SoundManager.cs
new file mode 100644
index 00000000..492de203
--- /dev/null
+++ b/Assets/Scripts/SoundManager.cs
@@ -0,0 +1,52 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine.UI;
+using UnityEngine;
+
+public class SoundManager : MonoBehaviour
+{
+ public static SoundManager Instance;
+ [SerializeField] Slider volumeSlider;
+ public const float defaultVolume = 0.5f;
+ // Start is called before the first frame update
+ void Start()
+ {
+ if(!PlayerPrefs.HasKey("soundVolume")) {
+ PlayerPrefs.SetFloat("soundVolume", defaultVolume);
+ Load();
+ } else
+ {
+ Load();
+ }
+ }
+
+ public void Awake()
+ {
+ //singleton
+ if(Instance == null)
+ {
+ Instance = this;
+ DontDestroyOnLoad(gameObject);
+ } else
+ {
+ Destroy(gameObject);
+ }
+ }
+
+ public void ChangeVolume()
+ {
+ AudioListener.volume = volumeSlider.value;
+ Save();
+ }
+
+ private void Load()
+ {
+ volumeSlider.value = PlayerPrefs.GetFloat("soundVolume");
+ }
+ private void Save()
+ {
+ PlayerPrefs.SetFloat("soundVolume", volumeSlider.value);
+ }
+
+
+}
diff --git a/Assets/Scripts/SoundManager.cs.meta b/Assets/Scripts/SoundManager.cs.meta
new file mode 100644
index 00000000..cdedc868
--- /dev/null
+++ b/Assets/Scripts/SoundManager.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 994d5a1b578342f49bee0725f09a3df7
+MonoImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset
index c5d5362f..20793095 100644
--- a/UserSettings/EditorUserSettings.asset
+++ b/UserSettings/EditorUserSettings.asset
@@ -6,26 +6,26 @@ EditorUserSettings:
serializedVersion: 4
m_ConfigSettings:
RecentlyUsedSceneGuid-0:
- value: 5b01035553515d0e0b0f5b7415725d444e4f1d2b2e782332757f4863e4e6673c
+ value: 5b5200520604510a5b5b587642270744124e4e7a7e7f2764742f1b61b0e6613a
flags: 0
RecentlyUsedSceneGuid-1:
- value: 5b5200520604510a5b5b587642270744124e4e7a7e7f2764742f1b61b0e6613a
+ value: 0702005254070d5d5d5a5d7145210f444116487c282d7f357e7a1e66b6b0313a
flags: 0
RecentlyUsedSceneGuid-2:
- value: 0702005254070d5d5d5a5d7145210f444116487c282d7f357e7a1e66b6b0313a
+ value: 0709560454055c0d0c5e5c2444740b4413154a72792d22627c714963e0b6373d
flags: 0
RecentlyUsedSceneGuid-3:
- value: 0709560454055c0d0c5e5c2444740b4413154a72792d22627c714963e0b6373d
+ value: 520107035d0c510c080d547215760b4413154d2e7a2c226129281c65e3b63768
flags: 0
RecentlyUsedSceneGuid-4:
- value: 0502505152005e020c0d0e2446275e44144f19287f707e362c7c4b60b2b9353c
- flags: 0
- RecentlyUsedSceneGuid-5:
- value: 57505505560608585a56557116730644404e4d7b7c7b7562787e4f66e4b1313e
+ value: 5b01035553515d0e0b0f5b7415725d444e4f1d2b2e782332757f4863e4e6673c
flags: 0
RecentlyUsedSceneGuid-5:
value: 0502505152005e020c0d0e2446275e44144f19287f707e362c7c4b60b2b9353c
flags: 0
+ RecentlyUsedSceneGuid-6:
+ value: 57505505560608585a56557116730644404e4d7b7c7b7562787e4f66e4b1313e
+ flags: 0
RecentlyUsedScenePath-0:
value: 22424703114646680e0b0227036c681f041b1c39631c3435281e1221eee47a2decee22f0
flags: 0
--
GitLab