mute audio toggle
This commit is contained in:
1 parent
d227ce3842
commit
439bf147f0
7 files changed
+50
-31
No files matched your search
@@ -13,6 +13,7 @@ public class PlayerData {
|
|||||||
public class PlayerSettings {
|
public class PlayerSettings {
|
||||||
public float ViewSens = 1.0f;
|
public float ViewSens = 1.0f;
|
||||||
public bool InvertY = false;
|
public bool InvertY = false;
|
||||||
|
public bool MuteAudio = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
public static class PlayerDataService {
|
public static class PlayerDataService {
|
||||||
|
|||||||
@@ -44,6 +44,15 @@ public class ShipControls : MonoBehaviour {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bool _muteAudio = false;
|
||||||
|
public bool MuteAudio {
|
||||||
|
set {
|
||||||
|
_muteAudio = value;
|
||||||
|
AudioListener.volume = _muteAudio ? 0f : 1f;
|
||||||
|
Debug.Log($"Set muteAudio {_muteAudio}");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
public PowerUnit powerUnit = new();
|
public PowerUnit powerUnit = new();
|
||||||
|
|
||||||
public float Speed => rigidBody.velocity.magnitude;
|
public float Speed => rigidBody.velocity.magnitude;
|
||||||
|
|||||||
+29
-29
@@ -1,29 +1,29 @@
|
|||||||
<ui:UXML xmlns:ui="UnityEngine.UIElements" xmlns:uie="UnityEditor.UIElements" xsi="http://www.w3.org/2001/XMLSchema-instance" engine="UnityEngine.UIElements" editor="UnityEditor.UIElements" noNamespaceSchemaLocation="../../UIElementsSchema/UIElements.xsd" editor-extension-mode="False">
|
<ui:UXML xmlns:ui="UnityEngine.UIElements" xmlns:uie="UnityEditor.UIElements" xsi="http://www.w3.org/2001/XMLSchema-instance" engine="UnityEngine.UIElements" editor="UnityEditor.UIElements" noNamespaceSchemaLocation="../../UIElementsSchema/UIElements.xsd" editor-extension-mode="False">
|
||||||
<Style src="project://database/Assets/Src/UI/Menu.uss?fileID=7433441132597879392&guid=144cc2c04c975bad88fb864cea91f099&type=3#Menu" />
|
<Style src="project://database/Assets/Src/UI/Menu.uss?fileID=7433441132597879392&guid=144cc2c04c975bad88fb864cea91f099&type=3#Menu" />
|
||||||
<Style src="project://database/Assets/Src/UI/Global.uss?fileID=7433441132597879392&guid=000591923dc977463bf0fd9f4e7d463e&type=3#Global" />
|
<Style src="project://database/Assets/Src/UI/Global.uss?fileID=7433441132597879392&guid=000591923dc977463bf0fd9f4e7d463e&type=3#Global" />
|
||||||
<ui:VisualElement name="main" class="nav" style="flex-grow: 1;">
|
<ui:VisualElement name="main" class="nav" style="flex-grow: 1;">
|
||||||
<ui:VisualElement name="body" style="flex-direction: row; height: 100%;">
|
<ui:VisualElement name="body" style="flex-direction: row; height: 100%;">
|
||||||
<ui:VisualElement name="left" style="flex-grow: 0; flex-basis: 50%; padding-top: 0; padding-right: 0; padding-bottom: 0; padding-left: 0;">
|
<ui:VisualElement name="left" style="flex-grow: 0; flex-basis: 50%; padding-top: 0; padding-right: 0; padding-bottom: 0; padding-left: 0;">
|
||||||
<ui:VisualElement name="tracksCtr" style="flex-grow: 1; background-color: rgba(0, 0, 0, 0);">
|
<ui:VisualElement name="tracksCtr" style="flex-grow: 1; background-color: rgba(0, 0, 0, 0);">
|
||||||
<ui:Label text="TRACK" display-tooltip-when-elided="true" name="Track" style="-unity-font: url('project://database/Assets/UI%20Toolkit/Fonts/Jura-DemiBold.otf?fileID=12800000&guid=1d103e83da4f14189b3e8b0b865eca3d&type=3#Jura-DemiBold'); -unity-font-style: bold;" />
|
<ui:Label text="TRACK" display-tooltip-when-elided="true" name="Track" style="-unity-font: url('project://database/Assets/UI%20Toolkit/Fonts/Jura-DemiBold.otf?fileID=12800000&guid=1d103e83da4f14189b3e8b0b865eca3d&type=3#Jura-DemiBold'); -unity-font-style: bold;" />
|
||||||
<ui:VisualElement name="tracks">
|
<ui:VisualElement name="tracks">
|
||||||
<ui:Button text="sr_junglism" display-tooltip-when-elided="true" />
|
<ui:Button text="sr_junglism" display-tooltip-when-elided="true" />
|
||||||
<ui:Button text="sr_silverstorage" display-tooltip-when-elided="true" />
|
<ui:Button text="sr_silverstorage" display-tooltip-when-elided="true" />
|
||||||
</ui:VisualElement>
|
</ui:VisualElement>
|
||||||
</ui:VisualElement>
|
</ui:VisualElement>
|
||||||
<ui:VisualElement name="settings" style="flex-grow: 1; flex-direction: column; display: flex; visibility: visible;">
|
<ui:VisualElement name="settings" style="flex-grow: 1; flex-direction: column; display: flex; visibility: visible;">
|
||||||
<ui:Label tabindex="-1" text="CONTROLS" display-tooltip-when-elided="true" style="-unity-font-style: bold; align-items: auto;" />
|
<ui:Label tabindex="-1" text="CONTROLS" display-tooltip-when-elided="true" style="-unity-font-style: bold; align-items: auto;" />
|
||||||
<ui:Slider label="View Sensitivity" value="1" high-value="3" name="viewSens" low-value="0.1" show-input-field="false" style="width: 100%;" />
|
<ui:Slider label="View Sensitivity" value="1" high-value="3" name="viewSens" low-value="0.1" show-input-field="false" style="width: 100%;" />
|
||||||
<ui:Label tabindex="-1" text="Label" display-tooltip-when-elided="true" name="viewSensLabel" style="-unity-text-align: upper-right; align-self: flex-end;" />
|
<ui:Label tabindex="-1" text="Label" display-tooltip-when-elided="true" name="viewSensLabel" style="-unity-text-align: upper-right; align-self: flex-end;" />
|
||||||
<ui:Toggle label="Invert Y" name="invertY" tooltip="Invert Y Axis Controls" value="false" />
|
<ui:Toggle label="Invert Y" name="invertY" tooltip="Invert Y Axis Controls" value="false" />
|
||||||
</ui:VisualElement>
|
</ui:VisualElement>
|
||||||
<ui:VisualElement name="SoonTM" style="flex-grow: 1; flex-direction: column; display: flex; visibility: visible;">
|
<ui:VisualElement name="audio" style="flex-grow: 1; flex-direction: column; display: flex; visibility: visible;">
|
||||||
<ui:Label tabindex="-1" text="AUDIO" display-tooltip-when-elided="true" style="-unity-font-style: bold; align-items: auto;" />
|
<ui:Label tabindex="-1" text="AUDIO" display-tooltip-when-elided="true" style="-unity-font-style: bold; align-items: auto;" />
|
||||||
<ui:Label tabindex="-1" text="Coming soon!" parse-escape-sequences="true" display-tooltip-when-elided="true" />
|
<ui:Toggle label="Mute" name="muteAudioToggle" />
|
||||||
</ui:VisualElement>
|
</ui:VisualElement>
|
||||||
<ui:Button text="EXIT" display-tooltip-when-elided="true" name="exit" tabindex="2" class="exit" />
|
<ui:Button text="EXIT" display-tooltip-when-elided="true" name="exit" tabindex="2" class="exit" />
|
||||||
</ui:VisualElement>
|
</ui:VisualElement>
|
||||||
<ui:VisualElement name="right" style="background-image: url('project://database/Assets/Images/Controls.HUD.png?fileID=2800000&guid=16a9df7a449918546a5000d9830d1e2a&type=3#Controls.HUD'); flex-grow: 1; -unity-background-scale-mode: scale-to-fit;" />
|
<ui:VisualElement name="right" style="background-image: url('project://database/Assets/Images/Controls.HUD.png?fileID=2800000&guid=16a9df7a449918546a5000d9830d1e2a&type=3#Controls.HUD'); flex-grow: 1; -unity-background-scale-mode: scale-to-fit;" />
|
||||||
</ui:VisualElement>
|
</ui:VisualElement>
|
||||||
</ui:VisualElement>
|
</ui:VisualElement>
|
||||||
</ui:UXML>
|
</ui:UXML>
|
||||||
@@ -35,6 +35,7 @@ public class MenuControls : MonoBehaviour {
|
|||||||
|
|
||||||
PlayerData _player;
|
PlayerData _player;
|
||||||
|
|
||||||
|
Toggle muteAudioToggle;
|
||||||
Toggle invertYToggle;
|
Toggle invertYToggle;
|
||||||
Slider viewSensSlider;
|
Slider viewSensSlider;
|
||||||
Label viewSensLabel;
|
Label viewSensLabel;
|
||||||
@@ -129,11 +130,13 @@ public class MenuControls : MonoBehaviour {
|
|||||||
void BindSettings() {
|
void BindSettings() {
|
||||||
Debug.Log("Setting controls change callbacks");
|
Debug.Log("Setting controls change callbacks");
|
||||||
invertYToggle = menuDoc.rootVisualElement.Q<Toggle>("invertY");
|
invertYToggle = menuDoc.rootVisualElement.Q<Toggle>("invertY");
|
||||||
|
muteAudioToggle = menuDoc.rootVisualElement.Q<Toggle>("muteAudioToggle");
|
||||||
viewSensSlider = menuDoc.rootVisualElement.Q<Slider>("viewSens");
|
viewSensSlider = menuDoc.rootVisualElement.Q<Slider>("viewSens");
|
||||||
viewSensLabel = menuDoc.rootVisualElement.Q<Label>("viewSensLabel");
|
viewSensLabel = menuDoc.rootVisualElement.Q<Label>("viewSensLabel");
|
||||||
|
|
||||||
viewSensSlider.value = _player.Settings.ViewSens;
|
viewSensSlider.value = _player.Settings.ViewSens;
|
||||||
invertYToggle.value = _player.Settings.InvertY;
|
invertYToggle.value = _player.Settings.InvertY;
|
||||||
|
muteAudioToggle.value = _player.Settings.MuteAudio;
|
||||||
|
|
||||||
viewSensLabel.text = $"{viewSensSlider.value:0.00}";
|
viewSensLabel.text = $"{viewSensSlider.value:0.00}";
|
||||||
|
|
||||||
@@ -144,6 +147,12 @@ public class MenuControls : MonoBehaviour {
|
|||||||
PlayerDataService.Persist(_player);
|
PlayerDataService.Persist(_player);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
muteAudioToggle.RegisterValueChangedCallback(evt => {
|
||||||
|
_player.Settings.MuteAudio = evt.newValue;
|
||||||
|
shipControls.MuteAudio = evt.newValue;
|
||||||
|
PlayerDataService.Persist(_player);
|
||||||
|
});
|
||||||
|
|
||||||
viewSensSlider.RegisterValueChangedCallback(evt => {
|
viewSensSlider.RegisterValueChangedCallback(evt => {
|
||||||
shipControls.ViewSens = evt.newValue;
|
shipControls.ViewSens = evt.newValue;
|
||||||
_player.Settings.ViewSens = evt.newValue;
|
_player.Settings.ViewSens = evt.newValue;
|
||||||
|
|||||||
@@ -7,7 +7,7 @@
|
|||||||
"dependencies": {}
|
"dependencies": {}
|
||||||
},
|
},
|
||||||
"com.unity.burst": {
|
"com.unity.burst": {
|
||||||
"version": "1.8.8",
|
"version": "1.8.7",
|
||||||
"depth": 1,
|
"depth": 1,
|
||||||
"source": "registry",
|
"source": "registry",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
|
|||||||
Executable → Regular
File mode changed.
Executable → Regular
+1
-1
@@ -12,6 +12,6 @@ VFXManager:
|
|||||||
m_MaxDeltaTime: 0.05
|
m_MaxDeltaTime: 0.05
|
||||||
m_MaxScrubTime: 30
|
m_MaxScrubTime: 30
|
||||||
m_CompiledVersion: 7
|
m_CompiledVersion: 7
|
||||||
m_RuntimeVersion: 35
|
m_RuntimeVersion: 33
|
||||||
m_RuntimeResources: {fileID: 11400000, guid: bc10b42afe3813544bffd38ae2cd893d, type: 2}
|
m_RuntimeResources: {fileID: 11400000, guid: bc10b42afe3813544bffd38ae2cd893d, type: 2}
|
||||||
m_BatchEmptyLifetime: 300
|
m_BatchEmptyLifetime: 300
|
||||||
Reference in new issue
Block a user