1

Src/Unity/Scripts/Reference/DictionaryReferenceScriptableObject.cs

@@ -2,10 +2,10 @@ using System.Collections;
 using System.Collections.Generic;
 using System.IO;
 using AYellowpaper.SerializedCollections;
-
+using YooAsset;
 #if UNITY_EDITOR
 using UnityEditor;
-using YooAsset;
+
 #endif
 
 using UnityEngine;

Src/Unity/Scripts/UX/ContextMenu/UXContextMenu.cs

@@ -111,6 +111,7 @@ namespace BITKit.UX
         private readonly IUXService _uxService;
         private VisualElement _root;
         private VisualElement _container;
+        private bool _isInitialized = false;
         public UXContextMenu(IUXService uxService)
         {
             _uxService = uxService;
@@ -121,7 +122,7 @@ namespace BITKit.UX
 
         private async void InitializeAsync()
         {
-            var go = new GameObject("UXConsole");
+            var go = new GameObject(nameof(UXContextMenu));
             Object.DontDestroyOnLoad(go);
             var document = go.AddComponent<UIDocument>();
             document.sortingOrder = 1;
@@ -143,6 +144,7 @@ namespace BITKit.UX
             {
                 Close();
             });
+            _isInitialized = true;
             Close();
         }
         public void Create(ContextMenuBuilder builder)
@@ -166,6 +168,7 @@ namespace BITKit.UX
         }
         private void Close()
         {
+            if(_isInitialized is false)return;
             _container.Clear();
             _root.SetActive(false);
         }

Src/Unity/Scripts/UX/Service/UI Toolkit/UIToolKitPanel.cs

@@ -29,6 +29,7 @@ namespace BITKit.UX
 		public VisualElement RootVisualElement { get; set; }
 		protected VisualTreeAsset VisualTreeAsset { get; private set; }
 		private readonly ValidHandle _isBusy = new();
+		public readonly UniTaskCompletionSource WaitUtilInitialized = new();
 		protected UIToolKitPanel(IUXService uxService)
 		{
 			UXService = uxService;
@@ -76,6 +77,8 @@ namespace BITKit.UX
 				UXUtils.Inject(this);
 				
 				RootVisualElement.SetActive(false);
+				
+				WaitUtilInitialized.TrySetResult();
 			}
 		}
 		

Src/Unity/Scripts/UX/Service/UI Toolkit/UIToolkitSubPanel.cs

@@ -1,11 +0,0 @@
-using System.Collections;
-using System.Collections.Generic;
-using BITKit.UX;
-using UnityEngine;
-
-public class UIToolkitSubPanel
-{
-    public UIToolkitSubPanel()
-    {
-    }
-}

Src/Unity/Scripts/UX/Service/UI Toolkit/UIToolkitSubPanel.cs.meta

@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 398253ee7f746d143bbbcd9effab9da1
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: