Merge branch 'develop' into fix/green-names-on-late-joiners

Unity-Technologies · Jan 17, 2025 · 003c718 · 003c718
2 parents 85318a7 + 7a42396
commit 003c718
Show file tree

Hide file tree

Showing 55 changed files with 1,777 additions and 259 deletions.
diff --git a/Assets/Editor/Tutorials/Homepage.meta b/Assets/Editor/Tutorials/Homepage.meta
diff --git a/Assets/Editor/Tutorials/Homepage/0_TableOfContents.asset b/Assets/Editor/Tutorials/Homepage/0_TableOfContents.asset
diff --git a/...itor/Tutorials/TableOfContents.asset.meta → ...als/Homepage/0_TableOfContents.asset.meta b/...itor/Tutorials/TableOfContents.asset.meta → ...als/Homepage/0_TableOfContents.asset.meta
diff --git a/Assets/Editor/Tutorials/Homepage/1_ConfigureUGS.asset b/Assets/Editor/Tutorials/Homepage/1_ConfigureUGS.asset
diff --git a/Assets/Editor/Tutorials/Homepage/1_ConfigureUGS.asset.meta b/Assets/Editor/Tutorials/Homepage/1_ConfigureUGS.asset.meta
diff --git a/Assets/Editor/Tutorials/Images.meta b/Assets/Editor/Tutorials/Images.meta
diff --git a/Assets/Editor/Tutorials/Images/Feature_Image_008.png b/Assets/Editor/Tutorials/Images/Feature_Image_008.png
diff --git a/Assets/Editor/Tutorials/Images/Feature_Image_008.png.meta b/Assets/Editor/Tutorials/Images/Feature_Image_008.png.meta
diff --git a/Assets/Editor/Tutorials/TableOfContents.asset b/Assets/Editor/Tutorials/TableOfContents.asset
diff --git a/Assets/Editor/Tutorials/Tutorial Welcome Page.asset b/Assets/Editor/Tutorials/Tutorial Welcome Page.asset
diff --git a/Assets/Editor/Tutorials/Tutorial0_SetupUGS.meta b/Assets/Editor/Tutorials/Tutorial0_SetupUGS.meta
diff --git a/Assets/Editor/Tutorials/Tutorial0_SetupUGS/1-Verify And Setup UGS.asset b/Assets/Editor/Tutorials/Tutorial0_SetupUGS/1-Verify And Setup UGS.asset
diff --git a/Assets/Editor/Tutorials/Tutorial0_SetupUGS/1-Verify And Setup UGS.asset.meta b/Assets/Editor/Tutorials/Tutorial0_SetupUGS/1-Verify And Setup UGS.asset.meta
diff --git a/Assets/Editor/Tutorials/Tutorial0_SetupUGS/2-CheckServices.asset b/Assets/Editor/Tutorials/Tutorial0_SetupUGS/2-CheckServices.asset
diff --git a/Assets/Editor/Tutorials/Tutorial0_SetupUGS/2-CheckServices.asset.meta b/Assets/Editor/Tutorials/Tutorial0_SetupUGS/2-CheckServices.asset.meta
diff --git a/Assets/Editor/Tutorials/Tutorial0_SetupUGS/8-Project Successfully Linked.asset b/Assets/Editor/Tutorials/Tutorial0_SetupUGS/8-Project Successfully Linked.asset
diff --git a/Assets/Editor/Tutorials/Tutorial0_SetupUGS/8-Project Successfully Linked.asset.meta b/Assets/Editor/Tutorials/Tutorial0_SetupUGS/8-Project Successfully Linked.asset.meta
diff --git a/Assets/Editor/Tutorials/Tutorial0_SetupUGS/Tutorial 0 - UGS Setup.asset b/Assets/Editor/Tutorials/Tutorial0_SetupUGS/Tutorial 0 - UGS Setup.asset
diff --git a/Assets/Editor/Tutorials/Tutorial0_SetupUGS/Tutorial 0 - UGS Setup.asset.meta b/Assets/Editor/Tutorials/Tutorial0_SetupUGS/Tutorial 0 - UGS Setup.asset.meta
diff --git a/Assets/Editor/Tutorials/TutorialCallbacks.cs b/Assets/Editor/Tutorials/TutorialCallbacks.cs
@@ -4,19 +4,19 @@
 
 namespace Unity.Netcode.Samples.BossRoom
 {
-
     /// <summary>
     /// Implement your Tutorial callbacks here.
     /// </summary>
-    [CreateAssetMenu(fileName = DefaultFileName, menuName = "Tutorials/" + DefaultFileName + " Instance")]
+    [CreateAssetMenu(fileName = k_DefaultFileName, menuName = "Tutorials/" + k_DefaultFileName + " Instance")]
     public class TutorialCallbacks : ScriptableObject
     {
-        [SerializeField] SceneAsset m_StartupScene;
+        [SerializeField]
+        SceneAsset m_StartupScene;
 
         /// <summary>
         /// The default file name used to create asset of this class type.
         /// </summary>
-        public const string DefaultFileName = "TutorialCallbacks";
+        const string k_DefaultFileName = "TutorialCallbacks";
 
         /// <summary>
         /// Creates a TutorialCallbacks asset and shows it in the Project window.
@@ -27,7 +27,7 @@ public class TutorialCallbacks : ScriptableObject
         /// <returns>The created asset</returns>
         public static ScriptableObject CreateAndShowAsset(string assetPath = null)
         {
-            assetPath = assetPath ?? $"{TutorialEditorUtils.GetActiveFolderPath()}/{DefaultFileName}.asset";
+            assetPath = assetPath ?? $"{TutorialEditorUtils.GetActiveFolderPath()}/{k_DefaultFileName}.asset";
             var asset = CreateInstance<TutorialCallbacks>();
             AssetDatabase.CreateAsset(asset, AssetDatabase.GenerateUniqueAssetPath(assetPath));
             EditorUtility.FocusProjectWindow(); // needed in order to make the selection of newly created asset to really work
@@ -40,35 +40,14 @@ public void StartTutorial(Tutorial tutorial)
             TutorialWindow.StartTutorial(tutorial);
         }
 
-        public void FocusGameView()
-        {
-            /*
-             * note: this solution is a bit weak, but it's the best we can do without accessing internal APIs.
-             * we'll need to check that it works for Unity 6 as well
-             */
-            EditorApplication.ExecuteMenuItem("Window/General/Game");
-        }
-
-        public void FocusSceneView()
-        {
-            EditorApplication.ExecuteMenuItem("Window/General/Scene");
-        }
-
-        public bool IsRunningAsHost()
-        {
-            return NetworkManager.Singleton && NetworkManager.Singleton.IsHost;
-        }
-
-        public bool IsRunningAsServerOnly()
+        public bool IsConnectedToUgs()
         {
-            return NetworkManager.Singleton && NetworkManager.Singleton.IsServer
-                                            && !NetworkManager.Singleton.IsClient;
+            return CloudProjectSettings.projectBound;
         }
 
-        public bool IsRunningAsClientOnly()
+        public void ShowServicesSettings()
         {
-            return NetworkManager.Singleton && !NetworkManager.Singleton.IsServer
-                                            && NetworkManager.Singleton.IsClient;
+            SettingsService.OpenProjectSettings("Project/Services");
         }
 
         public void OpenURL(string url)

diff --git a/Assets/InputSystem.meta b/Assets/InputSystem.meta