diff --git a/Assets/FishNet/Runtime/Editor/Configuring/ConfigurationEditor.cs b/Assets/FishNet/Runtime/Editor/Configuring/ConfigurationEditor.cs index d68bb1a44..864cf7ac5 100644 --- a/Assets/FishNet/Runtime/Editor/Configuring/ConfigurationEditor.cs +++ b/Assets/FishNet/Runtime/Editor/Configuring/ConfigurationEditor.cs @@ -2,10 +2,10 @@ using FishNet.Editing.PrefabCollectionGenerator; using FishNet.Object; using FishNet.Utility.Extension; +using FishNet.Utility.Performance; using GameKit.Dependencies.Utilities; using System.Collections.Generic; using UnityEditor; -using UnityEditor.SceneManagement; using UnityEngine; using UnityEngine.SceneManagement; @@ -20,7 +20,7 @@ public static void ShowConfiguration() SettingsService.OpenProjectSettings("Project/Fish-Networking/Configuration"); } - } + } public class DeveloperMenu : MonoBehaviour { @@ -103,8 +103,6 @@ private static bool RemoveOrAddDefine(string define, bool removeDefine) } - - public class RebuildSelectedSceneIdsMenu : MonoBehaviour { /// <summary> /// Rebuilds sceneIds for open scenes. @@ -113,7 +111,7 @@ public class RebuildSelectedSceneIdsMenu : MonoBehaviour { public static void RebuildSelectedScenesSceneIds() { SceneAsset[] selectedScenes = Selection.GetFiltered<SceneAsset>(SelectionMode.Assets); - //Thanks FREEZX + // Debug.Log(selectedScenes.Length); for (int i = 0; i < selectedScenes.Length; ++i) { string path = AssetDatabase.GetAssetPath(selectedScenes[i]); Scene scene = EditorSceneManager.OpenScene(path, OpenSceneMode.Single); diff --git a/Assets/FishNet/Runtime/Generated/Component/NetworkAnimator/NetworkAnimator.cs b/Assets/FishNet/Runtime/Generated/Component/NetworkAnimator/NetworkAnimator.cs index 945a04d12..871853e8b 100644 --- a/Assets/FishNet/Runtime/Generated/Component/NetworkAnimator/NetworkAnimator.cs +++ b/Assets/FishNet/Runtime/Generated/Component/NetworkAnimator/NetworkAnimator.cs @@ -329,19 +329,19 @@ public ParameterDetail(AnimatorControllerParameter controllerParameter, byte typ /// <summary> /// All parameter values, excluding triggers. /// </summary> - private readonly List<ParameterDetail> _parameterDetails = new(); + private List<ParameterDetail> _parameterDetails = new(); /// <summary> /// Last int values. /// </summary> - private readonly List<int> _ints = new(); + private List<int> _ints = new(); /// <summary> /// Last float values. /// </summary> - private readonly List<float> _floats = new(); + private List<float> _floats = new(); /// <summary> /// Last bool values. /// </summary> - private readonly List<bool> _bools = new(); + private List<bool> _bools = new(); /// <summary> /// Last layer weights. /// </summary> @@ -353,11 +353,11 @@ public ParameterDetail(AnimatorControllerParameter controllerParameter, byte typ /// <summary> /// Trigger values set by using SetTrigger and ResetTrigger. /// </summary> - private readonly List<TriggerUpdate> _triggerUpdates = new(); - // /// <summary> - // /// Updates going to clients. - // /// </summary> - // private List<byte[]> _toClientsBuffer = new(); + private List<TriggerUpdate> _triggerUpdates = new(); + /// <summary> + /// Updates going to clients. + /// </summary> + private List<byte[]> _toClientsBuffer = new(); /// <summary> /// Returns if the animator is exist and can be synchronized. /// </summary> @@ -365,13 +365,9 @@ private bool _canSynchronizeAnimator { get { - if (!_isAnimatorSet) - return false; - - if (_animator.enabled || _synchronizeWhenDisabled) - return true; - - return false; + bool enabled = _animator && (_animator.enabled || _synchronizeWhenDisabled); + bool failedChecks = (!_isAnimatorSet || !enabled); + return !failedChecks; } } /// <summary> @@ -502,14 +498,14 @@ public override void OnStartServer() if (_clientAuthoritative) { _clientAuthoritativeUpdates = new(); - // //Expand to clients buffer count to however many buffers can be held. - // for (int i = 0; i < ClientAuthoritativeUpdate.MAXIMUM_BUFFER_COUNT; i++) - // _toClientsBuffer.Add(new byte[0]); + //Expand to clients buffer count to however many buffers can be held. + for (int i = 0; i < ClientAuthoritativeUpdate.MAXIMUM_BUFFER_COUNT; i++) + _toClientsBuffer.Add(new byte[0]); + } + else + { + _toClientsBuffer.Add(new byte[0]); } - // else - // { - // _toClientsBuffer.Add(new byte[0]); - // } } public override void OnStartClient() diff --git a/Assets/FishNet/Runtime/Object/Synchronizing/SyncList.cs b/Assets/FishNet/Runtime/Object/Synchronizing/SyncList.cs index c85c5c085..a374d7ec9 100644 --- a/Assets/FishNet/Runtime/Object/Synchronizing/SyncList.cs +++ b/Assets/FishNet/Runtime/Object/Synchronizing/SyncList.cs @@ -726,10 +726,8 @@ public void Dirty(int index) if (!base.CanNetworkSetValues(true)) return; -// bool asServer = true; T value = Collection[index]; -// if (asServer) - AddOperation(SyncListOperation.Set, index, value, value); + AddOperation(SyncListOperation.Set, index, value, value); } /// <summary> /// Sets value at index.