huangjiayu
/
Test-TaizhouWarehousePhaseII
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

4.0003

This commit is contained in:
wangzhixun 2025-11-05 10:04:06 +08:00
parent a55eee122a
commit dc1fd35524
5 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
3d/Assets/3rdParty/HighlightPlus/Runtime/Scripts/HighlightTrigger.cs vendored
View File

@ -332,10 +332,10 @@ namespace HighlightPlus {
hb.SetHighlighted(true); hb.SetHighlighted(true);
} }
return; return;
} else if (!highlightOnHover) {
hb.SetHighlighted(false);
return;
} }
} }
hb.SetHighlighted(state); hb.SetHighlighted(state);
} }

4
3d/Assets/AVProVideo/Runtime/Scripts/Components/MediaPlayer_PlatformOptions.cs
View File

@ -143,13 +143,13 @@ namespace RenderHeads.Media.AVProVideo
{ {
return (base.IsModified() return (base.IsModified()
|| !useHardwareDecoding || !useHardwareDecoding
|| useTextureMips
|| use10BitTextures || use10BitTextures
|| useLowLatency || useLowLatency
|| audioOutput != WindowsUWP.AudioOutput.System || audioOutput != WindowsUWP.AudioOutput.System
|| (audio360ChannelMode != Audio360ChannelMode.TBE_8_2) || (audio360ChannelMode != Audio360ChannelMode.TBE_8_2)
|| videoApi != WindowsUWP.VideoApi.WinRT || videoApi != WindowsUWP.VideoApi.WinRT
|| startWithHighestBitrate
|| useLowLiveLatency || useLowLiveLatency
); );
} }

14
3d/Assets/AVProVideo/Runtime/Scripts/Components/PlaylistMediaPlayer.cs
View File

@ -635,13 +635,13 @@ namespace RenderHeads.Media.AVProVideo
NextPlayer.CloseMedia(); NextPlayer.CloseMedia();
} }
} }
else if (!_pausePreviousOnTransition)
{
if (NextPlayer != null && NextPlayer.Control.IsPlaying())
{
NextPlayer.Pause();
}
}
} }
} }
else else

2
3d/Assets/Plugins/UniTask/Runtime/Internal/WeakDictionary.cs
View File

@ -271,7 +271,7 @@ namespace Cysharp.Threading.Tasks.Internal
} }
finally finally
{ {
if (lockTaken) gate.Exit(false); gate.Exit(false);
} }
return listIndex; return listIndex;

4
3d/Assets/Plugins/UniTask/Runtime/UnityAsyncExtensions.cs
View File

@ -352,12 +352,12 @@ namespace Cysharp.Threading.Tasks
result.asyncOperation = asyncOperation; result.asyncOperation = asyncOperation;
result.progress = progress; result.progress = progress;
result.cancellationToken = cancellationToken; result.cancellationToken = cancellationToken;
result.cancelImmediately = cancelImmediately; result.cancelImmediately = false;
result.completed = false; result.completed = false;
asyncOperation.completed += result.continuationAction; asyncOperation.completed += result.continuationAction;
if (cancelImmediately && cancellationToken.CanBeCanceled) if (cancellationToken.CanBeCanceled)
{ {
result.cancellationTokenRegistration = cancellationToken.RegisterWithoutCaptureExecutionContext(state => result.cancellationTokenRegistration = cancellationToken.RegisterWithoutCaptureExecutionContext(state =>
{ {