From 92a1395c7975dc5b3ad256a4ceeeb731ce4893a1 Mon Sep 17 00:00:00 2001 From: xpeng <1216772231@qq.com> Date: Fri, 7 Oct 2022 14:20:01 +0200 Subject: [PATCH] fix capture desktop config not working; add config for turn off light effect --- Assets/Scenes/WACVR.unity | 88 +++++++++++-------- .../Configuration/CaptureSettingManager.cs | 2 - Assets/Script/Configuration/ConfigManager.cs | 1 + .../Configuration/LightSettingManager.cs | 7 +- Assets/Script/LightManager/LightManager.cs | 2 +- 5 files changed, 55 insertions(+), 45 deletions(-) diff --git a/Assets/Scenes/WACVR.unity b/Assets/Scenes/WACVR.unity index 2408e07..ff702d0 100644 --- a/Assets/Scenes/WACVR.unity +++ b/Assets/Scenes/WACVR.unity @@ -8580,7 +8580,7 @@ MonoBehaviour: capturePriority: 0 captureRequestTiming: 0 captureFrameRate: 90 - drawCursor: 1 + drawCursor: 0 updateTitle: 1 searchAnotherWindowWhenInvalid: 0 scaleControlType: 3 @@ -28728,24 +28728,24 @@ MonoBehaviour: m_AudioClipForOnHoverExited: {fileID: 0} m_PlayAudioClipOnHoverCanceled: 0 m_AudioClipForOnHoverCanceled: {fileID: 0} - m_PlayHapticsOnSelectEntered: 0 - m_HapticSelectEnterIntensity: 0 - m_HapticSelectEnterDuration: 0 - m_PlayHapticsOnSelectExited: 0 - m_HapticSelectExitIntensity: 0 - m_HapticSelectExitDuration: 0 - m_PlayHapticsOnSelectCanceled: 0 - m_HapticSelectCancelIntensity: 0 - m_HapticSelectCancelDuration: 0 - m_PlayHapticsOnHoverEntered: 0 - m_HapticHoverEnterIntensity: 0 - m_HapticHoverEnterDuration: 0 - m_PlayHapticsOnHoverExited: 0 - m_HapticHoverExitIntensity: 0 - m_HapticHoverExitDuration: 0 - m_PlayHapticsOnHoverCanceled: 0 - m_HapticHoverCancelIntensity: 0 - m_HapticHoverCancelDuration: 0 + m_PlayHapticsOnSelectEntered: 1 + m_HapticSelectEnterIntensity: 0.4 + m_HapticSelectEnterDuration: 0.05 + m_PlayHapticsOnSelectExited: 1 + m_HapticSelectExitIntensity: 0.4 + m_HapticSelectExitDuration: 0.02 + m_PlayHapticsOnSelectCanceled: 1 + m_HapticSelectCancelIntensity: 0.6 + m_HapticSelectCancelDuration: 0.05 + m_PlayHapticsOnHoverEntered: 1 + m_HapticHoverEnterIntensity: 0.25 + m_HapticHoverEnterDuration: 0.01 + m_PlayHapticsOnHoverExited: 1 + m_HapticHoverExitIntensity: 0.25 + m_HapticHoverExitDuration: 0.01 + m_PlayHapticsOnHoverCanceled: 1 + m_HapticHoverCancelIntensity: 0.5 + m_HapticHoverCancelDuration: 0.01 m_LineType: 0 m_BlendVisualLinePoints: 1 m_MaxRaycastDistance: 3 @@ -30884,24 +30884,24 @@ MonoBehaviour: m_AudioClipForOnHoverExited: {fileID: 0} m_PlayAudioClipOnHoverCanceled: 0 m_AudioClipForOnHoverCanceled: {fileID: 0} - m_PlayHapticsOnSelectEntered: 0 - m_HapticSelectEnterIntensity: 0 - m_HapticSelectEnterDuration: 0 - m_PlayHapticsOnSelectExited: 0 - m_HapticSelectExitIntensity: 0 - m_HapticSelectExitDuration: 0 - m_PlayHapticsOnSelectCanceled: 0 - m_HapticSelectCancelIntensity: 0 - m_HapticSelectCancelDuration: 0 - m_PlayHapticsOnHoverEntered: 0 - m_HapticHoverEnterIntensity: 0 - m_HapticHoverEnterDuration: 0 - m_PlayHapticsOnHoverExited: 0 - m_HapticHoverExitIntensity: 0 - m_HapticHoverExitDuration: 0 - m_PlayHapticsOnHoverCanceled: 0 - m_HapticHoverCancelIntensity: 0 - m_HapticHoverCancelDuration: 0 + m_PlayHapticsOnSelectEntered: 1 + m_HapticSelectEnterIntensity: 0.4 + m_HapticSelectEnterDuration: 0.05 + m_PlayHapticsOnSelectExited: 1 + m_HapticSelectExitIntensity: 0.4 + m_HapticSelectExitDuration: 0.02 + m_PlayHapticsOnSelectCanceled: 1 + m_HapticSelectCancelIntensity: 0.6 + m_HapticSelectCancelDuration: 0.05 + m_PlayHapticsOnHoverEntered: 1 + m_HapticHoverEnterIntensity: 0.25 + m_HapticHoverEnterDuration: 0.01 + m_PlayHapticsOnHoverExited: 1 + m_HapticHoverExitIntensity: 0.25 + m_HapticHoverExitDuration: 0.01 + m_PlayHapticsOnHoverCanceled: 1 + m_HapticHoverCancelIntensity: 0.5 + m_HapticHoverCancelDuration: 0.01 m_LineType: 0 m_BlendVisualLinePoints: 1 m_MaxRaycastDistance: 3 @@ -32855,6 +32855,7 @@ GameObject: - component: {fileID: 1748802425554287225} - component: {fileID: 1748802425554287222} - component: {fileID: 7308342869353410805} + - component: {fileID: 7308342869353410806} m_Layer: 5 m_Name: ConfigCanvas m_TagString: Untagged @@ -35079,6 +35080,19 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: f0559825455822d48a37fc54c6dfd318, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!114 &7308342869353410806 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1748802425554287228} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 785dd3d2a9b58f24d9e6ecf071fb1304, type: 3} + m_Name: + m_EditorClassIdentifier: + LightManager: {fileID: 1251312950} --- !u!1001 &8069494991214085012 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Script/Configuration/CaptureSettingManager.cs b/Assets/Script/Configuration/CaptureSettingManager.cs index b097fe1..6d3850f 100644 --- a/Assets/Script/Configuration/CaptureSettingManager.cs +++ b/Assets/Script/Configuration/CaptureSettingManager.cs @@ -28,7 +28,5 @@ public class CaptureSettingManager : MonoBehaviour } else windowTexture.type = WindowTextureType.Window; - - windowTexture.desktopIndex = ConfigManager.config.CaptureDesktopNumber; } } diff --git a/Assets/Script/Configuration/ConfigManager.cs b/Assets/Script/Configuration/ConfigManager.cs index 1bbf04d..cbc646f 100644 --- a/Assets/Script/Configuration/ConfigManager.cs +++ b/Assets/Script/Configuration/ConfigManager.cs @@ -203,6 +203,7 @@ public class ConfigManager : MonoBehaviour void onBoolChanged(bool value) { + config.CaptureDesktop = CaptureDesktopToggle.isOn; config.useIPCLighting = isIPCLightingToggle.isOn; config.useIPCTouch = isIPCTouchToggle.isOn; onConfigChanged?.Invoke(); diff --git a/Assets/Script/Configuration/LightSettingManager.cs b/Assets/Script/Configuration/LightSettingManager.cs index c173d24..a599655 100644 --- a/Assets/Script/Configuration/LightSettingManager.cs +++ b/Assets/Script/Configuration/LightSettingManager.cs @@ -4,7 +4,7 @@ using UnityEngine; public class LightSettingManager : MonoBehaviour { - public List Lights; + public GameObject LightManager; void Start() { ConfigManager.onConfigChanged += ApplyConfig; @@ -13,9 +13,6 @@ public class LightSettingManager : MonoBehaviour } void ApplyConfig() { - foreach (var light in Lights) - { - light.SetActive(ConfigManager.config.useLight); - } + LightManager.SetActive(ConfigManager.config.useLight); } } diff --git a/Assets/Script/LightManager/LightManager.cs b/Assets/Script/LightManager/LightManager.cs index 94dc343..4a06dc6 100644 --- a/Assets/Script/LightManager/LightManager.cs +++ b/Assets/Script/LightManager/LightManager.cs @@ -86,7 +86,7 @@ public class LightManager : MonoBehaviour } public void UpdateFadeLight(int Area, bool State) { - if(!isIPCIdle | useIPCLighting) + if(!isIPCIdle) return; Area -= 1;