com.beamable 5.0.1 → 5.1.0-PREVIEW.RC10

package/Editor/UI/AccountWindow/AccountWindow_Games.cs

@@ -10,6 +10,8 @@ namespace Beamable.Editor.Accounts
 {
 	public partial class AccountWindow
 	{
+		private bool _isSelectingRealm;
+		
 		public bool needsGameSelection;
 		public int gameSelectionIndex = 0;
 		public int realmSelectionIndex = 0;
@@ -104,14 +106,28 @@ namespace Beamable.Editor.Accounts
 				EditorGUILayout.Space(24);
 
 				{
-					GUI.enabled = realmSelectionIndex >= 0;
+					GUI.enabled = realmSelectionIndex >= 0 && !_isSelectingRealm;
 					var wasClicked = BeamGUI.PrimaryButton(new GUIContent("Continue"), allowEnterKeyToClick: true);
 					GUI.enabled = true;
 					
 					if (wasClicked)
 					{
-						var _ = context.SwitchRealm(availableRealms[realmSelectionIndex].Pid);
-						needsGameSelection = false;
+						_isSelectingRealm = true;
+						
+						var selectedPid = availableRealms[realmSelectionIndex].Pid;
+						var switchPromise = context.SwitchRealm(selectedPid);
+						switchPromise.Then(_ =>
+						{
+							context.CommitProductionBuildConfigDefaultsIfMissing();
+							needsGameSelection = false;
+							_isSelectingRealm = false;
+						});
+
+						switchPromise.Error(ex =>
+						{
+							_isSelectingRealm = false;
+							Debug.LogError($"[AccountWindow_Games] Failed to switch realm: {ex}");
+						});
 					}
 				}
 				

package/Editor/UI/AccountWindow/AccountWindow_SignedIn.cs

@@ -1,3 +1,4 @@
+using Beamable.Common.Api.Realms;
 using Beamable.Config;
 using Beamable.Editor.BeamCli;
 using Beamable.Editor.Content;
@@ -70,13 +71,13 @@ namespace Beamable.Editor.Accounts
 						RenderLabel("Runtime Cid", config.Cid, "No value set");
 
 						var realmDisplay = config.Pid;
-						if (cli.pidToRealm.TryGetValue(config.Pid, out var realm))
+						if (!string.IsNullOrEmpty(config.Pid) && cli.pidToRealm.TryGetValue(config.Pid, out RealmView realm))
 						{
 							realmDisplay = realm.GetDisplayName();
 						}
 						RenderLabel("Runtime Realm", realmDisplay, "No value set");
 
-						List<string> missingRuntimeFields = new List<string>();
+						var missingRuntimeFields = new List<string>();
 						if (string.IsNullOrEmpty(config.HostUrl))
 						{
 							missingRuntimeFields.Add("host");
@@ -170,7 +171,7 @@ namespace Beamable.Editor.Accounts
 						if (_onQuitAction == null)
 						{
 							_onQuitAction = BeamLibraryWindow.Init;
-							_onQuitName = "Open Library";
+							_onQuitName = "Open Samples";
 						}
 
 						var clickedLibrary = BeamGUI.PrimaryButton(new GUIContent(_onQuitName), allowEnterKeyToClick: true);

package/Editor/UI/BeamGUI/BeamGUI_Icons.cs

@@ -68,79 +68,79 @@ namespace Beamable.Editor.Util
 
 		public static void LoadUnityIcons()
 		{
-			if (iconLocked == null)
+			if (!iconLocked)
 			{
 				iconLocked = EditorGUIUtility.IconContent("Locked").image;
 			}
-			
-			if (iconHelp == null)
+
+			if (!iconHelp)
 			{
 				iconHelp = EditorGUIUtility.IconContent("_Help").image;
 			}
 
-			if (iconRefresh == null)
+			if (!iconRefresh)
 			{
 				iconRefresh = EditorGUIUtility.IconContent("Refresh").image;
 			}
 
-			if (iconSettings == null)
+			if (!iconSettings)
 			{
 				iconSettings = EditorGUIUtility.IconContent("Settings").image;
 			}
 
-			if (iconFolder == null)
+			if (!iconFolder)
 			{
 				iconFolder = EditorGUIUtility.IconContent("Folder Icon").image;
 			}
 
 
-			if (iconOpenApi == null)
+			if (!iconOpenApi)
 			{
 				iconOpenApi = EditorGUIUtility.IconContent("BuildSettings.Web.Small").image;
 			}
 
-			if (iconOpenProject == null)
+			if (!iconOpenProject)
 			{
 				iconOpenProject = EditorGUIUtility.FindTexture("cs Script Icon");
 			}
 
-			if (iconMoreOptions == null)
+			if (!iconMoreOptions)
 			{
 				iconMoreOptions = EditorGUIUtility.IconContent("pane options@2x").image;
 			}
 
-			if (iconPlay == null)
+			if (!iconPlay)
 			{
 				iconPlay = EditorGUIUtility.FindTexture("PlayButton");
 			}
 
-			if (iconPlus == null)
+			if (!iconPlus)
 			{
 				iconPlus = EditorGUIUtility.IconContent("d_Toolbar Plus@2x").image;
 			}
 
-			if (iconCheck == null)
+			if (!iconCheck)
 			{
 				// iconCheck = EditorGUIUtility.IconContent("d_FilterSelectedOnly@2x").image;
 				iconCheck = EditorGUIUtility.IconContent("Toggle Icon").image;
 			}
 
-			if (iconUpload == null)
+			if (!iconUpload)
 			{
 				iconUpload = EditorGUIUtility.IconContent("Update-Available@2x").image;
 			}
 
-			if (iconDownload == null)
+			if (!iconDownload)
 			{
 				iconDownload = EditorGUIUtility.IconContent("Download-Available@2x").image;
 			}
 
-			if (iconMenuOptions == null)
+			if (!iconMenuOptions)
 			{
 				iconMenuOptions = EditorGUIUtility.IconContent("d__Menu@2x").image;
 			}
 
-			if (iconRotate == null)
+			if (!iconRotate)
 			{
 				iconRotate = EditorGUIUtility.IconContent("RotateTool On@2x").image;
 			}
@@ -177,28 +177,28 @@ namespace Beamable.Editor.Util
 				
 
 
-				if (artGameServers == null)
+				if (!artGameServers)
 				{
 					artGameServers =
 						EditorResources.Load<Texture>(
 							"Packages/com.beamable/Editor/UI/Common/Icons/beam_art_gameservers.png", true);
 				}
 
-				if (artLiveOps == null)
+				if (!artLiveOps)
 				{
 					artLiveOps =
 						EditorResources.Load<Texture>(
 							"Packages/com.beamable/Editor/UI/Common/Icons/beam_art_liveops.png", true);
 				}
 
-				if (artContent == null)
+				if (!artContent)
 				{
 					artContent =
 						EditorResources.Load<Texture>(
 							"Packages/com.beamable/Editor/UI/Common/Icons/beam_art_game_content.png", true);
 				}
 
-				if (artServerless == null)
+				if (!artServerless)
 				{
 					artServerless =
 						EditorResources.Load<Texture>(
@@ -211,29 +211,29 @@ namespace Beamable.Editor.Util
 				}
 
 
-				if (iconShadowSoftA == null)
+				if (!iconShadowSoftA)
 				{
 					iconShadowSoftA =
 						EditorResources.Load<Texture>(
 							"Packages/com.beamable/Editor/UI/Common/Icons/softShadow.png", true);
 				}
 
-				
-				if (iconLogoHeader == null)
+
+				if (!iconLogoHeader)
 				{
 					iconLogoHeader =
 						EditorResources.Load<Texture>(
 							"Packages/com.beamable/Editor/UI/Login/UI/icon/logo2 L white.png", true);
 				}
 
-				if (iconBeamableSmall == null)
+				if (!iconBeamableSmall)
 				{
 					iconBeamableSmall =
 						EditorResources.Load<Texture>(
 							"Packages/com.beamable/Editor/UI/Common/Icons/beam_icon_small.png", true);
 				}
 
-				if (iconBeamableSmallColor == null)
+				if (!iconBeamableSmallColor)
 				{
 					iconBeamableSmallColor =
 						EditorResources.Load<Texture>(
@@ -242,119 +242,119 @@ namespace Beamable.Editor.Util
 				}
 
 
-				if (iconService == null)
+				if (!iconService)
 				{
 					iconService =
 						EditorResources.Load<Texture>(
 							"Packages/com.beamable/Editor/UI/Common/Icons/microservice.png", true);
 				}
 
-				if (iconStorage == null)
+				if (!iconStorage)
 				{
 					iconStorage =
 						EditorResources.Load<Texture>("Packages/com.beamable/Editor/UI/Common/Icons/storage.png", true);
 				}
 
-				if (iconOpenMongoExpress == null)
+				if (!iconOpenMongoExpress)
 				{
 					iconOpenMongoExpress =
 						EditorResources.Load<Texture>("Packages/com.beamable/Editor/UI/Common/Icons/Database_light.png",
 						                              true);
 				}
 
-				if (iconTag == null)
+				if (!iconTag)
 				{
 					iconTag = EditorResources.Load<Texture>("Packages/com.beamable/Editor/UI/Common/Icons/Tag.png");
 				}
 
-				if (iconType == null)
+				if (!iconType)
 				{
 					iconType = EditorResources.Load<Texture>("Packages/com.beamable/Editor/UI/Common/Icons/Type.png");
 				}
 
-				if (iconStatus == null)
+				if (!iconStatus)
 				{
 					iconStatus =
 						EditorResources.Load<Texture>("Packages/com.beamable/Editor/UI/Common/Icons/Statuses.png");
 				}
 
-				if (iconDelete == null)
+				if (!iconDelete)
 				{
 					iconDelete =
 						EditorResources.Load<Texture>(
 							"Packages/com.beamable/Editor/UI/Common/Icons/IconStatus_Delete.png");
 				}
 
-				if (iconStatusModified == null)
+				if (!iconStatusModified)
 				{
 					iconStatusModified =
 						EditorResources.Load<Texture>(
 							"Packages/com.beamable/Editor/UI/Common/Icons/IconStatus_Modified.png");
 				}
 
-				if (iconStatusAdded == null)
+				if (!iconStatusAdded)
 				{
 					iconStatusAdded =
 						EditorResources.Load<Texture>(
 							"Packages/com.beamable/Editor/UI/Common/Icons/IconStatus_Added.png");
 				}
 
-				if (iconStatusDeleted == null)
+				if (!iconStatusDeleted)
 				{
 					iconStatusDeleted =
 						EditorResources.Load<Texture>(
 							"Packages/com.beamable/Editor/UI/Common/Icons/IconStatus_Deleted.png");
 				}
 
-				if (iconStatusConflicted == null)
+				if (!iconStatusConflicted)
 				{
 					iconStatusConflicted =
 						EditorResources.Load<Texture>(
 							"Packages/com.beamable/Editor/UI/Common/Icons/IconLogs_WarningMsg.png");
 				}
 
-				if (iconStatusInvalid == null)
+				if (!iconStatusInvalid)
 				{
 					iconStatusInvalid =
 						EditorResources.Load<Texture>(
 							"Packages/com.beamable/Editor/UI/Common/Icons/IconStatus_Invalid.png");
 				}
 
-				if (iconSync == null)
+				if (!iconSync)
 				{
 					iconSync = EditorResources.Load<Texture>(
 						"Packages/com.beamable/Editor/UI/Common/Icons/IconBeam_Sync.png");
 				}
 
-				if (iconPublish == null)
+				if (!iconPublish)
 				{
 					iconPublish =
 						EditorResources.Load<Texture>(
 							"Packages/com.beamable/Editor/UI/Common/Icons/IconBeam_Publish.png");
 				}
 
-				if (iconRevertAction == null)
+				if (!iconRevertAction)
 				{
 					iconRevertAction =
 						EditorResources.Load<Texture>(
 							"Packages/com.beamable/Editor/UI/Common/Icons/IconAction_Revert.png");
 				}
 
-				if (iconContentEditorIcon == null)
+				if (!iconContentEditorIcon)
 				{
 					iconContentEditorIcon =
 						EditorResources.Load<Texture>(
 							"Packages/com.beamable/Editor/UI/Common/Icons/IconBeam_ItemFallback.png");
 				}
 
-				if (iconContentSnapshotWhite == null)
+				if (!iconContentSnapshotWhite)
 				{
 					iconContentSnapshotWhite =
 						EditorResources.Load<Texture>(
 							"Packages/com.beamable/Editor/UI/Common/Icons/IconsWhite_ContentSnapshot.png");
 				}
 
-				if (iconContentSnapshotColor == null)
+				if (!iconContentSnapshotColor)
 				{
 					iconContentSnapshotColor =
 						EditorResources.Load<Texture>(

package/Editor/UI/BeamGUI/BeamGUI_LogoBanner.cs

@@ -11,6 +11,8 @@ namespace Beamable.Editor.Util
 
 			var logoRect = GUILayoutUtility.GetRect(GUIContent.none, GUIStyle.none, GUILayout.Height(50),
 			                                        GUILayout.ExpandWidth(true));
+			if (!logo) return;
+			
 			var logoAspect = logo.width / (float) logo.height;
 			var shadowWidth = logoAspect * logoRect.height;
 

package/Editor/UI/ContentWindow/ContentWindow.cs

@@ -31,7 +31,9 @@ namespace Beamable.Editor.UI.ContentWindow
 		private ContentConfiguration _contentConfiguration;
 		private Vector2 _horizontalScrollPosition;
 		private int _lastManifestChangedCount;
+		private int _lastProgressUpdateVersion;
 		private EditorGUISplitView _mainSplitter;
+		private bool _importingDefaultContent;
 
 		static ContentWindow()
 		{
@@ -109,6 +111,12 @@ namespace Beamable.Editor.UI.ContentWindow
 				ReloadData();
 				Repaint(); 
 			}
+
+			if (_contentService != null && _contentService.ProgressUpdateVersion != _lastProgressUpdateVersion)
+			{
+				_lastProgressUpdateVersion = _contentService.ProgressUpdateVersion;
+				Repaint();
+			}
 		}
 
 		private void ReloadData()
@@ -119,7 +127,7 @@ namespace Beamable.Editor.UI.ContentWindow
 			
 			if(!_contentService.HasChangedContents && _windowStatus != ContentWindowStatus.SnapshotManager)
 			{
-				ChangeWindowStatus(ContentWindowStatus.Normal);
+				ChangeWindowStatusDelayed(ContentWindowStatus.Normal);
 			}
 		}
 
@@ -208,8 +216,20 @@ namespace Beamable.Editor.UI.ContentWindow
 				return;
 			}
 
-			
-			
+			if (_importingDefaultContent)
+			{
+				DrawBlockLoading("Importing default content...");
+				return;
+			}
+
+			if (ShouldShowDefaultContentPrompt())
+			{
+				DrawDefaultContentPrompt();
+				return;
+			}
+
+
+
 			EditorGUILayout.BeginVertical();
 			_horizontalScrollPosition = EditorGUILayout.BeginScrollView(_horizontalScrollPosition);
 			
@@ -248,21 +268,28 @@ namespace Beamable.Editor.UI.ContentWindow
 			
 			var bottomRectController = new EditorGUIRectController(bottomRect);
 
-			var createdContents = _contentService.GetAllContentFromStatus(ContentStatus.Created);
+			var allRenames = _contentService.GetAllRenames();
+			var renamedCreatedIds = new HashSet<string>(allRenames.Select(r => r.CreatedFullId));
+			var renamedDeletedIds = new HashSet<string>(allRenames.Select(r => r.DeletedFullId));
+
+			var createdContents = _contentService.GetAllContentFromStatus(ContentStatus.Created)
+				.Where(e => !renamedCreatedIds.Contains(e.FullId)).ToList();
 			if (createdContents.Count > 0)
 			{
 				DrawFooterButton($"{createdContents.Count}  created", BeamGUI.iconStatusAdded, ContentFilterStatus.Created);
 				bottomRectController.ReserveWidth(BASE_PADDING);
 			}
-			
+
 			var modifiedContents = _contentService.GetAllContentFromStatus(ContentStatus.Modified);
-			if (modifiedContents.Count > 0)
+			int modifiedCount = modifiedContents.Count + allRenames.Count;
+			if (modifiedCount > 0)
 			{
-				DrawFooterButton($"{modifiedContents.Count}  modified", BeamGUI.iconStatusModified, ContentFilterStatus.Modified);
+				DrawFooterButton($"{modifiedCount}  modified", BeamGUI.iconStatusModified, ContentFilterStatus.Modified);
 				bottomRectController.ReserveWidth(BASE_PADDING);
 			}
-			
-			var deletedContents = _contentService.GetAllContentFromStatus(ContentStatus.Deleted);
+
+			var deletedContents = _contentService.GetAllContentFromStatus(ContentStatus.Deleted)
+				.Where(e => !renamedDeletedIds.Contains(e.FullId)).ToList();
 			if (deletedContents.Count > 0)
 			{
 				DrawFooterButton($"{deletedContents.Count}  deleted", BeamGUI.iconStatusDeleted, ContentFilterStatus.Deleted);
@@ -342,6 +369,91 @@ namespace Beamable.Editor.UI.ContentWindow
 			}
 		}
 		
+		/// <summary>
+		/// Whether to offer the opt-in default-content import. Only shown when the realm's remote
+		/// manifest is confirmed empty (not merely still loading or errored), there is no content
+		/// at all yet, and the user hasn't dismissed the prompt for this realm.
+		/// </summary>
+		private bool ShouldShowDefaultContentPrompt()
+		{
+			if (_contentService == null)
+				return false;
+			if (!_contentService.RemoteManifestsLoaded || _contentService.RemoteManifestsErrored)
+				return false;
+			if (_contentService.RemoteManifestCount > 0)
+				return false;
+			if (_contentService.EntriesCache.Count > 0)
+				return false;
+
+			var cid = _cli?.CurrentRealm?.Cid;
+			var pid = _cli?.CurrentRealm?.Pid;
+			if (string.IsNullOrEmpty(cid) || string.IsNullOrEmpty(pid))
+				return false;
+
+			return !DefaultContentImporter.IsDismissed(cid, pid);
+		}
+
+		private void DrawDefaultContentPrompt()
+		{
+			EditorGUILayout.BeginVertical(new GUIStyle(EditorStyles.helpBox)
+			{
+				padding = new RectOffset(12, 12, 12, 12),
+				margin = new RectOffset(10, 10, 10, 10)
+			});
+
+			EditorGUILayout.TextArea(
+				"This realm doesn't have any content yet. " +
+				"\n\n" +
+				"Would you like to import Beamable's default content? This creates the gems and coins " +
+				"currencies and copies their icon sprites into Assets/Beamable/DefaultAssets, " +
+				"registering them as Addressables. The content is added locally so you can review and " +
+				"publish it yourself.",
+				new GUIStyle(EditorStyles.label) { wordWrap = true });
+
+			EditorGUILayout.BeginHorizontal(new GUIStyle
+			{
+				margin = new RectOffset(0, 0, 12, 12)
+			});
+
+			EditorGUILayout.Space(5, true);
+			EditorGUILayout.Space(5, true);
+
+			var clickedNotNow = BeamGUI.CancelButton("Not now");
+			var clickedImport = BeamGUI.PrimaryButton(new GUIContent("Import"));
+
+			EditorGUILayout.EndHorizontal();
+			EditorGUILayout.EndVertical();
+
+			if (clickedNotNow)
+			{
+				DefaultContentImporter.SetDismissed(_cli?.CurrentRealm?.Cid, _cli?.CurrentRealm?.Pid);
+				Repaint();
+			}
+			else if (clickedImport)
+			{
+				StartDefaultContentImport();
+			}
+		}
+
+		private async void StartDefaultContentImport()
+		{
+			if (_importingDefaultContent)
+				return;
+
+			_importingDefaultContent = true;
+			Repaint();
+			try
+			{
+				// Awaited continuations resume on Unity's main-thread synchronization context.
+				await DefaultContentImporter.ImportDefaultContent();
+			}
+			finally
+			{
+				_importingDefaultContent = false;
+				Repaint();
+			}
+		}
+
 		private List<LocalContentManifestEntry> GetCachedManifestEntries()
 		{
 			var localContentManifestEntries = new List<LocalContentManifestEntry>();