Skip to content

Commit

Permalink
Add 'Audio' toggle button
Browse files Browse the repository at this point in the history
  • Loading branch information
dotsquid committed Jun 24, 2019
1 parent 116342a commit 02b0970
Show file tree
Hide file tree
Showing 10 changed files with 574 additions and 5 deletions.
7 changes: 6 additions & 1 deletion Assets/Atlases/UI_smooth.spriteatlas
Original file line number Diff line number Diff line change
Expand Up @@ -31,16 +31,21 @@ SpriteAtlas:
variantMultiplier: 1
packables:
- {fileID: 102900000, guid: e2d93b4e11aefd74599c570b698d20a7, type: 3}
totalSpriteSurfaceArea: 189263
- {fileID: 102900000, guid: f211ec977d396034692b99b241035e26, type: 3}
totalSpriteSurfaceArea: 320335
bindAsDefault: 1
m_MasterAtlas: {fileID: 0}
m_PackedSprites:
- {fileID: 21300000, guid: 50aae711b15c04947a89e9043ad33273, type: 3}
- {fileID: 21300000, guid: 30c46c41a6da8c84581a77076d6aa1b3, type: 3}
- {fileID: 21300000, guid: 47eabde564b1e4841b92e448a9ad15a7, type: 3}
- {fileID: 21300000, guid: 423b945d79feeb64bb8564550709013f, type: 3}
- {fileID: 21300000, guid: 8268b78e4c3ba594a81670babd46115d, type: 3}
m_PackedSpriteNamesToIndex:
- Hint_button
- Hint_arrow
- Hint_mouse
- audio_on
- audio_off
m_Tag: UI_smooth
m_IsVariant: 0
152 changes: 150 additions & 2 deletions Assets/Scenes/Main.unity
Original file line number Diff line number Diff line change
Expand Up @@ -2189,7 +2189,7 @@ RectTransform:
- {fileID: 1289207689}
- {fileID: 737725290}
m_Father: {fileID: 2090305182}
m_RootOrder: 1
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {x: 0.5, y: 0}
Expand Down Expand Up @@ -9256,7 +9256,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 2090305182}
m_RootOrder: 0
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 1}
Expand Down Expand Up @@ -11491,6 +11491,153 @@ MonoBehaviour:
_maxAmplitude: 4
_minSpeed: 1
_maxSpeed: 2
--- !u!1 &1351850097
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1351850098}
- component: {fileID: 1351850102}
- component: {fileID: 1351850101}
- component: {fileID: 1351850100}
- component: {fileID: 1351850099}
m_Layer: 0
m_Name: Audio
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &1351850098
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1351850097}
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: 2090305182}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 0}
m_AnchorMax: {x: 1, y: 0}
m_AnchoredPosition: {x: -8, y: 8}
m_SizeDelta: {x: 64, y: 64}
m_Pivot: {x: 1, y: 0}
--- !u!114 &1351850099
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1351850097}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 529ab1e669faf19459fe7bc544836898, type: 3}
m_Name:
m_EditorClassIdentifier:
_onSprite: {fileID: 21300000, guid: 423b945d79feeb64bb8564550709013f, type: 3}
_offSprite: {fileID: 21300000, guid: 8268b78e4c3ba594a81670babd46115d, type: 3}
--- !u!114 &1351850100
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1351850097}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 2109663825, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Navigation:
m_Mode: 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: 0.5019608}
m_HighlightedColor: {r: 1, g: 0.495283, b: 0.495283, a: 0.5019608}
m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, 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_DisabledSprite: {fileID: 0}
m_AnimationTriggers:
m_NormalTrigger: Normal
m_HighlightedTrigger: Highlighted
m_PressedTrigger: Pressed
m_DisabledTrigger: Disabled
m_Interactable: 1
m_TargetGraphic: {fileID: 1351850101}
toggleTransition: 0
graphic: {fileID: 0}
m_Group: {fileID: 0}
onValueChanged:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 104536633}
m_MethodName: SetState
m_Mode: 0
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
m_TypeName: UnityEngine.UI.Toggle+ToggleEvent, UnityEngine.UI, Version=1.0.0.0,
Culture=neutral, PublicKeyToken=null
m_IsOn: 1
--- !u!114 &1351850101
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1351850097}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 0.5019608}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 21300000, guid: 423b945d79feeb64bb8564550709013f, 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: 1
--- !u!222 &1351850102
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1351850097}
m_CullTransparentMesh: 0
--- !u!1 &1358804543
GameObject:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -16937,6 +17084,7 @@ RectTransform:
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0, y: 0, z: 0}
m_Children:
- {fileID: 1351850098}
- {fileID: 1126505682}
- {fileID: 271673233}
m_Father: {fileID: 0}
Expand Down
4 changes: 2 additions & 2 deletions Assets/Scripts/Environment/AudioController.cs
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ private IEnumerator Start()
}
}

public void ToggleMute()
public void SetState(bool isActive)
{
_audioSource.mute = !_audioSource.mute;
_audioSource.mute = !isActive;
}
}
32 changes: 32 additions & 0 deletions Assets/Scripts/UI/ToggleImage.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
using UnityEngine;
using UnityEngine.UI;

[RequireComponent(typeof(Image), typeof(Toggle))]
public class ToggleImage : MonoBehaviour
{
[SerializeField]
private Sprite _onSprite;
[SerializeField]
private Sprite _offSprite;

private Toggle _toggle;
private Image _image;

private void Awake()
{
_image = GetComponent<Image>();
_toggle = GetComponent<Toggle>();
_toggle.onValueChanged.AddListener(OnValueChanged);
OnValueChanged(_toggle.isOn);
}

private void OnDestroy()
{
_toggle.onValueChanged.RemoveListener(OnValueChanged);
}

private void OnValueChanged(bool isOn)
{
_image.sprite = isOn ? _onSprite : _offSprite;
}
}
11 changes: 11 additions & 0 deletions Assets/Scripts/UI/ToggleImage.cs.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions Assets/Sprites/UI/Audio.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file added Assets/Sprites/UI/Audio/audio_off.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 02b0970

Please sign in to comment.