diff --git a/UnityProject/Assets/Mirror/Authenticators.meta b/UnityProject/Assets/Mirror/Authenticators.meta index ff0eac49..644f4ecc 100644 --- a/UnityProject/Assets/Mirror/Authenticators.meta +++ b/UnityProject/Assets/Mirror/Authenticators.meta @@ -3,6 +3,6 @@ guid: 1b2f9d254154cd942ba40b06b869b8f3 folderAsset: yes DefaultImporter: externalObjects: {} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Authenticators/BasicAuthenticator.cs b/UnityProject/Assets/Mirror/Authenticators/BasicAuthenticator.cs index b6bd6424..88923105 100644 --- a/UnityProject/Assets/Mirror/Authenticators/BasicAuthenticator.cs +++ b/UnityProject/Assets/Mirror/Authenticators/BasicAuthenticator.cs @@ -13,9 +13,6 @@ public class BasicAuthenticator : NetworkAuthenticator public string username; public string password; - // this is set if authentication fails to prevent garbage AuthRequestMessage spam - bool ServerAuthFailed; - #region Messages public struct AuthRequestMessage : NetworkMessage @@ -104,13 +101,7 @@ public void OnAuthRequestMessage(NetworkConnection conn, AuthRequestMessage msg) conn.isAuthenticated = false; // disconnect the client after 1 second so that response message gets delivered - if (!ServerAuthFailed) - { - // set this false so this coroutine can only be started once - ServerAuthFailed = true; - - StartCoroutine(DelayedDisconnect(conn, 1)); - } + StartCoroutine(DelayedDisconnect(conn, 1)); } } @@ -150,7 +141,7 @@ public override void OnStopClient() /// Called on client from OnClientAuthenticateInternal when a client needs to authenticate /// /// Connection of the client. - public override void OnClientAuthenticate() + public override void OnClientAuthenticate(NetworkConnection conn) { AuthRequestMessage authRequestMessage = new AuthRequestMessage { @@ -158,15 +149,13 @@ public override void OnClientAuthenticate() authPassword = password }; - NetworkClient.connection.Send(authRequestMessage); + conn.Send(authRequestMessage); } - [Obsolete("Call OnAuthResponseMessage without the NetworkConnection parameter. It always points to NetworkClient.connection anyway.")] - public void OnAuthResponseMessage(NetworkConnection conn, AuthResponseMessage msg) => OnAuthResponseMessage(msg); - /// /// Called on client when the server's AuthResponseMessage arrives /// + /// Connection to client. /// The message payload public void OnAuthResponseMessage(AuthResponseMessage msg) { @@ -175,17 +164,20 @@ public void OnAuthResponseMessage(AuthResponseMessage msg) // Debug.LogFormat(LogType.Log, "Authentication Response: {0}", msg.message); // Authentication has been accepted - ClientAccept(); + ClientAccept(NetworkClient.connection); } else { Debug.LogError($"Authentication Response: {msg.message}"); // Authentication has been rejected - ClientReject(); + ClientReject(NetworkClient.connection); } } + [Obsolete("Call OnAuthResponseMessage without the NetworkConnection parameter. It always points to NetworkClient.connection anyway.")] + public void OnAuthResponseMessage(NetworkConnection conn, AuthResponseMessage msg) => OnAuthResponseMessage(msg); + #endregion } } diff --git a/UnityProject/Assets/Mirror/Authenticators/BasicAuthenticator.cs.meta b/UnityProject/Assets/Mirror/Authenticators/BasicAuthenticator.cs.meta index 74b91346..47650136 100644 --- a/UnityProject/Assets/Mirror/Authenticators/BasicAuthenticator.cs.meta +++ b/UnityProject/Assets/Mirror/Authenticators/BasicAuthenticator.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {fileID: 2800000, guid: 7453abfe9e8b2c04a8a47eb536fe21eb, type: 3} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Authenticators/Mirror.Authenticators.asmdef.meta b/UnityProject/Assets/Mirror/Authenticators/Mirror.Authenticators.asmdef.meta index 0fa10145..27317010 100644 --- a/UnityProject/Assets/Mirror/Authenticators/Mirror.Authenticators.asmdef.meta +++ b/UnityProject/Assets/Mirror/Authenticators/Mirror.Authenticators.asmdef.meta @@ -2,6 +2,6 @@ fileFormatVersion: 2 guid: e720aa64e3f58fb4880566a322584340 AssemblyDefinitionImporter: externalObjects: {} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Authenticators/TimeoutAuthenticator.cs b/UnityProject/Assets/Mirror/Authenticators/TimeoutAuthenticator.cs index 28f989bf..f127f92d 100644 --- a/UnityProject/Assets/Mirror/Authenticators/TimeoutAuthenticator.cs +++ b/UnityProject/Assets/Mirror/Authenticators/TimeoutAuthenticator.cs @@ -48,21 +48,23 @@ public override void OnServerAuthenticate(NetworkConnection conn) StartCoroutine(BeginAuthentication(conn)); } - public override void OnClientAuthenticate() + public override void OnClientAuthenticate(NetworkConnection conn) { - authenticator.OnClientAuthenticate(); + authenticator.OnClientAuthenticate(conn); if (timeout > 0) - StartCoroutine(BeginAuthentication(NetworkClient.connection)); + StartCoroutine(BeginAuthentication(conn)); } IEnumerator BeginAuthentication(NetworkConnection conn) { // Debug.Log($"Authentication countdown started {conn} {timeout}"); + yield return new WaitForSecondsRealtime(timeout); if (!conn.isAuthenticated) { // Debug.Log($"Authentication Timeout {conn}"); + conn.Disconnect(); } } diff --git a/UnityProject/Assets/Mirror/Authenticators/TimeoutAuthenticator.cs.meta b/UnityProject/Assets/Mirror/Authenticators/TimeoutAuthenticator.cs.meta index 433d0943..b19ddec1 100644 --- a/UnityProject/Assets/Mirror/Authenticators/TimeoutAuthenticator.cs.meta +++ b/UnityProject/Assets/Mirror/Authenticators/TimeoutAuthenticator.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {fileID: 2800000, guid: 7453abfe9e8b2c04a8a47eb536fe21eb, type: 3} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Cloud.meta b/UnityProject/Assets/Mirror/Cloud.meta index f2c04e4d..e2c44def 100644 --- a/UnityProject/Assets/Mirror/Cloud.meta +++ b/UnityProject/Assets/Mirror/Cloud.meta @@ -3,6 +3,6 @@ guid: 73a9bb2dacafa8141bce8feef34e33a7 folderAsset: yes DefaultImporter: externalObjects: {} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Cloud/ApiConnector.cs b/UnityProject/Assets/Mirror/Cloud/ApiConnector.cs index 2f117877..2269d9cf 100644 --- a/UnityProject/Assets/Mirror/Cloud/ApiConnector.cs +++ b/UnityProject/Assets/Mirror/Cloud/ApiConnector.cs @@ -1 +1,61 @@ -// removed 2021-05-13 +using Mirror.Cloud.ListServerService; +using UnityEngine; + +namespace Mirror.Cloud +{ + /// + /// Used to requests and responses from the mirror api + /// + public interface IApiConnector + { + ListServer ListServer { get; } + } + + /// + /// Used to requests and responses from the mirror api + /// + [DisallowMultipleComponent] + [AddComponentMenu("Network/CloudServices/ApiConnector")] + [HelpURL("https://mirror-networking.com/docs/api/Mirror.Cloud.ApiConnector.html")] + public class ApiConnector : MonoBehaviour, IApiConnector, ICoroutineRunner + { + #region Inspector + [Header("Settings")] + + [Tooltip("Base URL of api, including https")] + [SerializeField] string ApiAddress = ""; + + [Tooltip("Api key required to access api")] + [SerializeField] string ApiKey = ""; + + [Header("Events")] + + [Tooltip("Triggered when server list updates")] + [SerializeField] ServerListEvent _onServerListUpdated = new ServerListEvent(); + #endregion + + IRequestCreator requestCreator; + + public ListServer ListServer { get; private set; } + + void Awake() + { + requestCreator = new RequestCreator(ApiAddress, ApiKey, this); + + InitListServer(); + } + + void InitListServer() + { + IListServerServerApi serverApi = new ListServerServerApi(this, requestCreator); + IListServerClientApi clientApi = new ListServerClientApi(this, requestCreator, _onServerListUpdated); + ListServer = new ListServer(serverApi, clientApi); + } + + public void OnDestroy() + { + ListServer?.ServerApi.Shutdown(); + ListServer?.ClientApi.Shutdown(); + } + } +} diff --git a/UnityProject/Assets/Mirror/Cloud/ApiConnector.cs.meta b/UnityProject/Assets/Mirror/Cloud/ApiConnector.cs.meta index 27dc6c93..9279c0cc 100644 --- a/UnityProject/Assets/Mirror/Cloud/ApiConnector.cs.meta +++ b/UnityProject/Assets/Mirror/Cloud/ApiConnector.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Cloud/Core/BaseApi.cs b/UnityProject/Assets/Mirror/Cloud/Core/BaseApi.cs index 2f117877..720f5981 100644 --- a/UnityProject/Assets/Mirror/Cloud/Core/BaseApi.cs +++ b/UnityProject/Assets/Mirror/Cloud/Core/BaseApi.cs @@ -1 +1,25 @@ -// removed 2021-05-13 +using System; + +namespace Mirror.Cloud +{ + public interface IBaseApi + { + /// + /// Cleans up any data created by the instance + /// For Example: removing server from list + /// + void Shutdown(); + } + + public abstract class BaseApi + { + protected readonly ICoroutineRunner runner; + protected readonly IRequestCreator requestCreator; + + protected BaseApi(ICoroutineRunner runner, IRequestCreator requestCreator) + { + this.runner = runner ?? throw new ArgumentNullException(nameof(runner)); + this.requestCreator = requestCreator ?? throw new ArgumentNullException(nameof(requestCreator)); + } + } +} diff --git a/UnityProject/Assets/Mirror/Cloud/Core/BaseApi.cs.meta b/UnityProject/Assets/Mirror/Cloud/Core/BaseApi.cs.meta index 9f10766b..f66b84e1 100644 --- a/UnityProject/Assets/Mirror/Cloud/Core/BaseApi.cs.meta +++ b/UnityProject/Assets/Mirror/Cloud/Core/BaseApi.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Cloud/Core/Events.cs b/UnityProject/Assets/Mirror/Cloud/Core/Events.cs index 2f117877..cf021f52 100644 --- a/UnityProject/Assets/Mirror/Cloud/Core/Events.cs +++ b/UnityProject/Assets/Mirror/Cloud/Core/Events.cs @@ -1 +1,12 @@ -// removed 2021-05-13 +using System; +using Mirror.Cloud.ListServerService; +using UnityEngine.Events; + +namespace Mirror.Cloud +{ + [Serializable] + public class ServerListEvent : UnityEvent {} + + [Serializable] + public class MatchFoundEvent : UnityEvent {} +} diff --git a/UnityProject/Assets/Mirror/Cloud/Core/Events.cs.meta b/UnityProject/Assets/Mirror/Cloud/Core/Events.cs.meta index e2da2f92..150d85b2 100644 --- a/UnityProject/Assets/Mirror/Cloud/Core/Events.cs.meta +++ b/UnityProject/Assets/Mirror/Cloud/Core/Events.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Cloud/Core/Extensions.cs b/UnityProject/Assets/Mirror/Cloud/Core/Extensions.cs index 2f117877..fa7dfa70 100644 --- a/UnityProject/Assets/Mirror/Cloud/Core/Extensions.cs +++ b/UnityProject/Assets/Mirror/Cloud/Core/Extensions.cs @@ -1 +1,12 @@ -// removed 2021-05-13 +using UnityEngine.Networking; + +namespace Mirror.Cloud +{ + public static class Extensions + { + public static bool IsOk(this UnityWebRequest webRequest) + { + return 200 <= webRequest.responseCode && webRequest.responseCode <= 299; + } + } +} diff --git a/UnityProject/Assets/Mirror/Cloud/Core/Extensions.cs.meta b/UnityProject/Assets/Mirror/Cloud/Core/Extensions.cs.meta index d22d7c64..6bf6291e 100644 --- a/UnityProject/Assets/Mirror/Cloud/Core/Extensions.cs.meta +++ b/UnityProject/Assets/Mirror/Cloud/Core/Extensions.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Cloud/Core/ICoroutineRunner.cs b/UnityProject/Assets/Mirror/Cloud/Core/ICoroutineRunner.cs index 2f117877..7fe3bbf3 100644 --- a/UnityProject/Assets/Mirror/Cloud/Core/ICoroutineRunner.cs +++ b/UnityProject/Assets/Mirror/Cloud/Core/ICoroutineRunner.cs @@ -1 +1,12 @@ -// removed 2021-05-13 +using System.Collections; +using UnityEngine; + +namespace Mirror.Cloud +{ + public interface ICoroutineRunner : IUnityEqualCheck + { + Coroutine StartCoroutine(IEnumerator routine); + void StopCoroutine(IEnumerator routine); + void StopCoroutine(Coroutine routine); + } +} diff --git a/UnityProject/Assets/Mirror/Cloud/Core/ICoroutineRunner.cs.meta b/UnityProject/Assets/Mirror/Cloud/Core/ICoroutineRunner.cs.meta index 9ee9c8ac..f1149a99 100644 --- a/UnityProject/Assets/Mirror/Cloud/Core/ICoroutineRunner.cs.meta +++ b/UnityProject/Assets/Mirror/Cloud/Core/ICoroutineRunner.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Cloud/Core/IRequestCreator.cs b/UnityProject/Assets/Mirror/Cloud/Core/IRequestCreator.cs index 2f117877..0a190df3 100644 --- a/UnityProject/Assets/Mirror/Cloud/Core/IRequestCreator.cs +++ b/UnityProject/Assets/Mirror/Cloud/Core/IRequestCreator.cs @@ -1 +1,42 @@ -// removed 2021-05-13 +using System.Collections; +using UnityEngine.Networking; + +namespace Mirror.Cloud +{ + public delegate void RequestSuccess(string responseBody); + + public delegate void RequestFail(string responseBody); + + /// + /// Objects that can be sent to the Api must have this interface + /// + public interface ICanBeJson {} + + /// + /// Methods to create and send UnityWebRequest + /// + public interface IRequestCreator + { + UnityWebRequest Delete(string page); + UnityWebRequest Get(string page); + UnityWebRequest Patch(string page, T json) where T : struct, ICanBeJson; + UnityWebRequest Post(string page, T json) where T : struct, ICanBeJson; + + /// + /// Sends Request to api and invokes callback when finished + /// Starts Coroutine of SendRequestEnumerator + /// + /// + /// + /// + void SendRequest(UnityWebRequest request, RequestSuccess onSuccess = null, RequestFail onFail = null); + /// + /// Sends Request to api and invokes callback when finished + /// + /// + /// + /// + /// + IEnumerator SendRequestEnumerator(UnityWebRequest request, RequestSuccess onSuccess = null, RequestFail onFail = null); + } +} diff --git a/UnityProject/Assets/Mirror/Cloud/Core/IRequestCreator.cs.meta b/UnityProject/Assets/Mirror/Cloud/Core/IRequestCreator.cs.meta index 61c46584..966c5031 100644 --- a/UnityProject/Assets/Mirror/Cloud/Core/IRequestCreator.cs.meta +++ b/UnityProject/Assets/Mirror/Cloud/Core/IRequestCreator.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Cloud/Core/IUnityEqualCheck.cs b/UnityProject/Assets/Mirror/Cloud/Core/IUnityEqualCheck.cs index 2f117877..be5e057c 100644 --- a/UnityProject/Assets/Mirror/Cloud/Core/IUnityEqualCheck.cs +++ b/UnityProject/Assets/Mirror/Cloud/Core/IUnityEqualCheck.cs @@ -1 +1,26 @@ -// removed 2021-05-13 +using UnityEngine; + +namespace Mirror.Cloud +{ + /// + /// Adds Extension to check if unity object is null. + /// Use these methods to stop MissingReferenceException + /// + public interface IUnityEqualCheck + { + + } + + public static class UnityEqualCheckExtension + { + public static bool IsNull(this IUnityEqualCheck obj) + { + return (obj as Object) == null; + } + + public static bool IsNotNull(this IUnityEqualCheck obj) + { + return (obj as Object) != null; + } + } +} diff --git a/UnityProject/Assets/Mirror/Cloud/Core/IUnityEqualCheck.cs.meta b/UnityProject/Assets/Mirror/Cloud/Core/IUnityEqualCheck.cs.meta index be2f9962..7cb2a59f 100644 --- a/UnityProject/Assets/Mirror/Cloud/Core/IUnityEqualCheck.cs.meta +++ b/UnityProject/Assets/Mirror/Cloud/Core/IUnityEqualCheck.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Cloud/Core/JsonStructs.cs b/UnityProject/Assets/Mirror/Cloud/Core/JsonStructs.cs index 2f117877..7827abcb 100644 --- a/UnityProject/Assets/Mirror/Cloud/Core/JsonStructs.cs +++ b/UnityProject/Assets/Mirror/Cloud/Core/JsonStructs.cs @@ -1 +1,24 @@ -// removed 2021-05-13 +using System; + +namespace Mirror.Cloud +{ + [Serializable] + public struct CreatedIdJson : ICanBeJson + { + public string id; + } + + [Serializable] + public struct ErrorJson : ICanBeJson + { + public string code; + public string message; + + public int HtmlCode => int.Parse(code); + } + + [Serializable] + public struct EmptyJson : ICanBeJson + { + } +} diff --git a/UnityProject/Assets/Mirror/Cloud/Core/JsonStructs.cs.meta b/UnityProject/Assets/Mirror/Cloud/Core/JsonStructs.cs.meta index beab7e74..2c040090 100644 --- a/UnityProject/Assets/Mirror/Cloud/Core/JsonStructs.cs.meta +++ b/UnityProject/Assets/Mirror/Cloud/Core/JsonStructs.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Cloud/Core/Logger.cs b/UnityProject/Assets/Mirror/Cloud/Core/Logger.cs index 2f117877..09a17bc4 100644 --- a/UnityProject/Assets/Mirror/Cloud/Core/Logger.cs +++ b/UnityProject/Assets/Mirror/Cloud/Core/Logger.cs @@ -1 +1,62 @@ -// removed 2021-05-13 +using System; +using UnityEngine; +using UnityEngine.Networking; + +namespace Mirror.Cloud +{ + public static class Logger + { + public static bool VerboseLogging = false; + + public static void LogRequest(string page, string method, bool hasJson, string json) + { + if (hasJson) + { + Debug.LogFormat("Request: {0} {1} {2}", method, page, json); + } + else + { + Debug.LogFormat("Request: {0} {1}", method, page); + } + } + + public static void LogResponse(UnityWebRequest statusRequest) + { + long code = statusRequest.responseCode; + + string format = "Response: {0} {1} {2} {3}"; + // we split path like this to make sure api key doesn't leak + Uri uri = new Uri(statusRequest.url); + string path = string.Join("", uri.Segments); + string msg = string.Format(format, statusRequest.method, code, path, statusRequest.downloadHandler.text); + Debug.Log(msg); + + if (!string.IsNullOrEmpty(statusRequest.error)) + { + msg = string.Format("WEB REQUEST ERROR: {0}", statusRequest.error); + Debug.LogError(msg); + } + } + + internal static void Log(string msg) + { + Debug.Log(msg); + } + + internal static void LogWarning(string msg) + { + Debug.LogWarning(msg); + } + + internal static void LogError(string msg) + { + Debug.LogError(msg); + } + + internal static void Verbose(string msg) + { + if (VerboseLogging) + Debug.Log(msg); + } + } +} diff --git a/UnityProject/Assets/Mirror/Cloud/Core/Logger.cs.meta b/UnityProject/Assets/Mirror/Cloud/Core/Logger.cs.meta index 41412801..5984ce30 100644 --- a/UnityProject/Assets/Mirror/Cloud/Core/Logger.cs.meta +++ b/UnityProject/Assets/Mirror/Cloud/Core/Logger.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Cloud/Core/RequestCreator.cs b/UnityProject/Assets/Mirror/Cloud/Core/RequestCreator.cs index 2f117877..7195c0e7 100644 --- a/UnityProject/Assets/Mirror/Cloud/Core/RequestCreator.cs +++ b/UnityProject/Assets/Mirror/Cloud/Core/RequestCreator.cs @@ -1 +1,144 @@ -// removed 2021-05-13 +using System; +using System.Collections; +using System.Text; +using UnityEngine; +using UnityEngine.Networking; + +namespace Mirror.Cloud +{ + /// + /// Methods to create and send UnityWebRequest + /// + public class RequestCreator : IRequestCreator + { + const string GET = "GET"; + const string POST = "POST"; + const string PATCH = "PATCH"; + const string DELETE = "DELETE"; + + public readonly string baseAddress; + public readonly string apiKey; + readonly ICoroutineRunner runner; + + public RequestCreator(string baseAddress, string apiKey, ICoroutineRunner coroutineRunner) + { + if (string.IsNullOrEmpty(baseAddress)) + { + throw new ArgumentNullException(nameof(baseAddress)); + } + + if (string.IsNullOrEmpty(apiKey)) + { + throw new ArgumentNullException(nameof(apiKey)); + } + + this.baseAddress = baseAddress; + this.apiKey = apiKey; + + runner = coroutineRunner ?? throw new ArgumentNullException(nameof(coroutineRunner)); + } + + + Uri CreateUri(string page) + { + return new Uri(string.Format("{0}/{1}?key={2}", baseAddress, page, apiKey)); + } + + UnityWebRequest CreateWebRequest(string page, string method, string json = null) + { + bool hasJson = !string.IsNullOrEmpty(json); + Logger.LogRequest(page, method, hasJson, json); + + UnityWebRequest request = new UnityWebRequest(CreateUri(page)); + request.method = method; + if (hasJson) + { + request.SetRequestHeader("Content-Type", "application/json"); + } + + request.downloadHandler = new DownloadHandlerBuffer(); + + byte[] bodyRaw = hasJson + ? Encoding.UTF8.GetBytes(json) + : null; + + request.uploadHandler = new UploadHandlerRaw(bodyRaw); + + return request; + } + + + + /// + /// Create Get Request to page + /// + /// + /// + public UnityWebRequest Get(string page) + { + return CreateWebRequest(page, GET); + } + + /// + /// Creates Post Request to page with Json body + /// + /// + /// + /// + /// + public UnityWebRequest Post(string page, T json) where T : struct, ICanBeJson + { + string jsonString = JsonUtility.ToJson(json); + return CreateWebRequest(page, POST, jsonString); + } + + /// + /// Creates Patch Request to page with Json body + /// + /// + /// + /// + /// + public UnityWebRequest Patch(string page, T json) where T : struct, ICanBeJson + { + string jsonString = JsonUtility.ToJson(json); + return CreateWebRequest(page, PATCH, jsonString); + } + + /// + /// Create Delete Request to page + /// + /// + /// + public UnityWebRequest Delete(string page) + { + return CreateWebRequest(page, DELETE); + } + + + public void SendRequest(UnityWebRequest request, RequestSuccess onSuccess = null, RequestFail onFail = null) + { + runner.StartCoroutine(SendRequestEnumerator(request, onSuccess, onFail)); + } + + public IEnumerator SendRequestEnumerator(UnityWebRequest request, RequestSuccess onSuccess = null, RequestFail onFail = null) + { + using (UnityWebRequest webRequest = request) + { + yield return webRequest.SendWebRequest(); + Logger.LogResponse(webRequest); + + string text = webRequest.downloadHandler.text; + Logger.Verbose(text); + if (webRequest.IsOk()) + { + onSuccess?.Invoke(text); + } + else + { + onFail?.Invoke(text); + } + } + } + } +} diff --git a/UnityProject/Assets/Mirror/Cloud/Core/RequestCreator.cs.meta b/UnityProject/Assets/Mirror/Cloud/Core/RequestCreator.cs.meta index 654cb83a..eb139af4 100644 --- a/UnityProject/Assets/Mirror/Cloud/Core/RequestCreator.cs.meta +++ b/UnityProject/Assets/Mirror/Cloud/Core/RequestCreator.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Cloud/ListServer/ListServer.cs b/UnityProject/Assets/Mirror/Cloud/ListServer/ListServer.cs index 2f117877..8b4af805 100644 --- a/UnityProject/Assets/Mirror/Cloud/ListServer/ListServer.cs +++ b/UnityProject/Assets/Mirror/Cloud/ListServer/ListServer.cs @@ -1 +1,66 @@ -// removed 2021-05-13 +using System; +using UnityEngine.Events; + +namespace Mirror.Cloud.ListServerService +{ + public sealed class ListServer + { + public readonly IListServerServerApi ServerApi; + public readonly IListServerClientApi ClientApi; + + public ListServer(IListServerServerApi serverApi, IListServerClientApi clientApi) + { + ServerApi = serverApi ?? throw new ArgumentNullException(nameof(serverApi)); + ClientApi = clientApi ?? throw new ArgumentNullException(nameof(clientApi)); + } + } + + public interface IListServerServerApi : IBaseApi + { + /// + /// Has a server been added to the list with this connection + /// + bool ServerInList { get; } + /// + /// Add a server to the list + /// + /// + void AddServer(ServerJson server); + /// + /// Update the current server + /// + /// + void UpdateServer(int newPlayerCount); + /// + /// Update the current server + /// + /// + void UpdateServer(ServerJson server); + /// + /// Removes the current server + /// + void RemoveServer(); + } + + public interface IListServerClientApi : IBaseApi + { + /// + /// Called when the server list is updated + /// + event UnityAction onServerListUpdated; + + /// + /// Get the server list once + /// + void GetServerList(); + /// + /// Start getting the server list every interval + /// + /// + void StartGetServerListRepeat(int interval); + /// + /// Stop getting the server list + /// + void StopGetServerListRepeat(); + } +} diff --git a/UnityProject/Assets/Mirror/Cloud/ListServer/ListServer.cs.meta b/UnityProject/Assets/Mirror/Cloud/ListServer/ListServer.cs.meta index f79ac5bf..519876dc 100644 --- a/UnityProject/Assets/Mirror/Cloud/ListServer/ListServer.cs.meta +++ b/UnityProject/Assets/Mirror/Cloud/ListServer/ListServer.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Cloud/ListServer/ListServerBaseApi.cs b/UnityProject/Assets/Mirror/Cloud/ListServer/ListServerBaseApi.cs index 2f117877..05d2e2e6 100644 --- a/UnityProject/Assets/Mirror/Cloud/ListServer/ListServerBaseApi.cs +++ b/UnityProject/Assets/Mirror/Cloud/ListServer/ListServerBaseApi.cs @@ -1 +1,9 @@ -// removed 2021-05-13 +namespace Mirror.Cloud.ListServerService +{ + public abstract class ListServerBaseApi : BaseApi + { + protected ListServerBaseApi(ICoroutineRunner runner, IRequestCreator requestCreator) : base(runner, requestCreator) + { + } + } +} diff --git a/UnityProject/Assets/Mirror/Cloud/ListServer/ListServerBaseApi.cs.meta b/UnityProject/Assets/Mirror/Cloud/ListServer/ListServerBaseApi.cs.meta index 55dd322f..a9d32ea0 100644 --- a/UnityProject/Assets/Mirror/Cloud/ListServer/ListServerBaseApi.cs.meta +++ b/UnityProject/Assets/Mirror/Cloud/ListServer/ListServerBaseApi.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Cloud/ListServer/ListServerClientApi.cs b/UnityProject/Assets/Mirror/Cloud/ListServer/ListServerClientApi.cs index 2f117877..d5ffcefb 100644 --- a/UnityProject/Assets/Mirror/Cloud/ListServer/ListServerClientApi.cs +++ b/UnityProject/Assets/Mirror/Cloud/ListServer/ListServerClientApi.cs @@ -1 +1,70 @@ -// removed 2021-05-13 +using System.Collections; +using UnityEngine; +using UnityEngine.Events; +using UnityEngine.Networking; + +namespace Mirror.Cloud.ListServerService +{ + public sealed class ListServerClientApi : ListServerBaseApi, IListServerClientApi + { + readonly ServerListEvent _onServerListUpdated; + + Coroutine getServerListRepeatCoroutine; + + public event UnityAction onServerListUpdated + { + add => _onServerListUpdated.AddListener(value); + remove => _onServerListUpdated.RemoveListener(value); + } + + public ListServerClientApi(ICoroutineRunner runner, IRequestCreator requestCreator, ServerListEvent onServerListUpdated) : base(runner, requestCreator) + { + _onServerListUpdated = onServerListUpdated; + } + + public void Shutdown() + { + StopGetServerListRepeat(); + } + + public void GetServerList() + { + runner.StartCoroutine(getServerList()); + } + + public void StartGetServerListRepeat(int interval) + { + getServerListRepeatCoroutine = runner.StartCoroutine(GetServerListRepeat(interval)); + } + + public void StopGetServerListRepeat() + { + // if runner is null it has been destroyed and will already be null + if (runner.IsNotNull() && getServerListRepeatCoroutine != null) + { + runner.StopCoroutine(getServerListRepeatCoroutine); + } + } + + IEnumerator GetServerListRepeat(int interval) + { + while (true) + { + yield return getServerList(); + + yield return new WaitForSeconds(interval); + } + } + IEnumerator getServerList() + { + UnityWebRequest request = requestCreator.Get("servers"); + yield return requestCreator.SendRequestEnumerator(request, onSuccess); + + void onSuccess(string responseBody) + { + ServerCollectionJson serverlist = JsonUtility.FromJson(responseBody); + _onServerListUpdated?.Invoke(serverlist); + } + } + } +} diff --git a/UnityProject/Assets/Mirror/Cloud/ListServer/ListServerClientApi.cs.meta b/UnityProject/Assets/Mirror/Cloud/ListServer/ListServerClientApi.cs.meta index 43c3e4d5..306bf7c6 100644 --- a/UnityProject/Assets/Mirror/Cloud/ListServer/ListServerClientApi.cs.meta +++ b/UnityProject/Assets/Mirror/Cloud/ListServer/ListServerClientApi.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Cloud/ListServer/ListServerJson.cs b/UnityProject/Assets/Mirror/Cloud/ListServer/ListServerJson.cs index 2f117877..2591331b 100644 --- a/UnityProject/Assets/Mirror/Cloud/ListServer/ListServerJson.cs +++ b/UnityProject/Assets/Mirror/Cloud/ListServer/ListServerJson.cs @@ -1 +1,207 @@ -// removed 2021-05-13 +using System; +using System.Collections.Generic; +using System.Linq; + +namespace Mirror.Cloud.ListServerService +{ + [Serializable] + public struct ServerCollectionJson : ICanBeJson + { + public ServerJson[] servers; + } + + [Serializable] + public struct ServerJson : ICanBeJson + { + public string protocol; + public int port; + public int playerCount; + public int maxPlayerCount; + + /// + /// optional + /// + public string displayName; + + /// + /// Uri string of the ip and port of the server. + /// The ip is calculated by the request to the API + /// This is returns from the api, any incoming address fields will be ignored + /// + public string address; + + /// + /// Can be used to set custom uri + /// optional + /// + public string customAddress; + + /// + /// Array of custom data, use SetCustomData to set values + /// optional + /// + public KeyValue[] customData; + + /// + /// Uri from address field + /// + /// + public Uri GetServerUri() => new Uri(address); + + /// + /// Uri from customAddress field + /// + /// + public Uri GetCustomUri() => new Uri(customAddress); + + /// + /// Updates the customData array + /// + /// + public void SetCustomData(Dictionary data) + { + if (data == null) + { + customData = null; + } + else + { + customData = data.ToKeyValueArray(); + CustomDataHelper.ValidateCustomData(customData); + } + } + + public bool Validate() + { + CustomDataHelper.ValidateCustomData(customData); + + if (string.IsNullOrEmpty(protocol)) + { + Logger.LogError("ServerJson should not have empty protocol"); + return false; + } + + if (port == 0) + { + Logger.LogError("ServerJson should not have port equal 0"); + return false; + } + + if (maxPlayerCount == 0) + { + Logger.LogError("ServerJson should not have maxPlayerCount equal 0"); + return false; + } + + return true; + } + } + + [Serializable] + public struct PartialServerJson : ICanBeJson + { + /// + /// optional + /// + public int playerCount; + + /// + /// optional + /// + public int maxPlayerCount; + + /// + /// optional + /// + public string displayName; + + /// + /// Array of custom data, use SetCustomData to set values + /// optional + /// + public KeyValue[] customData; + + + public void SetCustomData(Dictionary data) + { + if (data == null) + { + customData = null; + } + else + { + customData = data.ToKeyValueArray(); + CustomDataHelper.ValidateCustomData(customData); + } + } + + public void Validate() + { + CustomDataHelper.ValidateCustomData(customData); + } + } + + public static class CustomDataHelper + { + const int MaxCustomData = 16; + + public static Dictionary ToDictionary(this KeyValue[] keyValues) + { + return keyValues.ToDictionary(x => x.key, x => x.value); + } + public static KeyValue[] ToKeyValueArray(this Dictionary dictionary) + { + return dictionary.Select(kvp => new KeyValue(kvp.Key, kvp.Value)).ToArray(); + } + + public static void ValidateCustomData(KeyValue[] customData) + { + if (customData == null) + { + return; + } + + if (customData.Length > MaxCustomData) + { + Logger.LogError($"There can only be {MaxCustomData} custom data but there was {customData.Length} values given"); + Array.Resize(ref customData, MaxCustomData); + } + + foreach (KeyValue item in customData) + { + item.Validate(); + } + } + } + + [Serializable] + public struct KeyValue + { + const int MaxKeySize = 32; + const int MaxValueSize = 256; + + public string key; + public string value; + + public KeyValue(string key, string value) + { + this.key = key; + this.value = value; + } + + public void Validate() + { + if (key.Length > MaxKeySize) + { + Logger.LogError($"Custom Data must have key with length less than {MaxKeySize}"); + key = key.Substring(0, MaxKeySize); + } + + if (value.Length > MaxValueSize) + { + Logger.LogError($"Custom Data must have value with length less than {MaxValueSize}"); + value = value.Substring(0, MaxValueSize); + } + } + } +} diff --git a/UnityProject/Assets/Mirror/Cloud/ListServer/ListServerJson.cs.meta b/UnityProject/Assets/Mirror/Cloud/ListServer/ListServerJson.cs.meta index a863c651..7e206f11 100644 --- a/UnityProject/Assets/Mirror/Cloud/ListServer/ListServerJson.cs.meta +++ b/UnityProject/Assets/Mirror/Cloud/ListServer/ListServerJson.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Cloud/ListServer/ListServerServerApi.cs b/UnityProject/Assets/Mirror/Cloud/ListServer/ListServerServerApi.cs index 2f117877..106004a2 100644 --- a/UnityProject/Assets/Mirror/Cloud/ListServer/ListServerServerApi.cs +++ b/UnityProject/Assets/Mirror/Cloud/ListServer/ListServerServerApi.cs @@ -1 +1,219 @@ -// removed 2021-05-13 +using System.Collections; +using UnityEngine; +using UnityEngine.Networking; + +namespace Mirror.Cloud.ListServerService +{ + public sealed class ListServerServerApi : ListServerBaseApi, IListServerServerApi + { + const int PingInterval = 20; + const int MaxPingFails = 15; + + ServerJson currentServer; + string serverId; + + Coroutine _pingCoroutine; + /// + /// If the server has already been added + /// + bool added; + /// + /// if a request is currently sending + /// + bool sending; + /// + /// If an update request was recently sent + /// + bool skipNextPing; + /// + /// How many failed pings in a row + /// + int pingFails = 0; + + public bool ServerInList => added; + + public ListServerServerApi(ICoroutineRunner runner, IRequestCreator requestCreator) : base(runner, requestCreator) + { + } + + public void Shutdown() + { + stopPingCoroutine(); + if (added) + { + removeServerWithoutCoroutine(); + } + added = false; + } + + public void AddServer(ServerJson server) + { + if (added) { Logger.LogWarning("AddServer called when server was already adding or added"); return; } + bool valid = server.Validate(); + if (!valid) { return; } + + runner.StartCoroutine(addServer(server)); + } + + public void UpdateServer(int newPlayerCount) + { + if (!added) { Logger.LogWarning("UpdateServer called when before server was added"); return; } + + currentServer.playerCount = newPlayerCount; + UpdateServer(currentServer); + } + + public void UpdateServer(ServerJson server) + { + // TODO, use PartialServerJson as Arg Instead + if (!added) { Logger.LogWarning("UpdateServer called when before server was added"); return; } + + PartialServerJson partialServer = new PartialServerJson + { + displayName = server.displayName, + playerCount = server.playerCount, + maxPlayerCount = server.maxPlayerCount, + customData = server.customData, + }; + partialServer.Validate(); + + runner.StartCoroutine(updateServer(partialServer)); + } + + public void RemoveServer() + { + if (!added) { return; } + + if (string.IsNullOrEmpty(serverId)) + { + Logger.LogWarning("Can not remove server because serverId was empty"); + return; + } + + stopPingCoroutine(); + runner.StartCoroutine(removeServer()); + } + + void stopPingCoroutine() + { + if (_pingCoroutine != null) + { + runner.StopCoroutine(_pingCoroutine); + _pingCoroutine = null; + } + } + + IEnumerator addServer(ServerJson server) + { + added = true; + sending = true; + currentServer = server; + + UnityWebRequest request = requestCreator.Post("servers", currentServer); + yield return requestCreator.SendRequestEnumerator(request, onSuccess, onFail); + sending = false; + + void onSuccess(string responseBody) + { + CreatedIdJson created = JsonUtility.FromJson(responseBody); + serverId = created.id; + + // Start ping to keep server alive + _pingCoroutine = runner.StartCoroutine(ping()); + } + void onFail(string responseBody) + { + added = false; + } + } + + IEnumerator updateServer(PartialServerJson server) + { + // wait to not be sending + while (sending) + { + yield return new WaitForSeconds(1); + } + + // We need to check added in case Update is called soon after Add, and add failed + if (!added) { Logger.LogWarning("UpdateServer called when before server was added"); yield break; } + + sending = true; + UnityWebRequest request = requestCreator.Patch("servers/" + serverId, server); + yield return requestCreator.SendRequestEnumerator(request, onSuccess); + sending = false; + + void onSuccess(string responseBody) + { + skipNextPing = true; + + if (_pingCoroutine == null) + { + _pingCoroutine = runner.StartCoroutine(ping()); + } + } + } + + /// + /// Keeps server alive in database + /// + /// + IEnumerator ping() + { + while (pingFails <= MaxPingFails) + { + yield return new WaitForSeconds(PingInterval); + if (skipNextPing) + { + skipNextPing = false; + continue; + } + + sending = true; + UnityWebRequest request = requestCreator.Patch("servers/" + serverId, new EmptyJson()); + yield return requestCreator.SendRequestEnumerator(request, onSuccess, onFail); + sending = false; + } + + Logger.LogWarning("Max ping fails reached, stopping to ping server"); + _pingCoroutine = null; + + + void onSuccess(string responseBody) + { + pingFails = 0; + } + void onFail(string responseBody) + { + pingFails++; + } + } + + IEnumerator removeServer() + { + sending = true; + UnityWebRequest request = requestCreator.Delete("servers/" + serverId); + yield return requestCreator.SendRequestEnumerator(request); + sending = false; + + added = false; + } + + void removeServerWithoutCoroutine() + { + if (string.IsNullOrEmpty(serverId)) + { + Logger.LogWarning("Can not remove server because serverId was empty"); + return; + } + + UnityWebRequest request = requestCreator.Delete("servers/" + serverId); + UnityWebRequestAsyncOperation operation = request.SendWebRequest(); + + operation.completed += (op) => + { + Logger.LogResponse(request); + }; + } + } +} diff --git a/UnityProject/Assets/Mirror/Cloud/ListServer/ListServerServerApi.cs.meta b/UnityProject/Assets/Mirror/Cloud/ListServer/ListServerServerApi.cs.meta index a8db6197..82e23fdf 100644 --- a/UnityProject/Assets/Mirror/Cloud/ListServer/ListServerServerApi.cs.meta +++ b/UnityProject/Assets/Mirror/Cloud/ListServer/ListServerServerApi.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/CompilerSymbols.meta b/UnityProject/Assets/Mirror/CompilerSymbols.meta index 8d0dedcf..4652ae1b 100644 --- a/UnityProject/Assets/Mirror/CompilerSymbols.meta +++ b/UnityProject/Assets/Mirror/CompilerSymbols.meta @@ -3,6 +3,6 @@ guid: 1f8b918bcd89f5c488b06f5574f34760 folderAsset: yes DefaultImporter: externalObjects: {} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/CompilerSymbols/Mirror.CompilerSymbols.asmdef.meta b/UnityProject/Assets/Mirror/CompilerSymbols/Mirror.CompilerSymbols.asmdef.meta index 98ac7a03..8b238236 100644 --- a/UnityProject/Assets/Mirror/CompilerSymbols/Mirror.CompilerSymbols.asmdef.meta +++ b/UnityProject/Assets/Mirror/CompilerSymbols/Mirror.CompilerSymbols.asmdef.meta @@ -2,6 +2,6 @@ fileFormatVersion: 2 guid: 325984b52e4128546bc7558552f8b1d2 AssemblyDefinitionImporter: externalObjects: {} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/CompilerSymbols/PreprocessorDefine.cs.meta b/UnityProject/Assets/Mirror/CompilerSymbols/PreprocessorDefine.cs.meta index 248f00b2..30806d0f 100644 --- a/UnityProject/Assets/Mirror/CompilerSymbols/PreprocessorDefine.cs.meta +++ b/UnityProject/Assets/Mirror/CompilerSymbols/PreprocessorDefine.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Components.meta b/UnityProject/Assets/Mirror/Components.meta index a257fe64..c2771d96 100644 --- a/UnityProject/Assets/Mirror/Components.meta +++ b/UnityProject/Assets/Mirror/Components.meta @@ -3,6 +3,6 @@ guid: 9bee879fbc8ef4b1a9a9f7088bfbf726 folderAsset: yes DefaultImporter: externalObjects: {} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Components/AssemblyInfo.cs.meta b/UnityProject/Assets/Mirror/Components/AssemblyInfo.cs.meta index d50ab809..f9af1fa6 100644 --- a/UnityProject/Assets/Mirror/Components/AssemblyInfo.cs.meta +++ b/UnityProject/Assets/Mirror/Components/AssemblyInfo.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {fileID: 2800000, guid: 7453abfe9e8b2c04a8a47eb536fe21eb, type: 3} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Components/Discovery.meta b/UnityProject/Assets/Mirror/Components/Discovery.meta index 28e03271..d5bb0cbb 100644 --- a/UnityProject/Assets/Mirror/Components/Discovery.meta +++ b/UnityProject/Assets/Mirror/Components/Discovery.meta @@ -3,6 +3,6 @@ guid: b5dcf9618f5e14a4eb60bff5480284a6 folderAsset: yes DefaultImporter: externalObjects: {} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Components/Discovery/NetworkDiscovery.cs.meta b/UnityProject/Assets/Mirror/Components/Discovery/NetworkDiscovery.cs.meta index f6c8bcd2..c691a613 100644 --- a/UnityProject/Assets/Mirror/Components/Discovery/NetworkDiscovery.cs.meta +++ b/UnityProject/Assets/Mirror/Components/Discovery/NetworkDiscovery.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {fileID: 2800000, guid: 7453abfe9e8b2c04a8a47eb536fe21eb, type: 3} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Components/Discovery/NetworkDiscoveryBase.cs b/UnityProject/Assets/Mirror/Components/Discovery/NetworkDiscoveryBase.cs index 47796a1b..75203987 100644 --- a/UnityProject/Assets/Mirror/Components/Discovery/NetworkDiscoveryBase.cs +++ b/UnityProject/Assets/Mirror/Components/Discovery/NetworkDiscoveryBase.cs @@ -16,7 +16,7 @@ namespace Mirror.Discovery /// NetworkDiscovery for a sample implementation /// [DisallowMultipleComponent] - [HelpURL("https://mirror-networking.gitbook.io/docs/components/network-discovery")] + [HelpURL("https://mirror-networking.com/docs/Articles/Components/NetworkDiscovery.html")] public abstract class NetworkDiscoveryBase : MonoBehaviour where Request : NetworkMessage where Response : NetworkMessage diff --git a/UnityProject/Assets/Mirror/Components/Discovery/NetworkDiscoveryBase.cs.meta b/UnityProject/Assets/Mirror/Components/Discovery/NetworkDiscoveryBase.cs.meta index e51d40a6..7dfbaf62 100644 --- a/UnityProject/Assets/Mirror/Components/Discovery/NetworkDiscoveryBase.cs.meta +++ b/UnityProject/Assets/Mirror/Components/Discovery/NetworkDiscoveryBase.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Components/Discovery/NetworkDiscoveryHUD.cs b/UnityProject/Assets/Mirror/Components/Discovery/NetworkDiscoveryHUD.cs index c9de4f0d..5476971c 100644 --- a/UnityProject/Assets/Mirror/Components/Discovery/NetworkDiscoveryHUD.cs +++ b/UnityProject/Assets/Mirror/Components/Discovery/NetworkDiscoveryHUD.cs @@ -5,7 +5,7 @@ namespace Mirror.Discovery { [DisallowMultipleComponent] [AddComponentMenu("Network/NetworkDiscoveryHUD")] - [HelpURL("https://mirror-networking.gitbook.io/docs/components/network-discovery")] + [HelpURL("https://mirror-networking.com/docs/Articles/Components/NetworkDiscovery.html")] [RequireComponent(typeof(NetworkDiscovery))] public class NetworkDiscoveryHUD : MonoBehaviour { diff --git a/UnityProject/Assets/Mirror/Components/Discovery/NetworkDiscoveryHUD.cs.meta b/UnityProject/Assets/Mirror/Components/Discovery/NetworkDiscoveryHUD.cs.meta index 375a0d8a..f93b275c 100644 --- a/UnityProject/Assets/Mirror/Components/Discovery/NetworkDiscoveryHUD.cs.meta +++ b/UnityProject/Assets/Mirror/Components/Discovery/NetworkDiscoveryHUD.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {fileID: 2800000, guid: 7453abfe9e8b2c04a8a47eb536fe21eb, type: 3} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Components/Discovery/ServerRequest.cs.meta b/UnityProject/Assets/Mirror/Components/Discovery/ServerRequest.cs.meta index 0bbe3ef7..84f3232a 100644 --- a/UnityProject/Assets/Mirror/Components/Discovery/ServerRequest.cs.meta +++ b/UnityProject/Assets/Mirror/Components/Discovery/ServerRequest.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Components/Discovery/ServerResponse.cs.meta b/UnityProject/Assets/Mirror/Components/Discovery/ServerResponse.cs.meta index 09532c46..44f23bac 100644 --- a/UnityProject/Assets/Mirror/Components/Discovery/ServerResponse.cs.meta +++ b/UnityProject/Assets/Mirror/Components/Discovery/ServerResponse.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Components/Experimental.meta b/UnityProject/Assets/Mirror/Components/Experimental.meta index ebf1efd5..57cce382 100644 --- a/UnityProject/Assets/Mirror/Components/Experimental.meta +++ b/UnityProject/Assets/Mirror/Components/Experimental.meta @@ -3,6 +3,6 @@ guid: bfbf2a1f2b300c5489dcab219ef2846e folderAsset: yes DefaultImporter: externalObjects: {} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Components/Experimental/NetworkLerpRigidbody.cs b/UnityProject/Assets/Mirror/Components/Experimental/NetworkLerpRigidbody.cs index 41a4d6a5..e10b9cfe 100644 --- a/UnityProject/Assets/Mirror/Components/Experimental/NetworkLerpRigidbody.cs +++ b/UnityProject/Assets/Mirror/Components/Experimental/NetworkLerpRigidbody.cs @@ -3,7 +3,7 @@ namespace Mirror.Experimental { [AddComponentMenu("Network/Experimental/NetworkLerpRigidbody")] - [HelpURL("https://mirror-networking.gitbook.io/docs/components/network-lerp-rigidbody")] + [HelpURL("https://mirror-networking.com/docs/Articles/Components/NetworkLerpRigidbody.html")] public class NetworkLerpRigidbody : NetworkBehaviour { [Header("Settings")] diff --git a/UnityProject/Assets/Mirror/Components/Experimental/NetworkLerpRigidbody.cs.meta b/UnityProject/Assets/Mirror/Components/Experimental/NetworkLerpRigidbody.cs.meta index 1c006abf..35ef1fec 100644 --- a/UnityProject/Assets/Mirror/Components/Experimental/NetworkLerpRigidbody.cs.meta +++ b/UnityProject/Assets/Mirror/Components/Experimental/NetworkLerpRigidbody.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {fileID: 2800000, guid: 7453abfe9e8b2c04a8a47eb536fe21eb, type: 3} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Components/Experimental/NetworkRigidbody.cs b/UnityProject/Assets/Mirror/Components/Experimental/NetworkRigidbody.cs index b39b0ffd..d64547bb 100644 --- a/UnityProject/Assets/Mirror/Components/Experimental/NetworkRigidbody.cs +++ b/UnityProject/Assets/Mirror/Components/Experimental/NetworkRigidbody.cs @@ -3,7 +3,7 @@ namespace Mirror.Experimental { [AddComponentMenu("Network/Experimental/NetworkRigidbody")] - [HelpURL("https://mirror-networking.gitbook.io/docs/components/network-rigidbody")] + [HelpURL("https://mirror-networking.com/docs/Articles/Components/NetworkRigidbody.html")] public class NetworkRigidbody : NetworkBehaviour { [Header("Settings")] diff --git a/UnityProject/Assets/Mirror/Components/Experimental/NetworkRigidbody.cs.meta b/UnityProject/Assets/Mirror/Components/Experimental/NetworkRigidbody.cs.meta index 9a054055..1610f0a7 100644 --- a/UnityProject/Assets/Mirror/Components/Experimental/NetworkRigidbody.cs.meta +++ b/UnityProject/Assets/Mirror/Components/Experimental/NetworkRigidbody.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {fileID: 2800000, guid: 7453abfe9e8b2c04a8a47eb536fe21eb, type: 3} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Components/Experimental/NetworkRigidbody2D.cs.meta b/UnityProject/Assets/Mirror/Components/Experimental/NetworkRigidbody2D.cs.meta index f092db74..df466bd0 100644 --- a/UnityProject/Assets/Mirror/Components/Experimental/NetworkRigidbody2D.cs.meta +++ b/UnityProject/Assets/Mirror/Components/Experimental/NetworkRigidbody2D.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {fileID: 2800000, guid: 7453abfe9e8b2c04a8a47eb536fe21eb, type: 3} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Components/Experimental/NetworkTransform.cs b/UnityProject/Assets/Mirror/Components/Experimental/NetworkTransform.cs index 495518e3..58f37388 100644 --- a/UnityProject/Assets/Mirror/Components/Experimental/NetworkTransform.cs +++ b/UnityProject/Assets/Mirror/Components/Experimental/NetworkTransform.cs @@ -4,7 +4,7 @@ namespace Mirror.Experimental { [DisallowMultipleComponent] [AddComponentMenu("Network/Experimental/NetworkTransformExperimental")] - [HelpURL("https://mirror-networking.gitbook.io/docs/components/network-transform")] + [HelpURL("https://mirror-networking.com/docs/Articles/Components/NetworkTransform.html")] public class NetworkTransform : NetworkTransformBase { protected override Transform targetTransform => transform; diff --git a/UnityProject/Assets/Mirror/Components/Experimental/NetworkTransform.cs.meta b/UnityProject/Assets/Mirror/Components/Experimental/NetworkTransform.cs.meta index 412dcbf1..2bc16dd8 100644 --- a/UnityProject/Assets/Mirror/Components/Experimental/NetworkTransform.cs.meta +++ b/UnityProject/Assets/Mirror/Components/Experimental/NetworkTransform.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {fileID: 2800000, guid: 7453abfe9e8b2c04a8a47eb536fe21eb, type: 3} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Components/Experimental/NetworkTransformBase.cs.meta b/UnityProject/Assets/Mirror/Components/Experimental/NetworkTransformBase.cs.meta index adf37550..d737bed8 100644 --- a/UnityProject/Assets/Mirror/Components/Experimental/NetworkTransformBase.cs.meta +++ b/UnityProject/Assets/Mirror/Components/Experimental/NetworkTransformBase.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Components/Experimental/NetworkTransformChild.cs b/UnityProject/Assets/Mirror/Components/Experimental/NetworkTransformChild.cs index 44c49bd7..50651210 100644 --- a/UnityProject/Assets/Mirror/Components/Experimental/NetworkTransformChild.cs +++ b/UnityProject/Assets/Mirror/Components/Experimental/NetworkTransformChild.cs @@ -7,7 +7,7 @@ namespace Mirror.Experimental /// There must be a NetworkTransform on the root object of the hierarchy. There can be multiple NetworkTransformChild components on an object. This does not use physics for synchronization, it simply synchronizes the localPosition and localRotation of the child transform and lerps towards the received values. /// [AddComponentMenu("Network/Experimental/NetworkTransformChildExperimentalExperimental")] - [HelpURL("https://mirror-networking.gitbook.io/docs/components/network-transform-child")] + [HelpURL("https://mirror-networking.com/docs/Articles/Components/NetworkTransformChild.html")] public class NetworkTransformChild : NetworkTransformBase { [Header("Target")] diff --git a/UnityProject/Assets/Mirror/Components/Experimental/NetworkTransformChild.cs.meta b/UnityProject/Assets/Mirror/Components/Experimental/NetworkTransformChild.cs.meta index 2ed42122..30f0d890 100644 --- a/UnityProject/Assets/Mirror/Components/Experimental/NetworkTransformChild.cs.meta +++ b/UnityProject/Assets/Mirror/Components/Experimental/NetworkTransformChild.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {fileID: 2800000, guid: 7453abfe9e8b2c04a8a47eb536fe21eb, type: 3} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Components/GUIConsole.cs.meta b/UnityProject/Assets/Mirror/Components/GUIConsole.cs.meta index 933dd051..5664216d 100644 --- a/UnityProject/Assets/Mirror/Components/GUIConsole.cs.meta +++ b/UnityProject/Assets/Mirror/Components/GUIConsole.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {fileID: 2800000, guid: 7453abfe9e8b2c04a8a47eb536fe21eb, type: 3} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Components/InterestManagement.meta b/UnityProject/Assets/Mirror/Components/InterestManagement.meta index 1b7a9721..9b1f7466 100644 --- a/UnityProject/Assets/Mirror/Components/InterestManagement.meta +++ b/UnityProject/Assets/Mirror/Components/InterestManagement.meta @@ -3,6 +3,6 @@ guid: c66f27e006ab94253b39a55a3b213651 folderAsset: yes DefaultImporter: externalObjects: {} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Components/InterestManagement/Distance.meta b/UnityProject/Assets/Mirror/Components/InterestManagement/Distance.meta index 832357eb..98479020 100644 --- a/UnityProject/Assets/Mirror/Components/InterestManagement/Distance.meta +++ b/UnityProject/Assets/Mirror/Components/InterestManagement/Distance.meta @@ -1,3 +1,3 @@ -fileFormatVersion: 2 +fileFormatVersion: 2 guid: fa4cbc6b9c584db4971985cb9f369077 -timeCreated: 1613110605 +timeCreated: 1613110605 \ No newline at end of file diff --git a/UnityProject/Assets/Mirror/Components/InterestManagement/Distance/DistanceInterestManagement.cs.meta b/UnityProject/Assets/Mirror/Components/InterestManagement/Distance/DistanceInterestManagement.cs.meta index 6adbd650..1a575af5 100644 --- a/UnityProject/Assets/Mirror/Components/InterestManagement/Distance/DistanceInterestManagement.cs.meta +++ b/UnityProject/Assets/Mirror/Components/InterestManagement/Distance/DistanceInterestManagement.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {fileID: 2800000, guid: 7453abfe9e8b2c04a8a47eb536fe21eb, type: 3} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Components/InterestManagement/SpatialHashing.meta b/UnityProject/Assets/Mirror/Components/InterestManagement/SpatialHashing.meta index 6a35e1ec..00f5cd60 100644 --- a/UnityProject/Assets/Mirror/Components/InterestManagement/SpatialHashing.meta +++ b/UnityProject/Assets/Mirror/Components/InterestManagement/SpatialHashing.meta @@ -1,3 +1,3 @@ -fileFormatVersion: 2 +fileFormatVersion: 2 guid: cfa12b73503344d49b398b01bcb07967 -timeCreated: 1613110634 +timeCreated: 1613110634 \ No newline at end of file diff --git a/UnityProject/Assets/Mirror/Components/InterestManagement/SpatialHashing/Grid2D.cs.meta b/UnityProject/Assets/Mirror/Components/InterestManagement/SpatialHashing/Grid2D.cs.meta index 4448994b..f1d3cf0f 100644 --- a/UnityProject/Assets/Mirror/Components/InterestManagement/SpatialHashing/Grid2D.cs.meta +++ b/UnityProject/Assets/Mirror/Components/InterestManagement/SpatialHashing/Grid2D.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {fileID: 2800000, guid: 7453abfe9e8b2c04a8a47eb536fe21eb, type: 3} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Components/InterestManagement/SpatialHashing/SpatialHashingInterestManagement.cs.meta b/UnityProject/Assets/Mirror/Components/InterestManagement/SpatialHashing/SpatialHashingInterestManagement.cs.meta index 5f5007e2..271e4335 100644 --- a/UnityProject/Assets/Mirror/Components/InterestManagement/SpatialHashing/SpatialHashingInterestManagement.cs.meta +++ b/UnityProject/Assets/Mirror/Components/InterestManagement/SpatialHashing/SpatialHashingInterestManagement.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {fileID: 2800000, guid: 7453abfe9e8b2c04a8a47eb536fe21eb, type: 3} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Components/Mirror.Components.asmdef.meta b/UnityProject/Assets/Mirror/Components/Mirror.Components.asmdef.meta index 59c31c85..263b6f06 100644 --- a/UnityProject/Assets/Mirror/Components/Mirror.Components.asmdef.meta +++ b/UnityProject/Assets/Mirror/Components/Mirror.Components.asmdef.meta @@ -2,6 +2,6 @@ fileFormatVersion: 2 guid: 72872094b21c16e48b631b2224833d49 AssemblyDefinitionImporter: externalObjects: {} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Components/NetworkAnimator.cs b/UnityProject/Assets/Mirror/Components/NetworkAnimator.cs index 64042e7b..964d3dc6 100644 --- a/UnityProject/Assets/Mirror/Components/NetworkAnimator.cs +++ b/UnityProject/Assets/Mirror/Components/NetworkAnimator.cs @@ -15,7 +15,7 @@ namespace Mirror /// [AddComponentMenu("Network/NetworkAnimator")] [RequireComponent(typeof(NetworkIdentity))] - [HelpURL("https://mirror-networking.gitbook.io/docs/components/network-animator")] + [HelpURL("https://mirror-networking.com/docs/Articles/Components/NetworkAnimator.html")] public class NetworkAnimator : NetworkBehaviour { [Header("Authority")] diff --git a/UnityProject/Assets/Mirror/Components/NetworkAnimator.cs.meta b/UnityProject/Assets/Mirror/Components/NetworkAnimator.cs.meta index 7b0d8d19..211ce788 100644 --- a/UnityProject/Assets/Mirror/Components/NetworkAnimator.cs.meta +++ b/UnityProject/Assets/Mirror/Components/NetworkAnimator.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {fileID: 2800000, guid: 7453abfe9e8b2c04a8a47eb536fe21eb, type: 3} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Components/NetworkLobbyManager.cs b/UnityProject/Assets/Mirror/Components/NetworkLobbyManager.cs index 6ea069a9..99c0d1eb 100644 --- a/UnityProject/Assets/Mirror/Components/NetworkLobbyManager.cs +++ b/UnityProject/Assets/Mirror/Components/NetworkLobbyManager.cs @@ -12,7 +12,7 @@ namespace Mirror /// The OnLobby*() functions have empty implementations on the NetworkLobbyManager base class, so the base class functions do not have to be called. /// [AddComponentMenu("Network/NetworkLobbyManager")] - [HelpURL("https://mirror-networking.gitbook.io/docs/components/network-room-manager")] + [HelpURL("https://mirror-networking.com/docs/Articles/Components/NetworkRoomManager.html")] [Obsolete("Use / inherit from NetworkRoomManager instead")] public class NetworkLobbyManager : NetworkRoomManager {} } diff --git a/UnityProject/Assets/Mirror/Components/NetworkLobbyManager.cs.meta b/UnityProject/Assets/Mirror/Components/NetworkLobbyManager.cs.meta index 7fdd9ef3..a32c8c7c 100644 --- a/UnityProject/Assets/Mirror/Components/NetworkLobbyManager.cs.meta +++ b/UnityProject/Assets/Mirror/Components/NetworkLobbyManager.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {fileID: 2800000, guid: 7453abfe9e8b2c04a8a47eb536fe21eb, type: 3} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Components/NetworkLobbyPlayer.cs b/UnityProject/Assets/Mirror/Components/NetworkLobbyPlayer.cs index cf185663..b15b1063 100644 --- a/UnityProject/Assets/Mirror/Components/NetworkLobbyPlayer.cs +++ b/UnityProject/Assets/Mirror/Components/NetworkLobbyPlayer.cs @@ -9,7 +9,7 @@ namespace Mirror /// [DisallowMultipleComponent] [AddComponentMenu("Network/NetworkLobbyPlayer")] - [HelpURL("https://mirror-networking.gitbook.io/docs/components/network-room-player")] + [HelpURL("https://mirror-networking.com/docs/Articles/Components/NetworkRoomPlayer.html")] [Obsolete("Use / inherit from NetworkRoomPlayer instead")] public class NetworkLobbyPlayer : NetworkRoomPlayer {} } diff --git a/UnityProject/Assets/Mirror/Components/NetworkLobbyPlayer.cs.meta b/UnityProject/Assets/Mirror/Components/NetworkLobbyPlayer.cs.meta index 7dfc2058..7a21eec5 100644 --- a/UnityProject/Assets/Mirror/Components/NetworkLobbyPlayer.cs.meta +++ b/UnityProject/Assets/Mirror/Components/NetworkLobbyPlayer.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {fileID: 2800000, guid: 7453abfe9e8b2c04a8a47eb536fe21eb, type: 3} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Components/NetworkMatchChecker.cs b/UnityProject/Assets/Mirror/Components/NetworkMatchChecker.cs index 523305c0..373568cb 100644 --- a/UnityProject/Assets/Mirror/Components/NetworkMatchChecker.cs +++ b/UnityProject/Assets/Mirror/Components/NetworkMatchChecker.cs @@ -13,7 +13,7 @@ namespace Mirror [DisallowMultipleComponent] [AddComponentMenu("Network/NetworkMatchChecker")] [RequireComponent(typeof(NetworkIdentity))] - [HelpURL("https://mirror-networking.gitbook.io/docs/components/network-match-checker")] + [HelpURL("https://mirror-networking.com/docs/Articles/Components/NetworkMatchChecker.html")] public class NetworkMatchChecker : NetworkVisibility { static readonly Dictionary> matchPlayers = new Dictionary>(); diff --git a/UnityProject/Assets/Mirror/Components/NetworkMatchChecker.cs.meta b/UnityProject/Assets/Mirror/Components/NetworkMatchChecker.cs.meta index adf2a614..7c7d6cfc 100644 --- a/UnityProject/Assets/Mirror/Components/NetworkMatchChecker.cs.meta +++ b/UnityProject/Assets/Mirror/Components/NetworkMatchChecker.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {fileID: 2800000, guid: 7453abfe9e8b2c04a8a47eb536fe21eb, type: 3} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Components/NetworkOwnerChecker.cs b/UnityProject/Assets/Mirror/Components/NetworkOwnerChecker.cs index 175165a2..27113798 100644 --- a/UnityProject/Assets/Mirror/Components/NetworkOwnerChecker.cs +++ b/UnityProject/Assets/Mirror/Components/NetworkOwnerChecker.cs @@ -13,7 +13,7 @@ namespace Mirror [DisallowMultipleComponent] [AddComponentMenu("Network/NetworkOwnerChecker")] [RequireComponent(typeof(NetworkIdentity))] - [HelpURL("https://mirror-networking.gitbook.io/docs/components/network-owner-checker")] + [HelpURL("https://mirror-networking.com/docs/Components/NetworkOwnerChecker.html")] public class NetworkOwnerChecker : NetworkVisibility { /// diff --git a/UnityProject/Assets/Mirror/Components/NetworkOwnerChecker.cs.meta b/UnityProject/Assets/Mirror/Components/NetworkOwnerChecker.cs.meta index 060154ee..fee7725c 100644 --- a/UnityProject/Assets/Mirror/Components/NetworkOwnerChecker.cs.meta +++ b/UnityProject/Assets/Mirror/Components/NetworkOwnerChecker.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {fileID: 2800000, guid: 7453abfe9e8b2c04a8a47eb536fe21eb, type: 3} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Components/NetworkPingDisplay.cs b/UnityProject/Assets/Mirror/Components/NetworkPingDisplay.cs index ca3527bf..4db89457 100644 --- a/UnityProject/Assets/Mirror/Components/NetworkPingDisplay.cs +++ b/UnityProject/Assets/Mirror/Components/NetworkPingDisplay.cs @@ -8,7 +8,7 @@ namespace Mirror /// [DisallowMultipleComponent] [AddComponentMenu("Network/NetworkPingDisplay")] - [HelpURL("https://mirror-networking.gitbook.io/docs/components/network-ping-display")] + [HelpURL("https://mirror-networking.com/docs/Articles/Components/NetworkPingDisplay.html")] public class NetworkPingDisplay : MonoBehaviour { public Color color = Color.white; diff --git a/UnityProject/Assets/Mirror/Components/NetworkPingDisplay.cs.meta b/UnityProject/Assets/Mirror/Components/NetworkPingDisplay.cs.meta index 826d5d30..221a7458 100644 --- a/UnityProject/Assets/Mirror/Components/NetworkPingDisplay.cs.meta +++ b/UnityProject/Assets/Mirror/Components/NetworkPingDisplay.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {fileID: 2800000, guid: 7453abfe9e8b2c04a8a47eb536fe21eb, type: 3} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Components/NetworkProximityChecker.cs b/UnityProject/Assets/Mirror/Components/NetworkProximityChecker.cs index 0d594034..430fa52c 100644 --- a/UnityProject/Assets/Mirror/Components/NetworkProximityChecker.cs +++ b/UnityProject/Assets/Mirror/Components/NetworkProximityChecker.cs @@ -11,7 +11,7 @@ namespace Mirror [Obsolete(NetworkVisibilityObsoleteMessage.Message)] [AddComponentMenu("Network/NetworkProximityChecker")] [RequireComponent(typeof(NetworkIdentity))] - [HelpURL("https://mirror-networking.gitbook.io/docs/components/network-proximity-checker")] + [HelpURL("https://mirror-networking.com/docs/Articles/Components/NetworkProximityChecker.html")] public class NetworkProximityChecker : NetworkVisibility { /// diff --git a/UnityProject/Assets/Mirror/Components/NetworkProximityChecker.cs.meta b/UnityProject/Assets/Mirror/Components/NetworkProximityChecker.cs.meta index 0131b730..c5aa1123 100644 --- a/UnityProject/Assets/Mirror/Components/NetworkProximityChecker.cs.meta +++ b/UnityProject/Assets/Mirror/Components/NetworkProximityChecker.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {fileID: 2800000, guid: 7453abfe9e8b2c04a8a47eb536fe21eb, type: 3} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Components/NetworkRoomManager.cs b/UnityProject/Assets/Mirror/Components/NetworkRoomManager.cs index f7c29e4a..3941ae8b 100644 --- a/UnityProject/Assets/Mirror/Components/NetworkRoomManager.cs +++ b/UnityProject/Assets/Mirror/Components/NetworkRoomManager.cs @@ -14,7 +14,7 @@ namespace Mirror /// The OnRoom*() functions have empty implementations on the NetworkRoomManager base class, so the base class functions do not have to be called. /// [AddComponentMenu("Network/NetworkRoomManager")] - [HelpURL("https://mirror-networking.gitbook.io/docs/components/network-room-manager")] + [HelpURL("https://mirror-networking.com/docs/Articles/Components/NetworkRoomManager.html")] public class NetworkRoomManager : NetworkManager { public struct PendingPlayer diff --git a/UnityProject/Assets/Mirror/Components/NetworkRoomManager.cs.meta b/UnityProject/Assets/Mirror/Components/NetworkRoomManager.cs.meta index 2c646168..76e7d426 100644 --- a/UnityProject/Assets/Mirror/Components/NetworkRoomManager.cs.meta +++ b/UnityProject/Assets/Mirror/Components/NetworkRoomManager.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {fileID: 2800000, guid: 7453abfe9e8b2c04a8a47eb536fe21eb, type: 3} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Components/NetworkRoomPlayer.cs b/UnityProject/Assets/Mirror/Components/NetworkRoomPlayer.cs index c16052d7..36333933 100644 --- a/UnityProject/Assets/Mirror/Components/NetworkRoomPlayer.cs +++ b/UnityProject/Assets/Mirror/Components/NetworkRoomPlayer.cs @@ -8,7 +8,7 @@ namespace Mirror /// [DisallowMultipleComponent] [AddComponentMenu("Network/NetworkRoomPlayer")] - [HelpURL("https://mirror-networking.gitbook.io/docs/components/network-room-player")] + [HelpURL("https://mirror-networking.com/docs/Articles/Components/NetworkRoomPlayer.html")] public class NetworkRoomPlayer : NetworkBehaviour { /// diff --git a/UnityProject/Assets/Mirror/Components/NetworkRoomPlayer.cs.meta b/UnityProject/Assets/Mirror/Components/NetworkRoomPlayer.cs.meta index d355d8d2..0299beac 100644 --- a/UnityProject/Assets/Mirror/Components/NetworkRoomPlayer.cs.meta +++ b/UnityProject/Assets/Mirror/Components/NetworkRoomPlayer.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {fileID: 2800000, guid: 7453abfe9e8b2c04a8a47eb536fe21eb, type: 3} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Components/NetworkSceneChecker.cs b/UnityProject/Assets/Mirror/Components/NetworkSceneChecker.cs index d94400ed..d423e2d5 100644 --- a/UnityProject/Assets/Mirror/Components/NetworkSceneChecker.cs +++ b/UnityProject/Assets/Mirror/Components/NetworkSceneChecker.cs @@ -14,7 +14,7 @@ namespace Mirror [DisallowMultipleComponent] [AddComponentMenu("Network/NetworkSceneChecker")] [RequireComponent(typeof(NetworkIdentity))] - [HelpURL("https://mirror-networking.gitbook.io/docs/components/network-scene-checker")] + [HelpURL("https://mirror-networking.com/docs/Articles/Components/NetworkSceneChecker.html")] public class NetworkSceneChecker : NetworkVisibility { /// diff --git a/UnityProject/Assets/Mirror/Components/NetworkSceneChecker.cs.meta b/UnityProject/Assets/Mirror/Components/NetworkSceneChecker.cs.meta index f81ad4ff..b451655a 100644 --- a/UnityProject/Assets/Mirror/Components/NetworkSceneChecker.cs.meta +++ b/UnityProject/Assets/Mirror/Components/NetworkSceneChecker.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {fileID: 2800000, guid: 7453abfe9e8b2c04a8a47eb536fe21eb, type: 3} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Components/NetworkTransform.cs b/UnityProject/Assets/Mirror/Components/NetworkTransform.cs index e001d1ea..2154b715 100644 --- a/UnityProject/Assets/Mirror/Components/NetworkTransform.cs +++ b/UnityProject/Assets/Mirror/Components/NetworkTransform.cs @@ -4,7 +4,7 @@ namespace Mirror { [DisallowMultipleComponent] [AddComponentMenu("Network/NetworkTransform")] - [HelpURL("https://mirror-networking.gitbook.io/docs/components/network-transform")] + [HelpURL("https://mirror-networking.com/docs/Articles/Components/NetworkTransform.html")] public class NetworkTransform : NetworkTransformBase { protected override Transform targetComponent => transform; diff --git a/UnityProject/Assets/Mirror/Components/NetworkTransform.cs.meta b/UnityProject/Assets/Mirror/Components/NetworkTransform.cs.meta index 4ad6860f..a569990f 100644 --- a/UnityProject/Assets/Mirror/Components/NetworkTransform.cs.meta +++ b/UnityProject/Assets/Mirror/Components/NetworkTransform.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {fileID: 2800000, guid: 7453abfe9e8b2c04a8a47eb536fe21eb, type: 3} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Components/NetworkTransformBase.cs b/UnityProject/Assets/Mirror/Components/NetworkTransformBase.cs index 9fe6512b..c6c1f6a4 100644 --- a/UnityProject/Assets/Mirror/Components/NetworkTransformBase.cs +++ b/UnityProject/Assets/Mirror/Components/NetworkTransformBase.cs @@ -53,10 +53,6 @@ public abstract class NetworkTransformBase : NetworkBehaviour [Header("Interpolation")] [Tooltip("Set to true if scale should be interpolated, false is ideal for instant sprite flipping.")] public bool interpolateScale = true; - [Tooltip("Set to true if rotation should be interpolated, false is ideal for instant turning, common in retro 2d style games")] - public bool interpolateRotation = true; - [Tooltip("Set to true if position should be interpolated, false is ideal for grid bassed movement")] - public bool interpolatePosition = true; [Header("Synchronization")] // It should be very rare cases that people want to continuously sync scale, true by default to not break previous projects that use it @@ -269,13 +265,9 @@ static float CurrentInterpolationFactor(DataPoint start, DataPoint goal) return 0; } - Vector3 InterpolatePosition(DataPoint start, DataPoint goal, Vector3 currentPosition) + static Vector3 InterpolatePosition(DataPoint start, DataPoint goal, Vector3 currentPosition) { - if (!interpolatePosition) - { - return goal.localPosition; - } - else if (start != null) + if (start != null) { // Option 1: simply interpolate based on time. but stutter // will happen, it's not that smooth. especially noticeable if @@ -292,13 +284,9 @@ Vector3 InterpolatePosition(DataPoint start, DataPoint goal, Vector3 currentPosi return currentPosition; } - Quaternion InterpolateRotation(DataPoint start, DataPoint goal, Quaternion defaultRotation) + static Quaternion InterpolateRotation(DataPoint start, DataPoint goal, Quaternion defaultRotation) { - if (!interpolateRotation) - { - return goal.localRotation; - } - else if (start != null) + if (start != null) { float t = CurrentInterpolationFactor(start, goal); return Quaternion.Slerp(start.localRotation, goal.localRotation, t); @@ -308,15 +296,7 @@ Quaternion InterpolateRotation(DataPoint start, DataPoint goal, Quaternion defau Vector3 InterpolateScale(DataPoint start, DataPoint goal, Vector3 currentScale) { - if (!syncScale) - { - return currentScale; - } - else if (!interpolateScale) - { - return goal.localScale; - } - else if (interpolateScale && start != null ) + if (start != null && interpolateScale) { float t = CurrentInterpolationFactor(start, goal); return Vector3.Lerp(start.localScale, goal.localScale, t); diff --git a/UnityProject/Assets/Mirror/Components/NetworkTransformBase.cs.meta b/UnityProject/Assets/Mirror/Components/NetworkTransformBase.cs.meta index 3ce06614..ab649d94 100644 --- a/UnityProject/Assets/Mirror/Components/NetworkTransformBase.cs.meta +++ b/UnityProject/Assets/Mirror/Components/NetworkTransformBase.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {fileID: 2800000, guid: 7453abfe9e8b2c04a8a47eb536fe21eb, type: 3} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Components/NetworkTransformChild.cs b/UnityProject/Assets/Mirror/Components/NetworkTransformChild.cs index 3ad42877..d5d8a764 100644 --- a/UnityProject/Assets/Mirror/Components/NetworkTransformChild.cs +++ b/UnityProject/Assets/Mirror/Components/NetworkTransformChild.cs @@ -7,7 +7,7 @@ namespace Mirror /// There must be a NetworkTransform on the root object of the hierarchy. There can be multiple NetworkTransformChild components on an object. This does not use physics for synchronization, it simply synchronizes the localPosition and localRotation of the child transform and lerps towards the received values. /// [AddComponentMenu("Network/NetworkTransformChild")] - [HelpURL("https://mirror-networking.gitbook.io/docs/components/network-transform-child")] + [HelpURL("https://mirror-networking.com/docs/Articles/Components/NetworkTransformChild.html")] public class NetworkTransformChild : NetworkTransformBase { [Header("Target")] diff --git a/UnityProject/Assets/Mirror/Components/NetworkTransformChild.cs.meta b/UnityProject/Assets/Mirror/Components/NetworkTransformChild.cs.meta index 4fce4293..ae36756d 100644 --- a/UnityProject/Assets/Mirror/Components/NetworkTransformChild.cs.meta +++ b/UnityProject/Assets/Mirror/Components/NetworkTransformChild.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {fileID: 2800000, guid: 7453abfe9e8b2c04a8a47eb536fe21eb, type: 3} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Editor.meta b/UnityProject/Assets/Mirror/Editor.meta index 0c23e8c9..f679511c 100644 --- a/UnityProject/Assets/Mirror/Editor.meta +++ b/UnityProject/Assets/Mirror/Editor.meta @@ -3,6 +3,6 @@ guid: 2539267b6934a4026a505690a1e1eda2 folderAsset: yes DefaultImporter: externalObjects: {} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Editor/EditorHelper.cs.meta b/UnityProject/Assets/Mirror/Editor/EditorHelper.cs.meta index 02aec40a..a1cd814a 100644 --- a/UnityProject/Assets/Mirror/Editor/EditorHelper.cs.meta +++ b/UnityProject/Assets/Mirror/Editor/EditorHelper.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Editor/EnterPlayModeSettingsCheck.cs.meta b/UnityProject/Assets/Mirror/Editor/EnterPlayModeSettingsCheck.cs.meta index 49a4298c..79a200da 100644 --- a/UnityProject/Assets/Mirror/Editor/EnterPlayModeSettingsCheck.cs.meta +++ b/UnityProject/Assets/Mirror/Editor/EnterPlayModeSettingsCheck.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Editor/InspectorHelper.cs.meta b/UnityProject/Assets/Mirror/Editor/InspectorHelper.cs.meta index bb6cb6cc..852ff712 100644 --- a/UnityProject/Assets/Mirror/Editor/InspectorHelper.cs.meta +++ b/UnityProject/Assets/Mirror/Editor/InspectorHelper.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Editor/LogLevelWindow.cs.meta b/UnityProject/Assets/Mirror/Editor/LogLevelWindow.cs.meta index a068358d..b8cbaebc 100644 --- a/UnityProject/Assets/Mirror/Editor/LogLevelWindow.cs.meta +++ b/UnityProject/Assets/Mirror/Editor/LogLevelWindow.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Editor/Logging.meta b/UnityProject/Assets/Mirror/Editor/Logging.meta index 0919d1e3..257467ff 100644 --- a/UnityProject/Assets/Mirror/Editor/Logging.meta +++ b/UnityProject/Assets/Mirror/Editor/Logging.meta @@ -3,6 +3,6 @@ guid: 4d97731cd74ac8b4b8aad808548ef9cd folderAsset: yes DefaultImporter: externalObjects: {} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Editor/Logging/LogLevelWindow.cs.meta b/UnityProject/Assets/Mirror/Editor/Logging/LogLevelWindow.cs.meta index aff9fad0..832876fa 100644 --- a/UnityProject/Assets/Mirror/Editor/Logging/LogLevelWindow.cs.meta +++ b/UnityProject/Assets/Mirror/Editor/Logging/LogLevelWindow.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Editor/Logging/LogLevelsGUI.cs.meta b/UnityProject/Assets/Mirror/Editor/Logging/LogLevelsGUI.cs.meta index bc9e68c9..3214b088 100644 --- a/UnityProject/Assets/Mirror/Editor/Logging/LogLevelsGUI.cs.meta +++ b/UnityProject/Assets/Mirror/Editor/Logging/LogLevelsGUI.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Editor/Logging/LogSettingsEditor.cs.meta b/UnityProject/Assets/Mirror/Editor/Logging/LogSettingsEditor.cs.meta index 1a456c5a..2c1fac47 100644 --- a/UnityProject/Assets/Mirror/Editor/Logging/LogSettingsEditor.cs.meta +++ b/UnityProject/Assets/Mirror/Editor/Logging/LogSettingsEditor.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Editor/Logging/NetworkLogSettingsEditor.cs.meta b/UnityProject/Assets/Mirror/Editor/Logging/NetworkLogSettingsEditor.cs.meta index 21d0db68..b4c277d9 100644 --- a/UnityProject/Assets/Mirror/Editor/Logging/NetworkLogSettingsEditor.cs.meta +++ b/UnityProject/Assets/Mirror/Editor/Logging/NetworkLogSettingsEditor.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Editor/Mirror.Editor.asmdef.meta b/UnityProject/Assets/Mirror/Editor/Mirror.Editor.asmdef.meta index ba2d88cf..e2e6f2aa 100644 --- a/UnityProject/Assets/Mirror/Editor/Mirror.Editor.asmdef.meta +++ b/UnityProject/Assets/Mirror/Editor/Mirror.Editor.asmdef.meta @@ -2,6 +2,6 @@ fileFormatVersion: 2 guid: 1c7c33eb5480dd24c9e29a8250c1a775 AssemblyDefinitionImporter: externalObjects: {} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Editor/NetworkBehaviourInspector.cs.meta b/UnityProject/Assets/Mirror/Editor/NetworkBehaviourInspector.cs.meta index 2a4a45ae..78d9fa8f 100644 --- a/UnityProject/Assets/Mirror/Editor/NetworkBehaviourInspector.cs.meta +++ b/UnityProject/Assets/Mirror/Editor/NetworkBehaviourInspector.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Editor/NetworkInformationPreview.cs.meta b/UnityProject/Assets/Mirror/Editor/NetworkInformationPreview.cs.meta index c93e6c0c..9bf2de4d 100644 --- a/UnityProject/Assets/Mirror/Editor/NetworkInformationPreview.cs.meta +++ b/UnityProject/Assets/Mirror/Editor/NetworkInformationPreview.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Editor/NetworkManagerEditor.cs.meta b/UnityProject/Assets/Mirror/Editor/NetworkManagerEditor.cs.meta index 6fb657e1..7fe8dbc8 100644 --- a/UnityProject/Assets/Mirror/Editor/NetworkManagerEditor.cs.meta +++ b/UnityProject/Assets/Mirror/Editor/NetworkManagerEditor.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Editor/NetworkScenePostProcess.cs.meta b/UnityProject/Assets/Mirror/Editor/NetworkScenePostProcess.cs.meta index 53b148fd..b567cc95 100644 --- a/UnityProject/Assets/Mirror/Editor/NetworkScenePostProcess.cs.meta +++ b/UnityProject/Assets/Mirror/Editor/NetworkScenePostProcess.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Editor/SceneDrawer.cs.meta b/UnityProject/Assets/Mirror/Editor/SceneDrawer.cs.meta index e37ff9c5..6a996dcd 100644 --- a/UnityProject/Assets/Mirror/Editor/SceneDrawer.cs.meta +++ b/UnityProject/Assets/Mirror/Editor/SceneDrawer.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Editor/ScriptableObjectUtility.cs.meta b/UnityProject/Assets/Mirror/Editor/ScriptableObjectUtility.cs.meta index c1cfe35f..a1a0af37 100644 --- a/UnityProject/Assets/Mirror/Editor/ScriptableObjectUtility.cs.meta +++ b/UnityProject/Assets/Mirror/Editor/ScriptableObjectUtility.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Editor/SyncVarAttributeDrawer.cs.meta b/UnityProject/Assets/Mirror/Editor/SyncVarAttributeDrawer.cs.meta index 1cb12507..6311f1d3 100644 --- a/UnityProject/Assets/Mirror/Editor/SyncVarAttributeDrawer.cs.meta +++ b/UnityProject/Assets/Mirror/Editor/SyncVarAttributeDrawer.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Editor/Weaver.meta b/UnityProject/Assets/Mirror/Editor/Weaver.meta index ed8a67a0..121fbf44 100644 --- a/UnityProject/Assets/Mirror/Editor/Weaver.meta +++ b/UnityProject/Assets/Mirror/Editor/Weaver.meta @@ -3,6 +3,6 @@ guid: d9f8e6274119b4ce29e498cfb8aca8a4 folderAsset: yes DefaultImporter: externalObjects: {} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Editor/Weaver/AssemblyInfo.cs.meta b/UnityProject/Assets/Mirror/Editor/Weaver/AssemblyInfo.cs.meta index f31bae28..d356af81 100644 --- a/UnityProject/Assets/Mirror/Editor/Weaver/AssemblyInfo.cs.meta +++ b/UnityProject/Assets/Mirror/Editor/Weaver/AssemblyInfo.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Editor/Weaver/CompilationFinishedHook.cs.meta b/UnityProject/Assets/Mirror/Editor/Weaver/CompilationFinishedHook.cs.meta index 004ab69a..ed537ab5 100644 --- a/UnityProject/Assets/Mirror/Editor/Weaver/CompilationFinishedHook.cs.meta +++ b/UnityProject/Assets/Mirror/Editor/Weaver/CompilationFinishedHook.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Editor/Weaver/Extensions.cs.meta b/UnityProject/Assets/Mirror/Editor/Weaver/Extensions.cs.meta index a5b8aa47..78660f90 100644 --- a/UnityProject/Assets/Mirror/Editor/Weaver/Extensions.cs.meta +++ b/UnityProject/Assets/Mirror/Editor/Weaver/Extensions.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Editor/Weaver/Helpers.cs.meta b/UnityProject/Assets/Mirror/Editor/Weaver/Helpers.cs.meta index f49ae986..231f5396 100644 --- a/UnityProject/Assets/Mirror/Editor/Weaver/Helpers.cs.meta +++ b/UnityProject/Assets/Mirror/Editor/Weaver/Helpers.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Editor/Weaver/Log.cs.meta b/UnityProject/Assets/Mirror/Editor/Weaver/Log.cs.meta index ed584d5d..3f62978c 100644 --- a/UnityProject/Assets/Mirror/Editor/Weaver/Log.cs.meta +++ b/UnityProject/Assets/Mirror/Editor/Weaver/Log.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Editor/Weaver/Mirror.Weaver.asmdef.meta b/UnityProject/Assets/Mirror/Editor/Weaver/Mirror.Weaver.asmdef.meta index 2ee47545..b65a0cd3 100644 --- a/UnityProject/Assets/Mirror/Editor/Weaver/Mirror.Weaver.asmdef.meta +++ b/UnityProject/Assets/Mirror/Editor/Weaver/Mirror.Weaver.asmdef.meta @@ -2,6 +2,6 @@ fileFormatVersion: 2 guid: 1d0b9d21c3ff546a4aa32399dfd33474 AssemblyDefinitionImporter: externalObjects: {} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Editor/Weaver/Processors.meta b/UnityProject/Assets/Mirror/Editor/Weaver/Processors.meta index f3a01c12..eb719b4f 100644 --- a/UnityProject/Assets/Mirror/Editor/Weaver/Processors.meta +++ b/UnityProject/Assets/Mirror/Editor/Weaver/Processors.meta @@ -3,6 +3,6 @@ guid: e538d627280d2471b8c72fdea822ca49 folderAsset: yes DefaultImporter: externalObjects: {} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Editor/Weaver/Processors/CommandProcessor.cs.meta b/UnityProject/Assets/Mirror/Editor/Weaver/Processors/CommandProcessor.cs.meta index 4596f690..20c3e154 100644 --- a/UnityProject/Assets/Mirror/Editor/Weaver/Processors/CommandProcessor.cs.meta +++ b/UnityProject/Assets/Mirror/Editor/Weaver/Processors/CommandProcessor.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Editor/Weaver/Processors/GenericArgumentResolver.cs.meta b/UnityProject/Assets/Mirror/Editor/Weaver/Processors/GenericArgumentResolver.cs.meta index 3fcfa0cd..685f9145 100644 --- a/UnityProject/Assets/Mirror/Editor/Weaver/Processors/GenericArgumentResolver.cs.meta +++ b/UnityProject/Assets/Mirror/Editor/Weaver/Processors/GenericArgumentResolver.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Editor/Weaver/Processors/MessageClassProcessor.cs.meta b/UnityProject/Assets/Mirror/Editor/Weaver/Processors/MessageClassProcessor.cs.meta index d7b62082..cbea4d61 100644 --- a/UnityProject/Assets/Mirror/Editor/Weaver/Processors/MessageClassProcessor.cs.meta +++ b/UnityProject/Assets/Mirror/Editor/Weaver/Processors/MessageClassProcessor.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Editor/Weaver/Processors/MethodProcessor.cs.meta b/UnityProject/Assets/Mirror/Editor/Weaver/Processors/MethodProcessor.cs.meta index b40023d6..3c818940 100644 --- a/UnityProject/Assets/Mirror/Editor/Weaver/Processors/MethodProcessor.cs.meta +++ b/UnityProject/Assets/Mirror/Editor/Weaver/Processors/MethodProcessor.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Editor/Weaver/Processors/MonoBehaviourProcessor.cs.meta b/UnityProject/Assets/Mirror/Editor/Weaver/Processors/MonoBehaviourProcessor.cs.meta index 4eb88408..ef3f5f44 100644 --- a/UnityProject/Assets/Mirror/Editor/Weaver/Processors/MonoBehaviourProcessor.cs.meta +++ b/UnityProject/Assets/Mirror/Editor/Weaver/Processors/MonoBehaviourProcessor.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Editor/Weaver/Processors/NetworkBehaviourProcessor.cs.meta b/UnityProject/Assets/Mirror/Editor/Weaver/Processors/NetworkBehaviourProcessor.cs.meta index 78a67bf7..67c27dc0 100644 --- a/UnityProject/Assets/Mirror/Editor/Weaver/Processors/NetworkBehaviourProcessor.cs.meta +++ b/UnityProject/Assets/Mirror/Editor/Weaver/Processors/NetworkBehaviourProcessor.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Editor/Weaver/Processors/PropertySiteProcessor.cs.meta b/UnityProject/Assets/Mirror/Editor/Weaver/Processors/PropertySiteProcessor.cs.meta index b0fea9ad..e8c2500a 100644 --- a/UnityProject/Assets/Mirror/Editor/Weaver/Processors/PropertySiteProcessor.cs.meta +++ b/UnityProject/Assets/Mirror/Editor/Weaver/Processors/PropertySiteProcessor.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Editor/Weaver/Processors/ReaderWriterProcessor.cs.meta b/UnityProject/Assets/Mirror/Editor/Weaver/Processors/ReaderWriterProcessor.cs.meta index 8d8b30a6..c14d6fae 100644 --- a/UnityProject/Assets/Mirror/Editor/Weaver/Processors/ReaderWriterProcessor.cs.meta +++ b/UnityProject/Assets/Mirror/Editor/Weaver/Processors/ReaderWriterProcessor.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Editor/Weaver/Processors/RpcProcessor.cs.meta b/UnityProject/Assets/Mirror/Editor/Weaver/Processors/RpcProcessor.cs.meta index 5f94aa7f..22375bac 100644 --- a/UnityProject/Assets/Mirror/Editor/Weaver/Processors/RpcProcessor.cs.meta +++ b/UnityProject/Assets/Mirror/Editor/Weaver/Processors/RpcProcessor.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Editor/Weaver/Processors/ServerClientAttributeProcessor.cs.meta b/UnityProject/Assets/Mirror/Editor/Weaver/Processors/ServerClientAttributeProcessor.cs.meta index ff09ae9b..5a5451d1 100644 --- a/UnityProject/Assets/Mirror/Editor/Weaver/Processors/ServerClientAttributeProcessor.cs.meta +++ b/UnityProject/Assets/Mirror/Editor/Weaver/Processors/ServerClientAttributeProcessor.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Editor/Weaver/Processors/SyncDictionaryProcessor.cs.meta b/UnityProject/Assets/Mirror/Editor/Weaver/Processors/SyncDictionaryProcessor.cs.meta index 8ca8566b..0a7c2aa5 100644 --- a/UnityProject/Assets/Mirror/Editor/Weaver/Processors/SyncDictionaryProcessor.cs.meta +++ b/UnityProject/Assets/Mirror/Editor/Weaver/Processors/SyncDictionaryProcessor.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Editor/Weaver/Processors/SyncEventProcessor.cs.meta b/UnityProject/Assets/Mirror/Editor/Weaver/Processors/SyncEventProcessor.cs.meta index 2a2b5188..81b95768 100644 --- a/UnityProject/Assets/Mirror/Editor/Weaver/Processors/SyncEventProcessor.cs.meta +++ b/UnityProject/Assets/Mirror/Editor/Weaver/Processors/SyncEventProcessor.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Editor/Weaver/Processors/SyncListProcessor.cs.meta b/UnityProject/Assets/Mirror/Editor/Weaver/Processors/SyncListProcessor.cs.meta index 16b8097b..b73b0475 100644 --- a/UnityProject/Assets/Mirror/Editor/Weaver/Processors/SyncListProcessor.cs.meta +++ b/UnityProject/Assets/Mirror/Editor/Weaver/Processors/SyncListProcessor.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Editor/Weaver/Processors/SyncObjectInitializer.cs.meta b/UnityProject/Assets/Mirror/Editor/Weaver/Processors/SyncObjectInitializer.cs.meta index 1a0c3cf1..22f976e7 100644 --- a/UnityProject/Assets/Mirror/Editor/Weaver/Processors/SyncObjectInitializer.cs.meta +++ b/UnityProject/Assets/Mirror/Editor/Weaver/Processors/SyncObjectInitializer.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Editor/Weaver/Processors/SyncObjectProcessor.cs.meta b/UnityProject/Assets/Mirror/Editor/Weaver/Processors/SyncObjectProcessor.cs.meta index 82696b60..0efe434a 100644 --- a/UnityProject/Assets/Mirror/Editor/Weaver/Processors/SyncObjectProcessor.cs.meta +++ b/UnityProject/Assets/Mirror/Editor/Weaver/Processors/SyncObjectProcessor.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Editor/Weaver/Processors/SyncVarProcessor.cs.meta b/UnityProject/Assets/Mirror/Editor/Weaver/Processors/SyncVarProcessor.cs.meta index 31c45863..982f7680 100644 --- a/UnityProject/Assets/Mirror/Editor/Weaver/Processors/SyncVarProcessor.cs.meta +++ b/UnityProject/Assets/Mirror/Editor/Weaver/Processors/SyncVarProcessor.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Editor/Weaver/Processors/TargetRpcProcessor.cs.meta b/UnityProject/Assets/Mirror/Editor/Weaver/Processors/TargetRpcProcessor.cs.meta index c315349f..0ff7cc55 100644 --- a/UnityProject/Assets/Mirror/Editor/Weaver/Processors/TargetRpcProcessor.cs.meta +++ b/UnityProject/Assets/Mirror/Editor/Weaver/Processors/TargetRpcProcessor.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Editor/Weaver/Program.cs.meta b/UnityProject/Assets/Mirror/Editor/Weaver/Program.cs.meta index bde63d28..0a140186 100644 --- a/UnityProject/Assets/Mirror/Editor/Weaver/Program.cs.meta +++ b/UnityProject/Assets/Mirror/Editor/Weaver/Program.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Editor/Weaver/Readers.cs.meta b/UnityProject/Assets/Mirror/Editor/Weaver/Readers.cs.meta index e1196691..838ff590 100644 --- a/UnityProject/Assets/Mirror/Editor/Weaver/Readers.cs.meta +++ b/UnityProject/Assets/Mirror/Editor/Weaver/Readers.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Editor/Weaver/Resolvers.cs.meta b/UnityProject/Assets/Mirror/Editor/Weaver/Resolvers.cs.meta index 38680aa7..f4f66029 100644 --- a/UnityProject/Assets/Mirror/Editor/Weaver/Resolvers.cs.meta +++ b/UnityProject/Assets/Mirror/Editor/Weaver/Resolvers.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Editor/Weaver/TypeReferenceComparer.cs.meta b/UnityProject/Assets/Mirror/Editor/Weaver/TypeReferenceComparer.cs.meta index 1aed28f3..890b4dc9 100644 --- a/UnityProject/Assets/Mirror/Editor/Weaver/TypeReferenceComparer.cs.meta +++ b/UnityProject/Assets/Mirror/Editor/Weaver/TypeReferenceComparer.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Editor/Weaver/Weaver.cs.meta b/UnityProject/Assets/Mirror/Editor/Weaver/Weaver.cs.meta index ec2cb3e4..0ea2dfea 100644 --- a/UnityProject/Assets/Mirror/Editor/Weaver/Weaver.cs.meta +++ b/UnityProject/Assets/Mirror/Editor/Weaver/Weaver.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Editor/Weaver/WeaverExceptions.cs.meta b/UnityProject/Assets/Mirror/Editor/Weaver/WeaverExceptions.cs.meta index 4c115271..68643b2c 100644 --- a/UnityProject/Assets/Mirror/Editor/Weaver/WeaverExceptions.cs.meta +++ b/UnityProject/Assets/Mirror/Editor/Weaver/WeaverExceptions.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Editor/Weaver/WeaverTypes.cs.meta b/UnityProject/Assets/Mirror/Editor/Weaver/WeaverTypes.cs.meta index e15e589f..d71c33f3 100644 --- a/UnityProject/Assets/Mirror/Editor/Weaver/WeaverTypes.cs.meta +++ b/UnityProject/Assets/Mirror/Editor/Weaver/WeaverTypes.cs.meta @@ -1,3 +1,3 @@ -fileFormatVersion: 2 +fileFormatVersion: 2 guid: 2585961bf7fe4c10a9143f4087efdf6f -timeCreated: 1596486854 +timeCreated: 1596486854 \ No newline at end of file diff --git a/UnityProject/Assets/Mirror/Editor/Weaver/Writers.cs.meta b/UnityProject/Assets/Mirror/Editor/Weaver/Writers.cs.meta index a2f931f7..3769f7fd 100644 --- a/UnityProject/Assets/Mirror/Editor/Weaver/Writers.cs.meta +++ b/UnityProject/Assets/Mirror/Editor/Weaver/Writers.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Examples.meta b/UnityProject/Assets/Mirror/Examples.meta index f02aca23..b594a819 100644 --- a/UnityProject/Assets/Mirror/Examples.meta +++ b/UnityProject/Assets/Mirror/Examples.meta @@ -3,6 +3,6 @@ guid: a08b1f591326642d1b140fc818c9c6b1 folderAsset: yes DefaultImporter: externalObjects: {} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Examples/AdditiveScenes.meta b/UnityProject/Assets/Mirror/Examples/AdditiveScenes.meta index 518df512..bf61013a 100644 --- a/UnityProject/Assets/Mirror/Examples/AdditiveScenes.meta +++ b/UnityProject/Assets/Mirror/Examples/AdditiveScenes.meta @@ -3,6 +3,6 @@ guid: b84b2a39b3027c747b21ad714a439214 folderAsset: yes DefaultImporter: externalObjects: {} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Examples/AdditiveScenes/AnimationControllers.meta b/UnityProject/Assets/Mirror/Examples/AdditiveScenes/AnimationControllers.meta index ec709dab..c9cd79fd 100644 --- a/UnityProject/Assets/Mirror/Examples/AdditiveScenes/AnimationControllers.meta +++ b/UnityProject/Assets/Mirror/Examples/AdditiveScenes/AnimationControllers.meta @@ -3,6 +3,6 @@ guid: 4969918300bfa9a4a8c733975df74016 folderAsset: yes DefaultImporter: externalObjects: {} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Examples/AdditiveScenes/AnimationControllers/Tank.controller.meta b/UnityProject/Assets/Mirror/Examples/AdditiveScenes/AnimationControllers/Tank.controller.meta index 8ad6c719..b4df0096 100644 --- a/UnityProject/Assets/Mirror/Examples/AdditiveScenes/AnimationControllers/Tank.controller.meta +++ b/UnityProject/Assets/Mirror/Examples/AdditiveScenes/AnimationControllers/Tank.controller.meta @@ -3,6 +3,6 @@ guid: e0dbc8b2f2711a54f9b7ed1358a4c6af NativeFormatImporter: externalObjects: {} mainObjectFileID: 9100000 - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Examples/AdditiveScenes/Materials.meta b/UnityProject/Assets/Mirror/Examples/AdditiveScenes/Materials.meta index ebd0798c..d6629fb6 100644 --- a/UnityProject/Assets/Mirror/Examples/AdditiveScenes/Materials.meta +++ b/UnityProject/Assets/Mirror/Examples/AdditiveScenes/Materials.meta @@ -3,6 +3,6 @@ guid: 7ef7a74859259a546b73ed820e449ae8 folderAsset: yes DefaultImporter: externalObjects: {} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Examples/AdditiveScenes/Materials/Capsule.mat.meta b/UnityProject/Assets/Mirror/Examples/AdditiveScenes/Materials/Capsule.mat.meta index 9089181f..b202aa97 100644 --- a/UnityProject/Assets/Mirror/Examples/AdditiveScenes/Materials/Capsule.mat.meta +++ b/UnityProject/Assets/Mirror/Examples/AdditiveScenes/Materials/Capsule.mat.meta @@ -3,6 +3,6 @@ guid: 3ec90781e3720544da7fc86055e6cbe6 NativeFormatImporter: externalObjects: {} mainObjectFileID: 2100000 - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Examples/AdditiveScenes/Materials/Cube.mat.meta b/UnityProject/Assets/Mirror/Examples/AdditiveScenes/Materials/Cube.mat.meta index a8af065e..9c096c80 100644 --- a/UnityProject/Assets/Mirror/Examples/AdditiveScenes/Materials/Cube.mat.meta +++ b/UnityProject/Assets/Mirror/Examples/AdditiveScenes/Materials/Cube.mat.meta @@ -3,6 +3,6 @@ guid: 1d5f3015968dad04780bf9d2113cc772 NativeFormatImporter: externalObjects: {} mainObjectFileID: 2100000 - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Examples/AdditiveScenes/Materials/Cylinder.mat.meta b/UnityProject/Assets/Mirror/Examples/AdditiveScenes/Materials/Cylinder.mat.meta index d77fac59..00cc85ef 100644 --- a/UnityProject/Assets/Mirror/Examples/AdditiveScenes/Materials/Cylinder.mat.meta +++ b/UnityProject/Assets/Mirror/Examples/AdditiveScenes/Materials/Cylinder.mat.meta @@ -3,6 +3,6 @@ guid: 439a10ee8f8d14040be9003239449741 NativeFormatImporter: externalObjects: {} mainObjectFileID: 2100000 - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Examples/AdditiveScenes/Materials/Player.mat.meta b/UnityProject/Assets/Mirror/Examples/AdditiveScenes/Materials/Player.mat.meta index d0b34f0f..56884a46 100644 --- a/UnityProject/Assets/Mirror/Examples/AdditiveScenes/Materials/Player.mat.meta +++ b/UnityProject/Assets/Mirror/Examples/AdditiveScenes/Materials/Player.mat.meta @@ -3,6 +3,6 @@ guid: 792117fe9a386a8489e8010bec746339 NativeFormatImporter: externalObjects: {} mainObjectFileID: 2100000 - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Examples/AdditiveScenes/Materials/Quad.mat.meta b/UnityProject/Assets/Mirror/Examples/AdditiveScenes/Materials/Quad.mat.meta index cc7fb6e3..be7d0db5 100644 --- a/UnityProject/Assets/Mirror/Examples/AdditiveScenes/Materials/Quad.mat.meta +++ b/UnityProject/Assets/Mirror/Examples/AdditiveScenes/Materials/Quad.mat.meta @@ -3,6 +3,6 @@ guid: 6eb3f3ba66756364d8b94e662e7e8af5 NativeFormatImporter: externalObjects: {} mainObjectFileID: 2100000 - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Examples/AdditiveScenes/Materials/Shelter.mat.meta b/UnityProject/Assets/Mirror/Examples/AdditiveScenes/Materials/Shelter.mat.meta index dc0786be..c2619312 100644 --- a/UnityProject/Assets/Mirror/Examples/AdditiveScenes/Materials/Shelter.mat.meta +++ b/UnityProject/Assets/Mirror/Examples/AdditiveScenes/Materials/Shelter.mat.meta @@ -3,6 +3,6 @@ guid: aef230244d219314fb8453f0365b8176 NativeFormatImporter: externalObjects: {} mainObjectFileID: 2100000 - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Examples/AdditiveScenes/Materials/Sphere.mat.meta b/UnityProject/Assets/Mirror/Examples/AdditiveScenes/Materials/Sphere.mat.meta index 8556d789..88222159 100644 --- a/UnityProject/Assets/Mirror/Examples/AdditiveScenes/Materials/Sphere.mat.meta +++ b/UnityProject/Assets/Mirror/Examples/AdditiveScenes/Materials/Sphere.mat.meta @@ -3,6 +3,6 @@ guid: 58936713efca1ec488624ee297b5d687 NativeFormatImporter: externalObjects: {} mainObjectFileID: 2100000 - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Examples/AdditiveScenes/Materials/Zone.mat.meta b/UnityProject/Assets/Mirror/Examples/AdditiveScenes/Materials/Zone.mat.meta index 88474b26..4cfbe95b 100644 --- a/UnityProject/Assets/Mirror/Examples/AdditiveScenes/Materials/Zone.mat.meta +++ b/UnityProject/Assets/Mirror/Examples/AdditiveScenes/Materials/Zone.mat.meta @@ -3,6 +3,6 @@ guid: a7c679cf124f7ae46a0291ea35848554 NativeFormatImporter: externalObjects: {} mainObjectFileID: 2100000 - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Examples/AdditiveScenes/Prefabs.meta b/UnityProject/Assets/Mirror/Examples/AdditiveScenes/Prefabs.meta index ff4ccaf1..37601bff 100644 --- a/UnityProject/Assets/Mirror/Examples/AdditiveScenes/Prefabs.meta +++ b/UnityProject/Assets/Mirror/Examples/AdditiveScenes/Prefabs.meta @@ -3,6 +3,6 @@ guid: 2be4f78570b2a1e4cae84466d35d606c folderAsset: yes DefaultImporter: externalObjects: {} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Examples/AdditiveScenes/Prefabs/Capsule.prefab.meta b/UnityProject/Assets/Mirror/Examples/AdditiveScenes/Prefabs/Capsule.prefab.meta index 31b37d0d..99fb5c05 100644 --- a/UnityProject/Assets/Mirror/Examples/AdditiveScenes/Prefabs/Capsule.prefab.meta +++ b/UnityProject/Assets/Mirror/Examples/AdditiveScenes/Prefabs/Capsule.prefab.meta @@ -2,6 +2,6 @@ fileFormatVersion: 2 guid: e1971f4a8c7661546bc509b44bd91b80 PrefabImporter: externalObjects: {} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Examples/AdditiveScenes/Prefabs/Cube.prefab.meta b/UnityProject/Assets/Mirror/Examples/AdditiveScenes/Prefabs/Cube.prefab.meta index 913306b7..8b53f72f 100644 --- a/UnityProject/Assets/Mirror/Examples/AdditiveScenes/Prefabs/Cube.prefab.meta +++ b/UnityProject/Assets/Mirror/Examples/AdditiveScenes/Prefabs/Cube.prefab.meta @@ -2,6 +2,6 @@ fileFormatVersion: 2 guid: 4ff300cf6bb3c6342a9552c4f18788c8 PrefabImporter: externalObjects: {} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Examples/AdditiveScenes/Prefabs/Cylinder.prefab.meta b/UnityProject/Assets/Mirror/Examples/AdditiveScenes/Prefabs/Cylinder.prefab.meta index 391948a6..113674d4 100644 --- a/UnityProject/Assets/Mirror/Examples/AdditiveScenes/Prefabs/Cylinder.prefab.meta +++ b/UnityProject/Assets/Mirror/Examples/AdditiveScenes/Prefabs/Cylinder.prefab.meta @@ -2,6 +2,6 @@ fileFormatVersion: 2 guid: 12a4c14e672c00b4b840f937d824b890 PrefabImporter: externalObjects: {} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Examples/AdditiveScenes/Prefabs/Player.prefab.meta b/UnityProject/Assets/Mirror/Examples/AdditiveScenes/Prefabs/Player.prefab.meta index 7d6d9c08..b91d19dc 100644 --- a/UnityProject/Assets/Mirror/Examples/AdditiveScenes/Prefabs/Player.prefab.meta +++ b/UnityProject/Assets/Mirror/Examples/AdditiveScenes/Prefabs/Player.prefab.meta @@ -2,6 +2,6 @@ fileFormatVersion: 2 guid: a5bdca0a2315d43499be7dcef473fbc7 PrefabImporter: externalObjects: {} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Examples/AdditiveScenes/Prefabs/Sphere.prefab.meta b/UnityProject/Assets/Mirror/Examples/AdditiveScenes/Prefabs/Sphere.prefab.meta index bfe23671..0fb6a41c 100644 --- a/UnityProject/Assets/Mirror/Examples/AdditiveScenes/Prefabs/Sphere.prefab.meta +++ b/UnityProject/Assets/Mirror/Examples/AdditiveScenes/Prefabs/Sphere.prefab.meta @@ -2,6 +2,6 @@ fileFormatVersion: 2 guid: f6d08eb9a8e35d84fa30a7e3ae64181a PrefabImporter: externalObjects: {} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Examples/AdditiveScenes/Prefabs/Tank.prefab.meta b/UnityProject/Assets/Mirror/Examples/AdditiveScenes/Prefabs/Tank.prefab.meta index e16f65c9..9c53dffb 100644 --- a/UnityProject/Assets/Mirror/Examples/AdditiveScenes/Prefabs/Tank.prefab.meta +++ b/UnityProject/Assets/Mirror/Examples/AdditiveScenes/Prefabs/Tank.prefab.meta @@ -2,6 +2,6 @@ fileFormatVersion: 2 guid: ab222ed73ada1ac4ba2f61e843d7627c PrefabImporter: externalObjects: {} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Examples/AdditiveScenes/Prefabs/Zone.prefab.meta b/UnityProject/Assets/Mirror/Examples/AdditiveScenes/Prefabs/Zone.prefab.meta index c0793244..7099571b 100644 --- a/UnityProject/Assets/Mirror/Examples/AdditiveScenes/Prefabs/Zone.prefab.meta +++ b/UnityProject/Assets/Mirror/Examples/AdditiveScenes/Prefabs/Zone.prefab.meta @@ -2,6 +2,6 @@ fileFormatVersion: 2 guid: de939020b5e2aa5489ebcc4002d75d54 PrefabImporter: externalObjects: {} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Examples/AdditiveScenes/README.md.meta b/UnityProject/Assets/Mirror/Examples/AdditiveScenes/README.md.meta index 53021c1c..470c34f8 100644 --- a/UnityProject/Assets/Mirror/Examples/AdditiveScenes/README.md.meta +++ b/UnityProject/Assets/Mirror/Examples/AdditiveScenes/README.md.meta @@ -2,6 +2,6 @@ fileFormatVersion: 2 guid: 0a023e0d7315ac74094703ab69348733 TextScriptImporter: externalObjects: {} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Examples/AdditiveScenes/Scenes.meta b/UnityProject/Assets/Mirror/Examples/AdditiveScenes/Scenes.meta index 06714e84..79b44f1e 100644 --- a/UnityProject/Assets/Mirror/Examples/AdditiveScenes/Scenes.meta +++ b/UnityProject/Assets/Mirror/Examples/AdditiveScenes/Scenes.meta @@ -3,6 +3,6 @@ guid: e989860f377e7764bb7787086ef44ea4 folderAsset: yes DefaultImporter: externalObjects: {} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Examples/AdditiveScenes/Scenes/MainScene.unity.meta b/UnityProject/Assets/Mirror/Examples/AdditiveScenes/Scenes/MainScene.unity.meta index 8c5b47be..a2317505 100644 --- a/UnityProject/Assets/Mirror/Examples/AdditiveScenes/Scenes/MainScene.unity.meta +++ b/UnityProject/Assets/Mirror/Examples/AdditiveScenes/Scenes/MainScene.unity.meta @@ -2,6 +2,6 @@ fileFormatVersion: 2 guid: 7a0eee2f518e9dc4fb628d96dc452faf DefaultImporter: externalObjects: {} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Examples/AdditiveScenes/Scenes/SubScene.unity.meta b/UnityProject/Assets/Mirror/Examples/AdditiveScenes/Scenes/SubScene.unity.meta index 25341d34..94a2050c 100644 --- a/UnityProject/Assets/Mirror/Examples/AdditiveScenes/Scenes/SubScene.unity.meta +++ b/UnityProject/Assets/Mirror/Examples/AdditiveScenes/Scenes/SubScene.unity.meta @@ -2,6 +2,6 @@ fileFormatVersion: 2 guid: 7f4fd683fc6d866418c95f99977533a6 DefaultImporter: externalObjects: {} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Examples/AdditiveScenes/Scripts.meta b/UnityProject/Assets/Mirror/Examples/AdditiveScenes/Scripts.meta index 6aebeb53..cb97b325 100644 --- a/UnityProject/Assets/Mirror/Examples/AdditiveScenes/Scripts.meta +++ b/UnityProject/Assets/Mirror/Examples/AdditiveScenes/Scripts.meta @@ -3,6 +3,6 @@ guid: f9c36b0deb5d9b245b7c97e3d6eeed29 folderAsset: yes DefaultImporter: externalObjects: {} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Examples/AdditiveScenes/Scripts/AdditiveNetworkManager.cs.meta b/UnityProject/Assets/Mirror/Examples/AdditiveScenes/Scripts/AdditiveNetworkManager.cs.meta index 7b92eb69..0df3fb30 100644 --- a/UnityProject/Assets/Mirror/Examples/AdditiveScenes/Scripts/AdditiveNetworkManager.cs.meta +++ b/UnityProject/Assets/Mirror/Examples/AdditiveScenes/Scripts/AdditiveNetworkManager.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Examples/AdditiveScenes/Scripts/PlayerController.cs.meta b/UnityProject/Assets/Mirror/Examples/AdditiveScenes/Scripts/PlayerController.cs.meta index 98c0e27e..5deced64 100644 --- a/UnityProject/Assets/Mirror/Examples/AdditiveScenes/Scripts/PlayerController.cs.meta +++ b/UnityProject/Assets/Mirror/Examples/AdditiveScenes/Scripts/PlayerController.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Examples/AdditiveScenes/Scripts/RandomColor.cs.meta b/UnityProject/Assets/Mirror/Examples/AdditiveScenes/Scripts/RandomColor.cs.meta index d3c401f3..2c0008b8 100644 --- a/UnityProject/Assets/Mirror/Examples/AdditiveScenes/Scripts/RandomColor.cs.meta +++ b/UnityProject/Assets/Mirror/Examples/AdditiveScenes/Scripts/RandomColor.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Examples/AdditiveScenes/Scripts/ShootingTankBehaviour.cs.meta b/UnityProject/Assets/Mirror/Examples/AdditiveScenes/Scripts/ShootingTankBehaviour.cs.meta index 315914ab..90771ab9 100644 --- a/UnityProject/Assets/Mirror/Examples/AdditiveScenes/Scripts/ShootingTankBehaviour.cs.meta +++ b/UnityProject/Assets/Mirror/Examples/AdditiveScenes/Scripts/ShootingTankBehaviour.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Examples/AdditiveScenes/Scripts/ZoneHandler.cs.meta b/UnityProject/Assets/Mirror/Examples/AdditiveScenes/Scripts/ZoneHandler.cs.meta index 88adef5e..126d072d 100644 --- a/UnityProject/Assets/Mirror/Examples/AdditiveScenes/Scripts/ZoneHandler.cs.meta +++ b/UnityProject/Assets/Mirror/Examples/AdditiveScenes/Scripts/ZoneHandler.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Examples/Basic.meta b/UnityProject/Assets/Mirror/Examples/Basic.meta index b61f55f1..653ea786 100644 --- a/UnityProject/Assets/Mirror/Examples/Basic.meta +++ b/UnityProject/Assets/Mirror/Examples/Basic.meta @@ -3,6 +3,6 @@ guid: 0ea49fcefbc864e19a94091a170fc06c folderAsset: yes DefaultImporter: externalObjects: {} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Examples/Basic/Prefabs.meta b/UnityProject/Assets/Mirror/Examples/Basic/Prefabs.meta index 261c1873..234c22a6 100644 --- a/UnityProject/Assets/Mirror/Examples/Basic/Prefabs.meta +++ b/UnityProject/Assets/Mirror/Examples/Basic/Prefabs.meta @@ -3,6 +3,6 @@ guid: 4f821a97809492a479cac0843442e245 folderAsset: yes DefaultImporter: externalObjects: {} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Examples/Basic/Prefabs/Player.prefab.meta b/UnityProject/Assets/Mirror/Examples/Basic/Prefabs/Player.prefab.meta index 07fac0ce..a943869b 100644 --- a/UnityProject/Assets/Mirror/Examples/Basic/Prefabs/Player.prefab.meta +++ b/UnityProject/Assets/Mirror/Examples/Basic/Prefabs/Player.prefab.meta @@ -2,6 +2,6 @@ fileFormatVersion: 2 guid: dc2c4328591bef748abb8df795c17202 PrefabImporter: externalObjects: {} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Examples/Basic/Prefabs/PlayerUI.prefab.meta b/UnityProject/Assets/Mirror/Examples/Basic/Prefabs/PlayerUI.prefab.meta index c522c6f6..c6a8284a 100644 --- a/UnityProject/Assets/Mirror/Examples/Basic/Prefabs/PlayerUI.prefab.meta +++ b/UnityProject/Assets/Mirror/Examples/Basic/Prefabs/PlayerUI.prefab.meta @@ -2,6 +2,6 @@ fileFormatVersion: 2 guid: 22f1fa3a0aff72b46a371f667bb4fb30 PrefabImporter: externalObjects: {} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Examples/Basic/README.md.meta b/UnityProject/Assets/Mirror/Examples/Basic/README.md.meta index ce85eede..d4e17158 100644 --- a/UnityProject/Assets/Mirror/Examples/Basic/README.md.meta +++ b/UnityProject/Assets/Mirror/Examples/Basic/README.md.meta @@ -2,6 +2,6 @@ fileFormatVersion: 2 guid: 67177defd4d334a549e535f10506cc66 TextScriptImporter: externalObjects: {} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Examples/Basic/Scenes.meta b/UnityProject/Assets/Mirror/Examples/Basic/Scenes.meta index 56c04735..0c751c64 100644 --- a/UnityProject/Assets/Mirror/Examples/Basic/Scenes.meta +++ b/UnityProject/Assets/Mirror/Examples/Basic/Scenes.meta @@ -3,6 +3,6 @@ guid: 16f46473489d3364badc2f37c4db8634 folderAsset: yes DefaultImporter: externalObjects: {} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Examples/Basic/Scenes/Example.unity.meta b/UnityProject/Assets/Mirror/Examples/Basic/Scenes/Example.unity.meta index 7d2a8de0..25c602eb 100644 --- a/UnityProject/Assets/Mirror/Examples/Basic/Scenes/Example.unity.meta +++ b/UnityProject/Assets/Mirror/Examples/Basic/Scenes/Example.unity.meta @@ -2,6 +2,6 @@ fileFormatVersion: 2 guid: b30904751905d3f4dacde62ac85ec7c2 DefaultImporter: externalObjects: {} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Examples/Basic/Scripts.meta b/UnityProject/Assets/Mirror/Examples/Basic/Scripts.meta index b5807e63..5cc0800b 100644 --- a/UnityProject/Assets/Mirror/Examples/Basic/Scripts.meta +++ b/UnityProject/Assets/Mirror/Examples/Basic/Scripts.meta @@ -3,6 +3,6 @@ guid: 9c5291659f25af9409bbc25a2d37d628 folderAsset: yes DefaultImporter: externalObjects: {} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Examples/Basic/Scripts/BasicNetManager.cs b/UnityProject/Assets/Mirror/Examples/Basic/Scripts/BasicNetManager.cs index e9c9d570..29c1ef3a 100644 --- a/UnityProject/Assets/Mirror/Examples/Basic/Scripts/BasicNetManager.cs +++ b/UnityProject/Assets/Mirror/Examples/Basic/Scripts/BasicNetManager.cs @@ -2,7 +2,7 @@ using UnityEngine; /* - Documentation: https://mirror-networking.gitbook.io/docs/components/network-manager + Documentation: https://mirror-networking.com/docs/Articles/Components/NetworkManager.html API Reference: https://mirror-networking.com/docs/api/Mirror.NetworkManager.html */ diff --git a/UnityProject/Assets/Mirror/Examples/Basic/Scripts/BasicNetManager.cs.meta b/UnityProject/Assets/Mirror/Examples/Basic/Scripts/BasicNetManager.cs.meta index d2498816..35918e92 100644 --- a/UnityProject/Assets/Mirror/Examples/Basic/Scripts/BasicNetManager.cs.meta +++ b/UnityProject/Assets/Mirror/Examples/Basic/Scripts/BasicNetManager.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Examples/Basic/Scripts/Player.cs.meta b/UnityProject/Assets/Mirror/Examples/Basic/Scripts/Player.cs.meta index 3be18237..cf15827e 100644 --- a/UnityProject/Assets/Mirror/Examples/Basic/Scripts/Player.cs.meta +++ b/UnityProject/Assets/Mirror/Examples/Basic/Scripts/Player.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Examples/Basic/Scripts/PlayerUI.cs.meta b/UnityProject/Assets/Mirror/Examples/Basic/Scripts/PlayerUI.cs.meta index f5eaa15b..b7c07b74 100644 --- a/UnityProject/Assets/Mirror/Examples/Basic/Scripts/PlayerUI.cs.meta +++ b/UnityProject/Assets/Mirror/Examples/Basic/Scripts/PlayerUI.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Examples/Benchmark.meta b/UnityProject/Assets/Mirror/Examples/Benchmark.meta index 5e1f04cb..73801dfc 100644 --- a/UnityProject/Assets/Mirror/Examples/Benchmark.meta +++ b/UnityProject/Assets/Mirror/Examples/Benchmark.meta @@ -3,6 +3,6 @@ guid: 1a0b6db5b77ec4177a6e47b68ea7d064 folderAsset: yes DefaultImporter: externalObjects: {} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Examples/Benchmark/Materials.meta b/UnityProject/Assets/Mirror/Examples/Benchmark/Materials.meta index 1ac3c417..12a3156e 100644 --- a/UnityProject/Assets/Mirror/Examples/Benchmark/Materials.meta +++ b/UnityProject/Assets/Mirror/Examples/Benchmark/Materials.meta @@ -3,6 +3,6 @@ guid: ba4e4f7749e6b437aac187bd7625cf28 folderAsset: yes DefaultImporter: externalObjects: {} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Examples/Benchmark/Materials/Red.mat.meta b/UnityProject/Assets/Mirror/Examples/Benchmark/Materials/Red.mat.meta index a976752c..9e652887 100644 --- a/UnityProject/Assets/Mirror/Examples/Benchmark/Materials/Red.mat.meta +++ b/UnityProject/Assets/Mirror/Examples/Benchmark/Materials/Red.mat.meta @@ -3,6 +3,6 @@ guid: 451c5da2c5056496297cffba02216286 NativeFormatImporter: externalObjects: {} mainObjectFileID: 2100000 - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Examples/Benchmark/Materials/White.mat.meta b/UnityProject/Assets/Mirror/Examples/Benchmark/Materials/White.mat.meta index 2c7446d8..0a9db55e 100644 --- a/UnityProject/Assets/Mirror/Examples/Benchmark/Materials/White.mat.meta +++ b/UnityProject/Assets/Mirror/Examples/Benchmark/Materials/White.mat.meta @@ -3,6 +3,6 @@ guid: ff8f106e5c9e34da28ad9cee6edb2255 NativeFormatImporter: externalObjects: {} mainObjectFileID: 2100000 - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Examples/Benchmark/Prefabs.meta b/UnityProject/Assets/Mirror/Examples/Benchmark/Prefabs.meta index 21e533a1..2cdde64e 100644 --- a/UnityProject/Assets/Mirror/Examples/Benchmark/Prefabs.meta +++ b/UnityProject/Assets/Mirror/Examples/Benchmark/Prefabs.meta @@ -3,6 +3,6 @@ guid: 29276b4f741904266bb3eb6331bee4ab folderAsset: yes DefaultImporter: externalObjects: {} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Examples/Benchmark/Prefabs/Monster.prefab.meta b/UnityProject/Assets/Mirror/Examples/Benchmark/Prefabs/Monster.prefab.meta index af6f6835..766ed779 100644 --- a/UnityProject/Assets/Mirror/Examples/Benchmark/Prefabs/Monster.prefab.meta +++ b/UnityProject/Assets/Mirror/Examples/Benchmark/Prefabs/Monster.prefab.meta @@ -2,6 +2,6 @@ fileFormatVersion: 2 guid: 30b8f251d03d84284b70601e691d474f PrefabImporter: externalObjects: {} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Examples/Benchmark/Prefabs/Player.prefab.meta b/UnityProject/Assets/Mirror/Examples/Benchmark/Prefabs/Player.prefab.meta index 36bbff1f..cb898f87 100644 --- a/UnityProject/Assets/Mirror/Examples/Benchmark/Prefabs/Player.prefab.meta +++ b/UnityProject/Assets/Mirror/Examples/Benchmark/Prefabs/Player.prefab.meta @@ -2,6 +2,6 @@ fileFormatVersion: 2 guid: e1299008405d14b17b1ca459a6cd44a2 PrefabImporter: externalObjects: {} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Examples/Benchmark/Scenes.meta b/UnityProject/Assets/Mirror/Examples/Benchmark/Scenes.meta index 5af04cfe..f73c6363 100644 --- a/UnityProject/Assets/Mirror/Examples/Benchmark/Scenes.meta +++ b/UnityProject/Assets/Mirror/Examples/Benchmark/Scenes.meta @@ -3,6 +3,6 @@ guid: 1507ce547cd6a42ddb4ba60c3552dc48 folderAsset: yes DefaultImporter: externalObjects: {} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Examples/Benchmark/Scenes/Scene.unity.meta b/UnityProject/Assets/Mirror/Examples/Benchmark/Scenes/Scene.unity.meta index 5f0f9072..4a3c47e5 100644 --- a/UnityProject/Assets/Mirror/Examples/Benchmark/Scenes/Scene.unity.meta +++ b/UnityProject/Assets/Mirror/Examples/Benchmark/Scenes/Scene.unity.meta @@ -2,6 +2,6 @@ fileFormatVersion: 2 guid: 3b956c7d68b6144dd8e6c36636e25b52 DefaultImporter: externalObjects: {} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Examples/Benchmark/Scripts.meta b/UnityProject/Assets/Mirror/Examples/Benchmark/Scripts.meta index 868debf0..72470267 100644 --- a/UnityProject/Assets/Mirror/Examples/Benchmark/Scripts.meta +++ b/UnityProject/Assets/Mirror/Examples/Benchmark/Scripts.meta @@ -3,6 +3,6 @@ guid: 56ec73164c7f24072b822ed0d1e4d03e folderAsset: yes DefaultImporter: externalObjects: {} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Examples/Benchmark/Scripts/BenchmarkNetworkManager.cs.meta b/UnityProject/Assets/Mirror/Examples/Benchmark/Scripts/BenchmarkNetworkManager.cs.meta index 34f34b74..6355efed 100644 --- a/UnityProject/Assets/Mirror/Examples/Benchmark/Scripts/BenchmarkNetworkManager.cs.meta +++ b/UnityProject/Assets/Mirror/Examples/Benchmark/Scripts/BenchmarkNetworkManager.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Examples/Benchmark/Scripts/MonsterMovement.cs.meta b/UnityProject/Assets/Mirror/Examples/Benchmark/Scripts/MonsterMovement.cs.meta index 23d46c46..e4aea031 100644 --- a/UnityProject/Assets/Mirror/Examples/Benchmark/Scripts/MonsterMovement.cs.meta +++ b/UnityProject/Assets/Mirror/Examples/Benchmark/Scripts/MonsterMovement.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Examples/Benchmark/Scripts/PlayerMovement.cs.meta b/UnityProject/Assets/Mirror/Examples/Benchmark/Scripts/PlayerMovement.cs.meta index 7eb53670..a520ac78 100644 --- a/UnityProject/Assets/Mirror/Examples/Benchmark/Scripts/PlayerMovement.cs.meta +++ b/UnityProject/Assets/Mirror/Examples/Benchmark/Scripts/PlayerMovement.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Examples/Chat.meta b/UnityProject/Assets/Mirror/Examples/Chat.meta index d9b85513..1b51dde6 100644 --- a/UnityProject/Assets/Mirror/Examples/Chat.meta +++ b/UnityProject/Assets/Mirror/Examples/Chat.meta @@ -3,6 +3,6 @@ guid: 92165d23a248449f58d0be75d794a127 folderAsset: yes DefaultImporter: externalObjects: {} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Examples/Chat/Prefabs.meta b/UnityProject/Assets/Mirror/Examples/Chat/Prefabs.meta index ea5ec309..f3f82c47 100644 --- a/UnityProject/Assets/Mirror/Examples/Chat/Prefabs.meta +++ b/UnityProject/Assets/Mirror/Examples/Chat/Prefabs.meta @@ -3,6 +3,6 @@ guid: 55a4e4e8824ec4e329adf12e2cfb02a4 folderAsset: yes DefaultImporter: externalObjects: {} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Examples/Chat/Prefabs/Player.prefab.meta b/UnityProject/Assets/Mirror/Examples/Chat/Prefabs/Player.prefab.meta index c1264aa3..0429ce46 100644 --- a/UnityProject/Assets/Mirror/Examples/Chat/Prefabs/Player.prefab.meta +++ b/UnityProject/Assets/Mirror/Examples/Chat/Prefabs/Player.prefab.meta @@ -2,6 +2,6 @@ fileFormatVersion: 2 guid: e5905ffa27de84009b346b49d518ba03 PrefabImporter: externalObjects: {} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Examples/Chat/Scenes.meta b/UnityProject/Assets/Mirror/Examples/Chat/Scenes.meta index 63a8fe5f..ac2b33e1 100644 --- a/UnityProject/Assets/Mirror/Examples/Chat/Scenes.meta +++ b/UnityProject/Assets/Mirror/Examples/Chat/Scenes.meta @@ -3,6 +3,6 @@ guid: 71f6f21bb51d14dc0b231a8488826aac folderAsset: yes DefaultImporter: externalObjects: {} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Examples/Chat/Scenes/Main.unity.meta b/UnityProject/Assets/Mirror/Examples/Chat/Scenes/Main.unity.meta index cf815269..d381d8c5 100644 --- a/UnityProject/Assets/Mirror/Examples/Chat/Scenes/Main.unity.meta +++ b/UnityProject/Assets/Mirror/Examples/Chat/Scenes/Main.unity.meta @@ -2,6 +2,6 @@ fileFormatVersion: 2 guid: f4e8d4de4484e44bba666f2d1f66c73e DefaultImporter: externalObjects: {} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Examples/Chat/Scripts.meta b/UnityProject/Assets/Mirror/Examples/Chat/Scripts.meta index e1c9c153..71858f4e 100644 --- a/UnityProject/Assets/Mirror/Examples/Chat/Scripts.meta +++ b/UnityProject/Assets/Mirror/Examples/Chat/Scripts.meta @@ -3,6 +3,6 @@ guid: 81da49d71176c41169a24259df78e50a folderAsset: yes DefaultImporter: externalObjects: {} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Examples/Chat/Scripts/ChatNetworkManager.cs.meta b/UnityProject/Assets/Mirror/Examples/Chat/Scripts/ChatNetworkManager.cs.meta index fd00d18a..cbc4ca70 100644 --- a/UnityProject/Assets/Mirror/Examples/Chat/Scripts/ChatNetworkManager.cs.meta +++ b/UnityProject/Assets/Mirror/Examples/Chat/Scripts/ChatNetworkManager.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Examples/Chat/Scripts/ChatWindow.cs.meta b/UnityProject/Assets/Mirror/Examples/Chat/Scripts/ChatWindow.cs.meta index 6b6dedb6..9b9bd1f7 100644 --- a/UnityProject/Assets/Mirror/Examples/Chat/Scripts/ChatWindow.cs.meta +++ b/UnityProject/Assets/Mirror/Examples/Chat/Scripts/ChatWindow.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Examples/Chat/Scripts/Player.cs.meta b/UnityProject/Assets/Mirror/Examples/Chat/Scripts/Player.cs.meta index 4a7ac910..610ee4c9 100644 --- a/UnityProject/Assets/Mirror/Examples/Chat/Scripts/Player.cs.meta +++ b/UnityProject/Assets/Mirror/Examples/Chat/Scripts/Player.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Examples/Cloud/GUI/Scripts/ApiUpdater.cs b/UnityProject/Assets/Mirror/Examples/Cloud/GUI/Scripts/ApiUpdater.cs index 2f117877..38ef24b8 100644 --- a/UnityProject/Assets/Mirror/Examples/Cloud/GUI/Scripts/ApiUpdater.cs +++ b/UnityProject/Assets/Mirror/Examples/Cloud/GUI/Scripts/ApiUpdater.cs @@ -1 +1,101 @@ -// removed 2021-05-13 +using System; +using Mirror.Cloud.ListServerService; +using UnityEngine; + +namespace Mirror.Cloud.Example +{ + /// + /// This component should be put on the NetworkManager object + /// + public class ApiUpdater : MonoBehaviour + { + [SerializeField] NetworkManagerListServer manager; + [SerializeField] ApiConnector connector; + public string gameName = "Game"; + + void Awake() + { + if (manager == null) + { + manager = FindObjectOfType(); + } + if (connector == null) + { + connector = manager.GetComponent(); + } + + Debug.Assert(manager != null, "ApiUpdater could not find NetworkManagerListServer"); + Debug.Assert(connector != null, "ApiUpdater could not find ApiConnector"); + + manager.onPlayerListChanged += onPlayerListChanged; + manager.onServerStarted += ServerStartedHandler; + manager.onServerStopped += ServerStoppedHandler; + } + + void OnDestroy() + { + if (manager != null) + { + manager.onPlayerListChanged -= onPlayerListChanged; + manager.onServerStarted -= ServerStartedHandler; + manager.onServerStopped -= ServerStoppedHandler; + } + } + + void onPlayerListChanged(int playerCount) + { + if (connector.ListServer.ServerApi.ServerInList) + { + // update player count so that other players can see + if (playerCount < manager.maxConnections) + { + Debug.Log($"Updating Server, player count: {playerCount} "); + connector.ListServer.ServerApi.UpdateServer(playerCount); + } + // remove server when there is max players + else + { + Debug.Log($"Removing Server, player count: {playerCount}"); + connector.ListServer.ServerApi.RemoveServer(); + } + } + else + { + // if not in list, and player counts drops below 2, add server to list + if (playerCount < 2) + { + Debug.Log($"Adding Server, player count: {playerCount}"); + AddServer(playerCount); + } + } + } + + void ServerStartedHandler() + { + AddServer(0); + } + + void AddServer(int playerCount) + { + Transport transport = Transport.activeTransport; + + Uri uri = transport.ServerUri(); + int port = uri.Port; + string protocol = uri.Scheme; + + connector.ListServer.ServerApi.AddServer(new ServerJson + { + displayName = $"{gameName} {(UnityEngine.Random.value * 1000).ToString("0")}", + protocol = protocol, + port = port, + maxPlayerCount = NetworkManager.singleton.maxConnections, + playerCount = playerCount + }); + } + + void ServerStoppedHandler() + { + connector.ListServer.ServerApi.RemoveServer(); + } + } +} diff --git a/UnityProject/Assets/Mirror/Examples/Cloud/GUI/Scripts/ApiUpdater.cs.meta b/UnityProject/Assets/Mirror/Examples/Cloud/GUI/Scripts/ApiUpdater.cs.meta index 5c4e761e..98a4c110 100644 --- a/UnityProject/Assets/Mirror/Examples/Cloud/GUI/Scripts/ApiUpdater.cs.meta +++ b/UnityProject/Assets/Mirror/Examples/Cloud/GUI/Scripts/ApiUpdater.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Examples/Cloud/GUI/Scripts/InstantiateNetworkManager.cs b/UnityProject/Assets/Mirror/Examples/Cloud/GUI/Scripts/InstantiateNetworkManager.cs index 2f117877..d3c343da 100644 --- a/UnityProject/Assets/Mirror/Examples/Cloud/GUI/Scripts/InstantiateNetworkManager.cs +++ b/UnityProject/Assets/Mirror/Examples/Cloud/GUI/Scripts/InstantiateNetworkManager.cs @@ -1 +1,20 @@ -// removed 2021-05-13 +using UnityEngine; + +namespace Mirror.Cloud.Examples +{ + /// + /// Instantiate a new NetworkManager if one does not already exist + /// + public class InstantiateNetworkManager : MonoBehaviour + { + public GameObject prefab; + + void Awake() + { + if (NetworkManager.singleton == null) + { + Instantiate(prefab); + } + } + } +} diff --git a/UnityProject/Assets/Mirror/Examples/Cloud/GUI/Scripts/InstantiateNetworkManager.cs.meta b/UnityProject/Assets/Mirror/Examples/Cloud/GUI/Scripts/InstantiateNetworkManager.cs.meta index 52832d36..4b7219be 100644 --- a/UnityProject/Assets/Mirror/Examples/Cloud/GUI/Scripts/InstantiateNetworkManager.cs.meta +++ b/UnityProject/Assets/Mirror/Examples/Cloud/GUI/Scripts/InstantiateNetworkManager.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Examples/Cloud/GUI/Scripts/NetworkManagerListServer.cs b/UnityProject/Assets/Mirror/Examples/Cloud/GUI/Scripts/NetworkManagerListServer.cs index 2f117877..498d0375 100644 --- a/UnityProject/Assets/Mirror/Examples/Cloud/GUI/Scripts/NetworkManagerListServer.cs +++ b/UnityProject/Assets/Mirror/Examples/Cloud/GUI/Scripts/NetworkManagerListServer.cs @@ -1 +1,58 @@ -// removed 2021-05-13 +using System; + +namespace Mirror.Cloud.Example +{ + /// + /// Network Manager with events that are used by the list server + /// + public class NetworkManagerListServer : NetworkManager + { + /// + /// Called when Server Starts + /// + public event Action onServerStarted; + + /// + /// Called when Server Stops + /// + public event Action onServerStopped; + + /// + /// Called when players leaves or joins the room + /// + public event OnPlayerListChanged onPlayerListChanged; + + public delegate void OnPlayerListChanged(int playerCount); + + + int connectionCount => NetworkServer.connections.Count; + + public override void OnServerConnect(NetworkConnection conn) + { + int count = connectionCount; + if (count > maxConnections) + { + conn.Disconnect(); + return; + } + + onPlayerListChanged?.Invoke(count); + } + + public override void OnServerDisconnect(NetworkConnection conn) + { + base.OnServerDisconnect(conn); + onPlayerListChanged?.Invoke(connectionCount); + } + + public override void OnStartServer() + { + onServerStarted?.Invoke(); + } + + public override void OnStopServer() + { + onServerStopped?.Invoke(); + } + } +} diff --git a/UnityProject/Assets/Mirror/Examples/Cloud/GUI/Scripts/NetworkManagerListServer.cs.meta b/UnityProject/Assets/Mirror/Examples/Cloud/GUI/Scripts/NetworkManagerListServer.cs.meta index 1a4791f8..86775dfd 100644 --- a/UnityProject/Assets/Mirror/Examples/Cloud/GUI/Scripts/NetworkManagerListServer.cs.meta +++ b/UnityProject/Assets/Mirror/Examples/Cloud/GUI/Scripts/NetworkManagerListServer.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Examples/Cloud/GUI/Scripts/QuickListServerDebug.cs b/UnityProject/Assets/Mirror/Examples/Cloud/GUI/Scripts/QuickListServerDebug.cs index 2f117877..19c365e4 100644 --- a/UnityProject/Assets/Mirror/Examples/Cloud/GUI/Scripts/QuickListServerDebug.cs +++ b/UnityProject/Assets/Mirror/Examples/Cloud/GUI/Scripts/QuickListServerDebug.cs @@ -1 +1,46 @@ -// removed 2021-05-13 +using Mirror.Cloud.ListServerService; +using UnityEngine; + +namespace Mirror.Cloud.Example +{ + /// + /// This Script can be used to test the list server without needing to use canvas or other UI + /// + public class QuickListServerDebug : MonoBehaviour + { + ApiConnector connector; + ServerCollectionJson? collection; + + void Start() + { + NetworkManager manager = NetworkManager.singleton; + connector = manager.GetComponent(); + + connector.ListServer.ClientApi.onServerListUpdated += ClientApi_onServerListUpdated; + } + + void ClientApi_onServerListUpdated(ServerCollectionJson arg0) + { + collection = arg0; + } + + public void OnGUI() + { + GUILayout.Label("List Server"); + if (GUILayout.Button("Refresh")) + { + connector.ListServer.ClientApi.GetServerList(); + } + GUILayout.Space(40); + + if (collection != null) + { + GUILayout.Label("Servers:"); + foreach (ServerJson item in collection.Value.servers) + { + GUILayout.Label($"{item.displayName}, {item.address}, {item.playerCount}/{item.maxPlayerCount}"); + } + } + } + } +} diff --git a/UnityProject/Assets/Mirror/Examples/Cloud/GUI/Scripts/QuickListServerDebug.cs.meta b/UnityProject/Assets/Mirror/Examples/Cloud/GUI/Scripts/QuickListServerDebug.cs.meta index 3db6d158..4a225654 100644 --- a/UnityProject/Assets/Mirror/Examples/Cloud/GUI/Scripts/QuickListServerDebug.cs.meta +++ b/UnityProject/Assets/Mirror/Examples/Cloud/GUI/Scripts/QuickListServerDebug.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Examples/Cloud/GUI/Scripts/QuitButtonHUD.cs b/UnityProject/Assets/Mirror/Examples/Cloud/GUI/Scripts/QuitButtonHUD.cs index 2f117877..71fe1791 100644 --- a/UnityProject/Assets/Mirror/Examples/Cloud/GUI/Scripts/QuitButtonHUD.cs +++ b/UnityProject/Assets/Mirror/Examples/Cloud/GUI/Scripts/QuitButtonHUD.cs @@ -1 +1,39 @@ -// removed 2021-05-13 +using UnityEngine; + +namespace Mirror.Examples.Pong +{ + /// + /// Similar to NetworkManagerHUD but just quit buttons + /// + public class QuitButtonHUD : MonoBehaviour + { + void OnGUI() + { + NetworkManager manager = NetworkManager.singleton; + if (manager == null) + return; + + if (manager.mode == NetworkManagerMode.ServerOnly) + { + if (GUILayout.Button("Stop Server")) + { + manager.StopServer(); + } + } + else if (manager.mode == NetworkManagerMode.Host) + { + if (GUILayout.Button("Stop Host")) + { + manager.StopHost(); + } + } + else if (manager.mode == NetworkManagerMode.ClientOnly) + { + if (GUILayout.Button("Stop Client")) + { + manager.StopClient(); + } + } + } + } +} diff --git a/UnityProject/Assets/Mirror/Examples/Cloud/GUI/Scripts/QuitButtonHUD.cs.meta b/UnityProject/Assets/Mirror/Examples/Cloud/GUI/Scripts/QuitButtonHUD.cs.meta index 96ea79b0..67341ea8 100644 --- a/UnityProject/Assets/Mirror/Examples/Cloud/GUI/Scripts/QuitButtonHUD.cs.meta +++ b/UnityProject/Assets/Mirror/Examples/Cloud/GUI/Scripts/QuitButtonHUD.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Examples/Cloud/GUI/Scripts/ServerListManager.cs b/UnityProject/Assets/Mirror/Examples/Cloud/GUI/Scripts/ServerListManager.cs index 2f117877..14e8e2eb 100644 --- a/UnityProject/Assets/Mirror/Examples/Cloud/GUI/Scripts/ServerListManager.cs +++ b/UnityProject/Assets/Mirror/Examples/Cloud/GUI/Scripts/ServerListManager.cs @@ -1 +1,69 @@ -// removed 2021-05-13 +using UnityEngine; +using UnityEngine.UI; + +namespace Mirror.Cloud.Example +{ + /// + /// Uses the ApiConnector on NetworkManager to update the Server list + /// + public class ServerListManager : MonoBehaviour + { + [Header("UI")] + [SerializeField] ServerListUI listUI = null; + + [Header("Buttons")] + [SerializeField] Button refreshButton = null; + [SerializeField] Button startServerButton = null; + + + [Header("Auto Refresh")] + [SerializeField] bool autoRefreshServerlist = false; + [SerializeField] int refreshinterval = 20; + + ApiConnector connector; + + void Start() + { + NetworkManager manager = NetworkManager.singleton; + connector = manager.GetComponent(); + + connector.ListServer.ClientApi.onServerListUpdated += listUI.UpdateList; + + if (autoRefreshServerlist) + { + connector.ListServer.ClientApi.StartGetServerListRepeat(refreshinterval); + } + + AddButtonHandlers(); + } + + void AddButtonHandlers() + { + refreshButton.onClick.AddListener(RefreshButtonHandler); + startServerButton.onClick.AddListener(StartServerButtonHandler); + } + + void OnDestroy() + { + if (connector == null) + return; + + if (autoRefreshServerlist) + { + connector.ListServer.ClientApi.StopGetServerListRepeat(); + } + + connector.ListServer.ClientApi.onServerListUpdated -= listUI.UpdateList; + } + + public void RefreshButtonHandler() + { + connector.ListServer.ClientApi.GetServerList(); + } + + public void StartServerButtonHandler() + { + NetworkManager.singleton.StartServer(); + } + } +} diff --git a/UnityProject/Assets/Mirror/Examples/Cloud/GUI/Scripts/ServerListManager.cs.meta b/UnityProject/Assets/Mirror/Examples/Cloud/GUI/Scripts/ServerListManager.cs.meta index 77644bd8..74c6a0f2 100644 --- a/UnityProject/Assets/Mirror/Examples/Cloud/GUI/Scripts/ServerListManager.cs.meta +++ b/UnityProject/Assets/Mirror/Examples/Cloud/GUI/Scripts/ServerListManager.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Examples/Cloud/GUI/Scripts/ServerListUI.cs b/UnityProject/Assets/Mirror/Examples/Cloud/GUI/Scripts/ServerListUI.cs index 2f117877..f42e4592 100644 --- a/UnityProject/Assets/Mirror/Examples/Cloud/GUI/Scripts/ServerListUI.cs +++ b/UnityProject/Assets/Mirror/Examples/Cloud/GUI/Scripts/ServerListUI.cs @@ -1 +1,51 @@ -// removed 2021-05-13 +using System.Collections.Generic; +using Mirror.Cloud.ListServerService; +using UnityEngine; + +namespace Mirror.Cloud.Example +{ + /// + /// Displays the list of servers + /// + public class ServerListUI : MonoBehaviour + { + [SerializeField] ServerListUIItem itemPrefab = null; + [SerializeField] Transform parent = null; + + readonly List items = new List(); + + void OnValidate() + { + if (parent == null) + { + parent = transform; + } + } + + public void UpdateList(ServerCollectionJson serverCollection) + { + DeleteOldItems(); + CreateNewItems(serverCollection.servers); + } + + void CreateNewItems(ServerJson[] servers) + { + foreach (ServerJson server in servers) + { + ServerListUIItem clone = Instantiate(itemPrefab, parent); + clone.Setup(server); + items.Add(clone); + } + } + + void DeleteOldItems() + { + foreach (ServerListUIItem item in items) + { + Destroy(item.gameObject); + } + + items.Clear(); + } + } +} diff --git a/UnityProject/Assets/Mirror/Examples/Cloud/GUI/Scripts/ServerListUI.cs.meta b/UnityProject/Assets/Mirror/Examples/Cloud/GUI/Scripts/ServerListUI.cs.meta index 438be38d..f7fe4f2e 100644 --- a/UnityProject/Assets/Mirror/Examples/Cloud/GUI/Scripts/ServerListUI.cs.meta +++ b/UnityProject/Assets/Mirror/Examples/Cloud/GUI/Scripts/ServerListUI.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Examples/Cloud/GUI/Scripts/ServerListUIItem.cs b/UnityProject/Assets/Mirror/Examples/Cloud/GUI/Scripts/ServerListUIItem.cs index 2f117877..f018a5ee 100644 --- a/UnityProject/Assets/Mirror/Examples/Cloud/GUI/Scripts/ServerListUIItem.cs +++ b/UnityProject/Assets/Mirror/Examples/Cloud/GUI/Scripts/ServerListUIItem.cs @@ -1 +1,37 @@ -// removed 2021-05-13 +using System; +using Mirror.Cloud.ListServerService; +using UnityEngine; +using UnityEngine.UI; + +namespace Mirror.Cloud.Example +{ + /// + /// Displays a server created by ServerListUI + /// + public class ServerListUIItem : MonoBehaviour + { + [SerializeField] Text nameText = null; + [SerializeField] Text namePlayers = null; + [SerializeField] string playersFormat = "{0} / {1}"; + [SerializeField] Text addressText = null; + + [SerializeField] Button joinButton = null; + + ServerJson server; + + public void Setup(ServerJson server) + { + this.server = server; + nameText.text = server.displayName; + namePlayers.text = string.Format(playersFormat, server.playerCount, server.maxPlayerCount); + addressText.text = server.address; + + joinButton.onClick.AddListener(OnJoinClicked); + } + + void OnJoinClicked() + { + NetworkManager.singleton.StartClient(new Uri(server.address)); + } + } +} diff --git a/UnityProject/Assets/Mirror/Examples/Cloud/GUI/Scripts/ServerListUIItem.cs.meta b/UnityProject/Assets/Mirror/Examples/Cloud/GUI/Scripts/ServerListUIItem.cs.meta index cd437148..d8857e80 100644 --- a/UnityProject/Assets/Mirror/Examples/Cloud/GUI/Scripts/ServerListUIItem.cs.meta +++ b/UnityProject/Assets/Mirror/Examples/Cloud/GUI/Scripts/ServerListUIItem.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Examples/Cloud/PongWithListServer/Scripts/Ball.cs b/UnityProject/Assets/Mirror/Examples/Cloud/PongWithListServer/Scripts/Ball.cs index 2f117877..199b1fd1 100644 --- a/UnityProject/Assets/Mirror/Examples/Cloud/PongWithListServer/Scripts/Ball.cs +++ b/UnityProject/Assets/Mirror/Examples/Cloud/PongWithListServer/Scripts/Ball.cs @@ -1 +1,61 @@ -// removed 2021-05-13 +using UnityEngine; + +namespace Mirror.Cloud.Examples.Pong +{ + public class Ball : NetworkBehaviour + { + public float speed = 30; + public Rigidbody2D rigidbody2d; + + public override void OnStartServer() + { + base.OnStartServer(); + + // only simulate ball physics on server + rigidbody2d.simulated = true; + + // Serve the ball from left player + rigidbody2d.velocity = Vector2.right * speed; + } + + float HitFactor(Vector2 ballPos, Vector2 racketPos, float racketHeight) + { + // ascii art: + // || 1 <- at the top of the racket + // || + // || 0 <- at the middle of the racket + // || + // || -1 <- at the bottom of the racket + return (ballPos.y - racketPos.y) / racketHeight; + } + + // only call this on server + [ServerCallback] + void OnCollisionEnter2D(Collision2D col) + { + // Note: 'col' holds the collision information. If the + // Ball collided with a racket, then: + // col.gameObject is the racket + // col.transform.position is the racket's position + // col.collider is the racket's collider + + // did we hit a racket? then we need to calculate the hit factor + if (col.transform.GetComponent()) + { + // Calculate y direction via hit Factor + float y = HitFactor(transform.position, + col.transform.position, + col.collider.bounds.size.y); + + // Calculate x direction via opposite collision + float x = col.relativeVelocity.x > 0 ? 1 : -1; + + // Calculate direction, make length=1 via .normalized + Vector2 dir = new Vector2(x, y).normalized; + + // Set Velocity with dir * speed + rigidbody2d.velocity = dir * speed; + } + } + } +} diff --git a/UnityProject/Assets/Mirror/Examples/Cloud/PongWithListServer/Scripts/Ball.cs.meta b/UnityProject/Assets/Mirror/Examples/Cloud/PongWithListServer/Scripts/Ball.cs.meta index dd62ea21..a6fc2724 100644 --- a/UnityProject/Assets/Mirror/Examples/Cloud/PongWithListServer/Scripts/Ball.cs.meta +++ b/UnityProject/Assets/Mirror/Examples/Cloud/PongWithListServer/Scripts/Ball.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Examples/Cloud/PongWithListServer/Scripts/BallManager.cs b/UnityProject/Assets/Mirror/Examples/Cloud/PongWithListServer/Scripts/BallManager.cs index 2f117877..3c433239 100644 --- a/UnityProject/Assets/Mirror/Examples/Cloud/PongWithListServer/Scripts/BallManager.cs +++ b/UnityProject/Assets/Mirror/Examples/Cloud/PongWithListServer/Scripts/BallManager.cs @@ -1 +1,53 @@ -// removed 2021-05-13 +using Mirror.Cloud.Example; +using UnityEngine; + +namespace Mirror.Cloud.Examples.Pong +{ + public class BallManager : NetworkBehaviour + { + [SerializeField] GameObject ballPrefab = null; + GameObject ball; + NetworkManagerListServerPong manager; + + public override void OnStartServer() + { + manager = (NetworkManager.singleton as NetworkManagerListServerPong); + manager.onPlayerListChanged += onPlayerListChanged; + } + public override void OnStopServer() + { + manager.onPlayerListChanged -= onPlayerListChanged; + } + + void onPlayerListChanged(int playerCount) + { + if (playerCount >= 2) + { + SpawnBall(); + } + if (playerCount < 2) + { + DestroyBall(); + } + } + + void SpawnBall() + { + if (ball != null) + return; + + ball = Instantiate(ballPrefab); + NetworkServer.Spawn(ball); + } + + void DestroyBall() + { + if (ball == null) + return; + + // destroy ball + NetworkServer.Destroy(ball); + ball = null; + } + } +} diff --git a/UnityProject/Assets/Mirror/Examples/Cloud/PongWithListServer/Scripts/BallManager.cs.meta b/UnityProject/Assets/Mirror/Examples/Cloud/PongWithListServer/Scripts/BallManager.cs.meta index dbb29676..b914a33e 100644 --- a/UnityProject/Assets/Mirror/Examples/Cloud/PongWithListServer/Scripts/BallManager.cs.meta +++ b/UnityProject/Assets/Mirror/Examples/Cloud/PongWithListServer/Scripts/BallManager.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Examples/Cloud/PongWithListServer/Scripts/NetworkManagerListServerPong.cs b/UnityProject/Assets/Mirror/Examples/Cloud/PongWithListServer/Scripts/NetworkManagerListServerPong.cs index 2f117877..b2b21059 100644 --- a/UnityProject/Assets/Mirror/Examples/Cloud/PongWithListServer/Scripts/NetworkManagerListServerPong.cs +++ b/UnityProject/Assets/Mirror/Examples/Cloud/PongWithListServer/Scripts/NetworkManagerListServerPong.cs @@ -1 +1,20 @@ -// removed 2021-05-13 +using UnityEngine; + +namespace Mirror.Cloud.Example +{ + public sealed class NetworkManagerListServerPong : NetworkManagerListServer + { + public override void OnServerAddPlayer(NetworkConnection conn) + { + Debug.Assert(startPositions.Count == 2, "Pong Scene should have 2 start Positions"); + // add player at correct spawn position + Transform startPos = numPlayers == 0 ? startPositions[0] : startPositions[1]; + + GameObject player = startPos != null + ? Instantiate(playerPrefab, startPos.position, startPos.rotation) + : Instantiate(playerPrefab); + + NetworkServer.AddPlayerForConnection(conn, player); + } + } +} diff --git a/UnityProject/Assets/Mirror/Examples/Cloud/PongWithListServer/Scripts/NetworkManagerListServerPong.cs.meta b/UnityProject/Assets/Mirror/Examples/Cloud/PongWithListServer/Scripts/NetworkManagerListServerPong.cs.meta index ca3708c9..5c4294f7 100644 --- a/UnityProject/Assets/Mirror/Examples/Cloud/PongWithListServer/Scripts/NetworkManagerListServerPong.cs.meta +++ b/UnityProject/Assets/Mirror/Examples/Cloud/PongWithListServer/Scripts/NetworkManagerListServerPong.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Examples/Cloud/PongWithListServer/Scripts/Player.cs b/UnityProject/Assets/Mirror/Examples/Cloud/PongWithListServer/Scripts/Player.cs index 2f117877..6fadd8c9 100644 --- a/UnityProject/Assets/Mirror/Examples/Cloud/PongWithListServer/Scripts/Player.cs +++ b/UnityProject/Assets/Mirror/Examples/Cloud/PongWithListServer/Scripts/Player.cs @@ -1 +1,21 @@ -// removed 2021-05-13 +using UnityEngine; + +namespace Mirror.Cloud.Examples.Pong +{ + public class Player : NetworkBehaviour + { + public float speed = 1500; + public Rigidbody2D rigidbody2d; + + // need to use FixedUpdate for rigidbody + void FixedUpdate() + { + // only let the local player control the racket. + // don't control other player's rackets + if (!isLocalPlayer) + return; + + rigidbody2d.velocity = new Vector2(0, Input.GetAxisRaw("Vertical")) * speed * Time.fixedDeltaTime; + } + } +} diff --git a/UnityProject/Assets/Mirror/Examples/Cloud/PongWithListServer/Scripts/Player.cs.meta b/UnityProject/Assets/Mirror/Examples/Cloud/PongWithListServer/Scripts/Player.cs.meta index a8ada012..1c858281 100644 --- a/UnityProject/Assets/Mirror/Examples/Cloud/PongWithListServer/Scripts/Player.cs.meta +++ b/UnityProject/Assets/Mirror/Examples/Cloud/PongWithListServer/Scripts/Player.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Examples/Discovery.meta b/UnityProject/Assets/Mirror/Examples/Discovery.meta index ba768651..85a73ff3 100644 --- a/UnityProject/Assets/Mirror/Examples/Discovery.meta +++ b/UnityProject/Assets/Mirror/Examples/Discovery.meta @@ -3,6 +3,6 @@ guid: 450d6133608b04c57a6ebd6830d455fd folderAsset: yes DefaultImporter: externalObjects: {} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Examples/Discovery/Prefabs.meta b/UnityProject/Assets/Mirror/Examples/Discovery/Prefabs.meta index b9080f84..ef0083dc 100644 --- a/UnityProject/Assets/Mirror/Examples/Discovery/Prefabs.meta +++ b/UnityProject/Assets/Mirror/Examples/Discovery/Prefabs.meta @@ -3,6 +3,6 @@ guid: 8d8abc53a4efb4544ad9cb7a44b4840a folderAsset: yes DefaultImporter: externalObjects: {} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Examples/Discovery/Prefabs/Player.prefab.meta b/UnityProject/Assets/Mirror/Examples/Discovery/Prefabs/Player.prefab.meta index c40645cd..1c818fad 100644 --- a/UnityProject/Assets/Mirror/Examples/Discovery/Prefabs/Player.prefab.meta +++ b/UnityProject/Assets/Mirror/Examples/Discovery/Prefabs/Player.prefab.meta @@ -2,6 +2,6 @@ fileFormatVersion: 2 guid: ecd52c53a6ef7496693343d3e32dace1 PrefabImporter: externalObjects: {} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Examples/Discovery/Scenes.meta b/UnityProject/Assets/Mirror/Examples/Discovery/Scenes.meta index 4cf810aa..ed0ba645 100644 --- a/UnityProject/Assets/Mirror/Examples/Discovery/Scenes.meta +++ b/UnityProject/Assets/Mirror/Examples/Discovery/Scenes.meta @@ -3,6 +3,6 @@ guid: ceaf2344f4e6944258442667a9fbbfdf folderAsset: yes DefaultImporter: externalObjects: {} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Examples/Discovery/Scenes/Scene.unity.meta b/UnityProject/Assets/Mirror/Examples/Discovery/Scenes/Scene.unity.meta index 1f4f24e8..b02433fd 100644 --- a/UnityProject/Assets/Mirror/Examples/Discovery/Scenes/Scene.unity.meta +++ b/UnityProject/Assets/Mirror/Examples/Discovery/Scenes/Scene.unity.meta @@ -2,6 +2,6 @@ fileFormatVersion: 2 guid: 90fddc74fa21c423599167eb28b09dd1 DefaultImporter: externalObjects: {} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Examples/Mirror.Examples.asmdef.meta b/UnityProject/Assets/Mirror/Examples/Mirror.Examples.asmdef.meta index b68d67b1..2b545b58 100644 --- a/UnityProject/Assets/Mirror/Examples/Mirror.Examples.asmdef.meta +++ b/UnityProject/Assets/Mirror/Examples/Mirror.Examples.asmdef.meta @@ -2,6 +2,6 @@ fileFormatVersion: 2 guid: fecf25954bb196642ab50657689761d6 AssemblyDefinitionImporter: externalObjects: {} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Examples/MultipleAdditiveScenes.meta b/UnityProject/Assets/Mirror/Examples/MultipleAdditiveScenes.meta index d9d9280b..bbe9ba2f 100644 --- a/UnityProject/Assets/Mirror/Examples/MultipleAdditiveScenes.meta +++ b/UnityProject/Assets/Mirror/Examples/MultipleAdditiveScenes.meta @@ -3,6 +3,6 @@ guid: 792b2d05e371c3c47ac7c4b1fa0dbfe2 folderAsset: yes DefaultImporter: externalObjects: {} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Examples/MultipleAdditiveScenes/Materials.meta b/UnityProject/Assets/Mirror/Examples/MultipleAdditiveScenes/Materials.meta index edd37109..7a4a3372 100644 --- a/UnityProject/Assets/Mirror/Examples/MultipleAdditiveScenes/Materials.meta +++ b/UnityProject/Assets/Mirror/Examples/MultipleAdditiveScenes/Materials.meta @@ -3,6 +3,6 @@ guid: ef54d3fc8c3b6c845bb29f2d04ea7edb folderAsset: yes DefaultImporter: externalObjects: {} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Examples/MultipleAdditiveScenes/Materials/Physics.meta b/UnityProject/Assets/Mirror/Examples/MultipleAdditiveScenes/Materials/Physics.meta index 13d0938a..a372565d 100644 --- a/UnityProject/Assets/Mirror/Examples/MultipleAdditiveScenes/Materials/Physics.meta +++ b/UnityProject/Assets/Mirror/Examples/MultipleAdditiveScenes/Materials/Physics.meta @@ -3,6 +3,6 @@ guid: b5ae92b6f97224e418115c9f16c50fd8 folderAsset: yes DefaultImporter: externalObjects: {} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Examples/MultipleAdditiveScenes/Materials/Physics/Icosphere.physicMaterial.meta b/UnityProject/Assets/Mirror/Examples/MultipleAdditiveScenes/Materials/Physics/Icosphere.physicMaterial.meta index 7bb76bd9..04038736 100644 --- a/UnityProject/Assets/Mirror/Examples/MultipleAdditiveScenes/Materials/Physics/Icosphere.physicMaterial.meta +++ b/UnityProject/Assets/Mirror/Examples/MultipleAdditiveScenes/Materials/Physics/Icosphere.physicMaterial.meta @@ -3,6 +3,6 @@ guid: 47163bc0301c1a146bbaa4d539a6ac36 NativeFormatImporter: externalObjects: {} mainObjectFileID: 13400000 - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Examples/MultipleAdditiveScenes/Materials/Physics/Player.physicMaterial.meta b/UnityProject/Assets/Mirror/Examples/MultipleAdditiveScenes/Materials/Physics/Player.physicMaterial.meta index 2016cde9..40322e39 100644 --- a/UnityProject/Assets/Mirror/Examples/MultipleAdditiveScenes/Materials/Physics/Player.physicMaterial.meta +++ b/UnityProject/Assets/Mirror/Examples/MultipleAdditiveScenes/Materials/Physics/Player.physicMaterial.meta @@ -3,6 +3,6 @@ guid: 2debad4ac21a6644faf4fc93bd5b5869 NativeFormatImporter: externalObjects: {} mainObjectFileID: 13400000 - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Examples/MultipleAdditiveScenes/Materials/Physics/RoomBounce.physicMaterial.meta b/UnityProject/Assets/Mirror/Examples/MultipleAdditiveScenes/Materials/Physics/RoomBounce.physicMaterial.meta index 9a6653e2..02a172b9 100644 --- a/UnityProject/Assets/Mirror/Examples/MultipleAdditiveScenes/Materials/Physics/RoomBounce.physicMaterial.meta +++ b/UnityProject/Assets/Mirror/Examples/MultipleAdditiveScenes/Materials/Physics/RoomBounce.physicMaterial.meta @@ -3,6 +3,6 @@ guid: 2e179c076d5d0924dbf5a2de0630bdb1 NativeFormatImporter: externalObjects: {} mainObjectFileID: 13400000 - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Examples/MultipleAdditiveScenes/Materials/Render.meta b/UnityProject/Assets/Mirror/Examples/MultipleAdditiveScenes/Materials/Render.meta index 26b8d435..09531484 100644 --- a/UnityProject/Assets/Mirror/Examples/MultipleAdditiveScenes/Materials/Render.meta +++ b/UnityProject/Assets/Mirror/Examples/MultipleAdditiveScenes/Materials/Render.meta @@ -3,6 +3,6 @@ guid: e79e44ac19c0d9244bb54a0e960210e3 folderAsset: yes DefaultImporter: externalObjects: {} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Examples/MultipleAdditiveScenes/Materials/Render/PlayArea.mat.meta b/UnityProject/Assets/Mirror/Examples/MultipleAdditiveScenes/Materials/Render/PlayArea.mat.meta index dcdfd421..ab00bc86 100644 --- a/UnityProject/Assets/Mirror/Examples/MultipleAdditiveScenes/Materials/Render/PlayArea.mat.meta +++ b/UnityProject/Assets/Mirror/Examples/MultipleAdditiveScenes/Materials/Render/PlayArea.mat.meta @@ -3,6 +3,6 @@ guid: 42fe0bcfbb65da3429ae2c289686e024 NativeFormatImporter: externalObjects: {} mainObjectFileID: 2100000 - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Examples/MultipleAdditiveScenes/Materials/Render/Player.mat.meta b/UnityProject/Assets/Mirror/Examples/MultipleAdditiveScenes/Materials/Render/Player.mat.meta index 1c930eb8..d890edb2 100644 --- a/UnityProject/Assets/Mirror/Examples/MultipleAdditiveScenes/Materials/Render/Player.mat.meta +++ b/UnityProject/Assets/Mirror/Examples/MultipleAdditiveScenes/Materials/Render/Player.mat.meta @@ -3,6 +3,6 @@ guid: 2089070a3452e6f4d866c53e51aae8f2 NativeFormatImporter: externalObjects: {} mainObjectFileID: 2100000 - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Examples/MultipleAdditiveScenes/Materials/Render/Prize.mat.meta b/UnityProject/Assets/Mirror/Examples/MultipleAdditiveScenes/Materials/Render/Prize.mat.meta index 551120bf..3df4a27c 100644 --- a/UnityProject/Assets/Mirror/Examples/MultipleAdditiveScenes/Materials/Render/Prize.mat.meta +++ b/UnityProject/Assets/Mirror/Examples/MultipleAdditiveScenes/Materials/Render/Prize.mat.meta @@ -3,6 +3,6 @@ guid: 2becd2014627a774e9e8f668f281f1d2 NativeFormatImporter: externalObjects: {} mainObjectFileID: 2100000 - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Examples/MultipleAdditiveScenes/Models.meta b/UnityProject/Assets/Mirror/Examples/MultipleAdditiveScenes/Models.meta index 0cf8693f..fbeb501e 100644 --- a/UnityProject/Assets/Mirror/Examples/MultipleAdditiveScenes/Models.meta +++ b/UnityProject/Assets/Mirror/Examples/MultipleAdditiveScenes/Models.meta @@ -3,6 +3,6 @@ guid: 758bdb1e6d29abf4e96198a11d34f313 folderAsset: yes DefaultImporter: externalObjects: {} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Examples/MultipleAdditiveScenes/Models/Icosphere.meta b/UnityProject/Assets/Mirror/Examples/MultipleAdditiveScenes/Models/Icosphere.meta index 45126aa1..5a415270 100644 --- a/UnityProject/Assets/Mirror/Examples/MultipleAdditiveScenes/Models/Icosphere.meta +++ b/UnityProject/Assets/Mirror/Examples/MultipleAdditiveScenes/Models/Icosphere.meta @@ -3,6 +3,6 @@ guid: ea3fb2e0d8b9abc43b8b628e3e550872 folderAsset: yes DefaultImporter: externalObjects: {} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Examples/MultipleAdditiveScenes/Models/Icosphere/Icosphere.obj.meta b/UnityProject/Assets/Mirror/Examples/MultipleAdditiveScenes/Models/Icosphere/Icosphere.obj.meta index 26d5bc8e..e72ff2cf 100644 --- a/UnityProject/Assets/Mirror/Examples/MultipleAdditiveScenes/Models/Icosphere/Icosphere.obj.meta +++ b/UnityProject/Assets/Mirror/Examples/MultipleAdditiveScenes/Models/Icosphere/Icosphere.obj.meta @@ -27,12 +27,12 @@ ModelImporter: bakeSimulation: 0 resampleCurves: 1 optimizeGameObjects: 0 - motionNodeName: '' - rigImportErrors: '' - rigImportWarnings: '' - animationImportErrors: '' - animationImportWarnings: '' - animationRetargetingWarnings: '' + motionNodeName: + rigImportErrors: + rigImportWarnings: + animationImportErrors: + animationImportWarnings: + animationRetargetingWarnings: animationDoRetargetingWarnings: 0 importAnimatedCustomProperties: 0 importConstraints: 0 @@ -91,7 +91,7 @@ ModelImporter: armStretch: 0.05 legStretch: 0.05 feetSpacing: 0 - rootMotionBoneName: '' + rootMotionBoneName: hasTranslationDoF: 0 hasExtraRoot: 0 skeletonHasParents: 1 @@ -99,6 +99,6 @@ ModelImporter: animationType: 0 humanoidOversampling: 1 additionalBone: 0 - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Examples/MultipleAdditiveScenes/Models/Icosphere/Materials.meta b/UnityProject/Assets/Mirror/Examples/MultipleAdditiveScenes/Models/Icosphere/Materials.meta index a9904b2a..1eb00d1b 100644 --- a/UnityProject/Assets/Mirror/Examples/MultipleAdditiveScenes/Models/Icosphere/Materials.meta +++ b/UnityProject/Assets/Mirror/Examples/MultipleAdditiveScenes/Models/Icosphere/Materials.meta @@ -3,6 +3,6 @@ guid: 2c07f54121eb4534e85f72041ec0f196 folderAsset: yes DefaultImporter: externalObjects: {} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Examples/MultipleAdditiveScenes/Models/Icosphere/Materials/Icosphere.mat.meta b/UnityProject/Assets/Mirror/Examples/MultipleAdditiveScenes/Models/Icosphere/Materials/Icosphere.mat.meta index 4fb049f1..3e1c3b87 100644 --- a/UnityProject/Assets/Mirror/Examples/MultipleAdditiveScenes/Models/Icosphere/Materials/Icosphere.mat.meta +++ b/UnityProject/Assets/Mirror/Examples/MultipleAdditiveScenes/Models/Icosphere/Materials/Icosphere.mat.meta @@ -3,6 +3,6 @@ guid: 7e6bf26596c6f564097734c7cc319e15 NativeFormatImporter: externalObjects: {} mainObjectFileID: 2100000 - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Examples/MultipleAdditiveScenes/Prefabs.meta b/UnityProject/Assets/Mirror/Examples/MultipleAdditiveScenes/Prefabs.meta index 41ae6a31..6d235af1 100644 --- a/UnityProject/Assets/Mirror/Examples/MultipleAdditiveScenes/Prefabs.meta +++ b/UnityProject/Assets/Mirror/Examples/MultipleAdditiveScenes/Prefabs.meta @@ -3,6 +3,6 @@ guid: 90a1d98ef5d99304095438cdf9cbdc10 folderAsset: yes DefaultImporter: externalObjects: {} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Examples/MultipleAdditiveScenes/Prefabs/Icosphere.prefab.meta b/UnityProject/Assets/Mirror/Examples/MultipleAdditiveScenes/Prefabs/Icosphere.prefab.meta index aad8827f..2d5d3820 100644 --- a/UnityProject/Assets/Mirror/Examples/MultipleAdditiveScenes/Prefabs/Icosphere.prefab.meta +++ b/UnityProject/Assets/Mirror/Examples/MultipleAdditiveScenes/Prefabs/Icosphere.prefab.meta @@ -2,6 +2,6 @@ fileFormatVersion: 2 guid: a104de86221e66a48832c222471d4f1e PrefabImporter: externalObjects: {} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Examples/MultipleAdditiveScenes/Prefabs/Player.prefab.meta b/UnityProject/Assets/Mirror/Examples/MultipleAdditiveScenes/Prefabs/Player.prefab.meta index 16c9602b..2aa9fe4f 100644 --- a/UnityProject/Assets/Mirror/Examples/MultipleAdditiveScenes/Prefabs/Player.prefab.meta +++ b/UnityProject/Assets/Mirror/Examples/MultipleAdditiveScenes/Prefabs/Player.prefab.meta @@ -3,6 +3,6 @@ guid: 1f4d376d8ca693049abd1744e4c79fad NativeFormatImporter: externalObjects: {} mainObjectFileID: 100100000 - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Examples/MultipleAdditiveScenes/Prefabs/Prize.prefab.meta b/UnityProject/Assets/Mirror/Examples/MultipleAdditiveScenes/Prefabs/Prize.prefab.meta index 8bdf5f14..b0e72267 100644 --- a/UnityProject/Assets/Mirror/Examples/MultipleAdditiveScenes/Prefabs/Prize.prefab.meta +++ b/UnityProject/Assets/Mirror/Examples/MultipleAdditiveScenes/Prefabs/Prize.prefab.meta @@ -3,6 +3,6 @@ guid: 8cec47ed46e0eff45966a5173d3aa0d3 NativeFormatImporter: externalObjects: {} mainObjectFileID: 100100000 - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Examples/MultipleAdditiveScenes/README.md.meta b/UnityProject/Assets/Mirror/Examples/MultipleAdditiveScenes/README.md.meta index dbf036c5..668fabd4 100644 --- a/UnityProject/Assets/Mirror/Examples/MultipleAdditiveScenes/README.md.meta +++ b/UnityProject/Assets/Mirror/Examples/MultipleAdditiveScenes/README.md.meta @@ -2,6 +2,6 @@ fileFormatVersion: 2 guid: 915d7b115a88c7c409dadf5bfc543737 TextScriptImporter: externalObjects: {} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Examples/MultipleAdditiveScenes/Scenes.meta b/UnityProject/Assets/Mirror/Examples/MultipleAdditiveScenes/Scenes.meta index 01b8f9dc..d749d32c 100644 --- a/UnityProject/Assets/Mirror/Examples/MultipleAdditiveScenes/Scenes.meta +++ b/UnityProject/Assets/Mirror/Examples/MultipleAdditiveScenes/Scenes.meta @@ -3,6 +3,6 @@ guid: 060de58cc46acdf4b92e21c43400aa58 folderAsset: yes DefaultImporter: externalObjects: {} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Examples/MultipleAdditiveScenes/Scenes/Game.unity.meta b/UnityProject/Assets/Mirror/Examples/MultipleAdditiveScenes/Scenes/Game.unity.meta index 274c1835..dae050d1 100644 --- a/UnityProject/Assets/Mirror/Examples/MultipleAdditiveScenes/Scenes/Game.unity.meta +++ b/UnityProject/Assets/Mirror/Examples/MultipleAdditiveScenes/Scenes/Game.unity.meta @@ -2,6 +2,6 @@ fileFormatVersion: 2 guid: d45ed07e5475d4740812c97ae565255c DefaultImporter: externalObjects: {} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Examples/MultipleAdditiveScenes/Scenes/Main.unity.meta b/UnityProject/Assets/Mirror/Examples/MultipleAdditiveScenes/Scenes/Main.unity.meta index 365d1c56..036bc0db 100644 --- a/UnityProject/Assets/Mirror/Examples/MultipleAdditiveScenes/Scenes/Main.unity.meta +++ b/UnityProject/Assets/Mirror/Examples/MultipleAdditiveScenes/Scenes/Main.unity.meta @@ -2,6 +2,6 @@ fileFormatVersion: 2 guid: 0fa8b7965660de64f8aefd6b64f18a08 DefaultImporter: externalObjects: {} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Examples/MultipleAdditiveScenes/Scripts.meta b/UnityProject/Assets/Mirror/Examples/MultipleAdditiveScenes/Scripts.meta index 2b4112f5..bcb2ac27 100644 --- a/UnityProject/Assets/Mirror/Examples/MultipleAdditiveScenes/Scripts.meta +++ b/UnityProject/Assets/Mirror/Examples/MultipleAdditiveScenes/Scripts.meta @@ -3,6 +3,6 @@ guid: 6d930bed284ca5040b2743524031cc13 folderAsset: yes DefaultImporter: externalObjects: {} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Examples/MultipleAdditiveScenes/Scripts/MultiSceneNetManager.cs.meta b/UnityProject/Assets/Mirror/Examples/MultipleAdditiveScenes/Scripts/MultiSceneNetManager.cs.meta index fc86894a..dbca1404 100644 --- a/UnityProject/Assets/Mirror/Examples/MultipleAdditiveScenes/Scripts/MultiSceneNetManager.cs.meta +++ b/UnityProject/Assets/Mirror/Examples/MultipleAdditiveScenes/Scripts/MultiSceneNetManager.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Examples/MultipleAdditiveScenes/Scripts/PhysicsCollision.cs.meta b/UnityProject/Assets/Mirror/Examples/MultipleAdditiveScenes/Scripts/PhysicsCollision.cs.meta index 0aae7a16..2343563d 100644 --- a/UnityProject/Assets/Mirror/Examples/MultipleAdditiveScenes/Scripts/PhysicsCollision.cs.meta +++ b/UnityProject/Assets/Mirror/Examples/MultipleAdditiveScenes/Scripts/PhysicsCollision.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Examples/MultipleAdditiveScenes/Scripts/PhysicsSimulator.cs.meta b/UnityProject/Assets/Mirror/Examples/MultipleAdditiveScenes/Scripts/PhysicsSimulator.cs.meta index fa7c2b5e..a48884d3 100644 --- a/UnityProject/Assets/Mirror/Examples/MultipleAdditiveScenes/Scripts/PhysicsSimulator.cs.meta +++ b/UnityProject/Assets/Mirror/Examples/MultipleAdditiveScenes/Scripts/PhysicsSimulator.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Examples/MultipleAdditiveScenes/Scripts/PlayerController.cs.meta b/UnityProject/Assets/Mirror/Examples/MultipleAdditiveScenes/Scripts/PlayerController.cs.meta index 9d5e1094..c3bad11c 100644 --- a/UnityProject/Assets/Mirror/Examples/MultipleAdditiveScenes/Scripts/PlayerController.cs.meta +++ b/UnityProject/Assets/Mirror/Examples/MultipleAdditiveScenes/Scripts/PlayerController.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Examples/MultipleAdditiveScenes/Scripts/PlayerScore.cs.meta b/UnityProject/Assets/Mirror/Examples/MultipleAdditiveScenes/Scripts/PlayerScore.cs.meta index a20c7ca0..3b9c9dd0 100644 --- a/UnityProject/Assets/Mirror/Examples/MultipleAdditiveScenes/Scripts/PlayerScore.cs.meta +++ b/UnityProject/Assets/Mirror/Examples/MultipleAdditiveScenes/Scripts/PlayerScore.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Examples/MultipleAdditiveScenes/Scripts/RandomColor.cs.meta b/UnityProject/Assets/Mirror/Examples/MultipleAdditiveScenes/Scripts/RandomColor.cs.meta index 7a9c6f1a..2bef2a62 100644 --- a/UnityProject/Assets/Mirror/Examples/MultipleAdditiveScenes/Scripts/RandomColor.cs.meta +++ b/UnityProject/Assets/Mirror/Examples/MultipleAdditiveScenes/Scripts/RandomColor.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Examples/MultipleAdditiveScenes/Scripts/Reward.cs.meta b/UnityProject/Assets/Mirror/Examples/MultipleAdditiveScenes/Scripts/Reward.cs.meta index 931aa47d..1bb7ea35 100644 --- a/UnityProject/Assets/Mirror/Examples/MultipleAdditiveScenes/Scripts/Reward.cs.meta +++ b/UnityProject/Assets/Mirror/Examples/MultipleAdditiveScenes/Scripts/Reward.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Examples/MultipleAdditiveScenes/Scripts/Spawner.cs.meta b/UnityProject/Assets/Mirror/Examples/MultipleAdditiveScenes/Scripts/Spawner.cs.meta index 602d86a5..9d9b2b1b 100644 --- a/UnityProject/Assets/Mirror/Examples/MultipleAdditiveScenes/Scripts/Spawner.cs.meta +++ b/UnityProject/Assets/Mirror/Examples/MultipleAdditiveScenes/Scripts/Spawner.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Examples/MultipleMatches.meta b/UnityProject/Assets/Mirror/Examples/MultipleMatches.meta index 10786b54..c8788e5b 100644 --- a/UnityProject/Assets/Mirror/Examples/MultipleMatches.meta +++ b/UnityProject/Assets/Mirror/Examples/MultipleMatches.meta @@ -3,6 +3,6 @@ guid: 8e1be7be6da8e2448ba40eba0daa44b9 folderAsset: yes DefaultImporter: externalObjects: {} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Examples/MultipleMatches/Prefabs.meta b/UnityProject/Assets/Mirror/Examples/MultipleMatches/Prefabs.meta index c61a3fbd..7d19e915 100644 --- a/UnityProject/Assets/Mirror/Examples/MultipleMatches/Prefabs.meta +++ b/UnityProject/Assets/Mirror/Examples/MultipleMatches/Prefabs.meta @@ -3,6 +3,6 @@ guid: ad2253a5702ed854995bf034be09a1ae folderAsset: yes DefaultImporter: externalObjects: {} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Examples/MultipleMatches/Prefabs/CellGUI.prefab.meta b/UnityProject/Assets/Mirror/Examples/MultipleMatches/Prefabs/CellGUI.prefab.meta index a4b23e01..8ddee88f 100644 --- a/UnityProject/Assets/Mirror/Examples/MultipleMatches/Prefabs/CellGUI.prefab.meta +++ b/UnityProject/Assets/Mirror/Examples/MultipleMatches/Prefabs/CellGUI.prefab.meta @@ -2,6 +2,6 @@ fileFormatVersion: 2 guid: 5ab8c221183f0094eb04b7f6eb569e7b PrefabImporter: externalObjects: {} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Examples/MultipleMatches/Prefabs/MatchController.prefab.meta b/UnityProject/Assets/Mirror/Examples/MultipleMatches/Prefabs/MatchController.prefab.meta index e1cda8d1..e358fcc1 100644 --- a/UnityProject/Assets/Mirror/Examples/MultipleMatches/Prefabs/MatchController.prefab.meta +++ b/UnityProject/Assets/Mirror/Examples/MultipleMatches/Prefabs/MatchController.prefab.meta @@ -2,6 +2,6 @@ fileFormatVersion: 2 guid: e101d385946c91b4c81f318efc723a88 PrefabImporter: externalObjects: {} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Examples/MultipleMatches/Prefabs/MatchGUI.prefab.meta b/UnityProject/Assets/Mirror/Examples/MultipleMatches/Prefabs/MatchGUI.prefab.meta index 3096ce49..3308e2cf 100644 --- a/UnityProject/Assets/Mirror/Examples/MultipleMatches/Prefabs/MatchGUI.prefab.meta +++ b/UnityProject/Assets/Mirror/Examples/MultipleMatches/Prefabs/MatchGUI.prefab.meta @@ -2,6 +2,6 @@ fileFormatVersion: 2 guid: df3727c2222378b4ca786485a8b09981 PrefabImporter: externalObjects: {} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Examples/MultipleMatches/Prefabs/MatchPlayer.prefab.meta b/UnityProject/Assets/Mirror/Examples/MultipleMatches/Prefabs/MatchPlayer.prefab.meta index 1c8503f7..66f3795d 100644 --- a/UnityProject/Assets/Mirror/Examples/MultipleMatches/Prefabs/MatchPlayer.prefab.meta +++ b/UnityProject/Assets/Mirror/Examples/MultipleMatches/Prefabs/MatchPlayer.prefab.meta @@ -2,6 +2,6 @@ fileFormatVersion: 2 guid: 11d2414f1e120a14c98cba6866e5348f PrefabImporter: externalObjects: {} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Examples/MultipleMatches/Prefabs/PlayerGUI.prefab.meta b/UnityProject/Assets/Mirror/Examples/MultipleMatches/Prefabs/PlayerGUI.prefab.meta index 7dbc9349..27639dc3 100644 --- a/UnityProject/Assets/Mirror/Examples/MultipleMatches/Prefabs/PlayerGUI.prefab.meta +++ b/UnityProject/Assets/Mirror/Examples/MultipleMatches/Prefabs/PlayerGUI.prefab.meta @@ -2,6 +2,6 @@ fileFormatVersion: 2 guid: 504f86497324bc040be44f6f88b6cc73 PrefabImporter: externalObjects: {} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Examples/MultipleMatches/README.md.meta b/UnityProject/Assets/Mirror/Examples/MultipleMatches/README.md.meta index 3c529dea..fdee8404 100644 --- a/UnityProject/Assets/Mirror/Examples/MultipleMatches/README.md.meta +++ b/UnityProject/Assets/Mirror/Examples/MultipleMatches/README.md.meta @@ -2,6 +2,6 @@ fileFormatVersion: 2 guid: 9749e23e4e90e0646afc81061710a927 TextScriptImporter: externalObjects: {} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Examples/MultipleMatches/Scenes.meta b/UnityProject/Assets/Mirror/Examples/MultipleMatches/Scenes.meta index 085483e5..af275425 100644 --- a/UnityProject/Assets/Mirror/Examples/MultipleMatches/Scenes.meta +++ b/UnityProject/Assets/Mirror/Examples/MultipleMatches/Scenes.meta @@ -3,6 +3,6 @@ guid: a92fd9255da5fe9449e612566195a3aa folderAsset: yes DefaultImporter: externalObjects: {} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Examples/MultipleMatches/Scenes/Main.unity.meta b/UnityProject/Assets/Mirror/Examples/MultipleMatches/Scenes/Main.unity.meta index 15b29681..234a1737 100644 --- a/UnityProject/Assets/Mirror/Examples/MultipleMatches/Scenes/Main.unity.meta +++ b/UnityProject/Assets/Mirror/Examples/MultipleMatches/Scenes/Main.unity.meta @@ -2,6 +2,6 @@ fileFormatVersion: 2 guid: aa1f875396fa7d348a782cebc2f75d7c DefaultImporter: externalObjects: {} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Examples/MultipleMatches/Scripts.meta b/UnityProject/Assets/Mirror/Examples/MultipleMatches/Scripts.meta index 6e44c51a..bc1a9c00 100644 --- a/UnityProject/Assets/Mirror/Examples/MultipleMatches/Scripts.meta +++ b/UnityProject/Assets/Mirror/Examples/MultipleMatches/Scripts.meta @@ -3,6 +3,6 @@ guid: d418be768b6d32e4d9c3b8828929c3eb folderAsset: yes DefaultImporter: externalObjects: {} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Examples/MultipleMatches/Scripts/CanvasController.cs.meta b/UnityProject/Assets/Mirror/Examples/MultipleMatches/Scripts/CanvasController.cs.meta index 99b4f9a7..9379f5c0 100644 --- a/UnityProject/Assets/Mirror/Examples/MultipleMatches/Scripts/CanvasController.cs.meta +++ b/UnityProject/Assets/Mirror/Examples/MultipleMatches/Scripts/CanvasController.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Examples/MultipleMatches/Scripts/CellGUI.cs.meta b/UnityProject/Assets/Mirror/Examples/MultipleMatches/Scripts/CellGUI.cs.meta index 6a7568a5..2ab1003b 100644 --- a/UnityProject/Assets/Mirror/Examples/MultipleMatches/Scripts/CellGUI.cs.meta +++ b/UnityProject/Assets/Mirror/Examples/MultipleMatches/Scripts/CellGUI.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Examples/MultipleMatches/Scripts/MatchController.cs.meta b/UnityProject/Assets/Mirror/Examples/MultipleMatches/Scripts/MatchController.cs.meta index 93839003..d6b6a8bd 100644 --- a/UnityProject/Assets/Mirror/Examples/MultipleMatches/Scripts/MatchController.cs.meta +++ b/UnityProject/Assets/Mirror/Examples/MultipleMatches/Scripts/MatchController.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Examples/MultipleMatches/Scripts/MatchGUI.cs.meta b/UnityProject/Assets/Mirror/Examples/MultipleMatches/Scripts/MatchGUI.cs.meta index eb3f3010..8a036f1b 100644 --- a/UnityProject/Assets/Mirror/Examples/MultipleMatches/Scripts/MatchGUI.cs.meta +++ b/UnityProject/Assets/Mirror/Examples/MultipleMatches/Scripts/MatchGUI.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Examples/MultipleMatches/Scripts/MatchMessages.cs.meta b/UnityProject/Assets/Mirror/Examples/MultipleMatches/Scripts/MatchMessages.cs.meta index cdc9baa1..bf41030a 100644 --- a/UnityProject/Assets/Mirror/Examples/MultipleMatches/Scripts/MatchMessages.cs.meta +++ b/UnityProject/Assets/Mirror/Examples/MultipleMatches/Scripts/MatchMessages.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Examples/MultipleMatches/Scripts/MatchNetworkManager.cs b/UnityProject/Assets/Mirror/Examples/MultipleMatches/Scripts/MatchNetworkManager.cs index 59bd579a..1046aa9a 100644 --- a/UnityProject/Assets/Mirror/Examples/MultipleMatches/Scripts/MatchNetworkManager.cs +++ b/UnityProject/Assets/Mirror/Examples/MultipleMatches/Scripts/MatchNetworkManager.cs @@ -1,7 +1,7 @@ using UnityEngine; /* - Documentation: https://mirror-networking.gitbook.io/docs/components/network-manager + Documentation: https://mirror-networking.com/docs/Components/NetworkManager.html API Reference: https://mirror-networking.com/docs/api/Mirror.NetworkManager.html */ diff --git a/UnityProject/Assets/Mirror/Examples/MultipleMatches/Scripts/MatchNetworkManager.cs.meta b/UnityProject/Assets/Mirror/Examples/MultipleMatches/Scripts/MatchNetworkManager.cs.meta index e73e281c..95f851cd 100644 --- a/UnityProject/Assets/Mirror/Examples/MultipleMatches/Scripts/MatchNetworkManager.cs.meta +++ b/UnityProject/Assets/Mirror/Examples/MultipleMatches/Scripts/MatchNetworkManager.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Examples/MultipleMatches/Scripts/PlayerGUI.cs.meta b/UnityProject/Assets/Mirror/Examples/MultipleMatches/Scripts/PlayerGUI.cs.meta index 42425cd2..7da4f20a 100644 --- a/UnityProject/Assets/Mirror/Examples/MultipleMatches/Scripts/PlayerGUI.cs.meta +++ b/UnityProject/Assets/Mirror/Examples/MultipleMatches/Scripts/PlayerGUI.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Examples/MultipleMatches/Scripts/RoomGUI.cs.meta b/UnityProject/Assets/Mirror/Examples/MultipleMatches/Scripts/RoomGUI.cs.meta index 082026b5..0e970ab0 100644 --- a/UnityProject/Assets/Mirror/Examples/MultipleMatches/Scripts/RoomGUI.cs.meta +++ b/UnityProject/Assets/Mirror/Examples/MultipleMatches/Scripts/RoomGUI.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Examples/Pong.meta b/UnityProject/Assets/Mirror/Examples/Pong.meta index fea47b9e..ac8a6e27 100644 --- a/UnityProject/Assets/Mirror/Examples/Pong.meta +++ b/UnityProject/Assets/Mirror/Examples/Pong.meta @@ -3,6 +3,6 @@ guid: 2220cb06641bd40be8c8330b3b4dd0ee folderAsset: yes DefaultImporter: externalObjects: {} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Examples/Pong/PhysicsMaterials.meta b/UnityProject/Assets/Mirror/Examples/Pong/PhysicsMaterials.meta index 31e934c2..3ba99854 100644 --- a/UnityProject/Assets/Mirror/Examples/Pong/PhysicsMaterials.meta +++ b/UnityProject/Assets/Mirror/Examples/Pong/PhysicsMaterials.meta @@ -3,6 +3,6 @@ guid: 7f122364b93b24938b3f50539de4d746 folderAsset: yes DefaultImporter: externalObjects: {} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Examples/Pong/PhysicsMaterials/BallMaterial.physicsMaterial2D.meta b/UnityProject/Assets/Mirror/Examples/Pong/PhysicsMaterials/BallMaterial.physicsMaterial2D.meta index ce1eb3f2..bf2d3b6a 100644 --- a/UnityProject/Assets/Mirror/Examples/Pong/PhysicsMaterials/BallMaterial.physicsMaterial2D.meta +++ b/UnityProject/Assets/Mirror/Examples/Pong/PhysicsMaterials/BallMaterial.physicsMaterial2D.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 guid: 97a3e4cddb8635c4eba1265f44d106bf timeCreated: 1426602119 -licenseType: Free +licenseType: Store NativeFormatImporter: - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Examples/Pong/Prefabs.meta b/UnityProject/Assets/Mirror/Examples/Pong/Prefabs.meta index 34f632a2..7e90f0dc 100644 --- a/UnityProject/Assets/Mirror/Examples/Pong/Prefabs.meta +++ b/UnityProject/Assets/Mirror/Examples/Pong/Prefabs.meta @@ -3,6 +3,6 @@ guid: db1c7e1499ee84bfba33fa7f2cb1bc57 folderAsset: yes DefaultImporter: externalObjects: {} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Examples/Pong/Prefabs/Ball.prefab.meta b/UnityProject/Assets/Mirror/Examples/Pong/Prefabs/Ball.prefab.meta index be6d784b..63224172 100644 --- a/UnityProject/Assets/Mirror/Examples/Pong/Prefabs/Ball.prefab.meta +++ b/UnityProject/Assets/Mirror/Examples/Pong/Prefabs/Ball.prefab.meta @@ -3,6 +3,6 @@ guid: 5f7a7f34494ed40268eff49dbf9168bf NativeFormatImporter: externalObjects: {} mainObjectFileID: 100100000 - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Examples/Pong/Prefabs/Racket.prefab.meta b/UnityProject/Assets/Mirror/Examples/Pong/Prefabs/Racket.prefab.meta index 87eb1421..c67ac8f8 100644 --- a/UnityProject/Assets/Mirror/Examples/Pong/Prefabs/Racket.prefab.meta +++ b/UnityProject/Assets/Mirror/Examples/Pong/Prefabs/Racket.prefab.meta @@ -3,6 +3,6 @@ guid: b1651eaf8c7564a1c86031dfbb8a7b28 NativeFormatImporter: externalObjects: {} mainObjectFileID: 100100000 - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Examples/Pong/Scenes.meta b/UnityProject/Assets/Mirror/Examples/Pong/Scenes.meta index 5a8969bd..ba5b4d4d 100644 --- a/UnityProject/Assets/Mirror/Examples/Pong/Scenes.meta +++ b/UnityProject/Assets/Mirror/Examples/Pong/Scenes.meta @@ -3,6 +3,6 @@ guid: 00c56c45628954f44aa4d944cbd9bfca folderAsset: yes DefaultImporter: externalObjects: {} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Examples/Pong/Scenes/Scene.unity.meta b/UnityProject/Assets/Mirror/Examples/Pong/Scenes/Scene.unity.meta index 9418efe1..f4267c6d 100644 --- a/UnityProject/Assets/Mirror/Examples/Pong/Scenes/Scene.unity.meta +++ b/UnityProject/Assets/Mirror/Examples/Pong/Scenes/Scene.unity.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 guid: 89a84548859e3b643b4fb27984dc2b0d timeCreated: 1426587410 -licenseType: Free +licenseType: Store DefaultImporter: - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Examples/Pong/Scripts.meta b/UnityProject/Assets/Mirror/Examples/Pong/Scripts.meta index 9387865b..b482c478 100644 --- a/UnityProject/Assets/Mirror/Examples/Pong/Scripts.meta +++ b/UnityProject/Assets/Mirror/Examples/Pong/Scripts.meta @@ -3,6 +3,6 @@ guid: 55e7bd9b7212f4318909cbca3bdb1284 folderAsset: yes DefaultImporter: externalObjects: {} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Examples/Pong/Scripts/Ball.cs.meta b/UnityProject/Assets/Mirror/Examples/Pong/Scripts/Ball.cs.meta index e4330702..14a37a0d 100644 --- a/UnityProject/Assets/Mirror/Examples/Pong/Scripts/Ball.cs.meta +++ b/UnityProject/Assets/Mirror/Examples/Pong/Scripts/Ball.cs.meta @@ -1,12 +1,12 @@ fileFormatVersion: 2 guid: 38b5c2f743cd8034a8beeebf277c92c1 timeCreated: 1426602353 -licenseType: Free +licenseType: Store MonoImporter: serializedVersion: 2 defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Examples/Pong/Scripts/NetworkManagerPong.cs.meta b/UnityProject/Assets/Mirror/Examples/Pong/Scripts/NetworkManagerPong.cs.meta index 0d4cbff2..4b191ea1 100644 --- a/UnityProject/Assets/Mirror/Examples/Pong/Scripts/NetworkManagerPong.cs.meta +++ b/UnityProject/Assets/Mirror/Examples/Pong/Scripts/NetworkManagerPong.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Examples/Pong/Scripts/Player.cs.meta b/UnityProject/Assets/Mirror/Examples/Pong/Scripts/Player.cs.meta index f1a15501..f0de41d9 100644 --- a/UnityProject/Assets/Mirror/Examples/Pong/Scripts/Player.cs.meta +++ b/UnityProject/Assets/Mirror/Examples/Pong/Scripts/Player.cs.meta @@ -1,12 +1,12 @@ fileFormatVersion: 2 guid: 0748c7eda22b19845b9ce0e4d23d1021 timeCreated: 1426597826 -licenseType: Free +licenseType: Store MonoImporter: serializedVersion: 2 defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Examples/Pong/Sprites.meta b/UnityProject/Assets/Mirror/Examples/Pong/Sprites.meta index e7b1178a..42350a39 100644 --- a/UnityProject/Assets/Mirror/Examples/Pong/Sprites.meta +++ b/UnityProject/Assets/Mirror/Examples/Pong/Sprites.meta @@ -3,6 +3,6 @@ guid: 9d39b68545c2e43cfa4a37f6703a983b folderAsset: yes DefaultImporter: externalObjects: {} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Examples/Pong/Sprites/Ball.png.meta b/UnityProject/Assets/Mirror/Examples/Pong/Sprites/Ball.png.meta index 3d91cf7d..040bba3d 100644 --- a/UnityProject/Assets/Mirror/Examples/Pong/Sprites/Ball.png.meta +++ b/UnityProject/Assets/Mirror/Examples/Pong/Sprites/Ball.png.meta @@ -77,12 +77,12 @@ TextureImporter: bones: [] spriteID: c5a291323e0d5f34883a55625f66ca70 vertices: [] - indices: '' + indices: edges: [] weights: [] - spritePackingTag: '' + spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Examples/Pong/Sprites/DottedLine.png.meta b/UnityProject/Assets/Mirror/Examples/Pong/Sprites/DottedLine.png.meta index 48e8eefc..993c8319 100644 --- a/UnityProject/Assets/Mirror/Examples/Pong/Sprites/DottedLine.png.meta +++ b/UnityProject/Assets/Mirror/Examples/Pong/Sprites/DottedLine.png.meta @@ -77,12 +77,12 @@ TextureImporter: bones: [] spriteID: 98b4e2aa86aa3d843821adfe71dbbac0 vertices: [] - indices: '' + indices: edges: [] weights: [] - spritePackingTag: '' + spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Examples/Pong/Sprites/Racket.png.meta b/UnityProject/Assets/Mirror/Examples/Pong/Sprites/Racket.png.meta index cc68660a..47b9fc8d 100644 --- a/UnityProject/Assets/Mirror/Examples/Pong/Sprites/Racket.png.meta +++ b/UnityProject/Assets/Mirror/Examples/Pong/Sprites/Racket.png.meta @@ -77,12 +77,12 @@ TextureImporter: bones: [] spriteID: 09819c66a21defd49b2cfc87fea685d2 vertices: [] - indices: '' + indices: edges: [] weights: [] - spritePackingTag: '' + spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Examples/Pong/Sprites/WallHorizontal.png.meta b/UnityProject/Assets/Mirror/Examples/Pong/Sprites/WallHorizontal.png.meta index fc57b86b..10afcfc8 100644 --- a/UnityProject/Assets/Mirror/Examples/Pong/Sprites/WallHorizontal.png.meta +++ b/UnityProject/Assets/Mirror/Examples/Pong/Sprites/WallHorizontal.png.meta @@ -77,12 +77,12 @@ TextureImporter: bones: [] spriteID: 74c5541eed52f67428025c83260d8bec vertices: [] - indices: '' + indices: edges: [] weights: [] - spritePackingTag: '' + spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Examples/Pong/Sprites/WallVertical.png.meta b/UnityProject/Assets/Mirror/Examples/Pong/Sprites/WallVertical.png.meta index fa3f7e03..9b191ee1 100644 --- a/UnityProject/Assets/Mirror/Examples/Pong/Sprites/WallVertical.png.meta +++ b/UnityProject/Assets/Mirror/Examples/Pong/Sprites/WallVertical.png.meta @@ -77,12 +77,12 @@ TextureImporter: bones: [] spriteID: 3a92f998f14389948aa928ac64e8e426 vertices: [] - indices: '' + indices: edges: [] weights: [] - spritePackingTag: '' + spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Examples/RigidbodyPhysics.meta b/UnityProject/Assets/Mirror/Examples/RigidbodyPhysics.meta index 2cf49d25..854a7cdb 100644 --- a/UnityProject/Assets/Mirror/Examples/RigidbodyPhysics.meta +++ b/UnityProject/Assets/Mirror/Examples/RigidbodyPhysics.meta @@ -3,6 +3,6 @@ guid: 703869fabc2e0e241962909920029b0b folderAsset: yes DefaultImporter: externalObjects: {} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Examples/RigidbodyPhysics/Materials.meta b/UnityProject/Assets/Mirror/Examples/RigidbodyPhysics/Materials.meta index e63d9d60..48b3a17c 100644 --- a/UnityProject/Assets/Mirror/Examples/RigidbodyPhysics/Materials.meta +++ b/UnityProject/Assets/Mirror/Examples/RigidbodyPhysics/Materials.meta @@ -3,6 +3,6 @@ guid: d871cab4e65c6e542a384f695eac5c75 folderAsset: yes DefaultImporter: externalObjects: {} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Examples/RigidbodyPhysics/Materials/Blue.mat.meta b/UnityProject/Assets/Mirror/Examples/RigidbodyPhysics/Materials/Blue.mat.meta index 34991dae..2b1c4f66 100644 --- a/UnityProject/Assets/Mirror/Examples/RigidbodyPhysics/Materials/Blue.mat.meta +++ b/UnityProject/Assets/Mirror/Examples/RigidbodyPhysics/Materials/Blue.mat.meta @@ -3,6 +3,6 @@ guid: 84335f003ad8f42408d13787e76d4f94 NativeFormatImporter: externalObjects: {} mainObjectFileID: 2100000 - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Examples/RigidbodyPhysics/Materials/Green.mat.meta b/UnityProject/Assets/Mirror/Examples/RigidbodyPhysics/Materials/Green.mat.meta index 2764f01a..f9ebf7bd 100644 --- a/UnityProject/Assets/Mirror/Examples/RigidbodyPhysics/Materials/Green.mat.meta +++ b/UnityProject/Assets/Mirror/Examples/RigidbodyPhysics/Materials/Green.mat.meta @@ -3,6 +3,6 @@ guid: bbe2c7293af197640a2b40018e79b9a6 NativeFormatImporter: externalObjects: {} mainObjectFileID: 2100000 - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Examples/RigidbodyPhysics/Materials/Red.mat.meta b/UnityProject/Assets/Mirror/Examples/RigidbodyPhysics/Materials/Red.mat.meta index f30b839a..f66bd071 100644 --- a/UnityProject/Assets/Mirror/Examples/RigidbodyPhysics/Materials/Red.mat.meta +++ b/UnityProject/Assets/Mirror/Examples/RigidbodyPhysics/Materials/Red.mat.meta @@ -3,6 +3,6 @@ guid: 6ec777c59ba249a4aa16956e9dd9a0ee NativeFormatImporter: externalObjects: {} mainObjectFileID: 2100000 - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Examples/RigidbodyPhysics/PhysicMaterials.meta b/UnityProject/Assets/Mirror/Examples/RigidbodyPhysics/PhysicMaterials.meta index 8824c45f..8564ffe9 100644 --- a/UnityProject/Assets/Mirror/Examples/RigidbodyPhysics/PhysicMaterials.meta +++ b/UnityProject/Assets/Mirror/Examples/RigidbodyPhysics/PhysicMaterials.meta @@ -3,6 +3,6 @@ guid: e271b04d72e58af47ad61009045f6779 folderAsset: yes DefaultImporter: externalObjects: {} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Examples/RigidbodyPhysics/PhysicMaterials/Ball.physicMaterial.meta b/UnityProject/Assets/Mirror/Examples/RigidbodyPhysics/PhysicMaterials/Ball.physicMaterial.meta index 2efdbad4..4526222d 100644 --- a/UnityProject/Assets/Mirror/Examples/RigidbodyPhysics/PhysicMaterials/Ball.physicMaterial.meta +++ b/UnityProject/Assets/Mirror/Examples/RigidbodyPhysics/PhysicMaterials/Ball.physicMaterial.meta @@ -3,6 +3,6 @@ guid: f2bb9a8ecc30457468aea7dacef6f5de NativeFormatImporter: externalObjects: {} mainObjectFileID: 13400000 - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Examples/RigidbodyPhysics/PhysicMaterials/Floor.physicMaterial.meta b/UnityProject/Assets/Mirror/Examples/RigidbodyPhysics/PhysicMaterials/Floor.physicMaterial.meta index 6fd1cc0d..aef94c69 100644 --- a/UnityProject/Assets/Mirror/Examples/RigidbodyPhysics/PhysicMaterials/Floor.physicMaterial.meta +++ b/UnityProject/Assets/Mirror/Examples/RigidbodyPhysics/PhysicMaterials/Floor.physicMaterial.meta @@ -3,6 +3,6 @@ guid: df195ce493ed09b4c929f832263ba617 NativeFormatImporter: externalObjects: {} mainObjectFileID: 13400000 - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Examples/RigidbodyPhysics/Prefabs.meta b/UnityProject/Assets/Mirror/Examples/RigidbodyPhysics/Prefabs.meta index 34067f9e..b257679b 100644 --- a/UnityProject/Assets/Mirror/Examples/RigidbodyPhysics/Prefabs.meta +++ b/UnityProject/Assets/Mirror/Examples/RigidbodyPhysics/Prefabs.meta @@ -3,6 +3,6 @@ guid: dd49d852d6231e6418c72870c7491fd7 folderAsset: yes DefaultImporter: externalObjects: {} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Examples/RigidbodyPhysics/Prefabs/Empty Player.prefab.meta b/UnityProject/Assets/Mirror/Examples/RigidbodyPhysics/Prefabs/Empty Player.prefab.meta index ad28c9af..28b4b2b9 100644 --- a/UnityProject/Assets/Mirror/Examples/RigidbodyPhysics/Prefabs/Empty Player.prefab.meta +++ b/UnityProject/Assets/Mirror/Examples/RigidbodyPhysics/Prefabs/Empty Player.prefab.meta @@ -2,6 +2,6 @@ fileFormatVersion: 2 guid: 4ab0a427bdc13244499c6e044ad7eb40 PrefabImporter: externalObjects: {} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Examples/RigidbodyPhysics/Scenes.meta b/UnityProject/Assets/Mirror/Examples/RigidbodyPhysics/Scenes.meta index 73e4cd4e..276beb55 100644 --- a/UnityProject/Assets/Mirror/Examples/RigidbodyPhysics/Scenes.meta +++ b/UnityProject/Assets/Mirror/Examples/RigidbodyPhysics/Scenes.meta @@ -3,6 +3,6 @@ guid: c11c778c869824342b9edc9a95de5a19 folderAsset: yes DefaultImporter: externalObjects: {} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Examples/RigidbodyPhysics/Scenes/BounceScene.unity.meta b/UnityProject/Assets/Mirror/Examples/RigidbodyPhysics/Scenes/BounceScene.unity.meta index 9a6b2b0a..2e53449d 100644 --- a/UnityProject/Assets/Mirror/Examples/RigidbodyPhysics/Scenes/BounceScene.unity.meta +++ b/UnityProject/Assets/Mirror/Examples/RigidbodyPhysics/Scenes/BounceScene.unity.meta @@ -2,6 +2,6 @@ fileFormatVersion: 2 guid: b42449e4a64f03a42b999b0c118df11b DefaultImporter: externalObjects: {} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Examples/RigidbodyPhysics/Scripts.meta b/UnityProject/Assets/Mirror/Examples/RigidbodyPhysics/Scripts.meta index 7f88d557..f7469ea0 100644 --- a/UnityProject/Assets/Mirror/Examples/RigidbodyPhysics/Scripts.meta +++ b/UnityProject/Assets/Mirror/Examples/RigidbodyPhysics/Scripts.meta @@ -3,6 +3,6 @@ guid: 8a0b4c0f86764874481e949b6190940e folderAsset: yes DefaultImporter: externalObjects: {} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Examples/RigidbodyPhysics/Scripts/AddForce.cs.meta b/UnityProject/Assets/Mirror/Examples/RigidbodyPhysics/Scripts/AddForce.cs.meta index cebd3c65..b985a202 100644 --- a/UnityProject/Assets/Mirror/Examples/RigidbodyPhysics/Scripts/AddForce.cs.meta +++ b/UnityProject/Assets/Mirror/Examples/RigidbodyPhysics/Scripts/AddForce.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Examples/Room.meta b/UnityProject/Assets/Mirror/Examples/Room.meta index a4ba161f..51c8ec20 100644 --- a/UnityProject/Assets/Mirror/Examples/Room.meta +++ b/UnityProject/Assets/Mirror/Examples/Room.meta @@ -3,6 +3,6 @@ guid: ba0822b68f209a743bc575c6f2cc78f0 folderAsset: yes DefaultImporter: externalObjects: {} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Examples/Room/Materials.meta b/UnityProject/Assets/Mirror/Examples/Room/Materials.meta index b604b3f5..15935716 100644 --- a/UnityProject/Assets/Mirror/Examples/Room/Materials.meta +++ b/UnityProject/Assets/Mirror/Examples/Room/Materials.meta @@ -3,6 +3,6 @@ guid: 177a490b498134246b6eeddfeb608b94 folderAsset: yes DefaultImporter: externalObjects: {} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Examples/Room/Materials/PlayArea.mat.meta b/UnityProject/Assets/Mirror/Examples/Room/Materials/PlayArea.mat.meta index 98ae3040..093bbc44 100644 --- a/UnityProject/Assets/Mirror/Examples/Room/Materials/PlayArea.mat.meta +++ b/UnityProject/Assets/Mirror/Examples/Room/Materials/PlayArea.mat.meta @@ -3,6 +3,6 @@ guid: 3201636fa507dad448e9a36d66a80825 NativeFormatImporter: externalObjects: {} mainObjectFileID: 2100000 - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Examples/Room/Materials/Player.mat.meta b/UnityProject/Assets/Mirror/Examples/Room/Materials/Player.mat.meta index d710b358..46963af0 100644 --- a/UnityProject/Assets/Mirror/Examples/Room/Materials/Player.mat.meta +++ b/UnityProject/Assets/Mirror/Examples/Room/Materials/Player.mat.meta @@ -3,6 +3,6 @@ guid: ac64a68d9ea8fa9459ff2f158065c1d0 NativeFormatImporter: externalObjects: {} mainObjectFileID: 2100000 - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Examples/Room/Materials/Prize.mat.meta b/UnityProject/Assets/Mirror/Examples/Room/Materials/Prize.mat.meta index f2e19fc7..18935a5d 100644 --- a/UnityProject/Assets/Mirror/Examples/Room/Materials/Prize.mat.meta +++ b/UnityProject/Assets/Mirror/Examples/Room/Materials/Prize.mat.meta @@ -3,6 +3,6 @@ guid: a1d7c9f39b41d414d86e64f7761cd545 NativeFormatImporter: externalObjects: {} mainObjectFileID: 2100000 - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Examples/Room/Materials/Textures.meta b/UnityProject/Assets/Mirror/Examples/Room/Materials/Textures.meta index 480567c7..0ab79025 100644 --- a/UnityProject/Assets/Mirror/Examples/Room/Materials/Textures.meta +++ b/UnityProject/Assets/Mirror/Examples/Room/Materials/Textures.meta @@ -3,6 +3,6 @@ guid: 047a5014adf04914f9ffded62a715e39 folderAsset: yes DefaultImporter: externalObjects: {} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Examples/Room/Materials/Textures/Wall01.tga.meta b/UnityProject/Assets/Mirror/Examples/Room/Materials/Textures/Wall01.tga.meta index e4b2df2e..e48bd959 100644 --- a/UnityProject/Assets/Mirror/Examples/Room/Materials/Textures/Wall01.tga.meta +++ b/UnityProject/Assets/Mirror/Examples/Room/Materials/Textures/Wall01.tga.meta @@ -75,14 +75,14 @@ TextureImporter: outline: [] physicsShape: [] bones: [] - spriteID: '' + spriteID: vertices: [] - indices: '' + indices: edges: [] weights: [] - spritePackingTag: '' + spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Examples/Room/Materials/Textures/Wall01_n.tga.meta b/UnityProject/Assets/Mirror/Examples/Room/Materials/Textures/Wall01_n.tga.meta index 86f5d885..1e69edae 100644 --- a/UnityProject/Assets/Mirror/Examples/Room/Materials/Textures/Wall01_n.tga.meta +++ b/UnityProject/Assets/Mirror/Examples/Room/Materials/Textures/Wall01_n.tga.meta @@ -75,14 +75,14 @@ TextureImporter: outline: [] physicsShape: [] bones: [] - spriteID: '' + spriteID: vertices: [] - indices: '' + indices: edges: [] weights: [] - spritePackingTag: '' + spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Examples/Room/Prefabs.meta b/UnityProject/Assets/Mirror/Examples/Room/Prefabs.meta index f6046b7f..78f4e75b 100644 --- a/UnityProject/Assets/Mirror/Examples/Room/Prefabs.meta +++ b/UnityProject/Assets/Mirror/Examples/Room/Prefabs.meta @@ -3,6 +3,6 @@ guid: 9a6e603a7f407ec4aa25ac2c2799f71b folderAsset: yes DefaultImporter: externalObjects: {} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Examples/Room/Prefabs/GamePlayer.prefab.meta b/UnityProject/Assets/Mirror/Examples/Room/Prefabs/GamePlayer.prefab.meta index 5aa120d7..0df6ef03 100644 --- a/UnityProject/Assets/Mirror/Examples/Room/Prefabs/GamePlayer.prefab.meta +++ b/UnityProject/Assets/Mirror/Examples/Room/Prefabs/GamePlayer.prefab.meta @@ -3,6 +3,6 @@ guid: 21daf89214c6ee443ad6875b73083c60 NativeFormatImporter: externalObjects: {} mainObjectFileID: 100100000 - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Examples/Room/Prefabs/Prize.prefab.meta b/UnityProject/Assets/Mirror/Examples/Room/Prefabs/Prize.prefab.meta index 9835e434..87ab623a 100644 --- a/UnityProject/Assets/Mirror/Examples/Room/Prefabs/Prize.prefab.meta +++ b/UnityProject/Assets/Mirror/Examples/Room/Prefabs/Prize.prefab.meta @@ -3,6 +3,6 @@ guid: 52f1c9ea06cfd154cb68ff9d1b66fc13 NativeFormatImporter: externalObjects: {} mainObjectFileID: 100100000 - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Examples/Room/Prefabs/RoomPlayer.prefab.meta b/UnityProject/Assets/Mirror/Examples/Room/Prefabs/RoomPlayer.prefab.meta index ecf0f17c..153c825d 100644 --- a/UnityProject/Assets/Mirror/Examples/Room/Prefabs/RoomPlayer.prefab.meta +++ b/UnityProject/Assets/Mirror/Examples/Room/Prefabs/RoomPlayer.prefab.meta @@ -3,6 +3,6 @@ guid: deae2134a1d77704b9c595efe69767dd NativeFormatImporter: externalObjects: {} mainObjectFileID: 100100000 - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Examples/Room/README.md.meta b/UnityProject/Assets/Mirror/Examples/Room/README.md.meta index 7f760e8e..eb4961d7 100644 --- a/UnityProject/Assets/Mirror/Examples/Room/README.md.meta +++ b/UnityProject/Assets/Mirror/Examples/Room/README.md.meta @@ -2,6 +2,6 @@ fileFormatVersion: 2 guid: 9110f04bd1e8468479f6625342d311c5 TextScriptImporter: externalObjects: {} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Examples/Room/Scenes.meta b/UnityProject/Assets/Mirror/Examples/Room/Scenes.meta index cc97df26..17072cfd 100644 --- a/UnityProject/Assets/Mirror/Examples/Room/Scenes.meta +++ b/UnityProject/Assets/Mirror/Examples/Room/Scenes.meta @@ -3,6 +3,6 @@ guid: 4f704ae4b4f98ae41a0bce26658850c1 folderAsset: yes DefaultImporter: externalObjects: {} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Examples/Room/Scenes/OfflineScene.unity.meta b/UnityProject/Assets/Mirror/Examples/Room/Scenes/OfflineScene.unity.meta index 9e52d86a..45332ad8 100644 --- a/UnityProject/Assets/Mirror/Examples/Room/Scenes/OfflineScene.unity.meta +++ b/UnityProject/Assets/Mirror/Examples/Room/Scenes/OfflineScene.unity.meta @@ -2,6 +2,6 @@ fileFormatVersion: 2 guid: 9e6f14982412b2545a0911ebaaa46a23 DefaultImporter: externalObjects: {} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Examples/Room/Scenes/OnlineScene.unity.meta b/UnityProject/Assets/Mirror/Examples/Room/Scenes/OnlineScene.unity.meta index 1c772762..8a990fea 100644 --- a/UnityProject/Assets/Mirror/Examples/Room/Scenes/OnlineScene.unity.meta +++ b/UnityProject/Assets/Mirror/Examples/Room/Scenes/OnlineScene.unity.meta @@ -2,6 +2,6 @@ fileFormatVersion: 2 guid: d7a6763559b31854586c9e49916273ef DefaultImporter: externalObjects: {} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Examples/Room/Scenes/RoomScene.unity.meta b/UnityProject/Assets/Mirror/Examples/Room/Scenes/RoomScene.unity.meta index 1015cbbe..87490263 100644 --- a/UnityProject/Assets/Mirror/Examples/Room/Scenes/RoomScene.unity.meta +++ b/UnityProject/Assets/Mirror/Examples/Room/Scenes/RoomScene.unity.meta @@ -2,6 +2,6 @@ fileFormatVersion: 2 guid: 48478f4d522f96945b8396f376299d3a DefaultImporter: externalObjects: {} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Examples/Room/Scripts.meta b/UnityProject/Assets/Mirror/Examples/Room/Scripts.meta index b9fd528c..b15256aa 100644 --- a/UnityProject/Assets/Mirror/Examples/Room/Scripts.meta +++ b/UnityProject/Assets/Mirror/Examples/Room/Scripts.meta @@ -3,6 +3,6 @@ guid: 03401915dd450454e88f0a839d3346f1 folderAsset: yes DefaultImporter: externalObjects: {} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Examples/Room/Scripts/NetworkRoomManagerExt.cs.meta b/UnityProject/Assets/Mirror/Examples/Room/Scripts/NetworkRoomManagerExt.cs.meta index a4f65c83..d8f57604 100644 --- a/UnityProject/Assets/Mirror/Examples/Room/Scripts/NetworkRoomManagerExt.cs.meta +++ b/UnityProject/Assets/Mirror/Examples/Room/Scripts/NetworkRoomManagerExt.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Examples/Room/Scripts/NetworkRoomPlayerExt.cs.meta b/UnityProject/Assets/Mirror/Examples/Room/Scripts/NetworkRoomPlayerExt.cs.meta index 773e162f..8e4d1359 100644 --- a/UnityProject/Assets/Mirror/Examples/Room/Scripts/NetworkRoomPlayerExt.cs.meta +++ b/UnityProject/Assets/Mirror/Examples/Room/Scripts/NetworkRoomPlayerExt.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Examples/Room/Scripts/PlayerController.cs.meta b/UnityProject/Assets/Mirror/Examples/Room/Scripts/PlayerController.cs.meta index 2dad6907..74f8f956 100644 --- a/UnityProject/Assets/Mirror/Examples/Room/Scripts/PlayerController.cs.meta +++ b/UnityProject/Assets/Mirror/Examples/Room/Scripts/PlayerController.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Examples/Room/Scripts/PlayerScore.cs.meta b/UnityProject/Assets/Mirror/Examples/Room/Scripts/PlayerScore.cs.meta index 2dab38c9..7b1502ff 100644 --- a/UnityProject/Assets/Mirror/Examples/Room/Scripts/PlayerScore.cs.meta +++ b/UnityProject/Assets/Mirror/Examples/Room/Scripts/PlayerScore.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Examples/Room/Scripts/RandomColor.cs.meta b/UnityProject/Assets/Mirror/Examples/Room/Scripts/RandomColor.cs.meta index 192269f2..be310a0c 100644 --- a/UnityProject/Assets/Mirror/Examples/Room/Scripts/RandomColor.cs.meta +++ b/UnityProject/Assets/Mirror/Examples/Room/Scripts/RandomColor.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Examples/Room/Scripts/Reward.cs.meta b/UnityProject/Assets/Mirror/Examples/Room/Scripts/Reward.cs.meta index 487ff181..879bc7db 100644 --- a/UnityProject/Assets/Mirror/Examples/Room/Scripts/Reward.cs.meta +++ b/UnityProject/Assets/Mirror/Examples/Room/Scripts/Reward.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Examples/Room/Scripts/Spawner.cs.meta b/UnityProject/Assets/Mirror/Examples/Room/Scripts/Spawner.cs.meta index 9bd2df82..d4103d6b 100644 --- a/UnityProject/Assets/Mirror/Examples/Room/Scripts/Spawner.cs.meta +++ b/UnityProject/Assets/Mirror/Examples/Room/Scripts/Spawner.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Examples/Tanks.meta b/UnityProject/Assets/Mirror/Examples/Tanks.meta index 08648860..bee4222d 100644 --- a/UnityProject/Assets/Mirror/Examples/Tanks.meta +++ b/UnityProject/Assets/Mirror/Examples/Tanks.meta @@ -3,6 +3,6 @@ guid: a6dc5104926d44c9296aec7699989ac3 folderAsset: yes DefaultImporter: externalObjects: {} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Examples/Tanks/Models.meta b/UnityProject/Assets/Mirror/Examples/Tanks/Models.meta index 709c608f..c94259ad 100644 --- a/UnityProject/Assets/Mirror/Examples/Tanks/Models.meta +++ b/UnityProject/Assets/Mirror/Examples/Tanks/Models.meta @@ -3,6 +3,6 @@ guid: 6878aacf12b204d03a94f71e49f9ad60 folderAsset: yes DefaultImporter: externalObjects: {} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Examples/Tanks/Models/(Public Domain) Recon_Tank.meta b/UnityProject/Assets/Mirror/Examples/Tanks/Models/(Public Domain) Recon_Tank.meta index fdade2c9..93b00754 100644 --- a/UnityProject/Assets/Mirror/Examples/Tanks/Models/(Public Domain) Recon_Tank.meta +++ b/UnityProject/Assets/Mirror/Examples/Tanks/Models/(Public Domain) Recon_Tank.meta @@ -3,6 +3,6 @@ guid: d8b3e43538fc240feb28e07816c7e733 folderAsset: yes DefaultImporter: externalObjects: {} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Examples/Tanks/Models/(Public Domain) Recon_Tank/BaseColor.png.meta b/UnityProject/Assets/Mirror/Examples/Tanks/Models/(Public Domain) Recon_Tank/BaseColor.png.meta index 8daf1fd0..6e069a18 100644 --- a/UnityProject/Assets/Mirror/Examples/Tanks/Models/(Public Domain) Recon_Tank/BaseColor.png.meta +++ b/UnityProject/Assets/Mirror/Examples/Tanks/Models/(Public Domain) Recon_Tank/BaseColor.png.meta @@ -75,14 +75,14 @@ TextureImporter: outline: [] physicsShape: [] bones: [] - spriteID: '' + spriteID: vertices: [] - indices: '' + indices: edges: [] weights: [] - spritePackingTag: '' + spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Examples/Tanks/Models/(Public Domain) Recon_Tank/Controller.controller.meta b/UnityProject/Assets/Mirror/Examples/Tanks/Models/(Public Domain) Recon_Tank/Controller.controller.meta index 498813a0..7e1061cc 100644 --- a/UnityProject/Assets/Mirror/Examples/Tanks/Models/(Public Domain) Recon_Tank/Controller.controller.meta +++ b/UnityProject/Assets/Mirror/Examples/Tanks/Models/(Public Domain) Recon_Tank/Controller.controller.meta @@ -3,6 +3,6 @@ guid: a7211483bbd794b6d85ed88576e7d85c NativeFormatImporter: externalObjects: {} mainObjectFileID: 9100000 - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Examples/Tanks/Models/(Public Domain) Recon_Tank/Emissive.png.meta b/UnityProject/Assets/Mirror/Examples/Tanks/Models/(Public Domain) Recon_Tank/Emissive.png.meta index d867e7d7..333174c9 100644 --- a/UnityProject/Assets/Mirror/Examples/Tanks/Models/(Public Domain) Recon_Tank/Emissive.png.meta +++ b/UnityProject/Assets/Mirror/Examples/Tanks/Models/(Public Domain) Recon_Tank/Emissive.png.meta @@ -75,14 +75,14 @@ TextureImporter: outline: [] physicsShape: [] bones: [] - spriteID: '' + spriteID: vertices: [] - indices: '' + indices: edges: [] weights: [] - spritePackingTag: '' + spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Examples/Tanks/Models/(Public Domain) Recon_Tank/Metallic.png.meta b/UnityProject/Assets/Mirror/Examples/Tanks/Models/(Public Domain) Recon_Tank/Metallic.png.meta index cf1ba031..91006e4d 100644 --- a/UnityProject/Assets/Mirror/Examples/Tanks/Models/(Public Domain) Recon_Tank/Metallic.png.meta +++ b/UnityProject/Assets/Mirror/Examples/Tanks/Models/(Public Domain) Recon_Tank/Metallic.png.meta @@ -75,14 +75,14 @@ TextureImporter: outline: [] physicsShape: [] bones: [] - spriteID: '' + spriteID: vertices: [] - indices: '' + indices: edges: [] weights: [] - spritePackingTag: '' + spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Examples/Tanks/Models/(Public Domain) Recon_Tank/Normal.png.meta b/UnityProject/Assets/Mirror/Examples/Tanks/Models/(Public Domain) Recon_Tank/Normal.png.meta index 2d023b06..acc128a4 100644 --- a/UnityProject/Assets/Mirror/Examples/Tanks/Models/(Public Domain) Recon_Tank/Normal.png.meta +++ b/UnityProject/Assets/Mirror/Examples/Tanks/Models/(Public Domain) Recon_Tank/Normal.png.meta @@ -75,14 +75,14 @@ TextureImporter: outline: [] physicsShape: [] bones: [] - spriteID: '' + spriteID: vertices: [] - indices: '' + indices: edges: [] weights: [] - spritePackingTag: '' + spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Examples/Tanks/Models/(Public Domain) Recon_Tank/Recon_Tank - License.txt.meta b/UnityProject/Assets/Mirror/Examples/Tanks/Models/(Public Domain) Recon_Tank/Recon_Tank - License.txt.meta index 0a73a61e..2168518d 100644 --- a/UnityProject/Assets/Mirror/Examples/Tanks/Models/(Public Domain) Recon_Tank/Recon_Tank - License.txt.meta +++ b/UnityProject/Assets/Mirror/Examples/Tanks/Models/(Public Domain) Recon_Tank/Recon_Tank - License.txt.meta @@ -2,6 +2,6 @@ fileFormatVersion: 2 guid: 6e745106dbbc3412bbe43eaf25dabd4f TextScriptImporter: externalObjects: {} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Examples/Tanks/Models/(Public Domain) Recon_Tank/TankMaterial.mat.meta b/UnityProject/Assets/Mirror/Examples/Tanks/Models/(Public Domain) Recon_Tank/TankMaterial.mat.meta index b99569a1..080f5345 100644 --- a/UnityProject/Assets/Mirror/Examples/Tanks/Models/(Public Domain) Recon_Tank/TankMaterial.mat.meta +++ b/UnityProject/Assets/Mirror/Examples/Tanks/Models/(Public Domain) Recon_Tank/TankMaterial.mat.meta @@ -3,6 +3,6 @@ guid: 2e67e42170aa64aa9a33424f8045ac89 NativeFormatImporter: externalObjects: {} mainObjectFileID: 2100000 - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Examples/Tanks/Models/(Public Domain) Recon_Tank/reconTank.fbx.meta b/UnityProject/Assets/Mirror/Examples/Tanks/Models/(Public Domain) Recon_Tank/reconTank.fbx.meta index 350ac4b6..1ac1ee01 100644 --- a/UnityProject/Assets/Mirror/Examples/Tanks/Models/(Public Domain) Recon_Tank/reconTank.fbx.meta +++ b/UnityProject/Assets/Mirror/Examples/Tanks/Models/(Public Domain) Recon_Tank/reconTank.fbx.meta @@ -50,12 +50,12 @@ ModelImporter: bakeSimulation: 0 resampleCurves: 1 optimizeGameObjects: 0 - motionNodeName: '' - rigImportErrors: '' - rigImportWarnings: '' - animationImportErrors: '' - animationImportWarnings: '' - animationRetargetingWarnings: '' + motionNodeName: + rigImportErrors: + rigImportWarnings: + animationImportErrors: + animationImportWarnings: + animationRetargetingWarnings: animationDoRetargetingWarnings: 0 importAnimatedCustomProperties: 0 importConstraints: 0 @@ -226,7 +226,7 @@ ModelImporter: armStretch: 0.05 legStretch: 0.05 feetSpacing: 0 - rootMotionBoneName: '' + rootMotionBoneName: hasTranslationDoF: 0 hasExtraRoot: 0 skeletonHasParents: 1 @@ -234,6 +234,6 @@ ModelImporter: animationType: 2 humanoidOversampling: 1 additionalBone: 0 - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Examples/Tanks/Prefabs.meta b/UnityProject/Assets/Mirror/Examples/Tanks/Prefabs.meta index 5de9ad38..6c924854 100644 --- a/UnityProject/Assets/Mirror/Examples/Tanks/Prefabs.meta +++ b/UnityProject/Assets/Mirror/Examples/Tanks/Prefabs.meta @@ -3,6 +3,6 @@ guid: 2baeb281f5e8e421582aa9f72e7f1702 folderAsset: yes DefaultImporter: externalObjects: {} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Examples/Tanks/Prefabs/Projectile.prefab.meta b/UnityProject/Assets/Mirror/Examples/Tanks/Prefabs/Projectile.prefab.meta index f7ff6997..f6d4068e 100644 --- a/UnityProject/Assets/Mirror/Examples/Tanks/Prefabs/Projectile.prefab.meta +++ b/UnityProject/Assets/Mirror/Examples/Tanks/Prefabs/Projectile.prefab.meta @@ -2,6 +2,6 @@ fileFormatVersion: 2 guid: b7dd46dbf38c643f09e206f9fa4be008 PrefabImporter: externalObjects: {} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Examples/Tanks/Prefabs/Tank.prefab.meta b/UnityProject/Assets/Mirror/Examples/Tanks/Prefabs/Tank.prefab.meta index 67bcb0db..44548182 100644 --- a/UnityProject/Assets/Mirror/Examples/Tanks/Prefabs/Tank.prefab.meta +++ b/UnityProject/Assets/Mirror/Examples/Tanks/Prefabs/Tank.prefab.meta @@ -3,6 +3,6 @@ guid: 6f43bf5488a7443d19ab2a83c6b91f35 NativeFormatImporter: externalObjects: {} mainObjectFileID: 100100000 - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Examples/Tanks/Scenes.meta b/UnityProject/Assets/Mirror/Examples/Tanks/Scenes.meta index 74874ff2..5665d392 100644 --- a/UnityProject/Assets/Mirror/Examples/Tanks/Scenes.meta +++ b/UnityProject/Assets/Mirror/Examples/Tanks/Scenes.meta @@ -3,6 +3,6 @@ guid: 91225a3fc58fe4a7f9e10718cd3bdc61 folderAsset: yes DefaultImporter: externalObjects: {} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Examples/Tanks/Scenes/Scene.meta b/UnityProject/Assets/Mirror/Examples/Tanks/Scenes/Scene.meta index 533d9ce6..01af5324 100644 --- a/UnityProject/Assets/Mirror/Examples/Tanks/Scenes/Scene.meta +++ b/UnityProject/Assets/Mirror/Examples/Tanks/Scenes/Scene.meta @@ -3,6 +3,6 @@ guid: 81cfd31f234d94a0985fe946d2ce699f folderAsset: yes DefaultImporter: externalObjects: {} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Examples/Tanks/Scenes/Scene.unity.meta b/UnityProject/Assets/Mirror/Examples/Tanks/Scenes/Scene.unity.meta index 55dfff7f..c7f922ea 100644 --- a/UnityProject/Assets/Mirror/Examples/Tanks/Scenes/Scene.unity.meta +++ b/UnityProject/Assets/Mirror/Examples/Tanks/Scenes/Scene.unity.meta @@ -2,6 +2,6 @@ fileFormatVersion: 2 guid: 83f9d2fb76f5742448c6e51f258327a2 DefaultImporter: externalObjects: {} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Examples/Tanks/Scenes/Scene/NavMesh.asset.meta b/UnityProject/Assets/Mirror/Examples/Tanks/Scenes/Scene/NavMesh.asset.meta index 6f229a87..1997fe96 100644 --- a/UnityProject/Assets/Mirror/Examples/Tanks/Scenes/Scene/NavMesh.asset.meta +++ b/UnityProject/Assets/Mirror/Examples/Tanks/Scenes/Scene/NavMesh.asset.meta @@ -3,6 +3,6 @@ guid: 0bc607fa2e315482ebe98797e844e11f NativeFormatImporter: externalObjects: {} mainObjectFileID: 23800000 - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Examples/Tanks/Scripts.meta b/UnityProject/Assets/Mirror/Examples/Tanks/Scripts.meta index 5cba8e52..e6be7b6f 100644 --- a/UnityProject/Assets/Mirror/Examples/Tanks/Scripts.meta +++ b/UnityProject/Assets/Mirror/Examples/Tanks/Scripts.meta @@ -3,6 +3,6 @@ guid: 3815d4126f2934af187ce078c648bbc8 folderAsset: yes DefaultImporter: externalObjects: {} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Examples/Tanks/Scripts/Projectile.cs.meta b/UnityProject/Assets/Mirror/Examples/Tanks/Scripts/Projectile.cs.meta index 55c8d37c..387ece6a 100644 --- a/UnityProject/Assets/Mirror/Examples/Tanks/Scripts/Projectile.cs.meta +++ b/UnityProject/Assets/Mirror/Examples/Tanks/Scripts/Projectile.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Examples/Tanks/Scripts/Tank.cs.meta b/UnityProject/Assets/Mirror/Examples/Tanks/Scripts/Tank.cs.meta index 2e38a393..b7874c48 100644 --- a/UnityProject/Assets/Mirror/Examples/Tanks/Scripts/Tank.cs.meta +++ b/UnityProject/Assets/Mirror/Examples/Tanks/Scripts/Tank.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Examples/Tanks/Textures.meta b/UnityProject/Assets/Mirror/Examples/Tanks/Textures.meta index c9204926..fad816bd 100644 --- a/UnityProject/Assets/Mirror/Examples/Tanks/Textures.meta +++ b/UnityProject/Assets/Mirror/Examples/Tanks/Textures.meta @@ -3,6 +3,6 @@ guid: 8ce6821cc1c644d5595ce9fc1f61debc folderAsset: yes DefaultImporter: externalObjects: {} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Examples/Tanks/Textures/(Public Domain) Dirt Hand Painted Texture.meta b/UnityProject/Assets/Mirror/Examples/Tanks/Textures/(Public Domain) Dirt Hand Painted Texture.meta index 5e1ff152..a77c1ef5 100644 --- a/UnityProject/Assets/Mirror/Examples/Tanks/Textures/(Public Domain) Dirt Hand Painted Texture.meta +++ b/UnityProject/Assets/Mirror/Examples/Tanks/Textures/(Public Domain) Dirt Hand Painted Texture.meta @@ -3,6 +3,6 @@ guid: 4e08c21c1034445fc834851f9e4202fe folderAsset: yes DefaultImporter: externalObjects: {} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Examples/Tanks/Textures/(Public Domain) Dirt Hand Painted Texture/Dirt Hand Painted Texture - License.txt.meta b/UnityProject/Assets/Mirror/Examples/Tanks/Textures/(Public Domain) Dirt Hand Painted Texture/Dirt Hand Painted Texture - License.txt.meta index fa90a4fa..4682e6c4 100644 --- a/UnityProject/Assets/Mirror/Examples/Tanks/Textures/(Public Domain) Dirt Hand Painted Texture/Dirt Hand Painted Texture - License.txt.meta +++ b/UnityProject/Assets/Mirror/Examples/Tanks/Textures/(Public Domain) Dirt Hand Painted Texture/Dirt Hand Painted Texture - License.txt.meta @@ -2,6 +2,6 @@ fileFormatVersion: 2 guid: 422e9f56a29ae488e836a23d1e0f21d0 TextScriptImporter: externalObjects: {} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Examples/Tanks/Textures/(Public Domain) Dirt Hand Painted Texture/Dirt.mat.meta b/UnityProject/Assets/Mirror/Examples/Tanks/Textures/(Public Domain) Dirt Hand Painted Texture/Dirt.mat.meta index 14ca3d0d..f571c8bf 100644 --- a/UnityProject/Assets/Mirror/Examples/Tanks/Textures/(Public Domain) Dirt Hand Painted Texture/Dirt.mat.meta +++ b/UnityProject/Assets/Mirror/Examples/Tanks/Textures/(Public Domain) Dirt Hand Painted Texture/Dirt.mat.meta @@ -3,6 +3,6 @@ guid: 29b49c27a74f145918356859bd7af511 NativeFormatImporter: externalObjects: {} mainObjectFileID: 2100000 - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Examples/Tanks/Textures/(Public Domain) Dirt Hand Painted Texture/dirt.png.meta b/UnityProject/Assets/Mirror/Examples/Tanks/Textures/(Public Domain) Dirt Hand Painted Texture/dirt.png.meta index 626e1d63..b00a6267 100644 --- a/UnityProject/Assets/Mirror/Examples/Tanks/Textures/(Public Domain) Dirt Hand Painted Texture/dirt.png.meta +++ b/UnityProject/Assets/Mirror/Examples/Tanks/Textures/(Public Domain) Dirt Hand Painted Texture/dirt.png.meta @@ -75,14 +75,14 @@ TextureImporter: outline: [] physicsShape: [] bones: [] - spriteID: '' + spriteID: vertices: [] - indices: '' + indices: edges: [] weights: [] - spritePackingTag: '' + spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Examples/Tanks/Textures/ProjectileMaterial.mat.meta b/UnityProject/Assets/Mirror/Examples/Tanks/Textures/ProjectileMaterial.mat.meta index 17cce744..84c957ed 100644 --- a/UnityProject/Assets/Mirror/Examples/Tanks/Textures/ProjectileMaterial.mat.meta +++ b/UnityProject/Assets/Mirror/Examples/Tanks/Textures/ProjectileMaterial.mat.meta @@ -3,6 +3,6 @@ guid: cba1b63a0bccc4b12ac25f05d0ae2dd1 NativeFormatImporter: externalObjects: {} mainObjectFileID: 2100000 - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Icon.meta b/UnityProject/Assets/Mirror/Icon.meta index eeeb74e5..7338187d 100644 --- a/UnityProject/Assets/Mirror/Icon.meta +++ b/UnityProject/Assets/Mirror/Icon.meta @@ -3,6 +3,6 @@ guid: b5f1356ad059a1243910a4e82cd68c5f folderAsset: yes DefaultImporter: externalObjects: {} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Icon/MirrorIcon.png.meta b/UnityProject/Assets/Mirror/Icon/MirrorIcon.png.meta index 4364f8a1..8049382f 100644 --- a/UnityProject/Assets/Mirror/Icon/MirrorIcon.png.meta +++ b/UnityProject/Assets/Mirror/Icon/MirrorIcon.png.meta @@ -97,14 +97,14 @@ TextureImporter: outline: [] physicsShape: [] bones: [] - spriteID: '' + spriteID: vertices: [] - indices: '' + indices: edges: [] weights: [] - spritePackingTag: '' + spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Plugins.meta b/UnityProject/Assets/Mirror/Plugins.meta index 47adc9e6..9504239e 100644 --- a/UnityProject/Assets/Mirror/Plugins.meta +++ b/UnityProject/Assets/Mirror/Plugins.meta @@ -3,6 +3,6 @@ guid: 05eb4061e2eb94061b9a08c918fff99b folderAsset: yes DefaultImporter: externalObjects: {} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Plugins/Mono.Cecil.meta b/UnityProject/Assets/Mirror/Plugins/Mono.Cecil.meta index bf53b8ca..a104e2e4 100644 --- a/UnityProject/Assets/Mirror/Plugins/Mono.Cecil.meta +++ b/UnityProject/Assets/Mirror/Plugins/Mono.Cecil.meta @@ -3,6 +3,6 @@ guid: ce126b4e1a7d13b4c865cd92929f13c3 folderAsset: yes DefaultImporter: externalObjects: {} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Plugins/Mono.Cecil/License.txt.meta b/UnityProject/Assets/Mirror/Plugins/Mono.Cecil/License.txt.meta index aa7a9293..9477cb6a 100644 --- a/UnityProject/Assets/Mirror/Plugins/Mono.Cecil/License.txt.meta +++ b/UnityProject/Assets/Mirror/Plugins/Mono.Cecil/License.txt.meta @@ -2,6 +2,6 @@ fileFormatVersion: 2 guid: ab858db5ebbb0d542a9acd197669cb5a TextScriptImporter: externalObjects: {} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Plugins/Mono.Cecil/Mono.CecilX.Mdb.dll.meta b/UnityProject/Assets/Mirror/Plugins/Mono.Cecil/Mono.CecilX.Mdb.dll.meta index bcec14a1..d5555bf8 100644 --- a/UnityProject/Assets/Mirror/Plugins/Mono.Cecil/Mono.CecilX.Mdb.dll.meta +++ b/UnityProject/Assets/Mirror/Plugins/Mono.Cecil/Mono.CecilX.Mdb.dll.meta @@ -23,7 +23,7 @@ PluginImporter: Exclude Win: 1 Exclude Win64: 1 - first: - Any: '' + Any: second: enabled: 0 settings: {} @@ -87,6 +87,6 @@ PluginImporter: enabled: 0 settings: CPU: AnyCPU - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Plugins/Mono.Cecil/Mono.CecilX.Pdb.dll.meta b/UnityProject/Assets/Mirror/Plugins/Mono.Cecil/Mono.CecilX.Pdb.dll.meta index bfcb6224..3ab420f5 100644 --- a/UnityProject/Assets/Mirror/Plugins/Mono.Cecil/Mono.CecilX.Pdb.dll.meta +++ b/UnityProject/Assets/Mirror/Plugins/Mono.Cecil/Mono.CecilX.Pdb.dll.meta @@ -23,7 +23,7 @@ PluginImporter: Exclude Win: 1 Exclude Win64: 1 - first: - Any: '' + Any: second: enabled: 0 settings: {} @@ -87,6 +87,6 @@ PluginImporter: enabled: 0 settings: CPU: AnyCPU - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Plugins/Mono.Cecil/Mono.CecilX.Rocks.dll.meta b/UnityProject/Assets/Mirror/Plugins/Mono.Cecil/Mono.CecilX.Rocks.dll.meta index 15e34efa..aff02377 100644 --- a/UnityProject/Assets/Mirror/Plugins/Mono.Cecil/Mono.CecilX.Rocks.dll.meta +++ b/UnityProject/Assets/Mirror/Plugins/Mono.Cecil/Mono.CecilX.Rocks.dll.meta @@ -23,7 +23,7 @@ PluginImporter: Exclude Win: 1 Exclude Win64: 1 - first: - Any: '' + Any: second: enabled: 0 settings: {} @@ -87,6 +87,6 @@ PluginImporter: enabled: 0 settings: CPU: AnyCPU - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Plugins/Mono.Cecil/Mono.CecilX.dll.meta b/UnityProject/Assets/Mirror/Plugins/Mono.Cecil/Mono.CecilX.dll.meta index 439068d6..f87dc691 100644 --- a/UnityProject/Assets/Mirror/Plugins/Mono.Cecil/Mono.CecilX.dll.meta +++ b/UnityProject/Assets/Mirror/Plugins/Mono.Cecil/Mono.CecilX.dll.meta @@ -23,7 +23,7 @@ PluginImporter: Exclude Win: 1 Exclude Win64: 1 - first: - Any: '' + Any: second: enabled: 0 settings: {} @@ -89,6 +89,6 @@ PluginImporter: enabled: 0 settings: CPU: AnyCPU - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Readme.txt b/UnityProject/Assets/Mirror/Readme.txt index 06c5bfb7..88779e74 100644 --- a/UnityProject/Assets/Mirror/Readme.txt +++ b/UnityProject/Assets/Mirror/Readme.txt @@ -8,7 +8,7 @@ Requirements: Runtime .Net 4.x (Project Settings > Player > Other Settings) Documentation: - https://mirror-networking.gitbook.io/docs/ + https://mirror-networking.com/docs/ Support: Discord: https://discordapp.com/invite/N9QVxbM diff --git a/UnityProject/Assets/Mirror/Readme.txt.meta b/UnityProject/Assets/Mirror/Readme.txt.meta index 255f2e5e..d52ccced 100644 --- a/UnityProject/Assets/Mirror/Readme.txt.meta +++ b/UnityProject/Assets/Mirror/Readme.txt.meta @@ -2,6 +2,6 @@ fileFormatVersion: 2 guid: f6d84e019c68446f28415a923b460a03 TextScriptImporter: externalObjects: {} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Runtime/AssemblyInfo.cs.meta b/UnityProject/Assets/Mirror/Runtime/AssemblyInfo.cs.meta index 728d533d..50cc0281 100644 --- a/UnityProject/Assets/Mirror/Runtime/AssemblyInfo.cs.meta +++ b/UnityProject/Assets/Mirror/Runtime/AssemblyInfo.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {fileID: 2800000, guid: 7453abfe9e8b2c04a8a47eb536fe21eb, type: 3} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Runtime/Attributes.cs.meta b/UnityProject/Assets/Mirror/Runtime/Attributes.cs.meta index 0a07632f..c50a4899 100644 --- a/UnityProject/Assets/Mirror/Runtime/Attributes.cs.meta +++ b/UnityProject/Assets/Mirror/Runtime/Attributes.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {fileID: 2800000, guid: 7453abfe9e8b2c04a8a47eb536fe21eb, type: 3} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Runtime/ClientScene.cs.meta b/UnityProject/Assets/Mirror/Runtime/ClientScene.cs.meta index 0da7dbce..82b617e3 100644 --- a/UnityProject/Assets/Mirror/Runtime/ClientScene.cs.meta +++ b/UnityProject/Assets/Mirror/Runtime/ClientScene.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {fileID: 2800000, guid: 7453abfe9e8b2c04a8a47eb536fe21eb, type: 3} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Runtime/Compression.cs.meta b/UnityProject/Assets/Mirror/Runtime/Compression.cs.meta index c24622db..e35474b1 100644 --- a/UnityProject/Assets/Mirror/Runtime/Compression.cs.meta +++ b/UnityProject/Assets/Mirror/Runtime/Compression.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {fileID: 2800000, guid: 7453abfe9e8b2c04a8a47eb536fe21eb, type: 3} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Runtime/Empty.meta b/UnityProject/Assets/Mirror/Runtime/Empty.meta index 43901a46..e7024022 100644 --- a/UnityProject/Assets/Mirror/Runtime/Empty.meta +++ b/UnityProject/Assets/Mirror/Runtime/Empty.meta @@ -1,3 +1,3 @@ -fileFormatVersion: 2 +fileFormatVersion: 2 guid: a99666a026b14cf6ba1a2b65946b1b27 -timeCreated: 1615288671 +timeCreated: 1615288671 \ No newline at end of file diff --git a/UnityProject/Assets/Mirror/Runtime/Empty/DotNetCompatibility.cs.meta b/UnityProject/Assets/Mirror/Runtime/Empty/DotNetCompatibility.cs.meta index b1bda334..87421976 100644 --- a/UnityProject/Assets/Mirror/Runtime/Empty/DotNetCompatibility.cs.meta +++ b/UnityProject/Assets/Mirror/Runtime/Empty/DotNetCompatibility.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Runtime/Empty/LogFactory.cs.meta b/UnityProject/Assets/Mirror/Runtime/Empty/LogFactory.cs.meta index 741b217a..07155017 100644 --- a/UnityProject/Assets/Mirror/Runtime/Empty/LogFactory.cs.meta +++ b/UnityProject/Assets/Mirror/Runtime/Empty/LogFactory.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Runtime/Empty/LogFilter.cs.meta b/UnityProject/Assets/Mirror/Runtime/Empty/LogFilter.cs.meta index b34efa67..aab4fa00 100644 --- a/UnityProject/Assets/Mirror/Runtime/Empty/LogFilter.cs.meta +++ b/UnityProject/Assets/Mirror/Runtime/Empty/LogFilter.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {fileID: 2800000, guid: 7453abfe9e8b2c04a8a47eb536fe21eb, type: 3} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Runtime/Empty/Logging.meta b/UnityProject/Assets/Mirror/Runtime/Empty/Logging.meta index 927da1df..867da74b 100644 --- a/UnityProject/Assets/Mirror/Runtime/Empty/Logging.meta +++ b/UnityProject/Assets/Mirror/Runtime/Empty/Logging.meta @@ -3,6 +3,6 @@ guid: 63d647500ca1bfa4a845bc1f4cff9dcc folderAsset: yes DefaultImporter: externalObjects: {} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Runtime/Empty/Logging/ConsoleColorLogHandler.cs.meta b/UnityProject/Assets/Mirror/Runtime/Empty/Logging/ConsoleColorLogHandler.cs.meta index cff4b2de..329c6eba 100644 --- a/UnityProject/Assets/Mirror/Runtime/Empty/Logging/ConsoleColorLogHandler.cs.meta +++ b/UnityProject/Assets/Mirror/Runtime/Empty/Logging/ConsoleColorLogHandler.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Runtime/Empty/Logging/EditorLogSettingsLoader.cs.meta b/UnityProject/Assets/Mirror/Runtime/Empty/Logging/EditorLogSettingsLoader.cs.meta index 4db0d882..81b33e99 100644 --- a/UnityProject/Assets/Mirror/Runtime/Empty/Logging/EditorLogSettingsLoader.cs.meta +++ b/UnityProject/Assets/Mirror/Runtime/Empty/Logging/EditorLogSettingsLoader.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Runtime/Empty/Logging/LogFactory.cs.meta b/UnityProject/Assets/Mirror/Runtime/Empty/Logging/LogFactory.cs.meta index 884703cf..acf3b634 100644 --- a/UnityProject/Assets/Mirror/Runtime/Empty/Logging/LogFactory.cs.meta +++ b/UnityProject/Assets/Mirror/Runtime/Empty/Logging/LogFactory.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Runtime/Empty/Logging/LogSettings.cs.meta b/UnityProject/Assets/Mirror/Runtime/Empty/Logging/LogSettings.cs.meta index c8169a8d..90c4e4d3 100644 --- a/UnityProject/Assets/Mirror/Runtime/Empty/Logging/LogSettings.cs.meta +++ b/UnityProject/Assets/Mirror/Runtime/Empty/Logging/LogSettings.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Runtime/Empty/Logging/NetworkHeadlessLogger.cs.meta b/UnityProject/Assets/Mirror/Runtime/Empty/Logging/NetworkHeadlessLogger.cs.meta index d855af43..221a61b8 100644 --- a/UnityProject/Assets/Mirror/Runtime/Empty/Logging/NetworkHeadlessLogger.cs.meta +++ b/UnityProject/Assets/Mirror/Runtime/Empty/Logging/NetworkHeadlessLogger.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {fileID: 2800000, guid: 7453abfe9e8b2c04a8a47eb536fe21eb, type: 3} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Runtime/Empty/Logging/NetworkLogSettings.cs.meta b/UnityProject/Assets/Mirror/Runtime/Empty/Logging/NetworkLogSettings.cs.meta index 48f84eb9..2f7ecdf9 100644 --- a/UnityProject/Assets/Mirror/Runtime/Empty/Logging/NetworkLogSettings.cs.meta +++ b/UnityProject/Assets/Mirror/Runtime/Empty/Logging/NetworkLogSettings.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {fileID: 2800000, guid: 7453abfe9e8b2c04a8a47eb536fe21eb, type: 3} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Runtime/Empty/StringHash.cs.meta b/UnityProject/Assets/Mirror/Runtime/Empty/StringHash.cs.meta index b9757b41..6198581c 100644 --- a/UnityProject/Assets/Mirror/Runtime/Empty/StringHash.cs.meta +++ b/UnityProject/Assets/Mirror/Runtime/Empty/StringHash.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Runtime/ExponentialMovingAverage.cs.meta b/UnityProject/Assets/Mirror/Runtime/ExponentialMovingAverage.cs.meta index 33545326..d0d82103 100644 --- a/UnityProject/Assets/Mirror/Runtime/ExponentialMovingAverage.cs.meta +++ b/UnityProject/Assets/Mirror/Runtime/ExponentialMovingAverage.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {fileID: 2800000, guid: 7453abfe9e8b2c04a8a47eb536fe21eb, type: 3} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Runtime/Extensions.cs.meta b/UnityProject/Assets/Mirror/Runtime/Extensions.cs.meta index dc46fce1..c2a18b7d 100644 --- a/UnityProject/Assets/Mirror/Runtime/Extensions.cs.meta +++ b/UnityProject/Assets/Mirror/Runtime/Extensions.cs.meta @@ -1,4 +1,4 @@ -fileFormatVersion: 2 +fileFormatVersion: 2 guid: decf32fd053744d18f35712b7a6f5116 MonoImporter: externalObjects: {} @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {fileID: 2800000, guid: 7453abfe9e8b2c04a8a47eb536fe21eb, type: 3} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Runtime/InterestManagement.cs.meta b/UnityProject/Assets/Mirror/Runtime/InterestManagement.cs.meta index 849cedb6..bfabf6bd 100644 --- a/UnityProject/Assets/Mirror/Runtime/InterestManagement.cs.meta +++ b/UnityProject/Assets/Mirror/Runtime/InterestManagement.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {fileID: 2800000, guid: 7453abfe9e8b2c04a8a47eb536fe21eb, type: 3} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Runtime/LocalConnections.cs b/UnityProject/Assets/Mirror/Runtime/LocalConnections.cs index 0a9a5a17..3386eb5b 100644 --- a/UnityProject/Assets/Mirror/Runtime/LocalConnections.cs +++ b/UnityProject/Assets/Mirror/Runtime/LocalConnections.cs @@ -35,7 +35,7 @@ internal void DisconnectInternal() // set not ready and handle clientscene disconnect in any case // (might be client or host mode here) isReady = false; - RemoveFromObservingsObservers(); + RemoveObservers(); } /// Disconnects this connection. @@ -72,7 +72,7 @@ internal override void Send(ArraySegment segment, int channelId = Channels } // handle the server's message directly - connectionToClient.OnTransportData(segment, channelId); + connectionToClient.TransportReceive(segment, channelId); } internal void Update() @@ -91,7 +91,7 @@ internal void Update() PooledNetworkWriter writer = queue.Dequeue(); ArraySegment segment = writer.ToArraySegment(); //Debug.Log("Dequeue " + BitConverter.ToString(segment.Array, segment.Offset, segment.Count)); - OnTransportData(segment, Channels.Reliable); + TransportReceive(segment, Channels.Reliable); NetworkWriterPool.Recycle(writer); } @@ -118,12 +118,6 @@ public override void Disconnect() { connectionToClient.DisconnectInternal(); DisconnectInternal(); - - // this was in NetworkClient.Disconnect 'if isLocalConnection' before - // but it's clearly local connection related, so put it in here. - // TODO should probably be in connectionToClient.DisconnectInternal - // because that's the NetworkServer's connection! - NetworkServer.RemoveLocalConnection(); } // true because local connections never timeout diff --git a/UnityProject/Assets/Mirror/Runtime/LocalConnections.cs.meta b/UnityProject/Assets/Mirror/Runtime/LocalConnections.cs.meta index ef61c3dd..a4f2d2cb 100644 --- a/UnityProject/Assets/Mirror/Runtime/LocalConnections.cs.meta +++ b/UnityProject/Assets/Mirror/Runtime/LocalConnections.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {fileID: 2800000, guid: 7453abfe9e8b2c04a8a47eb536fe21eb, type: 3} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Runtime/MessagePacking.cs b/UnityProject/Assets/Mirror/Runtime/MessagePacking.cs index 47c212c0..6a348b57 100644 --- a/UnityProject/Assets/Mirror/Runtime/MessagePacking.cs +++ b/UnityProject/Assets/Mirror/Runtime/MessagePacking.cs @@ -19,12 +19,12 @@ public static class MessagePacking // message header size internal const int HeaderSize = sizeof(ushort); - public static ushort GetId() where T : struct, NetworkMessage + public static int GetId() where T : struct, NetworkMessage { // paul: 16 bits is enough to avoid collisions - // - keeps the message size small + // - keeps the message size small because it gets varinted // - in case of collisions, Mirror will display an error - return (ushort)(typeof(T).FullName.GetStableHashCode() & 0xFFFF); + return typeof(T).FullName.GetStableHashCode() & 0xFFFF; } // pack message before sending @@ -33,8 +33,8 @@ public static ushort GetId() where T : struct, NetworkMessage public static void Pack(T message, NetworkWriter writer) where T : struct, NetworkMessage { - ushort msgType = GetId(); - writer.WriteUInt16(msgType); + int msgType = GetId(); + writer.WriteUInt16((ushort)msgType); // serialize message into writer writer.Write(message); @@ -44,7 +44,7 @@ public static void Pack(T message, NetworkWriter writer) // -> pass NetworkReader so it's less strange if we create it in here // and pass it upwards. // -> NetworkReader will point at content afterwards! - public static bool Unpack(NetworkReader messageReader, out ushort msgType) + public static bool Unpack(NetworkReader messageReader, out int msgType) { // read message type (varint) try @@ -59,6 +59,10 @@ public static bool Unpack(NetworkReader messageReader, out ushort msgType) } } + [Obsolete("MessagePacker.UnpackMessage was renamed to Unpack for consistency with Pack.")] + public static bool UnpackMessage(NetworkReader messageReader, out int msgType) => + Unpack(messageReader, out msgType); + internal static NetworkMessageDelegate WrapHandler(Action handler, bool requireAuthentication) where T : struct, NetworkMessage where C : NetworkConnection diff --git a/UnityProject/Assets/Mirror/Runtime/MessagePacking.cs.meta b/UnityProject/Assets/Mirror/Runtime/MessagePacking.cs.meta index de160132..910b75cf 100644 --- a/UnityProject/Assets/Mirror/Runtime/MessagePacking.cs.meta +++ b/UnityProject/Assets/Mirror/Runtime/MessagePacking.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {fileID: 2800000, guid: 7453abfe9e8b2c04a8a47eb536fe21eb, type: 3} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Runtime/Messages.cs.meta b/UnityProject/Assets/Mirror/Runtime/Messages.cs.meta index 56cb95fe..5d119e2c 100644 --- a/UnityProject/Assets/Mirror/Runtime/Messages.cs.meta +++ b/UnityProject/Assets/Mirror/Runtime/Messages.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {fileID: 2800000, guid: 7453abfe9e8b2c04a8a47eb536fe21eb, type: 3} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Runtime/Mirror.asmdef.meta b/UnityProject/Assets/Mirror/Runtime/Mirror.asmdef.meta index 93af53d5..202009bd 100644 --- a/UnityProject/Assets/Mirror/Runtime/Mirror.asmdef.meta +++ b/UnityProject/Assets/Mirror/Runtime/Mirror.asmdef.meta @@ -2,6 +2,6 @@ fileFormatVersion: 2 guid: 30817c1a0e6d646d99c048fc403f5979 AssemblyDefinitionImporter: externalObjects: {} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Runtime/NetworkAuthenticator.cs b/UnityProject/Assets/Mirror/Runtime/NetworkAuthenticator.cs index e5f360a4..237df741 100644 --- a/UnityProject/Assets/Mirror/Runtime/NetworkAuthenticator.cs +++ b/UnityProject/Assets/Mirror/Runtime/NetworkAuthenticator.cs @@ -7,7 +7,7 @@ namespace Mirror [Serializable] public class UnityEventNetworkConnection : UnityEvent {} /// Base class for implementing component-based authentication during the Connect phase - [HelpURL("https://mirror-networking.gitbook.io/docs/components/network-authenticators")] + [HelpURL("https://mirror-networking.com/docs/Articles/Guides/Authentication.html")] public abstract class NetworkAuthenticator : MonoBehaviour { /// Notify subscribers on the server when a client is authenticated @@ -44,30 +44,24 @@ public virtual void OnStartClient() {} /// Called when client stops, used to unregister message handlers if needed. public virtual void OnStopClient() {} - [Obsolete("Deprecated: Remove the NetworkConnection parameter from your override and use NetworkClient.connection instead")] - public virtual void OnClientAuthenticate(NetworkConnection conn) => OnClientAuthenticate(); - /// Called on client from OnClientAuthenticateInternal when a client needs to authenticate - public abstract void OnClientAuthenticate(); - - [Obsolete("Deprecated: Remove the NetworkConnection parameter from your override and use NetworkClient.connection instead")] - protected void ClientAccept(NetworkConnection conn) => ClientAccept(); + // TODO client callbacks don't need NetworkConnection parameter. use NetworkClient.connection! + public abstract void OnClientAuthenticate(NetworkConnection conn); - protected void ClientAccept() + // TODO client callbacks don't need NetworkConnection parameter. use NetworkClient.connection! + protected void ClientAccept(NetworkConnection conn) { - OnClientAuthenticated.Invoke(NetworkClient.connection); + OnClientAuthenticated.Invoke(conn); } - [Obsolete("Deprecated: Remove the NetworkConnection parameter from your override and use NetworkClient.connection instead")] - protected void ClientReject(NetworkConnection conn) => ClientReject(); - - protected void ClientReject() + // TODO client callbacks don't need NetworkConnection parameter. use NetworkClient.connection! + protected void ClientReject(NetworkConnection conn) { // Set this on the client for local reference - NetworkClient.connection.isAuthenticated = false; + conn.isAuthenticated = false; // disconnect the client - NetworkClient.connection.Disconnect(); + conn.Disconnect(); } void OnValidate() diff --git a/UnityProject/Assets/Mirror/Runtime/NetworkAuthenticator.cs.meta b/UnityProject/Assets/Mirror/Runtime/NetworkAuthenticator.cs.meta index e12482b4..d37db680 100644 --- a/UnityProject/Assets/Mirror/Runtime/NetworkAuthenticator.cs.meta +++ b/UnityProject/Assets/Mirror/Runtime/NetworkAuthenticator.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {fileID: 2800000, guid: 7453abfe9e8b2c04a8a47eb536fe21eb, type: 3} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Runtime/NetworkBehaviour.cs b/UnityProject/Assets/Mirror/Runtime/NetworkBehaviour.cs index 6a5f36e5..dc3250a8 100644 --- a/UnityProject/Assets/Mirror/Runtime/NetworkBehaviour.cs +++ b/UnityProject/Assets/Mirror/Runtime/NetworkBehaviour.cs @@ -10,7 +10,7 @@ public enum SyncMode { Observers, Owner } /// Base class for networked components. [AddComponentMenu("")] [RequireComponent(typeof(NetworkIdentity))] - [HelpURL("https://mirror-networking.gitbook.io/docs/guides/networkbehaviour")] + [HelpURL("https://mirror-networking.com/docs/Articles/Guides/NetworkBehaviour.html")] public abstract class NetworkBehaviour : MonoBehaviour { internal float lastSyncTime; diff --git a/UnityProject/Assets/Mirror/Runtime/NetworkBehaviour.cs.meta b/UnityProject/Assets/Mirror/Runtime/NetworkBehaviour.cs.meta index 980859a5..f0bc195c 100644 --- a/UnityProject/Assets/Mirror/Runtime/NetworkBehaviour.cs.meta +++ b/UnityProject/Assets/Mirror/Runtime/NetworkBehaviour.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {fileID: 2800000, guid: 7453abfe9e8b2c04a8a47eb536fe21eb, type: 3} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Runtime/NetworkClient.cs b/UnityProject/Assets/Mirror/Runtime/NetworkClient.cs index 6011a4dc..379aa3ec 100644 --- a/UnityProject/Assets/Mirror/Runtime/NetworkClient.cs +++ b/UnityProject/Assets/Mirror/Runtime/NetworkClient.cs @@ -17,8 +17,8 @@ public enum ConnectState public static class NetworkClient { // message handlers by messageId - static readonly Dictionary handlers = - new Dictionary(); + static readonly Dictionary handlers = + new Dictionary(); /// Client's NetworkConnection to server. public static NetworkConnection connection { get; internal set; } @@ -87,9 +87,9 @@ public static class NetworkClient // initialization ////////////////////////////////////////////////////// static void AddTransportHandlers() { - Transport.activeTransport.OnClientConnected = OnTransportConnected; - Transport.activeTransport.OnClientDataReceived = OnTransportData; - Transport.activeTransport.OnClientDisconnected = OnTransportDisconnected; + Transport.activeTransport.OnClientConnected = OnConnected; + Transport.activeTransport.OnClientDataReceived = OnDataReceived; + Transport.activeTransport.OnClientDisconnected = OnDisconnected; Transport.activeTransport.OnClientError = OnError; } @@ -207,24 +207,38 @@ public static void ConnectLocalServer() /// Disconnect from server. public static void Disconnect() { - // only if connected or connecting - if (connectState == ConnectState.Disconnected) return; - - // TODO move to 'cleanup' code below if safe connectState = ConnectState.Disconnected; ready = false; - // call Disconnect on the NetworkConnection - connection.Disconnect(); - - // clean up - // (previously only for remote connection, not for local) - connection = null; + // local or remote connection? + if (isLocalClient) + { + if (isConnected) + { + // call client OnDisconnected with connection to server + // => previously we used to send a DisconnectMessage to + // NetworkServer.localConnection. this would queue the + // message until NetworkClient.Update processes it. + // => invoking the client's OnDisconnected event directly + // here makes tests fail. so let's do it exactly the same + // order as before by queueing the event for next Update! + //OnDisconnectedEvent?.Invoke(connection); + ((LocalConnectionToServer)connection).QueueDisconnectedEvent(); + } + NetworkServer.RemoveLocalConnection(); + } + else + { + if (connection != null) + { + connection.Disconnect(); + connection = null; + } + } } /// Disconnect host mode. // this is needed to call DisconnectMessage for the host client too. - [Obsolete("Call NetworkClient.Disconnect() instead. Nobody should use DisconnectLocalServer.")] public static void DisconnectLocalServer() { // only if host connection is running @@ -234,13 +248,12 @@ public static void DisconnectLocalServer() // local connection. should we send a DisconnectMessage here too? // (if we do then we get an Unknown Message ID log) //NetworkServer.localConnection.Send(new DisconnectMessage()); - NetworkServer.OnTransportDisconnected(NetworkServer.localConnection.connectionId); + NetworkServer.OnDisconnected(NetworkServer.localConnection.connectionId); } } // transport events //////////////////////////////////////////////////// - // called by Transport - static void OnTransportConnected() + static void OnConnected() { if (connection != null) { @@ -256,23 +269,16 @@ static void OnTransportConnected() else Debug.LogError("Skipped Connect message handling because connection is null."); } - // called by Transport - internal static void OnTransportData(ArraySegment data, int channelId) + internal static void OnDataReceived(ArraySegment data, int channelId) { if (connection != null) { - connection.OnTransportData(data, channelId); + connection.TransportReceive(data, channelId); } else Debug.LogError("Skipped Data message handling because connection is null."); } - // called by Transport - // IMPORTANT: often times when disconnecting, we call this from Mirror - // too because we want to remove the connection and handle - // the disconnect immediately. - // => which is fine as long as we guarantee it only runs once - // => which we do by setting the state to Disconnected! - static void OnTransportDisconnected() + static void OnDisconnected() { // StopClient called from user code triggers Disconnected event // from transport which calls StopClient again, so check here @@ -309,7 +315,7 @@ public static void Send(T message, int channelId = Channels.Reliable) public static void RegisterHandler(Action handler, bool requireAuthentication = true) where T : struct, NetworkMessage { - ushort msgType = MessagePacking.GetId(); + int msgType = MessagePacking.GetId(); if (handlers.ContainsKey(msgType)) { Debug.LogWarning($"NetworkClient.RegisterHandler replacing handler for {typeof(T).FullName}, id={msgType}. If replacement is intentional, use ReplaceHandler instead to avoid this warning."); @@ -321,7 +327,7 @@ public static void RegisterHandler(Action handler, bool public static void RegisterHandler(Action handler, bool requireAuthentication = true) where T : struct, NetworkMessage { - ushort msgType = MessagePacking.GetId(); + int msgType = MessagePacking.GetId(); if (handlers.ContainsKey(msgType)) { Debug.LogWarning($"NetworkClient.RegisterHandler replacing handler for {typeof(T).FullName}, id={msgType}. If replacement is intentional, use ReplaceHandler instead to avoid this warning."); @@ -329,8 +335,8 @@ public static void RegisterHandler(Action handler, bool requireAuthenticat // we use the same WrapHandler function for server and client. // so let's wrap it to ignore the NetworkConnection parameter. // it's not needed on client. it's always NetworkClient.connection. - void HandlerWrapped(NetworkConnection _, T value) => handler(value); - handlers[msgType] = MessagePacking.WrapHandler((Action) HandlerWrapped, requireAuthentication); + Action handlerWrapped = (_, value) => { handler(value); }; + handlers[msgType] = MessagePacking.WrapHandler(handlerWrapped, requireAuthentication); } /// Replace a handler for a particular message type. Should require authentication by default. @@ -338,7 +344,7 @@ public static void RegisterHandler(Action handler, bool requireAuthenticat public static void ReplaceHandler(Action handler, bool requireAuthentication = true) where T : struct, NetworkMessage { - ushort msgType = MessagePacking.GetId(); + int msgType = MessagePacking.GetId(); handlers[msgType] = MessagePacking.WrapHandler(handler, requireAuthentication); } @@ -355,7 +361,7 @@ public static bool UnregisterHandler() where T : struct, NetworkMessage { // use int to minimize collisions - ushort msgType = MessagePacking.GetId(); + int msgType = MessagePacking.GetId(); return handlers.Remove(msgType); } @@ -972,7 +978,7 @@ static NetworkIdentity SpawnSceneObject(SpawnMessage message) NetworkIdentity identity = GetAndRemoveSceneObject(message.sceneId); if (identity == null) { - Debug.LogError($"Spawn scene object not found for {message.sceneId:X}. Make sure that client and server use exactly the same project. This only happens if the hierarchy gets out of sync."); + Debug.LogError($"Spawn scene object not found for {message.sceneId:X} SpawnableObjects.Count={spawnableObjects.Count}"); // dump the whole spawnable objects dict for easier debugging //foreach (KeyValuePair kvp in spawnableObjects) @@ -1285,7 +1291,6 @@ public static void Shutdown() // supposed to be shut down too! if (Transport.activeTransport != null) Transport.activeTransport.ClientDisconnect(); - connection = null; } } } diff --git a/UnityProject/Assets/Mirror/Runtime/NetworkClient.cs.meta b/UnityProject/Assets/Mirror/Runtime/NetworkClient.cs.meta index bbf1a4da..20cb2110 100644 --- a/UnityProject/Assets/Mirror/Runtime/NetworkClient.cs.meta +++ b/UnityProject/Assets/Mirror/Runtime/NetworkClient.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {fileID: 2800000, guid: 7453abfe9e8b2c04a8a47eb536fe21eb, type: 3} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Runtime/NetworkConnection.cs b/UnityProject/Assets/Mirror/Runtime/NetworkConnection.cs index b3815fe0..366c0800 100644 --- a/UnityProject/Assets/Mirror/Runtime/NetworkConnection.cs +++ b/UnityProject/Assets/Mirror/Runtime/NetworkConnection.cs @@ -15,7 +15,7 @@ public abstract class NetworkConnection // TODO this is NetworkServer.handlers on server and NetworkClient.handlers on client. // maybe use them directly. avoid extra state. - Dictionary messageHandlers; + Dictionary messageHandlers; /// Unique identifier for this connection that is assigned by the transport layer. // assigned by transport, this id is unique for every connection on server. @@ -64,26 +64,9 @@ internal NetworkConnection(int networkConnectionId) : this() } /// Disconnects this connection. - // for future reference, here is how Disconnects work in Mirror. - // - // first, there are two types of disconnects: - // * voluntary: the other end simply disconnected - // * involuntary: server disconnects a client by itself - // - // UNET had special (complex) code to handle both cases differently. - // - // Mirror handles both cases the same way: - // * Disconnect is called from TOP to BOTTOM - // NetworkServer/Client -> NetworkConnection -> Transport.Disconnect() - // * Disconnect is handled from BOTTOM to TOP - // Transport.OnDisconnected -> ... - // - // in other words, calling Disconnect() does no cleanup whatsoever. - // it simply asks the transport to disconnect. - // then later the transport events will do the clean up. public abstract void Disconnect(); - internal void SetHandlers(Dictionary handlers) + internal void SetHandlers(Dictionary handlers) { messageHandlers = handlers; } @@ -153,7 +136,7 @@ internal void RemoveFromObserving(NetworkIdentity netIdentity, bool isDestroyed) } // TODO move to server's NetworkConnectionToClient? - internal void RemoveFromObservingsObservers() + internal void RemoveObservers() { foreach (NetworkIdentity netIdentity in observing) { @@ -165,7 +148,7 @@ internal void RemoveFromObservingsObservers() // helper function protected bool UnpackAndInvoke(NetworkReader reader, int channelId) { - if (MessagePacking.Unpack(reader, out ushort msgType)) + if (MessagePacking.Unpack(reader, out int msgType)) { // try to invoke the handler for that message if (messageHandlers.TryGetValue(msgType, out NetworkMessageDelegate msgDelegate)) @@ -188,8 +171,8 @@ protected bool UnpackAndInvoke(NetworkReader reader, int channelId) } } - // called by NetworkServer/NetworkClient OnTransportData - internal void OnTransportData(ArraySegment buffer, int channelId) + // called when receiving data from the transport + internal void TransportReceive(ArraySegment buffer, int channelId) { if (buffer.Count < MessagePacking.HeaderSize) { diff --git a/UnityProject/Assets/Mirror/Runtime/NetworkConnection.cs.meta b/UnityProject/Assets/Mirror/Runtime/NetworkConnection.cs.meta index 2ece7b65..32c4ba27 100644 --- a/UnityProject/Assets/Mirror/Runtime/NetworkConnection.cs.meta +++ b/UnityProject/Assets/Mirror/Runtime/NetworkConnection.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {fileID: 2800000, guid: 7453abfe9e8b2c04a8a47eb536fe21eb, type: 3} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Runtime/NetworkConnectionToClient.cs b/UnityProject/Assets/Mirror/Runtime/NetworkConnectionToClient.cs index 5932c387..bc2b5842 100644 --- a/UnityProject/Assets/Mirror/Runtime/NetworkConnectionToClient.cs +++ b/UnityProject/Assets/Mirror/Runtime/NetworkConnectionToClient.cs @@ -179,7 +179,7 @@ public override void Disconnect() // (might be client or host mode here) isReady = false; Transport.activeTransport.ServerDisconnect(connectionId); - RemoveFromObservingsObservers(); + RemoveObservers(); } } } diff --git a/UnityProject/Assets/Mirror/Runtime/NetworkConnectionToClient.cs.meta b/UnityProject/Assets/Mirror/Runtime/NetworkConnectionToClient.cs.meta index 8ec61339..6001a716 100644 --- a/UnityProject/Assets/Mirror/Runtime/NetworkConnectionToClient.cs.meta +++ b/UnityProject/Assets/Mirror/Runtime/NetworkConnectionToClient.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {fileID: 2800000, guid: 7453abfe9e8b2c04a8a47eb536fe21eb, type: 3} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Runtime/NetworkConnectionToServer.cs.meta b/UnityProject/Assets/Mirror/Runtime/NetworkConnectionToServer.cs.meta index 12d66c99..3424b58d 100644 --- a/UnityProject/Assets/Mirror/Runtime/NetworkConnectionToServer.cs.meta +++ b/UnityProject/Assets/Mirror/Runtime/NetworkConnectionToServer.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {fileID: 2800000, guid: 7453abfe9e8b2c04a8a47eb536fe21eb, type: 3} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Runtime/NetworkDiagnostics.cs.meta b/UnityProject/Assets/Mirror/Runtime/NetworkDiagnostics.cs.meta index 69793338..fe373169 100644 --- a/UnityProject/Assets/Mirror/Runtime/NetworkDiagnostics.cs.meta +++ b/UnityProject/Assets/Mirror/Runtime/NetworkDiagnostics.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {fileID: 2800000, guid: 7453abfe9e8b2c04a8a47eb536fe21eb, type: 3} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Runtime/NetworkIdentity.cs b/UnityProject/Assets/Mirror/Runtime/NetworkIdentity.cs index 35285c38..f38466bb 100644 --- a/UnityProject/Assets/Mirror/Runtime/NetworkIdentity.cs +++ b/UnityProject/Assets/Mirror/Runtime/NetworkIdentity.cs @@ -22,7 +22,7 @@ public enum Visibility { Default, ForceHidden, ForceShown } /// NetworkIdentity identifies objects across the network. [DisallowMultipleComponent] [AddComponentMenu("Network/NetworkIdentity")] - [HelpURL("https://mirror-networking.gitbook.io/docs/components/network-identity")] + [HelpURL("https://mirror-networking.com/docs/Articles/Components/NetworkIdentity.html")] public sealed class NetworkIdentity : MonoBehaviour { /// Returns true if running as a client and this object was spawned by a server. diff --git a/UnityProject/Assets/Mirror/Runtime/NetworkIdentity.cs.meta b/UnityProject/Assets/Mirror/Runtime/NetworkIdentity.cs.meta index 45dacb66..7b965214 100644 --- a/UnityProject/Assets/Mirror/Runtime/NetworkIdentity.cs.meta +++ b/UnityProject/Assets/Mirror/Runtime/NetworkIdentity.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {fileID: 2800000, guid: 7453abfe9e8b2c04a8a47eb536fe21eb, type: 3} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Runtime/NetworkLoop.cs.meta b/UnityProject/Assets/Mirror/Runtime/NetworkLoop.cs.meta index 34322003..52b6e6a0 100644 --- a/UnityProject/Assets/Mirror/Runtime/NetworkLoop.cs.meta +++ b/UnityProject/Assets/Mirror/Runtime/NetworkLoop.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {fileID: 2800000, guid: 7453abfe9e8b2c04a8a47eb536fe21eb, type: 3} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Runtime/NetworkManager.cs b/UnityProject/Assets/Mirror/Runtime/NetworkManager.cs index 36522202..0a0de994 100644 --- a/UnityProject/Assets/Mirror/Runtime/NetworkManager.cs +++ b/UnityProject/Assets/Mirror/Runtime/NetworkManager.cs @@ -13,7 +13,7 @@ public enum NetworkManagerMode { Offline, ServerOnly, ClientOnly, Host } [DisallowMultipleComponent] [AddComponentMenu("Network/NetworkManager")] - [HelpURL("https://mirror-networking.gitbook.io/docs/components/network-manager")] + [HelpURL("https://mirror-networking.com/docs/Articles/Components/NetworkManager.html")] public class NetworkManager : MonoBehaviour { /// Enable to keep NetworkManager alive when changing scenes. @@ -82,10 +82,12 @@ public class NetworkManager : MonoBehaviour [Tooltip("Maximum number of concurrent connections.")] public int maxConnections = 100; - [Obsolete("Transport is responsible for timeouts.")] + /// Server Only - Disconnects remote connections that have been silent for more than Server Idle Timeout + [Tooltip("Server Only - Disconnects remote connections that have been silent for more than Server Idle Timeout")] public bool disconnectInactiveConnections; - [Obsolete("Transport is responsible for timeouts. Configure the Transport's timeout setting instead.")] + /// Timeout in seconds since last message from a client after which server will auto-disconnect if Disconnect Inactive Connections is enabled. + [Tooltip("Timeout in seconds since last message from a client after which server will auto-disconnect if Disconnect Inactive Connections is enabled.")] public float disconnectInactiveTimeout = 60f; [Header("Authentication")] @@ -169,16 +171,9 @@ public virtual void OnValidate() if (playerPrefab != null && playerPrefab.GetComponent() == null) { - Debug.LogError("NetworkManager - Player Prefab must have a NetworkIdentity."); + Debug.LogError("NetworkManager - playerPrefab must have a NetworkIdentity."); playerPrefab = null; } - - // This avoids the mysterious "Replacing existing prefab with assetId ... Old prefab 'Player', New prefab 'Player'" warning. - if (playerPrefab != null && spawnPrefabs.Contains(playerPrefab)) - { - Debug.LogWarning("NetworkManager - Player Prefab should not be added to Registered Spawnable Prefabs list...removed it."); - spawnPrefabs.Remove(playerPrefab); - } } // virtual so that inheriting classes' Awake() can call base.Awake() too @@ -254,10 +249,8 @@ void SetupServer() NetworkServer.batchInterval = serverBatchInterval; // Copy auto-disconnect settings to NetworkServer -#pragma warning disable 618 NetworkServer.disconnectInactiveTimeout = disconnectInactiveTimeout; NetworkServer.disconnectInactiveConnections = disconnectInactiveConnections; -#pragma warning restore 618 // start listening to network connections NetworkServer.Listen(maxConnections); @@ -527,12 +520,13 @@ public void StopHost() { OnStopHost(); - // calling OnTransportDisconnected was needed to fix - // https://github.com/vis2k/Mirror/issues/1515 - // so that the host client receives a DisconnectMessage - // TODO reevaluate if this is still needed after all the disconnect - // fixes, and try to put this into LocalConnection.Disconnect! - NetworkServer.OnTransportDisconnected(NetworkConnection.LocalConnectionId); + // TODO try to move DisconnectLocalServer into StopClient(), and + // then call StopClient() before StopServer(). needs testing!. + + // DisconnectLocalServer needs to be called so that the host client + // receives a DisconnectMessage too. + // fixes: https://github.com/vis2k/Mirror/issues/1515 + NetworkClient.DisconnectLocalServer(); StopClient(); StopServer(); @@ -693,7 +687,7 @@ bool InitializeSingleton() void RegisterServerMessages() { NetworkServer.OnConnectedEvent = OnServerConnectInternal; - NetworkServer.OnDisconnectedEvent = OnServerDisconnect; + NetworkServer.OnDisconnectedEvent = OnServerDisconnectInternal; NetworkServer.RegisterHandler(OnServerAddPlayerInternal); // Network Server initially registers its own handler for this, so we replace it here. @@ -1095,6 +1089,12 @@ void OnServerAuthenticated(NetworkConnection conn) OnServerConnect(conn); } + void OnServerDisconnectInternal(NetworkConnection conn) + { + //Debug.Log("NetworkManager.OnServerDisconnectInternal"); + OnServerDisconnect(conn); + } + void OnServerReadyMessageInternal(NetworkConnection conn, ReadyMessage msg) { //Debug.Log("NetworkManager.OnServerReadyMessageInternal"); @@ -1133,7 +1133,7 @@ void OnClientConnectInternal() if (authenticator != null) { // we have an authenticator - let it handle authentication - authenticator.OnClientAuthenticate(); + authenticator.OnClientAuthenticate(NetworkClient.connection); } else { @@ -1164,7 +1164,6 @@ void OnClientAuthenticated(NetworkConnection conn) } } - // TODO call OnClientDisconnect directly, don't pass the connection void OnClientDisconnectInternal() { //Debug.Log("NetworkManager.OnClientDisconnectInternal"); @@ -1192,12 +1191,8 @@ void OnClientSceneInternal(SceneMessage msg) public virtual void OnServerConnect(NetworkConnection conn) {} /// Called on the server when a client disconnects. - // Called by NetworkServer.OnTransportDisconnect! public virtual void OnServerDisconnect(NetworkConnection conn) { - // by default, this function destroys the connection's player. - // can be overwritten for cases like delayed logouts in MMOs to - // avoid players escaping from PvP situations by logging out. NetworkServer.DestroyPlayerForConnection(conn); Debug.Log("OnServerDisconnect: Client disconnected."); } @@ -1213,7 +1208,7 @@ public virtual void OnServerReady(NetworkConnection conn) NetworkServer.SetClientReady(conn); } - /// Called on server when a client requests to add the player. Adds playerPrefab by default. Can be overwritten. + /// Called on server when a client requests to add the player. Adds playerPrefab by default. Can be overwritte. // The default implementation for this function creates a new player object from the playerPrefab. public virtual void OnServerAddPlayer(NetworkConnection conn) { diff --git a/UnityProject/Assets/Mirror/Runtime/NetworkManager.cs.meta b/UnityProject/Assets/Mirror/Runtime/NetworkManager.cs.meta index 4a0c1cad..0a7564ad 100644 --- a/UnityProject/Assets/Mirror/Runtime/NetworkManager.cs.meta +++ b/UnityProject/Assets/Mirror/Runtime/NetworkManager.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {fileID: 2800000, guid: 7453abfe9e8b2c04a8a47eb536fe21eb, type: 3} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Runtime/NetworkManagerHUD.cs b/UnityProject/Assets/Mirror/Runtime/NetworkManagerHUD.cs index a4959f9e..c7377ea9 100644 --- a/UnityProject/Assets/Mirror/Runtime/NetworkManagerHUD.cs +++ b/UnityProject/Assets/Mirror/Runtime/NetworkManagerHUD.cs @@ -9,7 +9,7 @@ namespace Mirror [DisallowMultipleComponent] [AddComponentMenu("Network/NetworkManagerHUD")] [RequireComponent(typeof(NetworkManager))] - [HelpURL("https://mirror-networking.gitbook.io/docs/components/network-manager-hud")] + [HelpURL("https://mirror-networking.com/docs/Articles/Components/NetworkManagerHUD.html")] public class NetworkManagerHUD : MonoBehaviour { NetworkManager manager; diff --git a/UnityProject/Assets/Mirror/Runtime/NetworkManagerHUD.cs.meta b/UnityProject/Assets/Mirror/Runtime/NetworkManagerHUD.cs.meta index c1437a7d..a720b9ce 100644 --- a/UnityProject/Assets/Mirror/Runtime/NetworkManagerHUD.cs.meta +++ b/UnityProject/Assets/Mirror/Runtime/NetworkManagerHUD.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {fileID: 2800000, guid: 7453abfe9e8b2c04a8a47eb536fe21eb, type: 3} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Runtime/NetworkMessage.cs.meta b/UnityProject/Assets/Mirror/Runtime/NetworkMessage.cs.meta index ce49c4e7..73d3d8f2 100644 --- a/UnityProject/Assets/Mirror/Runtime/NetworkMessage.cs.meta +++ b/UnityProject/Assets/Mirror/Runtime/NetworkMessage.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {fileID: 2800000, guid: 7453abfe9e8b2c04a8a47eb536fe21eb, type: 3} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Runtime/NetworkReader.cs.meta b/UnityProject/Assets/Mirror/Runtime/NetworkReader.cs.meta index 4957f801..65ad3f0b 100644 --- a/UnityProject/Assets/Mirror/Runtime/NetworkReader.cs.meta +++ b/UnityProject/Assets/Mirror/Runtime/NetworkReader.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {fileID: 2800000, guid: 7453abfe9e8b2c04a8a47eb536fe21eb, type: 3} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Runtime/NetworkReaderPool.cs.meta b/UnityProject/Assets/Mirror/Runtime/NetworkReaderPool.cs.meta index 7db6ef0a..2c94768b 100644 --- a/UnityProject/Assets/Mirror/Runtime/NetworkReaderPool.cs.meta +++ b/UnityProject/Assets/Mirror/Runtime/NetworkReaderPool.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {fileID: 2800000, guid: 7453abfe9e8b2c04a8a47eb536fe21eb, type: 3} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Runtime/NetworkServer.cs b/UnityProject/Assets/Mirror/Runtime/NetworkServer.cs index 2b6d2ea9..cb552ef9 100644 --- a/UnityProject/Assets/Mirror/Runtime/NetworkServer.cs +++ b/UnityProject/Assets/Mirror/Runtime/NetworkServer.cs @@ -23,8 +23,8 @@ public static class NetworkServer new Dictionary(); /// Message Handlers dictionary, with mesageId as key - static Dictionary handlers = - new Dictionary(); + static Dictionary handlers = + new Dictionary(); /// Single player mode can use dontListen to not accept incoming connections // see also: https://github.com/vis2k/Mirror/pull/2595 @@ -44,11 +44,13 @@ public static class NetworkServer // by default, everyone observes everyone public static InterestManagement aoi; - [Obsolete("Transport is responsible for timeouts.")] + /// Automatically disconnect inactive connections after a timeout. Can be changed at runtime. public static bool disconnectInactiveConnections; - [Obsolete("Transport is responsible for timeouts. Configure the Transport's timeout setting instead.")] - public static float disconnectInactiveTimeout = 60f; + /// Timeout in seconds to disconnect inactive connections. Can be changed at runtime. + // By default, clients send at least a Ping message every 2 seconds. + // The Host client is immune from idle timeout disconnection. + public static float disconnectInactiveTimeout = 60; // OnConnected / OnDisconnected used to be NetworkMessages that were // invoked. this introduced a bug where external clients could send @@ -69,18 +71,15 @@ static void Initialize() //Make sure connections are cleared in case any old connections references exist from previous sessions connections.Clear(); - // reset NetworkTime - NetworkTime.Reset(); - Debug.Assert(Transport.activeTransport != null, "There was no active transport when calling NetworkServer.Listen, If you are calling Listen manually then make sure to set 'Transport.activeTransport' first"); AddTransportHandlers(); } static void AddTransportHandlers() { - Transport.activeTransport.OnServerConnected = OnTransportConnected; - Transport.activeTransport.OnServerDataReceived = OnTransportData; - Transport.activeTransport.OnServerDisconnected = OnTransportDisconnected; + Transport.activeTransport.OnServerConnected = OnConnected; + Transport.activeTransport.OnServerDataReceived = OnDataReceived; + Transport.activeTransport.OnServerDisconnected = OnDisconnected; Transport.activeTransport.OnServerError = OnError; } @@ -351,8 +350,7 @@ public static void SendToClientOfPlayer(NetworkIdentity identity, T msg, int } // transport events //////////////////////////////////////////////////// - // called by transport - static void OnTransportConnected(int connectionId) + static void OnConnected(int connectionId) { // Debug.Log("Server accepted client:" + connectionId); @@ -402,12 +400,11 @@ internal static void OnConnected(NetworkConnectionToClient conn) OnConnectedEvent?.Invoke(conn); } - // called by transport - static void OnTransportData(int connectionId, ArraySegment data, int channelId) + static void OnDataReceived(int connectionId, ArraySegment data, int channelId) { if (connections.TryGetValue(connectionId, out NetworkConnectionToClient conn)) { - conn.OnTransportData(data, channelId); + conn.TransportReceive(data, channelId); } else { @@ -415,35 +412,24 @@ static void OnTransportData(int connectionId, ArraySegment data, int chann } } - // called by transport - // IMPORTANT: often times when disconnecting, we call this from Mirror - // too because we want to remove the connection and handle - // the disconnect immediately. - // => which is fine as long as we guarantee it only runs once - // => which we do by removing the connection! - internal static void OnTransportDisconnected(int connectionId) + internal static void OnDisconnected(int connectionId) { // Debug.Log("Server disconnect client:" + connectionId); if (connections.TryGetValue(connectionId, out NetworkConnectionToClient conn)) { + conn.Disconnect(); RemoveConnection(connectionId); // Debug.Log("Server lost client:" + connectionId); - - // NetworkManager hooks into OnDisconnectedEvent to make - // DestroyPlayerForConnection(conn) optional, e.g. for PvP MMOs - // where players shouldn't be able to escape combat instantly. - if (OnDisconnectedEvent != null) - { - OnDisconnectedEvent.Invoke(conn); - } - // if nobody hooked into it, then simply call DestroyPlayerForConnection - else - { - DestroyPlayerForConnection(conn); - } + OnDisconnected(conn); } } + static void OnDisconnected(NetworkConnection conn) + { + OnDisconnectedEvent?.Invoke(conn); + //Debug.Log("Server lost client:" + conn); + } + static void OnError(int connectionId, Exception exception) { // TODO Let's discuss how we will handle errors @@ -455,7 +441,7 @@ static void OnError(int connectionId, Exception exception) public static void RegisterHandler(Action handler, bool requireAuthentication = true) where T : struct, NetworkMessage { - ushort msgType = MessagePacking.GetId(); + int msgType = MessagePacking.GetId(); if (handlers.ContainsKey(msgType)) { Debug.LogWarning($"NetworkServer.RegisterHandler replacing handler for {typeof(T).FullName}, id={msgType}. If replacement is intentional, use ReplaceHandler instead to avoid this warning."); @@ -475,7 +461,7 @@ public static void RegisterHandler(Action handler, bool requireAuthenticat public static void ReplaceHandler(Action handler, bool requireAuthentication = true) where T : struct, NetworkMessage { - ushort msgType = MessagePacking.GetId(); + int msgType = MessagePacking.GetId(); handlers[msgType] = MessagePacking.WrapHandler(handler, requireAuthentication); } @@ -490,7 +476,7 @@ public static void ReplaceHandler(Action handler, bool requireAuthenticati public static void UnregisterHandler() where T : struct, NetworkMessage { - ushort msgType = MessagePacking.GetId(); + int msgType = MessagePacking.GetId(); handlers.Remove(msgType); } @@ -510,8 +496,15 @@ internal static bool GetNetworkIdentity(GameObject go, out NetworkIdentity ident // disconnect ////////////////////////////////////////////////////////// /// Disconnect all connections, including the local connection. - // synchronous: handles disconnect events and cleans up fully before returning! public static void DisconnectAll() + { + DisconnectAllExternalConnections(); + localConnection = null; + active = false; + } + + /// Disconnect all currently connected clients except the local connection. + public static void DisconnectAllExternalConnections() { // disconnect and remove all connections. // we can not use foreach here because if @@ -526,33 +519,16 @@ public static void DisconnectAll() // copy is no performance problem. foreach (NetworkConnectionToClient conn in connections.Values.ToList()) { - // disconnect via connection->transport conn.Disconnect(); - - // we want this function to be synchronous: handle disconnect - // events and clean up fully before returning. - // -> OnTransportDisconnected can safely be called without - // waiting for the Transport's callback. - // -> it has checks to only run once. - - // call OnDisconnected unless local player in host mod - // TODO unnecessary check? + // call OnDisconnected unless local player in host mode if (conn.connectionId != NetworkConnection.LocalConnectionId) - OnTransportDisconnected(conn.connectionId); + OnDisconnected(conn); } - - // cleanup connections.Clear(); - localConnection = null; - active = false; } - /// Disconnect all currently connected clients except the local connection. - [Obsolete("Call NetworkClient.DisconnectAll() instead")] - public static void DisconnectAllExternalConnections() => DisconnectAll(); - - [Obsolete("Call NetworkClient.DisconnectAll() instead")] - public static void DisconnectAllConnections() => DisconnectAll(); + [Obsolete("DisconnectAllConnections was renamed to DisconnectAllExternalConnections because that's what it does.")] + public static void DisconnectAllConnections() => DisconnectAllExternalConnections(); // add/remove/replace player /////////////////////////////////////////// /// Called by server after AddPlayer message to add the player for the connection. @@ -711,7 +687,7 @@ public static void SetClientNotReady(NetworkConnection conn) { // Debug.Log("PlayerNotReady " + conn); conn.isReady = false; - conn.RemoveFromObservingsObservers(); + conn.RemoveObservers(); conn.Send(new NotReadyMessage()); } @@ -958,8 +934,6 @@ public static bool SpawnObjects() return false; NetworkIdentity[] identities = Resources.FindObjectsOfTypeAll(); - - // first pass: activate all scene objects foreach (NetworkIdentity identity in identities) { if (ValidateSceneObject(identity)) @@ -969,7 +943,6 @@ public static bool SpawnObjects() } } - // second pass: spawn all scene objects foreach (NetworkIdentity identity in identities) { if (ValidateSceneObject(identity)) @@ -1096,11 +1069,11 @@ static void DestroyObject(NetworkIdentity identity, bool destroyServerObject) identity.connectionToClient?.RemoveOwnedObject(identity); - ObjectDestroyMessage message = new ObjectDestroyMessage + ObjectDestroyMessage msg = new ObjectDestroyMessage { netId = identity.netId }; - SendToObservers(identity, message); + SendToObservers(identity, msg); identity.ClearObservers(); if (NetworkClient.active && localClientActive) @@ -1361,52 +1334,6 @@ struct Serialization static Dictionary serializations = new Dictionary(); - // helper function to get an entity's serialization with caching - static Serialization GetEntitySerialization(NetworkIdentity identity) - { - // multiple connections might be observed by the - // same NetworkIdentity, but we don't want to - // serialize them multiple times. look it up first. - // - // IMPORTANT: don't forget to return them to pool! - // TODO make this easier later. for now aim for - // feature parity to not break projects. - // TODO let the entity cache it's own serialization - // and recompute only if it was dirty. - if (!serializations.ContainsKey(identity)) - { - // serialize all the dirty components. - // one version for owner, one for observers. - PooledNetworkWriter ownerWriter = NetworkWriterPool.GetWriter(); - PooledNetworkWriter observersWriter = NetworkWriterPool.GetWriter(); - identity.OnSerializeAllSafely(false, ownerWriter, out int ownerWritten, observersWriter, out int observersWritten); - serializations[identity] = new Serialization - { - ownerWriter = ownerWriter, - observersWriter = observersWriter, - ownerWritten = ownerWritten, - observersWritten = observersWritten - }; - - // clear dirty bits only for the components that we serialized - // DO NOT clean ALL component's dirty bits, because - // components can have different syncIntervals and we don't - // want to reset dirty bits for the ones that were not - // synced yet. - // (we serialized only the IsDirty() components, or all of - // them if initialState. clearing the dirty ones is enough.) - // - // NOTE: this is what we did before push->pull - // broadcasting. let's keep doing this for - // feature parity to not break anyone's project. - // TODO make this more simple / unnecessary later. - identity.ClearDirtyComponentsDirtyBits(); - } - - // return the serialization - return serializations[identity]; - } - // NetworkLateUpdate called after any Update/FixedUpdate/LateUpdate // (we add this to the UnityEngine in NetworkLoop) internal static void NetworkLateUpdate() @@ -1418,7 +1345,6 @@ internal static void NetworkLateUpdate() foreach (NetworkConnectionToClient connection in connections.Values) { // check for inactivity -#pragma warning disable 618 if (disconnectInactiveConnections && !connection.IsAlive(disconnectInactiveTimeout)) { @@ -1426,7 +1352,6 @@ internal static void NetworkLateUpdate() connection.Disconnect(); continue; } -#pragma warning restore 618 // has this connection joined the world yet? // for each READY connection: @@ -1442,8 +1367,45 @@ internal static void NetworkLateUpdate() // NetworkServer.Destroy) if (identity != null) { - // get serialization for this entity (cached) - Serialization serialization = GetEntitySerialization(identity); + // multiple connections might be observed by the + // same NetworkIdentity, but we don't want to + // serialize them multiple times. look it up first. + // + // IMPORTANT: don't forget to return them to pool! + // TODO make this easier later. for now aim for + // feature parity to not break projects. + if (!serializations.ContainsKey(identity)) + { + // serialize all the dirty components. + // one version for owner, one for observers. + PooledNetworkWriter ownerWriter = NetworkWriterPool.GetWriter(); + PooledNetworkWriter observersWriter = NetworkWriterPool.GetWriter(); + identity.OnSerializeAllSafely(false, ownerWriter, out int ownerWritten, observersWriter, out int observersWritten); + serializations[identity] = new Serialization + { + ownerWriter = ownerWriter, + observersWriter = observersWriter, + ownerWritten = ownerWritten, + observersWritten = observersWritten + }; + + // clear dirty bits only for the components that we serialized + // DO NOT clean ALL component's dirty bits, because + // components can have different syncIntervals and we don't + // want to reset dirty bits for the ones that were not + // synced yet. + // (we serialized only the IsDirty() components, or all of + // them if initialState. clearing the dirty ones is enough.) + // + // NOTE: this is what we did before push->pull + // broadcasting. let's keep doing this for + // feature parity to not break anyone's project. + // TODO make this more simple / unnecessary later. + identity.ClearDirtyComponentsDirtyBits(); + } + + // get serialization + Serialization serialization = serializations[identity]; // is this entity owned by this connection? bool owned = identity.connectionToClient == connection; diff --git a/UnityProject/Assets/Mirror/Runtime/NetworkServer.cs.meta b/UnityProject/Assets/Mirror/Runtime/NetworkServer.cs.meta index af1a0685..98613422 100644 --- a/UnityProject/Assets/Mirror/Runtime/NetworkServer.cs.meta +++ b/UnityProject/Assets/Mirror/Runtime/NetworkServer.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {fileID: 2800000, guid: 7453abfe9e8b2c04a8a47eb536fe21eb, type: 3} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Runtime/NetworkStartPosition.cs b/UnityProject/Assets/Mirror/Runtime/NetworkStartPosition.cs index 91f26233..4948680c 100644 --- a/UnityProject/Assets/Mirror/Runtime/NetworkStartPosition.cs +++ b/UnityProject/Assets/Mirror/Runtime/NetworkStartPosition.cs @@ -5,7 +5,7 @@ namespace Mirror /// Start position for player spawning, automatically registers itself in the NetworkManager. [DisallowMultipleComponent] [AddComponentMenu("Network/NetworkStartPosition")] - [HelpURL("https://mirror-networking.gitbook.io/docs/components/network-start-position")] + [HelpURL("https://mirror-networking.com/docs/Articles/Components/NetworkStartPosition.html")] public class NetworkStartPosition : MonoBehaviour { public void Awake() diff --git a/UnityProject/Assets/Mirror/Runtime/NetworkStartPosition.cs.meta b/UnityProject/Assets/Mirror/Runtime/NetworkStartPosition.cs.meta index 286d5f7e..ae9ab898 100644 --- a/UnityProject/Assets/Mirror/Runtime/NetworkStartPosition.cs.meta +++ b/UnityProject/Assets/Mirror/Runtime/NetworkStartPosition.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {fileID: 2800000, guid: 7453abfe9e8b2c04a8a47eb536fe21eb, type: 3} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Runtime/NetworkTime.cs b/UnityProject/Assets/Mirror/Runtime/NetworkTime.cs index 91547948..5e8a9bc8 100644 --- a/UnityProject/Assets/Mirror/Runtime/NetworkTime.cs +++ b/UnityProject/Assets/Mirror/Runtime/NetworkTime.cs @@ -36,7 +36,6 @@ static NetworkTime() public static void Reset() { - stopwatch.Restart(); _rtt = new ExponentialMovingAverage(PingWindowSize); _offset = new ExponentialMovingAverage(PingWindowSize); offsetMin = double.MinValue; diff --git a/UnityProject/Assets/Mirror/Runtime/NetworkTime.cs.meta b/UnityProject/Assets/Mirror/Runtime/NetworkTime.cs.meta index ee55ad52..1dc9e0ac 100644 --- a/UnityProject/Assets/Mirror/Runtime/NetworkTime.cs.meta +++ b/UnityProject/Assets/Mirror/Runtime/NetworkTime.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {fileID: 2800000, guid: 7453abfe9e8b2c04a8a47eb536fe21eb, type: 3} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Runtime/NetworkVisibility.cs.meta b/UnityProject/Assets/Mirror/Runtime/NetworkVisibility.cs.meta index 9e3d280d..f71b7bed 100644 --- a/UnityProject/Assets/Mirror/Runtime/NetworkVisibility.cs.meta +++ b/UnityProject/Assets/Mirror/Runtime/NetworkVisibility.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {fileID: 2800000, guid: 7453abfe9e8b2c04a8a47eb536fe21eb, type: 3} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Runtime/NetworkWriter.cs.meta b/UnityProject/Assets/Mirror/Runtime/NetworkWriter.cs.meta index 0ffc0fc0..c9384962 100644 --- a/UnityProject/Assets/Mirror/Runtime/NetworkWriter.cs.meta +++ b/UnityProject/Assets/Mirror/Runtime/NetworkWriter.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {fileID: 2800000, guid: 7453abfe9e8b2c04a8a47eb536fe21eb, type: 3} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Runtime/NetworkWriterPool.cs.meta b/UnityProject/Assets/Mirror/Runtime/NetworkWriterPool.cs.meta index 593bfa8b..19d2bb74 100644 --- a/UnityProject/Assets/Mirror/Runtime/NetworkWriterPool.cs.meta +++ b/UnityProject/Assets/Mirror/Runtime/NetworkWriterPool.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {fileID: 2800000, guid: 7453abfe9e8b2c04a8a47eb536fe21eb, type: 3} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Runtime/Pool.cs.meta b/UnityProject/Assets/Mirror/Runtime/Pool.cs.meta index 66db3ccd..7d12a202 100644 --- a/UnityProject/Assets/Mirror/Runtime/Pool.cs.meta +++ b/UnityProject/Assets/Mirror/Runtime/Pool.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {fileID: 2800000, guid: 7453abfe9e8b2c04a8a47eb536fe21eb, type: 3} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Runtime/RemoteCallHelper.cs.meta b/UnityProject/Assets/Mirror/Runtime/RemoteCallHelper.cs.meta index bece1149..62b3288d 100644 --- a/UnityProject/Assets/Mirror/Runtime/RemoteCallHelper.cs.meta +++ b/UnityProject/Assets/Mirror/Runtime/RemoteCallHelper.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {fileID: 2800000, guid: 7453abfe9e8b2c04a8a47eb536fe21eb, type: 3} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Runtime/SyncDictionary.cs.meta b/UnityProject/Assets/Mirror/Runtime/SyncDictionary.cs.meta index 9c5728b7..1c20b57b 100644 --- a/UnityProject/Assets/Mirror/Runtime/SyncDictionary.cs.meta +++ b/UnityProject/Assets/Mirror/Runtime/SyncDictionary.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {fileID: 2800000, guid: 7453abfe9e8b2c04a8a47eb536fe21eb, type: 3} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Runtime/SyncList.cs.meta b/UnityProject/Assets/Mirror/Runtime/SyncList.cs.meta index a1bffbcf..088ef1e9 100644 --- a/UnityProject/Assets/Mirror/Runtime/SyncList.cs.meta +++ b/UnityProject/Assets/Mirror/Runtime/SyncList.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {fileID: 2800000, guid: 7453abfe9e8b2c04a8a47eb536fe21eb, type: 3} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Runtime/SyncObject.cs.meta b/UnityProject/Assets/Mirror/Runtime/SyncObject.cs.meta index 20fc0356..736c651f 100644 --- a/UnityProject/Assets/Mirror/Runtime/SyncObject.cs.meta +++ b/UnityProject/Assets/Mirror/Runtime/SyncObject.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {fileID: 2800000, guid: 7453abfe9e8b2c04a8a47eb536fe21eb, type: 3} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Runtime/SyncSet.cs.meta b/UnityProject/Assets/Mirror/Runtime/SyncSet.cs.meta index 8f15ffc6..6eeef1c5 100644 --- a/UnityProject/Assets/Mirror/Runtime/SyncSet.cs.meta +++ b/UnityProject/Assets/Mirror/Runtime/SyncSet.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {fileID: 2800000, guid: 7453abfe9e8b2c04a8a47eb536fe21eb, type: 3} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Runtime/Transport/FallbackTransport.cs b/UnityProject/Assets/Mirror/Runtime/Transport/FallbackTransport.cs index a66f04db..880ec472 100644 --- a/UnityProject/Assets/Mirror/Runtime/Transport/FallbackTransport.cs +++ b/UnityProject/Assets/Mirror/Runtime/Transport/FallbackTransport.cs @@ -6,9 +6,8 @@ namespace Mirror { - [HelpURL("https://mirror-networking.gitbook.io/docs/transports/fallback-transport")] + [HelpURL("https://mirror-networking.com/docs/Articles/Transports/Fallback.html")] [DisallowMultipleComponent] - [Obsolete("Fallback Transport will be retired. It was only needed for Apathy/Libuv. Use kcp or Telepathy instead, those run everywhere.")] public class FallbackTransport : Transport { public Transport[] transports; @@ -112,9 +111,9 @@ public override string ServerGetClientAddress(int connectionId) return available.ServerGetClientAddress(connectionId); } - public override void ServerDisconnect(int connectionId) + public override bool ServerDisconnect(int connectionId) { - available.ServerDisconnect(connectionId); + return available.ServerDisconnect(connectionId); } public override void ServerSend(int connectionId, int channelId, ArraySegment segment) diff --git a/UnityProject/Assets/Mirror/Runtime/Transport/FallbackTransport.cs.meta b/UnityProject/Assets/Mirror/Runtime/Transport/FallbackTransport.cs.meta index f4f199e0..509a58f2 100644 --- a/UnityProject/Assets/Mirror/Runtime/Transport/FallbackTransport.cs.meta +++ b/UnityProject/Assets/Mirror/Runtime/Transport/FallbackTransport.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {fileID: 2800000, guid: 7453abfe9e8b2c04a8a47eb536fe21eb, type: 3} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Runtime/Transport/KCP.meta b/UnityProject/Assets/Mirror/Runtime/Transport/KCP.meta index 3577324c..ba9d1902 100644 --- a/UnityProject/Assets/Mirror/Runtime/Transport/KCP.meta +++ b/UnityProject/Assets/Mirror/Runtime/Transport/KCP.meta @@ -3,6 +3,6 @@ guid: 953bb5ec5ab2346a092f58061e01ba65 folderAsset: yes DefaultImporter: externalObjects: {} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Runtime/Transport/KCP/MirrorTransport.meta b/UnityProject/Assets/Mirror/Runtime/Transport/KCP/MirrorTransport.meta index 8fbdc54f..dedea2fb 100644 --- a/UnityProject/Assets/Mirror/Runtime/Transport/KCP/MirrorTransport.meta +++ b/UnityProject/Assets/Mirror/Runtime/Transport/KCP/MirrorTransport.meta @@ -3,6 +3,6 @@ guid: 7bdb797750d0a490684410110bf48192 folderAsset: yes DefaultImporter: externalObjects: {} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Runtime/Transport/KCP/MirrorTransport/KcpTransport.cs b/UnityProject/Assets/Mirror/Runtime/Transport/KCP/MirrorTransport/KcpTransport.cs index d5ce8004..3dce7fc1 100644 --- a/UnityProject/Assets/Mirror/Runtime/Transport/KCP/MirrorTransport/KcpTransport.cs +++ b/UnityProject/Assets/Mirror/Runtime/Transport/KCP/MirrorTransport/KcpTransport.cs @@ -164,7 +164,11 @@ public override void ServerSend(int connectionId, int channelId, ArraySegment server.Disconnect(connectionId); + public override bool ServerDisconnect(int connectionId) + { + server.Disconnect(connectionId); + return true; + } public override string ServerGetClientAddress(int connectionId) => server.GetClientAddress(connectionId); public override void ServerStop() => server.Stop(); public override void ServerEarlyUpdate() diff --git a/UnityProject/Assets/Mirror/Runtime/Transport/KCP/MirrorTransport/KcpTransport.cs.meta b/UnityProject/Assets/Mirror/Runtime/Transport/KCP/MirrorTransport/KcpTransport.cs.meta index 14c10893..f7280c8b 100644 --- a/UnityProject/Assets/Mirror/Runtime/Transport/KCP/MirrorTransport/KcpTransport.cs.meta +++ b/UnityProject/Assets/Mirror/Runtime/Transport/KCP/MirrorTransport/KcpTransport.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {fileID: 2800000, guid: 7453abfe9e8b2c04a8a47eb536fe21eb, type: 3} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Runtime/Transport/KCP/kcp2k.meta b/UnityProject/Assets/Mirror/Runtime/Transport/KCP/kcp2k.meta index 95f3484b..1dceadfe 100644 --- a/UnityProject/Assets/Mirror/Runtime/Transport/KCP/kcp2k.meta +++ b/UnityProject/Assets/Mirror/Runtime/Transport/KCP/kcp2k.meta @@ -3,6 +3,6 @@ guid: 71a1c8e8c022d4731a481c1808f37e5d folderAsset: yes DefaultImporter: externalObjects: {} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Runtime/Transport/KCP/kcp2k/LICENSE.meta b/UnityProject/Assets/Mirror/Runtime/Transport/KCP/kcp2k/LICENSE.meta index 70f44683..49dc767e 100644 --- a/UnityProject/Assets/Mirror/Runtime/Transport/KCP/kcp2k/LICENSE.meta +++ b/UnityProject/Assets/Mirror/Runtime/Transport/KCP/kcp2k/LICENSE.meta @@ -2,6 +2,6 @@ fileFormatVersion: 2 guid: 9a3e8369060cf4e94ac117603de47aa6 DefaultImporter: externalObjects: {} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Runtime/Transport/KCP/kcp2k/VERSION.meta b/UnityProject/Assets/Mirror/Runtime/Transport/KCP/kcp2k/VERSION.meta index cd9d20d7..2a07daa5 100644 --- a/UnityProject/Assets/Mirror/Runtime/Transport/KCP/kcp2k/VERSION.meta +++ b/UnityProject/Assets/Mirror/Runtime/Transport/KCP/kcp2k/VERSION.meta @@ -2,6 +2,6 @@ fileFormatVersion: 2 guid: ed3f2cf1bbf1b4d53a6f2c103d311f71 DefaultImporter: externalObjects: {} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Runtime/Transport/KCP/kcp2k/highlevel.meta b/UnityProject/Assets/Mirror/Runtime/Transport/KCP/kcp2k/highlevel.meta index a9e212cf..1c11c3d3 100644 --- a/UnityProject/Assets/Mirror/Runtime/Transport/KCP/kcp2k/highlevel.meta +++ b/UnityProject/Assets/Mirror/Runtime/Transport/KCP/kcp2k/highlevel.meta @@ -3,6 +3,6 @@ guid: 5a54d18b954cb4407a28b633fc32ea6d folderAsset: yes DefaultImporter: externalObjects: {} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Runtime/Transport/KCP/kcp2k/highlevel/KcpChannel.cs.meta b/UnityProject/Assets/Mirror/Runtime/Transport/KCP/kcp2k/highlevel/KcpChannel.cs.meta index 1889c6c4..27210256 100644 --- a/UnityProject/Assets/Mirror/Runtime/Transport/KCP/kcp2k/highlevel/KcpChannel.cs.meta +++ b/UnityProject/Assets/Mirror/Runtime/Transport/KCP/kcp2k/highlevel/KcpChannel.cs.meta @@ -1,3 +1,3 @@ -fileFormatVersion: 2 +fileFormatVersion: 2 guid: 9e852b2532fb248d19715cfebe371db3 -timeCreated: 1610081248 +timeCreated: 1610081248 \ No newline at end of file diff --git a/UnityProject/Assets/Mirror/Runtime/Transport/KCP/kcp2k/highlevel/KcpClient.cs.meta b/UnityProject/Assets/Mirror/Runtime/Transport/KCP/kcp2k/highlevel/KcpClient.cs.meta index b9723976..e55306b4 100644 --- a/UnityProject/Assets/Mirror/Runtime/Transport/KCP/kcp2k/highlevel/KcpClient.cs.meta +++ b/UnityProject/Assets/Mirror/Runtime/Transport/KCP/kcp2k/highlevel/KcpClient.cs.meta @@ -1,3 +1,3 @@ -fileFormatVersion: 2 +fileFormatVersion: 2 guid: 6aa069a28ed24fedb533c102d9742b36 -timeCreated: 1603786960 +timeCreated: 1603786960 \ No newline at end of file diff --git a/UnityProject/Assets/Mirror/Runtime/Transport/KCP/kcp2k/highlevel/KcpClientConnection.cs.meta b/UnityProject/Assets/Mirror/Runtime/Transport/KCP/kcp2k/highlevel/KcpClientConnection.cs.meta index 79958902..33699184 100644 --- a/UnityProject/Assets/Mirror/Runtime/Transport/KCP/kcp2k/highlevel/KcpClientConnection.cs.meta +++ b/UnityProject/Assets/Mirror/Runtime/Transport/KCP/kcp2k/highlevel/KcpClientConnection.cs.meta @@ -1,3 +1,3 @@ -fileFormatVersion: 2 +fileFormatVersion: 2 guid: 96512e74aa8214a6faa8a412a7a07877 -timeCreated: 1602601237 +timeCreated: 1602601237 \ No newline at end of file diff --git a/UnityProject/Assets/Mirror/Runtime/Transport/KCP/kcp2k/highlevel/KcpConnection.cs.meta b/UnityProject/Assets/Mirror/Runtime/Transport/KCP/kcp2k/highlevel/KcpConnection.cs.meta index 9c41eb5d..fa5dcff9 100644 --- a/UnityProject/Assets/Mirror/Runtime/Transport/KCP/kcp2k/highlevel/KcpConnection.cs.meta +++ b/UnityProject/Assets/Mirror/Runtime/Transport/KCP/kcp2k/highlevel/KcpConnection.cs.meta @@ -1,3 +1,3 @@ -fileFormatVersion: 2 +fileFormatVersion: 2 guid: 3915c7c62b72d4dc2a9e4e76c94fc484 -timeCreated: 1602600432 +timeCreated: 1602600432 \ No newline at end of file diff --git a/UnityProject/Assets/Mirror/Runtime/Transport/KCP/kcp2k/highlevel/KcpHeader.cs.meta b/UnityProject/Assets/Mirror/Runtime/Transport/KCP/kcp2k/highlevel/KcpHeader.cs.meta index 6d12b559..9e81c946 100644 --- a/UnityProject/Assets/Mirror/Runtime/Transport/KCP/kcp2k/highlevel/KcpHeader.cs.meta +++ b/UnityProject/Assets/Mirror/Runtime/Transport/KCP/kcp2k/highlevel/KcpHeader.cs.meta @@ -1,3 +1,3 @@ -fileFormatVersion: 2 +fileFormatVersion: 2 guid: 91b5edac31224a49bd76f960ae018942 -timeCreated: 1610081248 +timeCreated: 1610081248 \ No newline at end of file diff --git a/UnityProject/Assets/Mirror/Runtime/Transport/KCP/kcp2k/highlevel/KcpServer.cs.meta b/UnityProject/Assets/Mirror/Runtime/Transport/KCP/kcp2k/highlevel/KcpServer.cs.meta index 509aca2e..ef720d4c 100644 --- a/UnityProject/Assets/Mirror/Runtime/Transport/KCP/kcp2k/highlevel/KcpServer.cs.meta +++ b/UnityProject/Assets/Mirror/Runtime/Transport/KCP/kcp2k/highlevel/KcpServer.cs.meta @@ -1,3 +1,3 @@ -fileFormatVersion: 2 +fileFormatVersion: 2 guid: 9759159c6589494a9037f5e130a867ed -timeCreated: 1603787747 +timeCreated: 1603787747 \ No newline at end of file diff --git a/UnityProject/Assets/Mirror/Runtime/Transport/KCP/kcp2k/highlevel/KcpServerConnection.cs.meta b/UnityProject/Assets/Mirror/Runtime/Transport/KCP/kcp2k/highlevel/KcpServerConnection.cs.meta index 32b97c60..10d9803d 100644 --- a/UnityProject/Assets/Mirror/Runtime/Transport/KCP/kcp2k/highlevel/KcpServerConnection.cs.meta +++ b/UnityProject/Assets/Mirror/Runtime/Transport/KCP/kcp2k/highlevel/KcpServerConnection.cs.meta @@ -1,3 +1,3 @@ -fileFormatVersion: 2 +fileFormatVersion: 2 guid: 80a9b1ce9a6f14abeb32bfa9921d097b -timeCreated: 1602601483 +timeCreated: 1602601483 \ No newline at end of file diff --git a/UnityProject/Assets/Mirror/Runtime/Transport/KCP/kcp2k/highlevel/Log.cs.meta b/UnityProject/Assets/Mirror/Runtime/Transport/KCP/kcp2k/highlevel/Log.cs.meta index bdc1fa51..333bee5f 100644 --- a/UnityProject/Assets/Mirror/Runtime/Transport/KCP/kcp2k/highlevel/Log.cs.meta +++ b/UnityProject/Assets/Mirror/Runtime/Transport/KCP/kcp2k/highlevel/Log.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Runtime/Transport/KCP/kcp2k/kcp.meta b/UnityProject/Assets/Mirror/Runtime/Transport/KCP/kcp2k/kcp.meta index 32121b3a..a7d6e112 100644 --- a/UnityProject/Assets/Mirror/Runtime/Transport/KCP/kcp2k/kcp.meta +++ b/UnityProject/Assets/Mirror/Runtime/Transport/KCP/kcp2k/kcp.meta @@ -3,6 +3,6 @@ guid: 5cafb8851a0084f3e94a580c207b3923 folderAsset: yes DefaultImporter: externalObjects: {} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Runtime/Transport/KCP/kcp2k/kcp/AssemblyInfo.cs.meta b/UnityProject/Assets/Mirror/Runtime/Transport/KCP/kcp2k/kcp/AssemblyInfo.cs.meta index 1f0cec54..6b442a94 100644 --- a/UnityProject/Assets/Mirror/Runtime/Transport/KCP/kcp2k/kcp/AssemblyInfo.cs.meta +++ b/UnityProject/Assets/Mirror/Runtime/Transport/KCP/kcp2k/kcp/AssemblyInfo.cs.meta @@ -1,3 +1,3 @@ -fileFormatVersion: 2 +fileFormatVersion: 2 guid: aec6a15ac7bd43129317ea1f01f19782 -timeCreated: 1602665988 +timeCreated: 1602665988 \ No newline at end of file diff --git a/UnityProject/Assets/Mirror/Runtime/Transport/KCP/kcp2k/kcp/Kcp.cs.meta b/UnityProject/Assets/Mirror/Runtime/Transport/KCP/kcp2k/kcp/Kcp.cs.meta index ec0a3e13..935b4239 100644 --- a/UnityProject/Assets/Mirror/Runtime/Transport/KCP/kcp2k/kcp/Kcp.cs.meta +++ b/UnityProject/Assets/Mirror/Runtime/Transport/KCP/kcp2k/kcp/Kcp.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Runtime/Transport/KCP/kcp2k/kcp/Segment.cs.meta b/UnityProject/Assets/Mirror/Runtime/Transport/KCP/kcp2k/kcp/Segment.cs.meta index 913d1371..d14dc1a1 100644 --- a/UnityProject/Assets/Mirror/Runtime/Transport/KCP/kcp2k/kcp/Segment.cs.meta +++ b/UnityProject/Assets/Mirror/Runtime/Transport/KCP/kcp2k/kcp/Segment.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Runtime/Transport/KCP/kcp2k/kcp/Utils.cs.meta b/UnityProject/Assets/Mirror/Runtime/Transport/KCP/kcp2k/kcp/Utils.cs.meta index 0b5a45bc..86118bc9 100644 --- a/UnityProject/Assets/Mirror/Runtime/Transport/KCP/kcp2k/kcp/Utils.cs.meta +++ b/UnityProject/Assets/Mirror/Runtime/Transport/KCP/kcp2k/kcp/Utils.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Runtime/Transport/KCP/kcp2k/kcp2k.asmdef.meta b/UnityProject/Assets/Mirror/Runtime/Transport/KCP/kcp2k/kcp2k.asmdef.meta index d01a5621..1d70e800 100644 --- a/UnityProject/Assets/Mirror/Runtime/Transport/KCP/kcp2k/kcp2k.asmdef.meta +++ b/UnityProject/Assets/Mirror/Runtime/Transport/KCP/kcp2k/kcp2k.asmdef.meta @@ -2,6 +2,6 @@ fileFormatVersion: 2 guid: 6806a62c384838046a3c66c44f06d75f AssemblyDefinitionImporter: externalObjects: {} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Runtime/Transport/LRM/LRMDirectConnectModule.cs b/UnityProject/Assets/Mirror/Runtime/Transport/LRM/LRMDirectConnectModule.cs index 8a3a4795..53fd576d 100644 --- a/UnityProject/Assets/Mirror/Runtime/Transport/LRM/LRMDirectConnectModule.cs +++ b/UnityProject/Assets/Mirror/Runtime/Transport/LRM/LRMDirectConnectModule.cs @@ -88,11 +88,11 @@ public bool SupportsNATPunch() return directConnectTransport is kcp2k.KcpTransport; } - public void KickClient(int clientID) + public bool KickClient(int clientID) { if (showDebugLogs) Debug.Log("Kicked direct connect client."); - directConnectTransport.ServerDisconnect(clientID); + return directConnectTransport.ServerDisconnect(clientID); } public void ClientDisconnect() diff --git a/UnityProject/Assets/Mirror/Runtime/Transport/LRM/LRMTransport/LRMTransportOverrides.cs b/UnityProject/Assets/Mirror/Runtime/Transport/LRM/LRMTransport/LRMTransportOverrides.cs index a75fe602..2ef59bd6 100644 --- a/UnityProject/Assets/Mirror/Runtime/Transport/LRM/LRMTransport/LRMTransportOverrides.cs +++ b/UnityProject/Assets/Mirror/Runtime/Transport/LRM/LRMTransport/LRMTransportOverrides.cs @@ -136,18 +136,20 @@ public override void ClientSend(int channelId, ArraySegment segment) } } - public override void ServerDisconnect(int connectionId) + public override bool ServerDisconnect(int connectionId) { if (_connectedRelayClients.TryGetBySecond(connectionId, out int relayId)) { int pos = 0; _clientSendBuffer.WriteByte(ref pos, (byte)OpCodes.KickPlayer); _clientSendBuffer.WriteInt(ref pos, relayId); - return; + return true; } if (_connectedDirectClients.TryGetBySecond(connectionId, out int directId)) - _directConnectModule.KickClient(directId); + return _directConnectModule.KickClient(directId); + + return false; } public override void ServerSend(int connectionId, int channelId, ArraySegment segment) diff --git a/UnityProject/Assets/Mirror/Runtime/Transport/LatencySimulation.cs b/UnityProject/Assets/Mirror/Runtime/Transport/LatencySimulation.cs index 550a8a12..bc492a4e 100644 --- a/UnityProject/Assets/Mirror/Runtime/Transport/LatencySimulation.cs +++ b/UnityProject/Assets/Mirror/Runtime/Transport/LatencySimulation.cs @@ -173,7 +173,7 @@ public override void ClientSend(int channelId, ArraySegment segment) public override string ServerGetClientAddress(int connectionId) => wrap.ServerGetClientAddress(connectionId); - public override void ServerDisconnect(int connectionId) => wrap.ServerDisconnect(connectionId); + public override bool ServerDisconnect(int connectionId) => wrap.ServerDisconnect(connectionId); public override void ServerSend(int connectionId, int channelId, ArraySegment segment) { diff --git a/UnityProject/Assets/Mirror/Runtime/Transport/LatencySimulation.cs.meta b/UnityProject/Assets/Mirror/Runtime/Transport/LatencySimulation.cs.meta index 8b02be0f..eabbe4a6 100644 --- a/UnityProject/Assets/Mirror/Runtime/Transport/LatencySimulation.cs.meta +++ b/UnityProject/Assets/Mirror/Runtime/Transport/LatencySimulation.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {fileID: 2800000, guid: 7453abfe9e8b2c04a8a47eb536fe21eb, type: 3} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Runtime/Transport/MiddlewareTransport.cs b/UnityProject/Assets/Mirror/Runtime/Transport/MiddlewareTransport.cs index 61e3f2e2..dbbe979f 100644 --- a/UnityProject/Assets/Mirror/Runtime/Transport/MiddlewareTransport.cs +++ b/UnityProject/Assets/Mirror/Runtime/Transport/MiddlewareTransport.cs @@ -46,7 +46,7 @@ public override void ServerStart() public override void ServerStop() => inner.ServerStop(); public override void ServerSend(int connectionId, int channelId, ArraySegment segment) => inner.ServerSend(connectionId, channelId, segment); - public override void ServerDisconnect(int connectionId) => inner.ServerDisconnect(connectionId); + public override bool ServerDisconnect(int connectionId) => inner.ServerDisconnect(connectionId); public override string ServerGetClientAddress(int connectionId) => inner.ServerGetClientAddress(connectionId); public override Uri ServerUri() => inner.ServerUri(); #endregion diff --git a/UnityProject/Assets/Mirror/Runtime/Transport/MiddlewareTransport.cs.meta b/UnityProject/Assets/Mirror/Runtime/Transport/MiddlewareTransport.cs.meta index b76168dc..dce8378f 100644 --- a/UnityProject/Assets/Mirror/Runtime/Transport/MiddlewareTransport.cs.meta +++ b/UnityProject/Assets/Mirror/Runtime/Transport/MiddlewareTransport.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {fileID: 2800000, guid: 7453abfe9e8b2c04a8a47eb536fe21eb, type: 3} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Runtime/Transport/MultiplexTransport.cs b/UnityProject/Assets/Mirror/Runtime/Transport/MultiplexTransport.cs index fe57714a..8608bf4d 100644 --- a/UnityProject/Assets/Mirror/Runtime/Transport/MultiplexTransport.cs +++ b/UnityProject/Assets/Mirror/Runtime/Transport/MultiplexTransport.cs @@ -224,11 +224,11 @@ public override string ServerGetClientAddress(int connectionId) return transports[transportId].ServerGetClientAddress(baseConnectionId); } - public override void ServerDisconnect(int connectionId) + public override bool ServerDisconnect(int connectionId) { int baseConnectionId = ToBaseId(connectionId); int transportId = ToTransportId(connectionId); - transports[transportId].ServerDisconnect(baseConnectionId); + return transports[transportId].ServerDisconnect(baseConnectionId); } public override void ServerSend(int connectionId, int channelId, ArraySegment segment) diff --git a/UnityProject/Assets/Mirror/Runtime/Transport/MultiplexTransport.cs.meta b/UnityProject/Assets/Mirror/Runtime/Transport/MultiplexTransport.cs.meta index 4e9e01fd..6e97b28f 100644 --- a/UnityProject/Assets/Mirror/Runtime/Transport/MultiplexTransport.cs.meta +++ b/UnityProject/Assets/Mirror/Runtime/Transport/MultiplexTransport.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {fileID: 2800000, guid: 7453abfe9e8b2c04a8a47eb536fe21eb, type: 3} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Runtime/Transport/SimpleWebTransport.meta b/UnityProject/Assets/Mirror/Runtime/Transport/SimpleWebTransport.meta index a503f867..5baa80fd 100644 --- a/UnityProject/Assets/Mirror/Runtime/Transport/SimpleWebTransport.meta +++ b/UnityProject/Assets/Mirror/Runtime/Transport/SimpleWebTransport.meta @@ -3,6 +3,6 @@ guid: a3ba68af305d809418d6c6a804939290 folderAsset: yes DefaultImporter: externalObjects: {} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Runtime/Transport/SimpleWebTransport/AssemblyInfo.cs.meta b/UnityProject/Assets/Mirror/Runtime/Transport/SimpleWebTransport/AssemblyInfo.cs.meta index e3739f64..028a3073 100644 --- a/UnityProject/Assets/Mirror/Runtime/Transport/SimpleWebTransport/AssemblyInfo.cs.meta +++ b/UnityProject/Assets/Mirror/Runtime/Transport/SimpleWebTransport/AssemblyInfo.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Runtime/Transport/SimpleWebTransport/Client.meta b/UnityProject/Assets/Mirror/Runtime/Transport/SimpleWebTransport/Client.meta index 90fa667a..e6e29434 100644 --- a/UnityProject/Assets/Mirror/Runtime/Transport/SimpleWebTransport/Client.meta +++ b/UnityProject/Assets/Mirror/Runtime/Transport/SimpleWebTransport/Client.meta @@ -3,6 +3,6 @@ guid: 5faa957b8d9fc314ab7596ccf14750d9 folderAsset: yes DefaultImporter: externalObjects: {} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Runtime/Transport/SimpleWebTransport/Client/SimpleWebClient.cs.meta b/UnityProject/Assets/Mirror/Runtime/Transport/SimpleWebTransport/Client/SimpleWebClient.cs.meta index e5889263..90c361b4 100644 --- a/UnityProject/Assets/Mirror/Runtime/Transport/SimpleWebTransport/Client/SimpleWebClient.cs.meta +++ b/UnityProject/Assets/Mirror/Runtime/Transport/SimpleWebTransport/Client/SimpleWebClient.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Runtime/Transport/SimpleWebTransport/Client/StandAlone.meta b/UnityProject/Assets/Mirror/Runtime/Transport/SimpleWebTransport/Client/StandAlone.meta index 2dc5fc0e..bf320c60 100644 --- a/UnityProject/Assets/Mirror/Runtime/Transport/SimpleWebTransport/Client/StandAlone.meta +++ b/UnityProject/Assets/Mirror/Runtime/Transport/SimpleWebTransport/Client/StandAlone.meta @@ -3,6 +3,6 @@ guid: a9c19d05220a87c4cbbe4d1e422da0aa folderAsset: yes DefaultImporter: externalObjects: {} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Runtime/Transport/SimpleWebTransport/Client/StandAlone/ClientHandshake.cs b/UnityProject/Assets/Mirror/Runtime/Transport/SimpleWebTransport/Client/StandAlone/ClientHandshake.cs index 24c3896a..87f4ecdd 100644 --- a/UnityProject/Assets/Mirror/Runtime/Transport/SimpleWebTransport/Client/StandAlone/ClientHandshake.cs +++ b/UnityProject/Assets/Mirror/Runtime/Transport/SimpleWebTransport/Client/StandAlone/ClientHandshake.cs @@ -32,7 +32,7 @@ public bool TryHandshake(Connection conn, Uri uri) string expectedResponse = Convert.ToBase64String(keySumHash); string handshake = - $"GET {uri.PathAndQuery} HTTP/1.1\r\n" + + $"GET /chat HTTP/1.1\r\n" + $"Host: {uri.Host}:{uri.Port}\r\n" + $"Upgrade: websocket\r\n" + $"Connection: Upgrade\r\n" + diff --git a/UnityProject/Assets/Mirror/Runtime/Transport/SimpleWebTransport/Client/StandAlone/ClientHandshake.cs.meta b/UnityProject/Assets/Mirror/Runtime/Transport/SimpleWebTransport/Client/StandAlone/ClientHandshake.cs.meta index b3e44910..ad3d40d0 100644 --- a/UnityProject/Assets/Mirror/Runtime/Transport/SimpleWebTransport/Client/StandAlone/ClientHandshake.cs.meta +++ b/UnityProject/Assets/Mirror/Runtime/Transport/SimpleWebTransport/Client/StandAlone/ClientHandshake.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Runtime/Transport/SimpleWebTransport/Client/StandAlone/ClientSslHelper.cs.meta b/UnityProject/Assets/Mirror/Runtime/Transport/SimpleWebTransport/Client/StandAlone/ClientSslHelper.cs.meta index 387f9477..d6be2bba 100644 --- a/UnityProject/Assets/Mirror/Runtime/Transport/SimpleWebTransport/Client/StandAlone/ClientSslHelper.cs.meta +++ b/UnityProject/Assets/Mirror/Runtime/Transport/SimpleWebTransport/Client/StandAlone/ClientSslHelper.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Runtime/Transport/SimpleWebTransport/Client/StandAlone/WebSocketClientStandAlone.cs.meta b/UnityProject/Assets/Mirror/Runtime/Transport/SimpleWebTransport/Client/StandAlone/WebSocketClientStandAlone.cs.meta index 29352079..37229d3d 100644 --- a/UnityProject/Assets/Mirror/Runtime/Transport/SimpleWebTransport/Client/StandAlone/WebSocketClientStandAlone.cs.meta +++ b/UnityProject/Assets/Mirror/Runtime/Transport/SimpleWebTransport/Client/StandAlone/WebSocketClientStandAlone.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Runtime/Transport/SimpleWebTransport/Client/Webgl.meta b/UnityProject/Assets/Mirror/Runtime/Transport/SimpleWebTransport/Client/Webgl.meta index c7ae4ea6..2d81f7f6 100644 --- a/UnityProject/Assets/Mirror/Runtime/Transport/SimpleWebTransport/Client/Webgl.meta +++ b/UnityProject/Assets/Mirror/Runtime/Transport/SimpleWebTransport/Client/Webgl.meta @@ -3,6 +3,6 @@ guid: 7142349d566213c4abc763afaf4d91a1 folderAsset: yes DefaultImporter: externalObjects: {} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Runtime/Transport/SimpleWebTransport/Client/Webgl/SimpleWebJSLib.cs.meta b/UnityProject/Assets/Mirror/Runtime/Transport/SimpleWebTransport/Client/Webgl/SimpleWebJSLib.cs.meta index de620852..9dfa12ef 100644 --- a/UnityProject/Assets/Mirror/Runtime/Transport/SimpleWebTransport/Client/Webgl/SimpleWebJSLib.cs.meta +++ b/UnityProject/Assets/Mirror/Runtime/Transport/SimpleWebTransport/Client/Webgl/SimpleWebJSLib.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Runtime/Transport/SimpleWebTransport/Client/Webgl/WebSocketClientWebGl.cs.meta b/UnityProject/Assets/Mirror/Runtime/Transport/SimpleWebTransport/Client/Webgl/WebSocketClientWebGl.cs.meta index f467f5aa..3827d3a1 100644 --- a/UnityProject/Assets/Mirror/Runtime/Transport/SimpleWebTransport/Client/Webgl/WebSocketClientWebGl.cs.meta +++ b/UnityProject/Assets/Mirror/Runtime/Transport/SimpleWebTransport/Client/Webgl/WebSocketClientWebGl.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Runtime/Transport/SimpleWebTransport/Client/Webgl/plugin.meta b/UnityProject/Assets/Mirror/Runtime/Transport/SimpleWebTransport/Client/Webgl/plugin.meta index 94a99183..b516a8f6 100644 --- a/UnityProject/Assets/Mirror/Runtime/Transport/SimpleWebTransport/Client/Webgl/plugin.meta +++ b/UnityProject/Assets/Mirror/Runtime/Transport/SimpleWebTransport/Client/Webgl/plugin.meta @@ -3,6 +3,6 @@ guid: 1999985791b91b9458059e88404885a7 folderAsset: yes DefaultImporter: externalObjects: {} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Runtime/Transport/SimpleWebTransport/Client/Webgl/plugin/SimpleWeb.jslib.meta b/UnityProject/Assets/Mirror/Runtime/Transport/SimpleWebTransport/Client/Webgl/plugin/SimpleWeb.jslib.meta index 592c2182..cc1319ec 100644 --- a/UnityProject/Assets/Mirror/Runtime/Transport/SimpleWebTransport/Client/Webgl/plugin/SimpleWeb.jslib.meta +++ b/UnityProject/Assets/Mirror/Runtime/Transport/SimpleWebTransport/Client/Webgl/plugin/SimpleWeb.jslib.meta @@ -12,7 +12,7 @@ PluginImporter: validateReferences: 1 platformData: - first: - Any: '' + Any: second: enabled: 0 settings: {} @@ -32,6 +32,6 @@ PluginImporter: second: enabled: 1 settings: {} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Runtime/Transport/SimpleWebTransport/Common.meta b/UnityProject/Assets/Mirror/Runtime/Transport/SimpleWebTransport/Common.meta index d14f3d56..078faaa7 100644 --- a/UnityProject/Assets/Mirror/Runtime/Transport/SimpleWebTransport/Common.meta +++ b/UnityProject/Assets/Mirror/Runtime/Transport/SimpleWebTransport/Common.meta @@ -3,6 +3,6 @@ guid: 564d2cd3eee5b21419553c0528739d1b folderAsset: yes DefaultImporter: externalObjects: {} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Runtime/Transport/SimpleWebTransport/Common/BufferPool.cs.meta b/UnityProject/Assets/Mirror/Runtime/Transport/SimpleWebTransport/Common/BufferPool.cs.meta index a93355f8..0b1070fe 100644 --- a/UnityProject/Assets/Mirror/Runtime/Transport/SimpleWebTransport/Common/BufferPool.cs.meta +++ b/UnityProject/Assets/Mirror/Runtime/Transport/SimpleWebTransport/Common/BufferPool.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Runtime/Transport/SimpleWebTransport/Common/Connection.cs.meta b/UnityProject/Assets/Mirror/Runtime/Transport/SimpleWebTransport/Common/Connection.cs.meta index 2238bb8b..d48a835d 100644 --- a/UnityProject/Assets/Mirror/Runtime/Transport/SimpleWebTransport/Common/Connection.cs.meta +++ b/UnityProject/Assets/Mirror/Runtime/Transport/SimpleWebTransport/Common/Connection.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Runtime/Transport/SimpleWebTransport/Common/Constants.cs.meta b/UnityProject/Assets/Mirror/Runtime/Transport/SimpleWebTransport/Common/Constants.cs.meta index e819821c..ece602ea 100644 --- a/UnityProject/Assets/Mirror/Runtime/Transport/SimpleWebTransport/Common/Constants.cs.meta +++ b/UnityProject/Assets/Mirror/Runtime/Transport/SimpleWebTransport/Common/Constants.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Runtime/Transport/SimpleWebTransport/Common/EventType.cs.meta b/UnityProject/Assets/Mirror/Runtime/Transport/SimpleWebTransport/Common/EventType.cs.meta index 4d3948c8..a91403a0 100644 --- a/UnityProject/Assets/Mirror/Runtime/Transport/SimpleWebTransport/Common/EventType.cs.meta +++ b/UnityProject/Assets/Mirror/Runtime/Transport/SimpleWebTransport/Common/EventType.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Runtime/Transport/SimpleWebTransport/Common/Log.cs.meta b/UnityProject/Assets/Mirror/Runtime/Transport/SimpleWebTransport/Common/Log.cs.meta index 5a25a921..beb28832 100644 --- a/UnityProject/Assets/Mirror/Runtime/Transport/SimpleWebTransport/Common/Log.cs.meta +++ b/UnityProject/Assets/Mirror/Runtime/Transport/SimpleWebTransport/Common/Log.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Runtime/Transport/SimpleWebTransport/Common/Message.cs.meta b/UnityProject/Assets/Mirror/Runtime/Transport/SimpleWebTransport/Common/Message.cs.meta index 12b39e80..3286a2c7 100644 --- a/UnityProject/Assets/Mirror/Runtime/Transport/SimpleWebTransport/Common/Message.cs.meta +++ b/UnityProject/Assets/Mirror/Runtime/Transport/SimpleWebTransport/Common/Message.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Runtime/Transport/SimpleWebTransport/Common/MessageProcessor.cs.meta b/UnityProject/Assets/Mirror/Runtime/Transport/SimpleWebTransport/Common/MessageProcessor.cs.meta index f0ebf7b0..7e3a7c41 100644 --- a/UnityProject/Assets/Mirror/Runtime/Transport/SimpleWebTransport/Common/MessageProcessor.cs.meta +++ b/UnityProject/Assets/Mirror/Runtime/Transport/SimpleWebTransport/Common/MessageProcessor.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Runtime/Transport/SimpleWebTransport/Common/ReadHelper.cs.meta b/UnityProject/Assets/Mirror/Runtime/Transport/SimpleWebTransport/Common/ReadHelper.cs.meta index 1d32a00e..77d09c18 100644 --- a/UnityProject/Assets/Mirror/Runtime/Transport/SimpleWebTransport/Common/ReadHelper.cs.meta +++ b/UnityProject/Assets/Mirror/Runtime/Transport/SimpleWebTransport/Common/ReadHelper.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Runtime/Transport/SimpleWebTransport/Common/ReceiveLoop.cs.meta b/UnityProject/Assets/Mirror/Runtime/Transport/SimpleWebTransport/Common/ReceiveLoop.cs.meta index 8e37342c..47c6ff5a 100644 --- a/UnityProject/Assets/Mirror/Runtime/Transport/SimpleWebTransport/Common/ReceiveLoop.cs.meta +++ b/UnityProject/Assets/Mirror/Runtime/Transport/SimpleWebTransport/Common/ReceiveLoop.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Runtime/Transport/SimpleWebTransport/Common/SendLoop.cs.meta b/UnityProject/Assets/Mirror/Runtime/Transport/SimpleWebTransport/Common/SendLoop.cs.meta index 4dab9090..09dfd1e6 100644 --- a/UnityProject/Assets/Mirror/Runtime/Transport/SimpleWebTransport/Common/SendLoop.cs.meta +++ b/UnityProject/Assets/Mirror/Runtime/Transport/SimpleWebTransport/Common/SendLoop.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Runtime/Transport/SimpleWebTransport/Common/TcpConfig.cs.meta b/UnityProject/Assets/Mirror/Runtime/Transport/SimpleWebTransport/Common/TcpConfig.cs.meta index 2530f1f3..62ba232e 100644 --- a/UnityProject/Assets/Mirror/Runtime/Transport/SimpleWebTransport/Common/TcpConfig.cs.meta +++ b/UnityProject/Assets/Mirror/Runtime/Transport/SimpleWebTransport/Common/TcpConfig.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Runtime/Transport/SimpleWebTransport/Common/Utils.cs.meta b/UnityProject/Assets/Mirror/Runtime/Transport/SimpleWebTransport/Common/Utils.cs.meta index a84f8d79..79a15836 100644 --- a/UnityProject/Assets/Mirror/Runtime/Transport/SimpleWebTransport/Common/Utils.cs.meta +++ b/UnityProject/Assets/Mirror/Runtime/Transport/SimpleWebTransport/Common/Utils.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Runtime/Transport/SimpleWebTransport/README.txt b/UnityProject/Assets/Mirror/Runtime/Transport/SimpleWebTransport/README.txt index 58aa246e..992424cb 100644 --- a/UnityProject/Assets/Mirror/Runtime/Transport/SimpleWebTransport/README.txt +++ b/UnityProject/Assets/Mirror/Runtime/Transport/SimpleWebTransport/README.txt @@ -10,7 +10,7 @@ Requirements: Mirror v18.0.0 Documentation: - https://mirror-networking.gitbook.io/docs/ + https://mirror-networking.com/docs/ https://github.com/MirrorNetworking/SimpleWebTransport/blob/master/README.md Support: diff --git a/UnityProject/Assets/Mirror/Runtime/Transport/SimpleWebTransport/README.txt.meta b/UnityProject/Assets/Mirror/Runtime/Transport/SimpleWebTransport/README.txt.meta index c0e5d045..b63fe39b 100644 --- a/UnityProject/Assets/Mirror/Runtime/Transport/SimpleWebTransport/README.txt.meta +++ b/UnityProject/Assets/Mirror/Runtime/Transport/SimpleWebTransport/README.txt.meta @@ -2,6 +2,6 @@ fileFormatVersion: 2 guid: 0e3971d5783109f4d9ce93c7a689d701 TextScriptImporter: externalObjects: {} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Runtime/Transport/SimpleWebTransport/Server.meta b/UnityProject/Assets/Mirror/Runtime/Transport/SimpleWebTransport/Server.meta index e1cd1362..31f317f6 100644 --- a/UnityProject/Assets/Mirror/Runtime/Transport/SimpleWebTransport/Server.meta +++ b/UnityProject/Assets/Mirror/Runtime/Transport/SimpleWebTransport/Server.meta @@ -3,6 +3,6 @@ guid: 0e599e92544d43344a9a9060052add28 folderAsset: yes DefaultImporter: externalObjects: {} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Runtime/Transport/SimpleWebTransport/Server/ServerHandshake.cs.meta b/UnityProject/Assets/Mirror/Runtime/Transport/SimpleWebTransport/Server/ServerHandshake.cs.meta index b0a80e9e..6fa74da2 100644 --- a/UnityProject/Assets/Mirror/Runtime/Transport/SimpleWebTransport/Server/ServerHandshake.cs.meta +++ b/UnityProject/Assets/Mirror/Runtime/Transport/SimpleWebTransport/Server/ServerHandshake.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Runtime/Transport/SimpleWebTransport/Server/ServerSslHelper.cs.meta b/UnityProject/Assets/Mirror/Runtime/Transport/SimpleWebTransport/Server/ServerSslHelper.cs.meta index 16d81e80..e0d133c6 100644 --- a/UnityProject/Assets/Mirror/Runtime/Transport/SimpleWebTransport/Server/ServerSslHelper.cs.meta +++ b/UnityProject/Assets/Mirror/Runtime/Transport/SimpleWebTransport/Server/ServerSslHelper.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Runtime/Transport/SimpleWebTransport/Server/SimpleWebServer.cs.meta b/UnityProject/Assets/Mirror/Runtime/Transport/SimpleWebTransport/Server/SimpleWebServer.cs.meta index 6d823bb3..c8c6f5ae 100644 --- a/UnityProject/Assets/Mirror/Runtime/Transport/SimpleWebTransport/Server/SimpleWebServer.cs.meta +++ b/UnityProject/Assets/Mirror/Runtime/Transport/SimpleWebTransport/Server/SimpleWebServer.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Runtime/Transport/SimpleWebTransport/Server/WebSocketServer.cs.meta b/UnityProject/Assets/Mirror/Runtime/Transport/SimpleWebTransport/Server/WebSocketServer.cs.meta index e05ef3a1..0a76a9fd 100644 --- a/UnityProject/Assets/Mirror/Runtime/Transport/SimpleWebTransport/Server/WebSocketServer.cs.meta +++ b/UnityProject/Assets/Mirror/Runtime/Transport/SimpleWebTransport/Server/WebSocketServer.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Runtime/Transport/SimpleWebTransport/SimpleWebTransport.asmdef.meta b/UnityProject/Assets/Mirror/Runtime/Transport/SimpleWebTransport/SimpleWebTransport.asmdef.meta index 1186f325..99755b68 100644 --- a/UnityProject/Assets/Mirror/Runtime/Transport/SimpleWebTransport/SimpleWebTransport.asmdef.meta +++ b/UnityProject/Assets/Mirror/Runtime/Transport/SimpleWebTransport/SimpleWebTransport.asmdef.meta @@ -2,6 +2,6 @@ fileFormatVersion: 2 guid: 3b5390adca4e2bb4791cb930316d6f3e AssemblyDefinitionImporter: externalObjects: {} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Runtime/Transport/SimpleWebTransport/SimpleWebTransport.cs b/UnityProject/Assets/Mirror/Runtime/Transport/SimpleWebTransport/SimpleWebTransport.cs index 131578fb..9e82b649 100644 --- a/UnityProject/Assets/Mirror/Runtime/Transport/SimpleWebTransport/SimpleWebTransport.cs +++ b/UnityProject/Assets/Mirror/Runtime/Transport/SimpleWebTransport/SimpleWebTransport.cs @@ -234,14 +234,15 @@ public override void ServerStop() server = null; } - public override void ServerDisconnect(int connectionId) + public override bool ServerDisconnect(int connectionId) { if (!ServerActive()) { Debug.LogError("SimpleWebServer Not Active"); + return false; } - server.KickClient(connectionId); + return server.KickClient(connectionId); } public override void ServerSend(int connectionId, int channelId, ArraySegment segment) diff --git a/UnityProject/Assets/Mirror/Runtime/Transport/SimpleWebTransport/SimpleWebTransport.cs.meta b/UnityProject/Assets/Mirror/Runtime/Transport/SimpleWebTransport/SimpleWebTransport.cs.meta index 5fc16319..381a5c76 100644 --- a/UnityProject/Assets/Mirror/Runtime/Transport/SimpleWebTransport/SimpleWebTransport.cs.meta +++ b/UnityProject/Assets/Mirror/Runtime/Transport/SimpleWebTransport/SimpleWebTransport.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {fileID: 2800000, guid: 7453abfe9e8b2c04a8a47eb536fe21eb, type: 3} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Runtime/Transport/SimpleWebTransport/SslConfigLoader.cs.meta b/UnityProject/Assets/Mirror/Runtime/Transport/SimpleWebTransport/SslConfigLoader.cs.meta index 6837a6c3..e6535324 100644 --- a/UnityProject/Assets/Mirror/Runtime/Transport/SimpleWebTransport/SslConfigLoader.cs.meta +++ b/UnityProject/Assets/Mirror/Runtime/Transport/SimpleWebTransport/SslConfigLoader.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Runtime/Transport/Telepathy.meta b/UnityProject/Assets/Mirror/Runtime/Transport/Telepathy.meta index 11de68f8..ede2d0e4 100644 --- a/UnityProject/Assets/Mirror/Runtime/Transport/Telepathy.meta +++ b/UnityProject/Assets/Mirror/Runtime/Transport/Telepathy.meta @@ -3,6 +3,6 @@ guid: 552b3d8382916438d81fe7f39e18db72 folderAsset: yes DefaultImporter: externalObjects: {} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Runtime/Transport/Telepathy/Telepathy.meta b/UnityProject/Assets/Mirror/Runtime/Transport/Telepathy/Telepathy.meta index 4f6d619a..345a6389 100644 --- a/UnityProject/Assets/Mirror/Runtime/Transport/Telepathy/Telepathy.meta +++ b/UnityProject/Assets/Mirror/Runtime/Transport/Telepathy/Telepathy.meta @@ -3,6 +3,6 @@ guid: a1233408bc4b145fb8f6f5a8e95790e0 folderAsset: yes DefaultImporter: externalObjects: {} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Runtime/Transport/Telepathy/Telepathy/Client.cs.meta b/UnityProject/Assets/Mirror/Runtime/Transport/Telepathy/Telepathy/Client.cs.meta index d75406d8..1b6d222e 100644 --- a/UnityProject/Assets/Mirror/Runtime/Transport/Telepathy/Telepathy/Client.cs.meta +++ b/UnityProject/Assets/Mirror/Runtime/Transport/Telepathy/Telepathy/Client.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Runtime/Transport/Telepathy/Telepathy/Common.cs.meta b/UnityProject/Assets/Mirror/Runtime/Transport/Telepathy/Telepathy/Common.cs.meta index db6a30cf..5d8ab5b9 100644 --- a/UnityProject/Assets/Mirror/Runtime/Transport/Telepathy/Telepathy/Common.cs.meta +++ b/UnityProject/Assets/Mirror/Runtime/Transport/Telepathy/Telepathy/Common.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Runtime/Transport/Telepathy/Telepathy/ConnectionState.cs.meta b/UnityProject/Assets/Mirror/Runtime/Transport/Telepathy/Telepathy/ConnectionState.cs.meta index 8fbd7164..3dcceaf6 100644 --- a/UnityProject/Assets/Mirror/Runtime/Transport/Telepathy/Telepathy/ConnectionState.cs.meta +++ b/UnityProject/Assets/Mirror/Runtime/Transport/Telepathy/Telepathy/ConnectionState.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Runtime/Transport/Telepathy/Telepathy/EventType.cs.meta b/UnityProject/Assets/Mirror/Runtime/Transport/Telepathy/Telepathy/EventType.cs.meta index 30fb5752..ac88c1b5 100644 --- a/UnityProject/Assets/Mirror/Runtime/Transport/Telepathy/Telepathy/EventType.cs.meta +++ b/UnityProject/Assets/Mirror/Runtime/Transport/Telepathy/Telepathy/EventType.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Runtime/Transport/Telepathy/Telepathy/LICENSE.meta b/UnityProject/Assets/Mirror/Runtime/Transport/Telepathy/Telepathy/LICENSE.meta index b83b89bc..4d7664e3 100644 --- a/UnityProject/Assets/Mirror/Runtime/Transport/Telepathy/Telepathy/LICENSE.meta +++ b/UnityProject/Assets/Mirror/Runtime/Transport/Telepathy/Telepathy/LICENSE.meta @@ -2,6 +2,6 @@ fileFormatVersion: 2 guid: 0ba11103b95fd4721bffbb08440d5b8e DefaultImporter: externalObjects: {} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Runtime/Transport/Telepathy/Telepathy/Log.cs.meta b/UnityProject/Assets/Mirror/Runtime/Transport/Telepathy/Telepathy/Log.cs.meta index 9f8fb16c..8f786504 100644 --- a/UnityProject/Assets/Mirror/Runtime/Transport/Telepathy/Telepathy/Log.cs.meta +++ b/UnityProject/Assets/Mirror/Runtime/Transport/Telepathy/Telepathy/Log.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Runtime/Transport/Telepathy/Telepathy/Logger.cs.meta b/UnityProject/Assets/Mirror/Runtime/Transport/Telepathy/Telepathy/Logger.cs.meta index 0c4898d8..304866fd 100644 --- a/UnityProject/Assets/Mirror/Runtime/Transport/Telepathy/Telepathy/Logger.cs.meta +++ b/UnityProject/Assets/Mirror/Runtime/Transport/Telepathy/Telepathy/Logger.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Runtime/Transport/Telepathy/Telepathy/MagnificentReceivePipe.cs.meta b/UnityProject/Assets/Mirror/Runtime/Transport/Telepathy/Telepathy/MagnificentReceivePipe.cs.meta index 9bdccd30..614bab65 100644 --- a/UnityProject/Assets/Mirror/Runtime/Transport/Telepathy/Telepathy/MagnificentReceivePipe.cs.meta +++ b/UnityProject/Assets/Mirror/Runtime/Transport/Telepathy/Telepathy/MagnificentReceivePipe.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Runtime/Transport/Telepathy/Telepathy/MagnificentSendPipe.cs.meta b/UnityProject/Assets/Mirror/Runtime/Transport/Telepathy/Telepathy/MagnificentSendPipe.cs.meta index aaf21dce..cf1415f7 100644 --- a/UnityProject/Assets/Mirror/Runtime/Transport/Telepathy/Telepathy/MagnificentSendPipe.cs.meta +++ b/UnityProject/Assets/Mirror/Runtime/Transport/Telepathy/Telepathy/MagnificentSendPipe.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Runtime/Transport/Telepathy/Telepathy/Message.cs.meta b/UnityProject/Assets/Mirror/Runtime/Transport/Telepathy/Telepathy/Message.cs.meta index 4734aff4..5937bb9a 100644 --- a/UnityProject/Assets/Mirror/Runtime/Transport/Telepathy/Telepathy/Message.cs.meta +++ b/UnityProject/Assets/Mirror/Runtime/Transport/Telepathy/Telepathy/Message.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Runtime/Transport/Telepathy/Telepathy/NetworkStreamExtensions.cs.meta b/UnityProject/Assets/Mirror/Runtime/Transport/Telepathy/Telepathy/NetworkStreamExtensions.cs.meta index 7dcf8447..e7e57440 100644 --- a/UnityProject/Assets/Mirror/Runtime/Transport/Telepathy/Telepathy/NetworkStreamExtensions.cs.meta +++ b/UnityProject/Assets/Mirror/Runtime/Transport/Telepathy/Telepathy/NetworkStreamExtensions.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Runtime/Transport/Telepathy/Telepathy/Pool.cs.meta b/UnityProject/Assets/Mirror/Runtime/Transport/Telepathy/Telepathy/Pool.cs.meta index 269e5f40..9a7dafca 100644 --- a/UnityProject/Assets/Mirror/Runtime/Transport/Telepathy/Telepathy/Pool.cs.meta +++ b/UnityProject/Assets/Mirror/Runtime/Transport/Telepathy/Telepathy/Pool.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Runtime/Transport/Telepathy/Telepathy/SafeQueue.cs.meta b/UnityProject/Assets/Mirror/Runtime/Transport/Telepathy/Telepathy/SafeQueue.cs.meta index 81789a69..f3a9310a 100644 --- a/UnityProject/Assets/Mirror/Runtime/Transport/Telepathy/Telepathy/SafeQueue.cs.meta +++ b/UnityProject/Assets/Mirror/Runtime/Transport/Telepathy/Telepathy/SafeQueue.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Runtime/Transport/Telepathy/Telepathy/Server.cs.meta b/UnityProject/Assets/Mirror/Runtime/Transport/Telepathy/Telepathy/Server.cs.meta index 541f1048..9cee8b7b 100644 --- a/UnityProject/Assets/Mirror/Runtime/Transport/Telepathy/Telepathy/Server.cs.meta +++ b/UnityProject/Assets/Mirror/Runtime/Transport/Telepathy/Telepathy/Server.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Runtime/Transport/Telepathy/Telepathy/Telepathy.asmdef.meta b/UnityProject/Assets/Mirror/Runtime/Transport/Telepathy/Telepathy/Telepathy.asmdef.meta index bcd17a70..572c1273 100644 --- a/UnityProject/Assets/Mirror/Runtime/Transport/Telepathy/Telepathy/Telepathy.asmdef.meta +++ b/UnityProject/Assets/Mirror/Runtime/Transport/Telepathy/Telepathy/Telepathy.asmdef.meta @@ -2,6 +2,6 @@ fileFormatVersion: 2 guid: 725ee7191c021de4dbf9269590ded755 AssemblyDefinitionImporter: externalObjects: {} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Runtime/Transport/Telepathy/Telepathy/ThreadExtensions.cs.meta b/UnityProject/Assets/Mirror/Runtime/Transport/Telepathy/Telepathy/ThreadExtensions.cs.meta index 9fc89246..77c885da 100644 --- a/UnityProject/Assets/Mirror/Runtime/Transport/Telepathy/Telepathy/ThreadExtensions.cs.meta +++ b/UnityProject/Assets/Mirror/Runtime/Transport/Telepathy/Telepathy/ThreadExtensions.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Runtime/Transport/Telepathy/Telepathy/ThreadFunctions.cs.meta b/UnityProject/Assets/Mirror/Runtime/Transport/Telepathy/Telepathy/ThreadFunctions.cs.meta index 4c7f3b84..ea536acd 100644 --- a/UnityProject/Assets/Mirror/Runtime/Transport/Telepathy/Telepathy/ThreadFunctions.cs.meta +++ b/UnityProject/Assets/Mirror/Runtime/Transport/Telepathy/Telepathy/ThreadFunctions.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Runtime/Transport/Telepathy/Telepathy/Utils.cs.meta b/UnityProject/Assets/Mirror/Runtime/Transport/Telepathy/Telepathy/Utils.cs.meta index b1b79b1f..0a9253b9 100644 --- a/UnityProject/Assets/Mirror/Runtime/Transport/Telepathy/Telepathy/Utils.cs.meta +++ b/UnityProject/Assets/Mirror/Runtime/Transport/Telepathy/Telepathy/Utils.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Runtime/Transport/Telepathy/Telepathy/VERSION.meta b/UnityProject/Assets/Mirror/Runtime/Transport/Telepathy/Telepathy/VERSION.meta index 87097870..04c1c8a8 100644 --- a/UnityProject/Assets/Mirror/Runtime/Transport/Telepathy/Telepathy/VERSION.meta +++ b/UnityProject/Assets/Mirror/Runtime/Transport/Telepathy/Telepathy/VERSION.meta @@ -2,6 +2,6 @@ fileFormatVersion: 2 guid: d942af06608be434dbeeaa58207d20bd DefaultImporter: externalObjects: {} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Runtime/Transport/Telepathy/TelepathyTransport.cs b/UnityProject/Assets/Mirror/Runtime/Transport/Telepathy/TelepathyTransport.cs index a37ac567..bff3b7ce 100644 --- a/UnityProject/Assets/Mirror/Runtime/Transport/Telepathy/TelepathyTransport.cs +++ b/UnityProject/Assets/Mirror/Runtime/Transport/Telepathy/TelepathyTransport.cs @@ -159,7 +159,7 @@ public override Uri ServerUri() public override bool ServerActive() => server.Active; public override void ServerStart() => server.Start(port); public override void ServerSend(int connectionId, int channelId, ArraySegment segment) => server.Send(connectionId, segment); - public override void ServerDisconnect(int connectionId) => server.Disconnect(connectionId); + public override bool ServerDisconnect(int connectionId) => server.Disconnect(connectionId); public override string ServerGetClientAddress(int connectionId) { try diff --git a/UnityProject/Assets/Mirror/Runtime/Transport/Telepathy/TelepathyTransport.cs.meta b/UnityProject/Assets/Mirror/Runtime/Transport/Telepathy/TelepathyTransport.cs.meta index bf454337..99cde3e9 100644 --- a/UnityProject/Assets/Mirror/Runtime/Transport/Telepathy/TelepathyTransport.cs.meta +++ b/UnityProject/Assets/Mirror/Runtime/Transport/Telepathy/TelepathyTransport.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 1000 icon: {fileID: 2800000, guid: 7453abfe9e8b2c04a8a47eb536fe21eb, type: 3} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Runtime/Transport/Transport.cs b/UnityProject/Assets/Mirror/Runtime/Transport/Transport.cs index 6f3430e1..ed5495ea 100644 --- a/UnityProject/Assets/Mirror/Runtime/Transport/Transport.cs +++ b/UnityProject/Assets/Mirror/Runtime/Transport/Transport.cs @@ -1,33 +1,42 @@ -// For future reference, here is what Transports need to do in Mirror: -// -// Connecting: -// * Transports are responsible to call either OnConnected || OnDisconnected -// in a certain time after a Connect was called. It can not end in limbo. -// -// Disconnecting: -// * Connections might disconnect voluntarily by the other end. -// * Connections might be disconnect involuntarily by the server. -// * Either way, Transports need to detect it and call OnDisconnected. -// -// Timeouts: -// * Transports should expose a configurable timeout -// * Transports are responsible for calling OnDisconnected after a timeout -// -// Channels: -// * Default channel is Reliable, as in reliable ordered (OR DISCONNECT) -// * Where possible, Unreliable should be supported (unordered, no guarantee) -// -// Other: -// * Transports functions are all bound to the main thread. -// (Transports can use other threads in the background if they manage them) -// * Transports should only process messages while the component is enabled. -// using System; using UnityEngine; namespace Mirror { - /// Abstract transport layer component + /// + /// Abstract transport layer component + /// + /// + ///

+ /// Transport Rules + ///

+ /// + /// + /// All transports should follow these rules so that they work correctly with mirror + /// + /// + /// When Monobehaviour is disabled the Transport should not invoke callbacks + /// + /// + /// Callbacks should be invoked on main thread. It is best to do this from LateUpdate + /// + /// + /// Callbacks can be invoked after or as been called + /// + /// + /// or can be called by mirror multiple times + /// + /// + /// should check the platform and 32 vs 64 bit if the transport only works on some of them + /// + /// + /// should return size even if transport is not running + /// + /// + /// Default channel should be reliable + /// + /// + /// public abstract class Transport : MonoBehaviour { /// @@ -166,7 +175,8 @@ public virtual void ClientConnect(Uri uri) /// Disconnect a client from this server. Useful to kick people out. /// /// the id of the client to disconnect - public abstract void ServerDisconnect(int connectionId); + /// true if the client was kicked + public abstract bool ServerDisconnect(int connectionId); /// /// Get the client address diff --git a/UnityProject/Assets/Mirror/Runtime/Transport/Transport.cs.meta b/UnityProject/Assets/Mirror/Runtime/Transport/Transport.cs.meta index 45081921..55072e10 100644 --- a/UnityProject/Assets/Mirror/Runtime/Transport/Transport.cs.meta +++ b/UnityProject/Assets/Mirror/Runtime/Transport/Transport.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {fileID: 2800000, guid: 7453abfe9e8b2c04a8a47eb536fe21eb, type: 3} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Mirror/Runtime/Utils.cs.meta b/UnityProject/Assets/Mirror/Runtime/Utils.cs.meta index 14967ce0..7cf1557d 100644 --- a/UnityProject/Assets/Mirror/Runtime/Utils.cs.meta +++ b/UnityProject/Assets/Mirror/Runtime/Utils.cs.meta @@ -6,6 +6,6 @@ MonoImporter: defaultReferences: [] executionOrder: 0 icon: {fileID: 2800000, guid: 7453abfe9e8b2c04a8a47eb536fe21eb, type: 3} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/ScriptTemplates/50-Mirror__Network Manager-NewNetworkManager.cs.txt b/UnityProject/Assets/ScriptTemplates/50-Mirror__Network Manager-NewNetworkManager.cs.txt index 4b086dfb..251649f3 100644 --- a/UnityProject/Assets/ScriptTemplates/50-Mirror__Network Manager-NewNetworkManager.cs.txt +++ b/UnityProject/Assets/ScriptTemplates/50-Mirror__Network Manager-NewNetworkManager.cs.txt @@ -3,7 +3,7 @@ using UnityEngine.SceneManagement; using Mirror; /* - Documentation: https://mirror-networking.gitbook.io/docs/components/network-manager + Documentation: https://mirror-networking.com/docs/Components/NetworkManager.html API Reference: https://mirror-networking.com/docs/api/Mirror.NetworkManager.html */ diff --git a/UnityProject/Assets/ScriptTemplates/50-Mirror__Network Manager-NewNetworkManager.cs.txt.meta b/UnityProject/Assets/ScriptTemplates/50-Mirror__Network Manager-NewNetworkManager.cs.txt.meta index 8ec8d560..6221c57c 100644 --- a/UnityProject/Assets/ScriptTemplates/50-Mirror__Network Manager-NewNetworkManager.cs.txt.meta +++ b/UnityProject/Assets/ScriptTemplates/50-Mirror__Network Manager-NewNetworkManager.cs.txt.meta @@ -2,6 +2,6 @@ fileFormatVersion: 2 guid: ed73cc79a95879d4abd948a36043c798 TextScriptImporter: externalObjects: {} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/ScriptTemplates/51-Mirror__Network Authenticator-NewNetworkAuthenticator.cs.txt b/UnityProject/Assets/ScriptTemplates/51-Mirror__Network Authenticator-NewNetworkAuthenticator.cs.txt index 90dac254..fa791c65 100644 --- a/UnityProject/Assets/ScriptTemplates/51-Mirror__Network Authenticator-NewNetworkAuthenticator.cs.txt +++ b/UnityProject/Assets/ScriptTemplates/51-Mirror__Network Authenticator-NewNetworkAuthenticator.cs.txt @@ -3,7 +3,8 @@ using UnityEngine.SceneManagement; using Mirror; /* - Documentation: https://mirror-networking.gitbook.io/docs/components/network-authenticators + Authenticators: https://mirror-networking.com/docs/Components/Authenticators/ + Documentation: https://mirror-networking.com/docs/Guides/Authentication.html API Reference: https://mirror-networking.com/docs/api/Mirror.NetworkAuthenticator.html */ @@ -67,7 +68,8 @@ public class #SCRIPTNAME# : NetworkAuthenticator /// /// Called on client from OnClientAuthenticateInternal when a client needs to authenticate /// - public override void OnClientAuthenticate() + /// Connection of the client. + public override void OnClientAuthenticate(NetworkConnection conn) { AuthRequestMessage authRequestMessage = new AuthRequestMessage(); @@ -77,11 +79,12 @@ public class #SCRIPTNAME# : NetworkAuthenticator /// /// Called on client when the server's AuthResponseMessage arrives /// + /// Connection to client. /// The message payload public void OnAuthResponseMessage(AuthResponseMessage msg) { // Authentication has been accepted - ClientAccept(); + ClientAccept(NetworkClient.connection); } #endregion diff --git a/UnityProject/Assets/ScriptTemplates/51-Mirror__Network Authenticator-NewNetworkAuthenticator.cs.txt.meta b/UnityProject/Assets/ScriptTemplates/51-Mirror__Network Authenticator-NewNetworkAuthenticator.cs.txt.meta index 8d95f682..be22fe6c 100644 --- a/UnityProject/Assets/ScriptTemplates/51-Mirror__Network Authenticator-NewNetworkAuthenticator.cs.txt.meta +++ b/UnityProject/Assets/ScriptTemplates/51-Mirror__Network Authenticator-NewNetworkAuthenticator.cs.txt.meta @@ -2,6 +2,6 @@ fileFormatVersion: 2 guid: 12dc04aca2d89f744bef5a65622ba708 TextScriptImporter: externalObjects: {} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/ScriptTemplates/52-Mirror__Network Behaviour-NewNetworkBehaviour.cs.txt b/UnityProject/Assets/ScriptTemplates/52-Mirror__Network Behaviour-NewNetworkBehaviour.cs.txt index 194ac343..e5e97205 100644 --- a/UnityProject/Assets/ScriptTemplates/52-Mirror__Network Behaviour-NewNetworkBehaviour.cs.txt +++ b/UnityProject/Assets/ScriptTemplates/52-Mirror__Network Behaviour-NewNetworkBehaviour.cs.txt @@ -3,7 +3,7 @@ using Mirror; using System.Collections.Generic; /* - Documentation: https://mirror-networking.gitbook.io/docs/guides/networkbehaviour + Documentation: https://mirror-networking.com/docs/Guides/NetworkBehaviour.html API Reference: https://mirror-networking.com/docs/api/Mirror.NetworkBehaviour.html */ diff --git a/UnityProject/Assets/ScriptTemplates/52-Mirror__Network Behaviour-NewNetworkBehaviour.cs.txt.meta b/UnityProject/Assets/ScriptTemplates/52-Mirror__Network Behaviour-NewNetworkBehaviour.cs.txt.meta index 57c3e33e..c5a0018b 100644 --- a/UnityProject/Assets/ScriptTemplates/52-Mirror__Network Behaviour-NewNetworkBehaviour.cs.txt.meta +++ b/UnityProject/Assets/ScriptTemplates/52-Mirror__Network Behaviour-NewNetworkBehaviour.cs.txt.meta @@ -2,6 +2,6 @@ fileFormatVersion: 2 guid: 29b2ae9aeacc49b47b711838dd1876a4 TextScriptImporter: externalObjects: {} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/ScriptTemplates/53-Mirror__Network Observer-NewNetworkObserver.cs.txt b/UnityProject/Assets/ScriptTemplates/53-Mirror__Network Observer-NewNetworkObserver.cs.txt index 74097731..1f2f081e 100644 --- a/UnityProject/Assets/ScriptTemplates/53-Mirror__Network Observer-NewNetworkObserver.cs.txt +++ b/UnityProject/Assets/ScriptTemplates/53-Mirror__Network Observer-NewNetworkObserver.cs.txt @@ -3,8 +3,8 @@ using Mirror; using System.Collections.Generic; /* - Visibility Guide: https://mirror-networking.gitbook.io/docs/guides/legacy-interest-management - API Reference: https://mirror-networking.com/docs/api/Mirror.NetworkVisibility.html + Visibility Guide: https://mirror-networking.com/docs/Guides/Visibility.html + API Reference: https://mirror-networking.com/docs/api/Mirror.NetworkBehaviour.html */ public class #SCRIPTNAME# : NetworkVisibility diff --git a/UnityProject/Assets/ScriptTemplates/53-Mirror__Network Observer-NewNetworkObserver.cs.txt.meta b/UnityProject/Assets/ScriptTemplates/53-Mirror__Network Observer-NewNetworkObserver.cs.txt.meta index 57bd573e..2c034bf6 100644 --- a/UnityProject/Assets/ScriptTemplates/53-Mirror__Network Observer-NewNetworkObserver.cs.txt.meta +++ b/UnityProject/Assets/ScriptTemplates/53-Mirror__Network Observer-NewNetworkObserver.cs.txt.meta @@ -2,6 +2,6 @@ fileFormatVersion: 2 guid: 4362fdd91ea5a9c44997cc575af62b3e TextScriptImporter: externalObjects: {} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/ScriptTemplates/54-Mirror__Network Room Manager-NewNetworkRoomManager.cs.txt b/UnityProject/Assets/ScriptTemplates/54-Mirror__Network Room Manager-NewNetworkRoomManager.cs.txt index e1c6485c..f872dbc4 100644 --- a/UnityProject/Assets/ScriptTemplates/54-Mirror__Network Room Manager-NewNetworkRoomManager.cs.txt +++ b/UnityProject/Assets/ScriptTemplates/54-Mirror__Network Room Manager-NewNetworkRoomManager.cs.txt @@ -2,11 +2,11 @@ using UnityEngine; using Mirror; /* - Documentation: https://mirror-networking.gitbook.io/docs/components/network-room-manager + Documentation: https://mirror-networking.com/docs/Components/NetworkRoomManager.html API Reference: https://mirror-networking.com/docs/api/Mirror.NetworkRoomManager.html See Also: NetworkManager - Documentation: https://mirror-networking.gitbook.io/docs/components/network-manager + Documentation: https://mirror-networking.com/docs/Components/NetworkManager.html API Reference: https://mirror-networking.com/docs/api/Mirror.NetworkManager.html */ diff --git a/UnityProject/Assets/ScriptTemplates/54-Mirror__Network Room Manager-NewNetworkRoomManager.cs.txt.meta b/UnityProject/Assets/ScriptTemplates/54-Mirror__Network Room Manager-NewNetworkRoomManager.cs.txt.meta index c43efe67..fe5bc327 100644 --- a/UnityProject/Assets/ScriptTemplates/54-Mirror__Network Room Manager-NewNetworkRoomManager.cs.txt.meta +++ b/UnityProject/Assets/ScriptTemplates/54-Mirror__Network Room Manager-NewNetworkRoomManager.cs.txt.meta @@ -2,6 +2,6 @@ fileFormatVersion: 2 guid: 2e5656107e61a93439544b91e5f541f6 TextScriptImporter: externalObjects: {} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/ScriptTemplates/55-Mirror__Network Room Player-NewNetworkRoomPlayer.cs.txt b/UnityProject/Assets/ScriptTemplates/55-Mirror__Network Room Player-NewNetworkRoomPlayer.cs.txt index 52d70506..935659b3 100644 --- a/UnityProject/Assets/ScriptTemplates/55-Mirror__Network Room Player-NewNetworkRoomPlayer.cs.txt +++ b/UnityProject/Assets/ScriptTemplates/55-Mirror__Network Room Player-NewNetworkRoomPlayer.cs.txt @@ -2,7 +2,7 @@ using UnityEngine; using Mirror; /* - Documentation: https://mirror-networking.gitbook.io/docs/components/network-room-player + Documentation: https://mirror-networking.com/docs/Components/NetworkRoomPlayer.html API Reference: https://mirror-networking.com/docs/api/Mirror.NetworkRoomPlayer.html */ diff --git a/UnityProject/Assets/ScriptTemplates/55-Mirror__Network Room Player-NewNetworkRoomPlayer.cs.txt.meta b/UnityProject/Assets/ScriptTemplates/55-Mirror__Network Room Player-NewNetworkRoomPlayer.cs.txt.meta index ef8142a7..36a48dd4 100644 --- a/UnityProject/Assets/ScriptTemplates/55-Mirror__Network Room Player-NewNetworkRoomPlayer.cs.txt.meta +++ b/UnityProject/Assets/ScriptTemplates/55-Mirror__Network Room Player-NewNetworkRoomPlayer.cs.txt.meta @@ -2,6 +2,6 @@ fileFormatVersion: 2 guid: 1ca8a6309173d4248bc7fa0c6ae001e0 TextScriptImporter: externalObjects: {} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/ScriptTemplates/56-Mirror__Network Discovery-NewNetworkDiscovery.cs.txt b/UnityProject/Assets/ScriptTemplates/56-Mirror__Network Discovery-NewNetworkDiscovery.cs.txt index 8f16194b..05cca285 100644 --- a/UnityProject/Assets/ScriptTemplates/56-Mirror__Network Discovery-NewNetworkDiscovery.cs.txt +++ b/UnityProject/Assets/ScriptTemplates/56-Mirror__Network Discovery-NewNetworkDiscovery.cs.txt @@ -3,7 +3,8 @@ using Mirror; using Mirror.Discovery; /* - Documentation: https://mirror-networking.gitbook.io/docs/components/network-discovery + Discovery Guide: https://mirror-networking.com/docs/Guides/NetworkDiscovery.html + Documentation: https://mirror-networking.com/docs/Components/NetworkDiscovery.html API Reference: https://mirror-networking.com/docs/api/Mirror.Discovery.NetworkDiscovery.html */ diff --git a/UnityProject/Assets/ScriptTemplates/56-Mirror__Network Discovery-NewNetworkDiscovery.cs.txt.meta b/UnityProject/Assets/ScriptTemplates/56-Mirror__Network Discovery-NewNetworkDiscovery.cs.txt.meta index 0d988d9a..a034ec86 100644 --- a/UnityProject/Assets/ScriptTemplates/56-Mirror__Network Discovery-NewNetworkDiscovery.cs.txt.meta +++ b/UnityProject/Assets/ScriptTemplates/56-Mirror__Network Discovery-NewNetworkDiscovery.cs.txt.meta @@ -2,6 +2,6 @@ fileFormatVersion: 2 guid: 04337367db30af3459bf9e9f3f880734 TextScriptImporter: externalObjects: {} - userData: '' - assetBundleName: '' - assetBundleVariant: '' + userData: + assetBundleName: + assetBundleVariant: