From dc1fd3552468e8272a830e85ad642ea81a67c0d7 Mon Sep 17 00:00:00 2001 From: wangzhixun <3077614386@qq.com> Date: Wed, 5 Nov 2025 10:04:06 +0800 Subject: [PATCH] 4.0003 --- .../Runtime/Scripts/HighlightTrigger.cs | 8 ++++---- .../Components/MediaPlayer_PlatformOptions.cs | 4 ++-- .../Scripts/Components/PlaylistMediaPlayer.cs | 14 +++++++------- .../UniTask/Runtime/Internal/WeakDictionary.cs | 2 +- .../UniTask/Runtime/UnityAsyncExtensions.cs | 4 ++-- 5 files changed, 16 insertions(+), 16 deletions(-) diff --git a/3d/Assets/3rdParty/HighlightPlus/Runtime/Scripts/HighlightTrigger.cs b/3d/Assets/3rdParty/HighlightPlus/Runtime/Scripts/HighlightTrigger.cs index 531b4a7..50837d1 100644 --- a/3d/Assets/3rdParty/HighlightPlus/Runtime/Scripts/HighlightTrigger.cs +++ b/3d/Assets/3rdParty/HighlightPlus/Runtime/Scripts/HighlightTrigger.cs @@ -332,10 +332,10 @@ namespace HighlightPlus { hb.SetHighlighted(true); } return; - } else if (!highlightOnHover) { - hb.SetHighlighted(false); - return; - } + } + + + } hb.SetHighlighted(state); } diff --git a/3d/Assets/AVProVideo/Runtime/Scripts/Components/MediaPlayer_PlatformOptions.cs b/3d/Assets/AVProVideo/Runtime/Scripts/Components/MediaPlayer_PlatformOptions.cs index 39434ed..75f4457 100644 --- a/3d/Assets/AVProVideo/Runtime/Scripts/Components/MediaPlayer_PlatformOptions.cs +++ b/3d/Assets/AVProVideo/Runtime/Scripts/Components/MediaPlayer_PlatformOptions.cs @@ -143,13 +143,13 @@ namespace RenderHeads.Media.AVProVideo { return (base.IsModified() || !useHardwareDecoding - || useTextureMips + || use10BitTextures || useLowLatency || audioOutput != WindowsUWP.AudioOutput.System || (audio360ChannelMode != Audio360ChannelMode.TBE_8_2) || videoApi != WindowsUWP.VideoApi.WinRT - || startWithHighestBitrate + || useLowLiveLatency ); } diff --git a/3d/Assets/AVProVideo/Runtime/Scripts/Components/PlaylistMediaPlayer.cs b/3d/Assets/AVProVideo/Runtime/Scripts/Components/PlaylistMediaPlayer.cs index 664b0ec..3596bf6 100644 --- a/3d/Assets/AVProVideo/Runtime/Scripts/Components/PlaylistMediaPlayer.cs +++ b/3d/Assets/AVProVideo/Runtime/Scripts/Components/PlaylistMediaPlayer.cs @@ -635,13 +635,13 @@ namespace RenderHeads.Media.AVProVideo NextPlayer.CloseMedia(); } } - else if (!_pausePreviousOnTransition) - { - if (NextPlayer != null && NextPlayer.Control.IsPlaying()) - { - NextPlayer.Pause(); - } - } + + + + + + + } } else diff --git a/3d/Assets/Plugins/UniTask/Runtime/Internal/WeakDictionary.cs b/3d/Assets/Plugins/UniTask/Runtime/Internal/WeakDictionary.cs index 3feaad8..188ac33 100644 --- a/3d/Assets/Plugins/UniTask/Runtime/Internal/WeakDictionary.cs +++ b/3d/Assets/Plugins/UniTask/Runtime/Internal/WeakDictionary.cs @@ -271,7 +271,7 @@ namespace Cysharp.Threading.Tasks.Internal } finally { - if (lockTaken) gate.Exit(false); + gate.Exit(false); } return listIndex; diff --git a/3d/Assets/Plugins/UniTask/Runtime/UnityAsyncExtensions.cs b/3d/Assets/Plugins/UniTask/Runtime/UnityAsyncExtensions.cs index a5c4895..b7b49ff 100644 --- a/3d/Assets/Plugins/UniTask/Runtime/UnityAsyncExtensions.cs +++ b/3d/Assets/Plugins/UniTask/Runtime/UnityAsyncExtensions.cs @@ -352,12 +352,12 @@ namespace Cysharp.Threading.Tasks result.asyncOperation = asyncOperation; result.progress = progress; result.cancellationToken = cancellationToken; - result.cancelImmediately = cancelImmediately; + result.cancelImmediately = false; result.completed = false; asyncOperation.completed += result.continuationAction; - if (cancelImmediately && cancellationToken.CanBeCanceled) + if (cancellationToken.CanBeCanceled) { result.cancellationTokenRegistration = cancellationToken.RegisterWithoutCaptureExecutionContext(state => {