Merge branch 'master' of https://github.com/JohannesDeml/UnityWebGL-LoadingTest into 6000.0

Author: JohannesDeml

.github/workflows/upgrade-unity.yml

@@ -32,7 +32,7 @@ on:
 
 jobs:
   upgrade-unity-version:
-    name: Upgrade Unity version and packages
+    name: Upgrade Unity version and packages to ${{ inputs.unityVersion }}
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
@@ -106,6 +106,13 @@ jobs:
         run: |
           LAST_UNITY_VERSION=$(sed -n 's/^\m_EditorVersion: //p'< ./ProjectSettings/ProjectVersion.txt)
           echo "VERSION=$LAST_UNITY_VERSION" >> $GITHUB_OUTPUT
+          BRANCH_NAME=${GITHUB_REF#refs/heads/}
+          if [[ "$BRANCH_NAME" == *"urp"* ]]
+          then
+            echo "NAME=$LAST_UNITY_VERSION-urp" >> $GITHUB_OUTPUT
+          else
+            echo "NAME=$LAST_UNITY_VERSION" >> $GITHUB_OUTPUT
+          fi
 
       - name: Set upgrade name
         id: upgrade_name
@@ -123,6 +130,7 @@ jobs:
       - name: Log variables
         run: |
           echo "last_unity_version -> ${{ steps.last_unity_version.outputs.VERSION }}"
+          echo "last_unity_name -> ${{ steps.last_unity_version.outputs.NAME }}"
           echo "upgrade_name -> ${{ steps.upgrade_name.outputs.NAME }}"
 
       - name: Build project
@@ -159,10 +167,10 @@ jobs:
         uses: peter-evans/create-pull-request@v4
         with:
           token: ${{ secrets.PR_GITHUB_TOKEN }}
-          commit-message: "[Automated workflow] upgrade-unity from ${{steps.last_unity_version.outputs.VERSION}} to ${{ inputs.unityVersion }}"
-          branch: "ci/upgrade-unity/from-${{steps.last_unity_version.outputs.VERSION}}-to-${{ steps.upgrade_name.outputs.NAME }}"
+          commit-message: "[Automated workflow] upgrade-unity from ${{steps.last_unity_version.outputs.NAME}} to ${{ inputs.unityVersion }}"
+          branch: "ci/upgrade-unity/from-${{steps.last_unity_version.outputs.NAME}}-to-${{ steps.upgrade_name.outputs.NAME }}"
           delete-branch: true
-          title: "[Automated workflow] upgrade-unity from ${{steps.last_unity_version.outputs.VERSION}} to ${{ steps.upgrade_name.outputs.NAME }}"
+          title: "[Automated workflow] upgrade-unity from ${{steps.last_unity_version.outputs.NAME}} to ${{ steps.upgrade_name.outputs.NAME }}"
           body: ${{ steps.template.outputs.result }}
 
       - name: Add tags

Assets/Plugins/WebGL/WebBridge/CommonCommands.cs

@@ -11,6 +11,8 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
+using System.Linq;
+using System.Text;
 using Supyrb.Attributes;
 using UnityEngine;
 using UnityEngine.Rendering;
@@ -161,6 +163,47 @@ public void SetTimeTimeScale(float timeScale)
 			Debug.Log($"Time.timeScale: {Time.timeScale}");
 		}
 
+		/// <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();
+			if (gameObjects.Length == 0)
+			{
+				Debug.Log($"No GameObject found with the name: {name}");
+			}
+			else
+			{
+				StringBuilder sb = new StringBuilder();
+				foreach (var go in gameObjects)
+				{
+					int pathStartIndex = 0;
+					var currentTransform = go.transform;
+					sb.Insert(pathStartIndex, currentTransform.name);
+					currentTransform = currentTransform.parent;
+					while (currentTransform != null)
+					{
+						sb.Insert(pathStartIndex, currentTransform.name + "/");
+						currentTransform = currentTransform.parent;
+					}
+
+					sb.AppendLine($", Tag: {go.tag}, Layer: {go.layer}, ActiveSelf: {go.activeSelf}, ActiveInHierarchy: {go.activeInHierarchy}");
+					sb.AppendLine("Attached Components:");
+					var components = go.GetComponents<Component>();
+					foreach (var component in components)
+					{
+						sb.AppendLine($"- {component.GetType().Name}");
+					}
+					Debug.Log(sb.ToString());
+					sb.Clear();
+				}
+			}
+		}
+
 		/// <summary>
 		/// Toggle the visibility of the info panel in the top right corner
 		/// Browser Usage: <code>unityGame.SendMessage("WebGL", "ToggleInfoPanel");</code>

Assets/Plugins/WebGL/WebBridge/WebBridge.cs

@@ -18,22 +18,23 @@
 
 namespace Supyrb
 {
+
 	/// <summary>
 	/// Bridge to Unity to access unity logic through the browser console
 	/// You can extend your commands by creating a partial class for WebBridge, see WebBridge.Commands as an example
 	/// </summary>
 	public class WebBridge : WebCommands
 	{
-		private const string WebBridgeGameObjectName = "WebBridge";
+		private const string GameObjectName = "WebBridge";
 
-		private static GameObject bridgeInstance;
+		private static GameObject instance;
 #if UNITY_WEBGL
 		[RuntimeInitializeOnLoadMethod(RuntimeInitializeLoadType.BeforeSceneLoad)]
 		private static void OnBeforeSceneLoadRuntimeMethod()
 		{
 			SetGlobalVariables();
-			bridgeInstance = new GameObject(WebBridgeGameObjectName);
-			DontDestroyOnLoad(bridgeInstance);
+			instance = new GameObject(GameObjectName);
+			DontDestroyOnLoad(instance);
 			AddAllWebCommands();
 		}
 #endif
@@ -58,7 +59,7 @@ private static void AddAllWebCommands()
 			webCommandTypes.Sort((a, b) => a.Name.CompareTo(b.Name));
 			foreach (var webCommandType in webCommandTypes)
 			{
-				bridgeInstance.AddComponent(webCommandType);
+				instance.AddComponent(webCommandType);
 			}
 		}
 

Assets/Plugins/WebGL/WebTools/EventListeners.meta

@@ -0,0 +1,30 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="WebEventListener.cs">
+//   Copyright (c) 2024 Johannes Deml. All rights reserved.
+// </copyright>
+// <author>
+//   Johannes Deml
+//   public@deml.io
+// </author>
+// --------------------------------------------------------------------------------------------------------------------
+
+using UnityEngine;
+
+namespace Supyrb
+{
+    public class CommonWebEventListener : MonoBehaviour
+	{
+		private void Start()
+		{
+			WebEventListeners.AddEventListener("focus", () =>
+			{
+				Debug.Log("WebEvent focus triggered");
+			});
+
+			WebEventListeners.AddEventListener("blur", () =>
+			{
+				Debug.Log("WebEvent blur triggered");
+			});
+		}
+	}
+}

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

@@ -0,0 +1,32 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="WebEventListener.cs">
+//   Copyright (c) 2024 Johannes Deml. All rights reserved.
+// </copyright>
+// <author>
+//   Johannes Deml
+//   public@deml.io
+// </author>
+// --------------------------------------------------------------------------------------------------------------------
+
+using System;
+using UnityEngine;
+
+namespace Supyrb
+{
+    public class WebEventListener : MonoBehaviour
+	{
+		public event Action OnEvent;
+
+		// Called from JavaScript
+		public void TriggerEvent()
+		{
+			OnEvent?.Invoke();
+		}
+
+		private void OnDestroy()
+		{
+			// Clean up event handlers when destroyed
+			OnEvent = null;
+		}
+	}
+}

Assets/Plugins/WebGL/WebTools/EventListeners/CommonWebEventListener.cs.meta

@@ -0,0 +1,67 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="WebGlBridge.cs">
+//   Copyright (c) 2021 Johannes Deml. All rights reserved.
+// </copyright>
+// <author>
+//   Johannes Deml
+//   public@deml.io
+// </author>
+// --------------------------------------------------------------------------------------------------------------------
+
+using System;
+using System.Collections.Generic;
+using System.Runtime.InteropServices;
+using UnityEngine;
+
+namespace Supyrb
+{
+	public class WebEventListeners : MonoBehaviour
+	{
+
+#if UNITY_WEBGL && !UNITY_EDITOR
+		[DllImport("__Internal")]
+		private static extern void _AddJsEventListener(string eventName);
+#endif
+		private const string GameObjectName = "WebEventListeners";
+
+		private Dictionary<string, WebEventListener> eventListeners = new Dictionary<string, WebEventListener>();
+		private static WebEventListeners instance;
+#if UNITY_WEBGL
+		[RuntimeInitializeOnLoadMethod(RuntimeInitializeLoadType.BeforeSceneLoad)]
+		private static void OnBeforeSceneLoadRuntimeMethod()
+		{
+			GameObject instanceGo = new GameObject(GameObjectName);
+			instance = instanceGo.AddComponent<WebEventListeners>();
+			DontDestroyOnLoad(instanceGo);
+		}
+#endif
+
+		public static void AddEventListener(string eventName, Action callback)
+		{
+			instance.AddEventListenerInternal(eventName, callback);
+		}
+
+		private void AddEventListenerInternal(string eventName, Action callback)
+		{
+			if(eventListeners.TryGetValue(eventName, out var eventListener))
+			{
+				eventListener.OnEvent += callback;
+			}
+			else
+			{
+				var eventGo = new GameObject("WebEvent-" + eventName);
+				eventGo.transform.parent = transform;
+				var eventComponent = eventGo.AddComponent<WebEventListener>();
+				eventListeners[eventName] = eventComponent;
+				eventComponent.OnEvent += callback;
+
+#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
+			}
+		}
+	}
+}