1
0
mirror of synced 2025-02-17 11:18:32 +01:00

fix button config issue and audio issue

This commit is contained in:
xpeng 2022-10-06 23:50:57 +02:00
parent 6c6e23188c
commit 0998fe4a9b
5 changed files with 19 additions and 17 deletions

View File

@ -16,7 +16,7 @@ LightingSettings:
m_AlbedoBoost: 1 m_AlbedoBoost: 1
m_IndirectOutputScale: 1 m_IndirectOutputScale: 1
m_UsingShadowmask: 0 m_UsingShadowmask: 0
m_BakeBackend: 2 m_BakeBackend: 1
m_LightmapMaxSize: 1024 m_LightmapMaxSize: 1024
m_BakeResolution: 256 m_BakeResolution: 256
m_Padding: 2 m_Padding: 2

View File

@ -1512,7 +1512,7 @@ AudioSource:
serializedVersion: 4 serializedVersion: 4
OutputAudioMixerGroup: {fileID: 0} OutputAudioMixerGroup: {fileID: 0}
m_audioClip: {fileID: 8300000, guid: 2a2fbd11bfacc9a4daa238a38ecc91c9, type: 3} m_audioClip: {fileID: 8300000, guid: 2a2fbd11bfacc9a4daa238a38ecc91c9, type: 3}
m_PlayOnAwake: 1 m_PlayOnAwake: 0
m_Volume: 1 m_Volume: 1
m_Pitch: 1 m_Pitch: 1
Loop: 0 Loop: 0
@ -2222,7 +2222,7 @@ AudioSource:
serializedVersion: 4 serializedVersion: 4
OutputAudioMixerGroup: {fileID: 0} OutputAudioMixerGroup: {fileID: 0}
m_audioClip: {fileID: 8300000, guid: 2a2fbd11bfacc9a4daa238a38ecc91c9, type: 3} m_audioClip: {fileID: 8300000, guid: 2a2fbd11bfacc9a4daa238a38ecc91c9, type: 3}
m_PlayOnAwake: 1 m_PlayOnAwake: 0
m_Volume: 1 m_Volume: 1
m_Pitch: 1 m_Pitch: 1
Loop: 0 Loop: 0
@ -31302,7 +31302,7 @@ PrefabInstance:
- target: {fileID: 6563380807134184743, guid: 5da4516f609052242915c455fc208ca2, - target: {fileID: 6563380807134184743, guid: 5da4516f609052242915c455fc208ca2,
type: 3} type: 3}
propertyPath: m_Options.m_Options.Array.size propertyPath: m_Options.m_Options.Array.size
value: 1 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
m_RemovedComponents: [] m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 5da4516f609052242915c455fc208ca2, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 5da4516f609052242915c455fc208ca2, type: 3}
@ -31792,7 +31792,7 @@ PrefabInstance:
- target: {fileID: 6563380807134184743, guid: 5da4516f609052242915c455fc208ca2, - target: {fileID: 6563380807134184743, guid: 5da4516f609052242915c455fc208ca2,
type: 3} type: 3}
propertyPath: m_Options.m_Options.Array.size propertyPath: m_Options.m_Options.Array.size
value: 1 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
m_RemovedComponents: [] m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 5da4516f609052242915c455fc208ca2, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 5da4516f609052242915c455fc208ca2, type: 3}
@ -33924,7 +33924,7 @@ PrefabInstance:
- target: {fileID: 6563380807134184743, guid: 5da4516f609052242915c455fc208ca2, - target: {fileID: 6563380807134184743, guid: 5da4516f609052242915c455fc208ca2,
type: 3} type: 3}
propertyPath: m_Options.m_Options.Array.size propertyPath: m_Options.m_Options.Array.size
value: 1 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
m_RemovedComponents: [] m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 5da4516f609052242915c455fc208ca2, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 5da4516f609052242915c455fc208ca2, type: 3}
@ -34235,7 +34235,7 @@ PrefabInstance:
- target: {fileID: 6563380807134184743, guid: 5da4516f609052242915c455fc208ca2, - target: {fileID: 6563380807134184743, guid: 5da4516f609052242915c455fc208ca2,
type: 3} type: 3}
propertyPath: m_Options.m_Options.Array.size propertyPath: m_Options.m_Options.Array.size
value: 1 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
m_RemovedComponents: [] m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 5da4516f609052242915c455fc208ca2, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 5da4516f609052242915c455fc208ca2, type: 3}

