Merge remote-tracking branch 'origin/main'

Author: insthync

Scripts/Extensions/NetDataReaderExtension.cs

@@ -140,7 +140,7 @@ public static TValue[] GetArrayExtension<TValue>(this NetDataReader reader)
             return result;
         }
 
-        public static object GetArray(this NetDataReader reader, Type type)
+        public static object GetArrayObject(this NetDataReader reader, Type type)
         {
             int count = reader.GetInt();
             Array array = Array.CreateInstance(type, count);

Scripts/Extensions/NetDataWriterExtension.cs

@@ -217,7 +217,7 @@ public static void PutArrayExtension<TValue>(this NetDataWriter writer, TValue[]
             }
         }
 
-        public static void PutArray(this NetDataWriter writer, Type type, object array)
+        public static void PutArrayObject(this NetDataWriter writer, Type type, object array)
         {
             if (array == null)
             {

Scripts/GameApi/AddressableAssets/AssetReferenceLiteNetLibBehaviour.cs

@@ -1,7 +1,4 @@
-using Insthync.AddressableAssetTools;
 using UnityEngine;
-using UnityEngine.AddressableAssets;
-using UnityEngine.ResourceManagement.AsyncOperations;
 #if UNITY_EDITOR
 using UnityEditor;
 #endif
@@ -60,21 +57,6 @@ public override bool SetEditorAsset(Object value)
         }
 #endif
 
-        public new AsyncOperationHandle<TBehaviour> InstantiateAsync(Vector3 position, Quaternion rotation, Transform parent = null)
-        {
-            return Addressables.ResourceManager.CreateChainOperation(Addressables.InstantiateAsync(RuntimeKey, position, rotation, parent, false), AssetReferenceUtils.CreateGetComponentCompletedOperation<TBehaviour>);
-        }
-
-        public new AsyncOperationHandle<TBehaviour> InstantiateAsync(Transform parent = null, bool instantiateInWorldSpace = false)
-        {
-            return Addressables.ResourceManager.CreateChainOperation(Addressables.InstantiateAsync(RuntimeKey, parent, instantiateInWorldSpace, false), AssetReferenceUtils.CreateGetComponentCompletedOperation<TBehaviour>);
-        }
-
-        public new AsyncOperationHandle<TBehaviour> LoadAssetAsync()
-        {
-            return Addressables.ResourceManager.CreateChainOperation(base.LoadAssetAsync<GameObject>(), AssetReferenceUtils.CreateGetComponentCompletedOperation<TBehaviour>);
-        }
-
         public override bool ValidateAsset(Object obj)
         {
             return ValidateAsset<TBehaviour>(obj);

Scripts/GameApi/AddressableAssets/AssetReferenceLiteNetLibIdentity.cs

@@ -31,7 +31,7 @@ public AssetReferenceLiteNetLibIdentity(LiteNetLibIdentity identity) : base(Asse
                 return;
             }
             hashAssetId = identity.HashAssetId;
-            Debug.Log($"[AssetReferenceLiteNetLibBehaviour] Set `hashAssetId` to `{hashAssetId}`, name: {identity.name}");
+            Debug.Log($"[AssetReferenceLiteNetLibIdentity] Set `hashAssetId` to `{hashAssetId}`, name: {identity.name}");
         }
 #endif
 

Scripts/GameApi/LiteNetLibAdditiveSceneLoader.cs

@@ -94,6 +94,7 @@ await AddressableAssetDownloadManager.Download(
                 var op = Addressables.LoadSceneAsync(
                     addressableScenes[i].RuntimeKey,
                     new LoadSceneParameters(LoadSceneMode.Additive));
+                AddressableAssetsManager.AddAddressableSceneHandle(op);
                 while (!op.IsDone)
                 {
                     await UniTask.Yield();

Scripts/GameApi/LiteNetLibFunction.cs

@@ -182,7 +182,7 @@ public void DeserializeParameters(NetDataReader reader)
             for (int i = 0; i < Parameters.Length; ++i)
             {
                 if (ParameterTypes[i].IsArray)
-                    Parameters[i] = reader.GetArray(ParameterTypes[i].GetElementType());
+                    Parameters[i] = reader.GetArrayObject(ParameterTypes[i].GetElementType());
                 else
                     Parameters[i] = reader.GetValue(ParameterTypes[i]);
             }
@@ -195,7 +195,7 @@ public void SerializeParameters(NetDataWriter writer)
             for (int i = 0; i < Parameters.Length; ++i)
             {
                 if (ParameterTypes[i].IsArray)
-                    writer.PutArray(ParameterTypes[i].GetElementType(), Parameters[i]);
+                    writer.PutArrayObject(ParameterTypes[i].GetElementType(), Parameters[i]);
                 else
                     writer.PutValue(ParameterTypes[i], Parameters[i]);
             }

Scripts/GameApi/LiteNetLibGameManager.cs

@@ -390,29 +390,36 @@ await AddressableAssetDownloadManager.Download(
                     Assets.onSceneDepsFileDownloading.Invoke,
                     Assets.onSceneDepsDownloaded.Invoke,
                     null);
-                // Load the scene
-                AsyncOperationHandle<SceneInstance> asyncOp = Addressables.LoadSceneAsync(
+                await AddressableAssetsManager.UnloadAddressableScenes();
+                AsyncOperationHandle<SceneInstance> addressableAsyncOp = Addressables.LoadSceneAsync(
                     serverSceneInfo.addressableKey,
-                    new LoadSceneParameters(LoadSceneMode.Single));
+                    new LoadSceneParameters(LoadSceneMode.Single), false);
+                AddressableAssetsManager.AddAddressableSceneHandle(addressableAsyncOp);
                 // Wait until scene loaded
-                while (!asyncOp.IsDone)
+                while (!addressableAsyncOp.IsDone)
                 {
                     await UniTask.Yield();
-                    float percentageComplete = asyncOp.GetDownloadStatus().Percent;
+                    float percentageComplete = addressableAsyncOp.GetDownloadStatus().Percent;
                     Assets.onLoadSceneProgress.Invoke(serverSceneInfo.sceneName, false, isOnline, percentageComplete);
                 }
+                await addressableAsyncOp.Result.ActivateAsync();
             }
             else
             {
+                await AddressableAssetsManager.UnloadAddressableScenes();
                 // Load the scene
                 AsyncOperation asyncOp = SceneManager.LoadSceneAsync(
                     serverSceneInfo.sceneName,
                     new LoadSceneParameters(LoadSceneMode.Single));
+                if (asyncOp != null)
+                    asyncOp.allowSceneActivation = false;
                 // Wait until scene loaded
                 while (asyncOp != null && !asyncOp.isDone)
                 {
                     await UniTask.Yield();
                     Assets.onLoadSceneProgress.Invoke(serverSceneInfo.sceneName, false, isOnline, asyncOp.progress);
+                    if (asyncOp.progress >= 0.9f)
+                        asyncOp.allowSceneActivation = true;
                 }
             }
 
@@ -532,13 +539,13 @@ protected override void RegisterMessages()
             RegisterClientMessage(GameMsgTypes.Disconnect, HandleServerDisconnect);
         }
 
-        public async void KickClient(long connectionId, byte[] data)
+        public async UniTask<bool> KickClient(long connectionId, byte[] data)
         {
             if (!IsServer)
-                return;
+                return false;
             ServerSendPacket(connectionId, 0, DeliveryMethod.ReliableOrdered, GameMsgTypes.Disconnect, (writer) => writer.PutBytesWithLength(data));
             await UniTask.Delay(500);
-            ServerTransport.ServerDisconnect(connectionId);
+            return ServerTransport.ServerDisconnect(connectionId);
         }
 
         public override void OnPeerConnected(long connectionId)

Scripts/GameApi/LiteNetLibIdentity.cs

@@ -764,6 +764,11 @@ public bool IsHideFrom(LiteNetLibIdentity identity)
                 // Don't hide, player own this one
                 return false;
             }
+            if (string.IsNullOrEmpty(SubChannelId) && string.IsNullOrEmpty(identity.SubChannelId))
+            {
+                // Don't hide, because sub-channelIDs aren't different
+                return false;
+            }
             if (!string.Equals(SubChannelId, identity.SubChannelId))
             {
                 // Hide because sub-channelIDs are different