CLYS-116 - Unity example patches

Assets/Colyseus/Runtime/Example~/Scripts/ExampleRoomController.cs

@@ -7,6 +7,7 @@
 using GameDevWare.Serialization;
 using LucidSightTools;
 using NativeWebSocket;
+using Settings;
 using UnityEngine;
 
 /// <summary>
@@ -136,6 +137,11 @@ public class ExampleRoomController
     /// </summary>
     public List<IColyseusRoom> rooms = new List<IColyseusRoom>();
 
+    private Action DisposeNetworkEntitiesOnAdd;
+    private Action DisposeNetworkEntitiesOnRemove;
+    private Action DisposeNetworkedUsersOnAdd;
+    private Action DisposeNetworkedUsersOnRemove;
+
     /// <summary>
     ///     Returns the synchronized time from the server in milliseconds.
     /// </summary>
@@ -295,7 +301,7 @@ public async Task CreateSpecificRoom(ColyseusClient client, string roomName, str
         }
 
         onComplete?.Invoke(true);
-        LSLog.LogImportant($"Created Room: {_room.Id}");
+        LSLog.LogImportant($"Created Room: {_room.RoomId}");
         _lastRoomId = roomId;
         RegisterRoomHandlers();
     }
@@ -326,8 +332,8 @@ public async Task JoinOrCreateRoom(Action<bool> onComplete = null)
         }
 
         onComplete?.Invoke(true);
-        LSLog.LogImportant($"Joined / Created Room: {_room.Id}");
-        _lastRoomId = _room.Id;
+        LSLog.LogImportant($"Joined / Created Room: {_room.RoomId}");
+        _lastRoomId = _room.RoomId;
         RegisterRoomHandlers();
     }
 
@@ -396,14 +402,12 @@ public virtual void RegisterRoomHandlers()
         //_room.OnMessage<YOUR_CUSTOM_MESSAGE>("messageNameInCustomLogic", objectOfTypeYOUR_CUSTOM_MESSAGE => {  });
 
         //========================
-        _room.State.networkedEntities.OnAdd += OnEntityAdd;
-        _room.State.networkedEntities.OnRemove += OnEntityRemoved;
-
-        _room.State.networkedUsers.OnAdd += OnUserAdd;
-        _room.State.networkedUsers.OnRemove += OnUserRemove;
+        this.DisposeNetworkEntitiesOnAdd = _room.State.networkedEntities.OnAdd(OnEntityAdd);
+        this.DisposeNetworkEntitiesOnRemove = _room.State.networkedEntities.OnRemove(OnEntityRemoved);
 
-        _room.State.TriggerAll();
-        //========================
+        this.DisposeNetworkedUsersOnAdd = _room.State.networkedUsers.OnAdd(OnUserAdd);
+        this.DisposeNetworkedUsersOnRemove = _room.State.networkedUsers.OnRemove(OnUserRemove);
+
 
         _room.colyseusConnection.OnError += Room_OnError;
         _room.colyseusConnection.OnClose += Room_OnClose;
@@ -439,10 +443,10 @@ private void ClearRoomHandlers()
             return;
         }
 
-        _room.State.networkedEntities.OnAdd -= OnEntityAdd;
-        _room.State.networkedEntities.OnRemove -= OnEntityRemoved;
-        _room.State.networkedUsers.OnAdd -= OnUserAdd;
-        _room.State.networkedUsers.OnRemove -= OnUserRemove;
+        this.DisposeNetworkEntitiesOnAdd();
+        this.DisposeNetworkEntitiesOnRemove();
+        this.DisposeNetworkedUsersOnAdd();
+        this.DisposeNetworkedUsersOnRemove();
 
         _room.colyseusConnection.OnError -= Room_OnError;
         _room.colyseusConnection.OnClose -= Room_OnClose;
@@ -564,7 +568,7 @@ private void OnUserAdd(string key, ExampleNetworkedUser user)
         _users.Add(key, user);
 
         // On entity update...
-        user.OnChange += changes =>
+        user.OnChange(() =>
         {
             user.updateHash = DateTimeOffset.UtcNow.ToUnixTimeMilliseconds().ToString();
 
@@ -574,7 +578,7 @@ private void OnUserAdd(string key, ExampleNetworkedUser user)
             {
                 OnCurrentUserStateChanged?.Invoke(user.attributes);
             }
-        };
+        });
     }
 
     /// <summary>

Assets/Colyseus/Runtime/Example~/Scripts/Lobby/UI/CreateUserMenu.cs

@@ -29,7 +29,7 @@ public string ServerURL
             {
                 return serverURLInput.text;
             }
-
+            
             return ExampleManager.Instance.ColyseusServerAddress;
         }
     }

Assets/Colyseus/Runtime/Example~/Scripts/Lobby/UI/LobbyController.cs

@@ -1,7 +1,9 @@
-using System;
+using System;
 using System.Collections;
 using System.Collections.Generic;
 using Colyseus;
+using LucidSightTools;
+using Settings;
 using UnityEngine;
 using UnityEngine.SceneManagement;
 

Assets/Colyseus/Runtime/Example~/Scripts/Views/ExampleNetworkedEntityView.cs

@@ -132,8 +132,8 @@ public void InitiView(ExampleNetworkedEntity entity)
             {
                 state = entity;
                 IsMine = ExampleManager.Instance.CurrentUser != null && string.Equals(ExampleManager.Instance.CurrentUser.sessionId, state.ownerId);
-                state.attributes.OnChange += Attributes_OnChange;
-                state.OnChange += Entity_State_OnChange;
+                state.attributes.OnChange(Attributes_OnChange);
+                state.OnChange(Entity_State_OnChange);
 
                 OwnerId = state.ownerId;
                 Id = state.id;
@@ -168,7 +168,7 @@ public virtual void OnEntityRemoved()
             // Entity removed from room state;
         }
 