View File

@ -1,6 +1,8 @@
using System.Collections; using System.Collections;
using System.Collections.Generic; using System.Collections.Generic;
using UnityEngine; using UnityEngine;
using WindowsInput.Native;
using System;
public class ButtonSettingManager : MonoBehaviour public class ButtonSettingManager : MonoBehaviour
{ {

View File

@ -179,10 +179,10 @@ public class ConfigManager : MonoBehaviour
config.Skybox = SkyboxDropdown.value; config.Skybox = SkyboxDropdown.value;
config.TouchSampleRate = (Config.touchSampleRate)TouchSampleRateDropdown.value; config.TouchSampleRate = (Config.touchSampleRate)TouchSampleRateDropdown.value;
config.HandStabilizationMode = (Config.handStabilization)HandStabilizationModeDropdown.value; config.HandStabilizationMode = (Config.handStabilization)HandStabilizationModeDropdown.value;
config.TestKey = (VirtualKeyCode)TestKeyDropdown.value; config.TestKey = (VirtualKeyCode)Enum.GetValues(typeof(VirtualKeyCode)).GetValue(TestKeyDropdown.value);
config.ServiceKey = (VirtualKeyCode)ServiceKeyDropdown.value; config.ServiceKey = (VirtualKeyCode)Enum.GetValues(typeof(VirtualKeyCode)).GetValue(ServiceKeyDropdown.value);
config.CoinKey = (VirtualKeyCode)CoinKeyDropdown.value; config.CoinKey = (VirtualKeyCode)Enum.GetValues(typeof(VirtualKeyCode)).GetValue(CoinKeyDropdown.value);
config.CustomKey = (VirtualKeyCode)CustomKeyDropdown.value; config.CustomKey = (VirtualKeyCode)Enum.GetValues(typeof(VirtualKeyCode)).GetValue(CustomKeyDropdown.value);
onConfigChanged?.Invoke(); onConfigChanged?.Invoke();
} }
@ -207,7 +207,7 @@ public class ConfigManager : MonoBehaviour
config.useIPCTouch = isIPCTouchToggle.isOn; config.useIPCTouch = isIPCTouchToggle.isOn;
onConfigChanged?.Invoke(); onConfigChanged?.Invoke();
} }
[ContextMenu("UpdateConfigPanel")]
void UpdateConfigPanel() void UpdateConfigPanel()
{ {
CaptureModeDropdown.value = (int)config.CaptureMode; CaptureModeDropdown.value = (int)config.CaptureMode;
@ -231,9 +231,9 @@ public class ConfigManager : MonoBehaviour
//HandStabilSmoothSlider.value = HandStabilSmooth; //HandStabilSmoothSlider.value = HandStabilSmooth;
isIPCLightingToggle.isOn = config.useIPCLighting; isIPCLightingToggle.isOn = config.useIPCLighting;
isIPCTouchToggle.isOn = config.useIPCTouch; isIPCTouchToggle.isOn = config.useIPCTouch;
TestKeyDropdown.value = (int)config.TestKey; TestKeyDropdown.value = Array.IndexOf(Enum.GetValues(typeof(VirtualKeyCode)), config.TestKey);
ServiceKeyDropdown.value = (int)config.ServiceKey; ServiceKeyDropdown.value = Array.IndexOf(Enum.GetValues(typeof(VirtualKeyCode)), config.ServiceKey);
CoinKeyDropdown.value = (int)config.CoinKey; CoinKeyDropdown.value = Array.IndexOf(Enum.GetValues(typeof(VirtualKeyCode)), config.CoinKey);
CustomKeyDropdown.value = (int)config.CustomKey; CustomKeyDropdown.value = Array.IndexOf(Enum.GetValues(typeof(VirtualKeyCode)), config.CustomKey);
} }
} }

View File

@ -8,7 +8,7 @@ using WindowsInput.Native;
public class KeyDropdownManager : MonoBehaviour public class KeyDropdownManager : MonoBehaviour
{ {
TMP_Dropdown Dropdown; TMP_Dropdown Dropdown;
void Start() void Awake()
{ {
Dropdown = GetComponent<TMP_Dropdown>(); Dropdown = GetComponent<TMP_Dropdown>();
PopulateList(); PopulateList();