Merge branch 'master' into 2021.3

# Conflicts:
#	Packages/manifest.json
#	Packages/packages-lock.json
#	ProjectSettings/ProjectVersion.txt

Author: JohannesDeml

Assets/Plugins/WebGL/WebBridge/CommonCommands.cs

@@ -163,12 +163,33 @@ public void SetTimeTimeScale(float timeScale)
 			Debug.Log($"Time.timeScale: {Time.timeScale}");
 		}
 
+		/// <summary>
+		/// Log information about when the WebBridge was initialized
+		/// </summary>
+		[WebCommand(Description = "Log initialization time information")]
+		[ContextMenu(nameof(LogInitializationTime))]
+		public void LogInitializationTime()
+		{
+			var currentUnityTime = Time.realtimeSinceStartupAsDouble;
+			var currentUtcTime = DateTime.UtcNow;
+
+			var unityTimeSinceInit = currentUnityTime - WebBridge.InitializationUnityTime;
+			var utcTimeSinceInit = currentUtcTime - WebBridge.InitializationUtcTime;
+
+			var timeComparison = unityTimeSinceInit > utcTimeSinceInit.TotalSeconds
+				? "future"
+				: "past";
+
+			Debug.Log($"Unity Time since init: {unityTimeSinceInit:F2}s\n" +
+					  $"UTC Time since init: {utcTimeSinceInit.TotalSeconds:F2}s\n" +
+					  $"Unity time lies {Math.Abs(unityTimeSinceInit - utcTimeSinceInit.TotalSeconds):F2}s in the {timeComparison} compared to UTC");
+		}
+
 		/// <summary>
 		/// Finds GameObject(s) by name and logs the found GameObject(s) and their components
 		/// </summary>
 		/// <param name="name">The name of the GameObject to find</param>
 		[WebCommand(Description = "Find GameObject by name and log its components")]