-        virtual protected void Entity_State_OnChange(List<Colyseus.Schema.DataChange> changes)
+        virtual protected void Entity_State_OnChange()
         {
             // Only record state change has been updated locally
             lastStateTimestamp = state.timestamp;

Assets/Colyseus/Runtime/Example~/Settings/ColyseusSettings.asset

@@ -9,7 +9,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: abda5a440b0b5634b8654ff3a0129b80, type: 3}
+  m_Script: {fileID: 11500000, guid: 6ed729989615d4b4db072e1e8c41076c, type: 3}
   m_Name: ColyseusSettings
   m_EditorClassIdentifier: 
   colyseusServerAddress: localhost
@@ -19,4 +19,4 @@ MonoBehaviour:
   - name: Content-Type
     value: application/json
   - name: Accept
-    value: application/json
+    value: application/json

Assets/Colyseus/Runtime/Scripts/Managers/ColyseusManager.cs

@@ -1,12 +1,11 @@
-using System.Collections.Generic;
-using LucidSightTools;
+using Settings;
 using UnityEngine;
 // ReSharper disable InconsistentNaming
 
 namespace Colyseus
 {
     /// <summary>
-    /// Base manager class 
+    /// Base manager class
     /// </summary>
     /// <typeparam name="T"></typeparam>
     public class ColyseusManager<T> : MonoBehaviour
@@ -15,7 +14,7 @@ public class ColyseusManager<T> : MonoBehaviour
         /// Reference to the Colyseus settings object.
         /// </summary>
         [SerializeField]
-        protected ColyseusSettings _colyseusSettings;
+        protected static ColyseusSettings _colyseusSettings;
 
         // Getters
         //==========================
@@ -30,7 +29,7 @@ public class ColyseusManager<T> : MonoBehaviour
         /// </summary>
         public string ColyseusServerAddress
         {
-            get { return _colyseusSettings.colyseusServerAddress; }
+	        get { return _colyseusSettings.colyseusServerAddress; }
         }
 
         /// <summary>
@@ -84,6 +83,7 @@ private void InitializeInstance()
             }
 
             Instance = GetComponent<T>();
+            _colyseusSettings = ScriptableObject.CreateInstance<ColyseusSettings>();
         }
 
         /// <summary>

Assets/Colyseus/Runtime/Scripts/Models/ColyseusClient.cs

@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
 using LucidSightTools;
+using Settings;
 using UnityEngine;
 
 // ReSharper disable InconsistentNaming

Assets/Colyseus/Runtime/Scripts/Request.cs

@@ -8,6 +8,7 @@
 using System.IO;
 using GameDevWare.Serialization;
 using LucidSightTools;
+using Settings;
 
 namespace Colyseus
 {
@@ -32,24 +33,24 @@ public async Task<string> Request(string uriMethod, string uriPath, string uriQu
             using (UnityWebRequest req = new UnityWebRequest())
             {
                 req.method = uriMethod;
-        
+
                 req.url = uriBuilder.Uri.ToString();
                 // Send JSON on request body
                 if (data != null)
                 {
                     req.uploadHandler = data;
                 }
-        
+
                 foreach (KeyValuePair<string, string> pair in _serverSettings.HeadersDictionary)
                 {
                     req.SetRequestHeader(pair.Key, pair.Value);
                 }
-        
+
                 if (!string.IsNullOrEmpty(Token))
                 {
                     req.SetRequestHeader("Authorization", "Bearer " + Token);
                 }
-        
+
                 // req.uploadHandler = new UploadHandlerRaw(bytes);
                 req.downloadHandler = new DownloadHandlerBuffer();
                 await req.SendWebRequest();
@@ -72,9 +73,9 @@ public async Task<string> Request(string uriMethod, string uriPath, string uriQu
                         throw new Exception(req.error);
                     }
                 }
-            
+
                 string json = req.downloadHandler.text;
-            
+
                 return json;
             } ;
         }
@@ -94,26 +95,26 @@ public async Task<string> Request(string uriMethod, string uriPath, Dictionary<s
                     // Send JSON options on request body
                     MemoryStream jsonBodyStream = new MemoryStream();
                     Json.Serialize(options, jsonBodyStream); //TODO: Replace GameDevWare serialization
-                    
+
                     req.uploadHandler = new UploadHandlerRaw(jsonBodyStream.ToArray())
                     {
                         contentType = "application/json"
                     };
                 }
-                
+
                 foreach (KeyValuePair<string, string> pair in _serverSettings.HeadersDictionary)
                 {
                     req.SetRequestHeader(pair.Key, pair.Value);
                 }
-                
+
                 if (headers != null)
                 {
                     foreach (KeyValuePair<string, string> header in headers)
                     {
                         req.SetRequestHeader(header.Key, header.Value);
                     }
                 }
-                
+
                 req.downloadHandler = new DownloadHandlerBuffer();
                 await req.SendWebRequest();
 
@@ -135,7 +136,7 @@ public async Task<string> Request(string uriMethod, string uriPath, Dictionary<s
                         throw new Exception(req.error);
                     }
                 }
-                
+
                 return req.downloadHandler.text;
             };
         }

Assets/Colyseus/Runtime/Scripts/Serializer/Schema/Schema.cs

@@ -288,6 +288,11 @@ public Action OnChange (OnChangeEventHandler handler)
             return () => __callbacks.OnChange -= handler;
         }
 
+        public void AddToOnChange(OnChangeEventHandler handler)
+        {
+	        __callbacks.OnChange += handler;
+        }
+
         /// <summary>
         ///     Attaches a callback that is triggered whenever this Schema instance has been removed from the server.
         /// </summary>