-		[ContextMenu(nameof(FindGameObjectByName))]
 		public void FindGameObjectByName(string name)
 		{
 			var gameObjects = GameObject.FindObjectsOfType<GameObject>().Where(go => go.name == name).ToArray();
@@ -312,7 +333,6 @@ public void DeleteAllPlayerPrefs()
 		/// </summary>
 		/// <param name="runInBackground">1 if it should run in background</param>
 		[WebCommand(Description = "GraphicsSettings.logWhenShaderIsCompiled")]
-		[ContextMenu(nameof(LogShaderCompilation))]
 		public void LogShaderCompilation(int enabled)
 		{
 			GraphicsSettings.logWhenShaderIsCompiled = enabled == 1;

Assets/Plugins/WebGL/WebBridge/WebBridge.cs

@@ -26,12 +26,16 @@ namespace Supyrb
 	public class WebBridge : WebCommands
 	{
 		private const string GameObjectName = "WebBridge";
+		public static double InitializationUnityTime {get; private set;}
+		public static DateTime InitializationUtcTime {get; private set;}
 
 		private static GameObject instance;
 #if UNITY_WEBGL
 		[RuntimeInitializeOnLoadMethod(RuntimeInitializeLoadType.BeforeSceneLoad)]
 		private static void OnBeforeSceneLoadRuntimeMethod()
 		{
+			InitializationUnityTime = Time.realtimeSinceStartupAsDouble;
+			InitializationUtcTime = DateTime.UtcNow;
 			SetGlobalVariables();
 			instance = new GameObject(GameObjectName);
 			DontDestroyOnLoad(instance);

Assets/Plugins/WebGL/WebTools/EventListeners/WebEventListeners.cs

@@ -18,10 +18,10 @@ namespace Supyrb
 	public class WebEventListeners : MonoBehaviour
 	{
 
-		#if UNITY_WEBGL
+#if UNITY_WEBGL && !UNITY_EDITOR
 		[DllImport("__Internal")]
 		private static extern void _AddJsEventListener(string eventName);
-		#endif
+#endif
 		private const string GameObjectName = "WebEventListeners";
 
 		private Dictionary<string, WebEventListener> eventListeners = new Dictionary<string, WebEventListener>();
@@ -55,9 +55,11 @@ private void AddEventListenerInternal(string eventName, Action callback)
 				eventListeners[eventName] = eventComponent;
 				eventComponent.OnEvent += callback;
 
-#if UNITY_WEBGL
+#if UNITY_WEBGL && !UNITY_EDITOR
 				// Add event listener on javascript side
 				_AddJsEventListener(eventName);
+#elif UNITY_EDITOR && WEBTOOLS_LOG_CALLS
+			Debug.Log($"<color=#00CCCC>{nameof(WebEventListeners)}.{nameof(AddEventListenerInternal)} add callback for {eventName}</color>");
 #endif
 			}
 		}

Assets/Plugins/WebGL/WebTools/WebToolPlugins.cs

@@ -19,7 +19,7 @@ namespace Supyrb
 {
 	public static class WebToolPlugins
 	{
-#if UNITY_WEBGL
+#if UNITY_WEBGL && !UNITY_EDITOR
 		[DllImport("__Internal")]
 		private static extern void _SetStringVariable(string variableName, string variableValue);
 		[DllImport("__Internal")]
@@ -81,7 +81,8 @@ public static void AddFpsTrackingEvent(float fps)
 #if UNITY_WEBGL && !UNITY_EDITOR
 			_AddFpsTrackingEvent(fps);
 #elif UNITY_EDITOR && WEBTOOLS_LOG_CALLS
-			Debug.Log($"{nameof(WebToolPlugins)}.{nameof(AddFpsTrackingEvent)} called with {fps:0.00}");
+			// This is called often, so it can spam the console, uncomment if needed
+			//Debug.Log($"{nameof(WebToolPlugins)}.{nameof(AddFpsTrackingEvent)} called with {fps:0.00}");
 #endif
 		}
 

Assets/Prefabs/Spawner.prefab

@@ -48,3 +48,4 @@ MonoBehaviour:
   spawnCoolDownSeconds: 0.4
   spawnOffsetSeconds: 0
   maxInstances: 1000
+  spawnSceneName: Cubes

Assets/Scripts/ObjectSpawner.cs

@@ -8,8 +8,10 @@
 // </author>
 // --------------------------------------------------------------------------------------------------------------------
 
+using System;
 using System.Collections.Generic;
 using UnityEngine;
+using UnityEngine.SceneManagement;
 
 namespace Supyrb
 {
@@ -30,6 +32,10 @@ public class ObjectSpawner : MonoBehaviour
 		[SerializeField]
 		private int maxInstances = 200;
 
+		[SerializeField]
+		[Tooltip("If set, the object will be spawned in the scene with the given name")]
+		private string spawnSceneName = string.Empty;
+
 		public float SpawnCoolDownSeconds
 		{
 			get => spawnCoolDownSeconds;
@@ -102,12 +108,35 @@ private void SpawnObject()
 				return;
 			}
 
-			var newGo = Instantiate(prefab, transform.position, transform.rotation);
+			var newGo = InstantiatePrefab();
 			spawnedObjects.Enqueue(newGo);
 			totalSpawnCount++;
 		}
 
-		#if UNITY_EDITOR
+		private GameObject InstantiatePrefab()
+		{
+			var lastActiveScene = SceneManager.GetActiveScene();
+			if(!string.IsNullOrEmpty(spawnSceneName))
+			{
+				var spawnScene = SceneManager.GetSceneByName(spawnSceneName);
+				if(!spawnScene.IsValid())
+				{
+					spawnScene = SceneManager.CreateScene(spawnSceneName);
+				}
+				SceneManager.SetActiveScene(spawnScene);
+			}
+
+			var newGo = Instantiate(prefab, transform.position, transform.rotation);
+
+			if(!string.IsNullOrEmpty(spawnSceneName))
+			{
+				SceneManager.SetActiveScene(lastActiveScene);
+			}
+
+			return newGo;
+		}
+
+#if UNITY_EDITOR
 		private void OnDrawGizmos()
 		{
 			Gizmos.DrawWireSphere(transform.position, 0.5f);

ProjectSettings/MultiplayerManager.asset

@@ -0,0 +1,7 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!655991488 &1
+MultiplayerManager:
+  m_ObjectHideFlags: 0
+  m_EnableMultiplayerRoles: 0
+  m_StrippingTypes: {}