Перекинул энтерстейт

Game/CourierOld/Assets/AddressableAssetsData/AddressableAssetGroupSortSettings.asset

@@ -0,0 +1,16 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: dea69d41f90c6ea4fa55c27c1d60c145, type: 3}
+  m_Name: AddressableAssetGroupSortSettings
+  m_EditorClassIdentifier: Unity.Addressables.Editor::UnityEditor.AddressableAssets.Settings.GroupSchemas.AddressableAssetGroupSortSettings
+  sortOrder:
+  - d447fc60305c17a17bf20948ab295a45

Game/CourierOld/Assets/AddressableAssetsData/AddressableAssetGroupSortSettings.asset.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 88c15d5f41d582974a9b7218c493e4a7
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Game/CourierOld/Assets/AddressableAssetsData/AddressableAssetSettings.asset

@@ -15,7 +15,7 @@ MonoBehaviour:
   m_DefaultGroup: d447fc60305c17a17bf20948ab295a45
   m_currentHash:
     serializedVersion: 2
-    Hash: 00000000000000000000000000000000
+    Hash: 90c715b85c1e0904b3dc61a9ed460206
   m_OptimizeCatalogSize: 0
   m_BuildRemoteCatalog: 0
   m_CatalogRequestsTimeout: 0

Game/CourierOld/Assets/AddressableAssetsData/AssetGroups/Default Local Group.asset

@@ -14,7 +14,32 @@ MonoBehaviour:
   m_EditorClassIdentifier: Unity.Addressables.Editor::UnityEditor.AddressableAssets.Settings.AddressableAssetGroup
   m_GroupName: Default Local Group
   m_GUID: d447fc60305c17a17bf20948ab295a45
-  m_SerializeEntries: []
+  m_SerializeEntries:
+  - m_GUID: 23e11d2c8a4f12f4ea9a7a43d1118464
+    m_Address: Gameplay
+    m_ReadOnly: 0
+    m_SerializedLabels: []
+    FlaggedDuringContentUpdateRestriction: 0
+  - m_GUID: 48aebfe8826dc0df79d047b5afbf8f5b
+    m_Address: Canvas
+    m_ReadOnly: 0
+    m_SerializedLabels: []
+    FlaggedDuringContentUpdateRestriction: 0
+  - m_GUID: b2e8dc2aeb0311cd8a826b51cf8e94dc
+    m_Address: GameOver
+    m_ReadOnly: 0
+    m_SerializedLabels: []
+    FlaggedDuringContentUpdateRestriction: 0
+  - m_GUID: c566fc932edefbbee9e53271eac3c560
+    m_Address: MainMenu
+    m_ReadOnly: 0
+    m_SerializedLabels: []
+    FlaggedDuringContentUpdateRestriction: 0
+  - m_GUID: f23b9fce9594618e5b75845f1cae50de
+    m_Address: LoadingScreen
+    m_ReadOnly: 0
+    m_SerializedLabels: []
+    FlaggedDuringContentUpdateRestriction: 0
   m_ReadOnly: 0
   m_Settings: {fileID: 11400000, guid: 2588e84eb64800d0781c574a37fa48d8, type: 2}
   m_SchemaSet:

Game/CourierOld/Assets/Code/App/AppStates/BootstrapState.cs

@@ -0,0 +1,12 @@
+using Code.App.StateMachine;
+using Code.StateMachine;
+
+namespace Code.App.AppStates
+{
+    public class BootstrapState : BaseState<AppStateMachineContext>
+    {
+        public BootstrapState(AppStateMachineContext context) : base(context)
+        {
+        }
+    }
+}

Game/CourierOld/Assets/Code/App/AppStates/BootstrapState.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 0183e73a08c64332babded3df3d06b95
+timeCreated: 1762122962

Game/CourierOld/Assets/Code/App/AppStates/GameplayState.cs

@@ -5,7 +5,6 @@ using Code.Input;
 using Code.Scenes;
 using Code.StateMachine;
 using Code.UI;
-using UnityEngine;
 using UnityEngine.InputSystem;
 
 namespace Code.App.AppStates
@@ -15,41 +14,57 @@ namespace Code.App.AppStates
         private PlayerHealth _playerHealth;
         private PlayerMoney _playerMoney;
 
+        private bool _uiLoaded, _sceneLoaded;
+        
         public GameplayState(AppStateMachineContext context) : base(context)
         {
         }
 
         public override void EnterState()
         {
+            _uiLoaded = _sceneLoaded = false;
+            
             Context.UIService.LoadingScreen.Show();
             
-            Context.SceneLoaderService.LoadScene((int)SceneIds.MovementDev, SceneLoaded); // TODO Фабрика говна Nada
-            Context.InputService.EnableMap(ActionMappings.Gameplay);
-
-            Context.UIService.SwitchPanelTo(UIPanel.Gameplay);
-
-            Context.CameraStateMachine.SwitchState(CameraMode.FirstPerson);
-
             _playerMoney = Context.PlayerFactory.CreatePlayerMoney();
             _playerHealth = Context.PlayerFactory.CreatePlayerHealth();
-
+            
             _playerHealth.OnDeath += EndGame;
             
+            Context.SceneLoaderService.LoadSceneAsync((int)SceneIds.MovementDev, callBack: OnSceneLoaded); // TODO Фабрика игрока Nada
+            
+            Context.UIService.SwitchPanelTo(UIPanel.Gameplay, callback: PostUILoaded);
+
             Context.InputService.DebugBindAction((int)ActionMappings.Debug, (int)DebugActions.GiveHealth, GiveHealth);
             Context.InputService.DebugBindAction((int)ActionMappings.Debug, (int)DebugActions.GiveMoney, GiveMoney);
             Context.InputService.DebugBindAction((int)ActionMappings.Debug, (int)DebugActions.LooseHealth, LooseHealth);
             Context.InputService.DebugBindAction((int)ActionMappings.Debug, (int)DebugActions.LooseMoney, LooseMoney);
         }
-
+        
-        private void SceneLoaded()
+        private void OnSceneLoaded()
         {
-            ((GameplayPanel)(Context.UIService.CurrentPanel)).Initialize(_playerMoney, _playerHealth);
+            _sceneLoaded = true;
-            Context.UIService.LoadingScreen.Hide();
+            CheckIfLoaded();
-
-            base.EnterState();
         }
 
-        
+        private void PostUILoaded()
+        {
+            ((GameplayPanel)Context.UIService.CurrentPanel).Initialize(_playerMoney, _playerHealth);
+            _uiLoaded = true;
+            CheckIfLoaded();
+        }
+
+        private void CheckIfLoaded()
+        {
+            if(!_uiLoaded || !_sceneLoaded) return;
+            
+            Context.UIService.LoadingScreen.Hide();
+            
+            Context.CameraStateMachine.SwitchState(CameraMode.FirstPerson);
+            Context.InputService.EnableMap(ActionMappings.Gameplay);
+        }
+
+
         // Debug
         private void GiveHealth(InputAction.CallbackContext context)
         {

Game/CourierOld/Assets/Code/App/AppStates/MainMenuState.cs

@@ -14,28 +14,36 @@ namespace Code.App.AppStates
 {
     public class MainMenuState : BaseState<AppStateMachineContext>
     {
+        private bool _uiLoaded, _sceneLoaded;
         public MainMenuState(AppStateMachineContext context) : base(context)
         {
         }
 
         public override void EnterState()
         {
+            _uiLoaded = _sceneLoaded = false;
+            
             Context.UIService.LoadingScreen.Show();
             
-            Context.SceneLoaderService.LoadScene((int)SceneIds.MainMenu, SceneLoaded);
+            Context.SceneLoaderService.LoadSceneAsync((int)SceneIds.MainMenu, callBack: SceneLoaded); 
-            Context.InputService.EnableMap(ActionMappings.MainMenu);
+             
-
+            Context.UIService.SwitchPanelTo(UIPanel.MainMenu, PostUILoaded);
-            Context.UIService.SwitchPanelTo(UIPanel.MainMenu);
-            ((MainMenuPanel)Context.UIService.CurrentPanel).startButton.onClick.AddListener(StartGame);
-            ((MainMenuPanel)Context.UIService.CurrentPanel).exitButton.onClick.AddListener(ExitGame);
 
             Context.CameraStateMachine.SwitchState(CameraMode.Static);
         }
 
+        private void PostUILoaded()
+        {
+            ((MainMenuPanel)Context.UIService.CurrentPanel).startButton.onClick.AddListener(StartGame);
+            ((MainMenuPanel)Context.UIService.CurrentPanel).exitButton.onClick.AddListener(ExitGame);
+            
+            _uiLoaded = true;
+            
+            CheckIfLoaded();
+        }
+
         private void SceneLoaded()
         {
-            Context.UIService.LoadingScreen.Hide();
-
             var hui = ((MainMenuEnvironment)SceneManager.GetActiveScene()
                 .GetSceneContainer().Resolve<CurrentSceneEnvironment>());
             
@@ -44,9 +52,23 @@ namespace Code.App.AppStates
             
             ((BaseCameraState)Context.CameraStateMachine.CurrentBaseState).SetFollowTransform(hui.cameraPosition);
 
-            base.EnterState();
+            
+            _sceneLoaded = true;
+            
+            CheckIfLoaded();
         }
 
+        private void CheckIfLoaded()
+        {
+            if(!_uiLoaded || !_sceneLoaded) return;
+            
+            Context.UIService.LoadingScreen.Hide();
+            
+            Context.InputService.EnableMap(ActionMappings.MainMenu);
+            
+            base.EnterState();
+        }
+        
         public override void Tick()
         {
         }

Game/CourierOld/Assets/Code/App/AppStates/MovementDevState.cs

@@ -15,7 +15,7 @@ namespace Code.App.AppStates
 
         public override void EnterState()
         {
-            Context.SceneLoaderService.LoadScene((int)SceneIds.MovementDev, SceneLoaded);
+            // Context.SceneLoaderService.LoadScene((int)SceneIds.MovementDev, SceneLoaded);
             Context.InputService.EnableMap(ActionMappings.Gameplay);
             
             Context.CameraStateMachine.SwitchState(CameraMode.FirstPerson);

Game/CourierOld/Assets/Code/App/BootstrapInstaller.cs

@@ -1,21 +1,25 @@
+using System.Threading.Tasks;
 using Code.App.StateMachine;
 using Code.Configs;
+using Code.Constants;
 using Code.Gameplay.Camera;
 using Code.Gameplay.Player;
 using Code.Input;
 using Code.Scenes;
 using Code.StaticData;
 using Code.UI;
+using Code.UI.Panels;
+using Cysharp.Threading.Tasks;
 using Reflex.Core;
 using Reflex.Injectors;
 using UnityEngine;
+using UnityEngine.AddressableAssets;
 using UnityEngine.InputSystem;
 
 namespace Code.App
 {
     public class BootstrapInstaller : MonoBehaviour, IInstaller
     {
-
         public void InstallBindings(ContainerBuilder containerBuilder)
         {
             InstallStaticData(containerBuilder, out IStaticDataService staticDataService);
@@ -35,11 +39,8 @@ namespace Code.App
 
         private void InitializeCamera(ContainerBuilder containerBuilder, IStaticDataService staticDataService)
         {
-            // CameraService cameraService = Instantiate(staticDataService.CameraConfig.cameraPrefab);
+            Camera camera = Instantiate(staticDataService.CameraConfig.cameraPrefab); 
-            // containerBuilder.AddSingleton(cameraService);
-            // DontDestroyOnLoad(cameraService);
             
-            Camera camera = Instantiate(staticDataService.CameraConfig.cameraPrefab);
             DontDestroyOnLoad(camera);
             containerBuilder.AddSingleton(camera);
         }
@@ -51,7 +52,7 @@ namespace Code.App
             
             containerBuilder.AddSingleton(infrastructureUnit);
             containerBuilder.AddSingleton(infrastructureUnit.AddComponent<CoroutineRunner>(),
-                typeof(ICoroutineRunner));
+                typeof(ICoroutineRunner));  
             containerBuilder.AddSingleton(infrastructureUnit.AddComponent<AppStateMachine>());
             containerBuilder.AddSingleton(infrastructureUnit.AddComponent<CameraStateMachine>());
         }
@@ -63,27 +64,41 @@ namespace Code.App
 
             containerBuilder.AddSingleton(staticDataService, typeof(IStaticDataService));
             containerBuilder.AddSingleton(staticDataService.InputConfig.inputActionAsset, typeof(InputActionAsset));
+            containerBuilder.AddSingleton(staticDataService.InputConfig, typeof(InputConfig));
             containerBuilder.AddSingleton(staticDataService.CameraConfig, typeof(CameraConfig));
             containerBuilder.AddSingleton(staticDataService.PlayerConfig, typeof(PlayerConfig));
             containerBuilder.AddSingleton(staticDataService.CharacterConfig, typeof(CharacterConfig));
-            containerBuilder.AddSingleton(staticDataService.UIConfig.canvasPrefab, typeof(Canvas));
+            containerBuilder.AddSingleton(staticDataService.UIConfig, typeof(UIConfig));
-            containerBuilder.AddSingleton(staticDataService.UIConfig.uiElementsPrefabs, typeof(UIElement[]));
+            // containerBuilder.AddSingleton(staticDataService.UIConfig.canvasPrefab, typeof(Canvas));
+            // containerBuilder.AddSingleton(staticDataService.UIConfig.uiElementsPrefabs, typeof(UIElement[]));
         }
 
+        private bool _onUiLoaded;
+        private AppStateMachine _appStateMachine;
         private void Bootstrap(Container container)
         {
-            AppStateMachine appStateMachine = container.Resolve<AppStateMachine>();
+            _appStateMachine = container.Resolve<AppStateMachine>();
-            appStateMachine.Initialize();
+            _appStateMachine.Initialize();
-
+            AttributeInjector.Inject(_appStateMachine.StateMachineContext, container);
-            AttributeInjector.Inject(appStateMachine.StateMachineContext, container);
             
             CameraStateMachine cameraStateMachine = container.Resolve<CameraStateMachine>();
             AttributeInjector.Inject(cameraStateMachine.StateMachineContext, container);
-
             cameraStateMachine.Initialize();
             
+            var loadingScreen = GameObject.FindWithTag(Tags.LoadingScreen);
+            DontDestroyOnLoad(loadingScreen);
+            
+            IUIService uiService = container.Resolve<IUIService>();
+            uiService.Initialize(loadingScreen.GetComponent<LoadingScreen>());
+            
+            TryStartGame();
+        }
+
+        private void TryStartGame()
+        {
+            
             // TODO: поменяно для теста
-            appStateMachine
+            _appStateMachine
                 .SwitchState(AppState.MainMenu)
                 .AllowStateTransition(AppState.Gameplay);
         }

Game/CourierOld/Assets/Code/App/StateMachine/AppStateMachine.cs

@@ -7,6 +7,7 @@ namespace Code.App.StateMachine
     {
         public override void Initialize()
         {
+            States.Add(AppState.Bootstrap, new BootstrapState(StateMachineContext));
             States.Add(AppState.MainMenu, new MainMenuState(StateMachineContext));
             States.Add(AppState.Gameplay, new GameplayState(StateMachineContext));
             States.Add(AppState.GameOver, new GameOverState(StateMachineContext));
@@ -16,6 +17,8 @@ namespace Code.App.StateMachine
             AllowedStates |= AppState.MainMenu;
             AllowedStates |= AppState.Gameplay;
             AllowedStates |= AppState.MovementDev;
+
+            CurrentBaseState = States[AppState.Bootstrap];
         }
 
         protected override bool CheckTransitionAllowed(AppState nextState) => AllowedStates.HasFlag(nextState);

Game/CourierOld/Assets/Code/Configs/CameraConfig.cs

@@ -1,4 +1,5 @@
 using UnityEngine;
+using UnityEngine.AddressableAssets;
 
 namespace Code.Configs
 {

Game/CourierOld/Assets/Code/Configs/UIConfig.cs

@@ -1,13 +1,12 @@
-using Code.UI;
 using UnityEngine;
-using UnityEngine.Serialization;
+using UnityEngine.AddressableAssets;
 
 namespace Code.Configs
 {
     [CreateAssetMenu(menuName = "Config/UI", fileName = "UIConfig")]
     public class UIConfig : ScriptableObject
     {
-        [FormerlySerializedAs("uiElements")] public UIElement[] uiElementsPrefabs;
+        public AssetReference[] uiPanelsAssetReferences;
-        [FormerlySerializedAs("canvas")] public Canvas canvasPrefab;
+        public AssetReference canvasAssetReference;
     }
 }

Game/CourierOld/Assets/Code/Constants/StringPaths.cs

@@ -6,4 +6,8 @@ namespace Code.Constants
         public const string ConfigMultiple = "Configs/{0}";
         
     }
+    public static class Tags
+    {
+        public const string LoadingScreen = "LoadingScreen";
+    }
 }

Game/CourierOld/Assets/Code/Gameplay/Camera/CameraStateMachine.cs

@@ -12,6 +12,8 @@ namespace Code.Gameplay.Camera
             States.Add(CameraMode.Static, new StaticState(StateMachineContext));
             States.Add(CameraMode.FirstPerson, new FirstPersonState(StateMachineContext));
             States.Add(CameraMode.ThirdPerson, new ThirdPersonState(StateMachineContext));
+            
+            CurrentBaseState = States[CameraMode.Static];
         }
         
 

Game/CourierOld/Assets/Code/Scenes/ISceneLoaderService.cs

@@ -1,10 +1,11 @@
 using System;
+using Cysharp.Threading.Tasks;
 
 namespace Code.Scenes
 {
     public interface ISceneLoaderService
-    {
+    { 
-        void LoadScene(string sceneName, Action callback = null, float waitFor = 0f);
+        UniTaskVoid LoadSceneAsync(string sceneName, float waitFor = 0f, Action callBack = null);
-        void LoadScene(int sceneId, Action callback = null, float waitFor = 0f);
+        UniTaskVoid LoadSceneAsync(int sceneId, float waitFor = 0f, Action callBack = null);
     }
 }

Game/CourierOld/Assets/Code/Scenes/SceneLoaderService.cs

@@ -1,46 +1,33 @@
 using System;
-using System.Collections;
+using Cysharp.Threading.Tasks;
-using Code.App;
-using Reflex.Attributes;
-using UnityEngine;
 using UnityEngine.SceneManagement;
 
 namespace Code.Scenes
 {
     public class SceneLoaderService : ISceneLoaderService
     {
-        [Inject] private ICoroutineRunner _coroutineRunner;
+        public async UniTaskVoid LoadSceneAsync(string sceneName, float waitFor = 0f, Action callBack = null)
-        
-        public void LoadScene(string sceneName, Action callback = null, float waitFor = 0f) =>
-            _coroutineRunner.StartCoroutine(LoadSceneAsync(sceneName, callback, waitFor));
-
-        public void LoadScene(int sceneId, Action callback = null, float waitFor = 0f) =>
-            _coroutineRunner.StartCoroutine(LoadSceneAsync(sceneId, callback, waitFor));
-
-        private IEnumerator LoadSceneAsync(string sceneName, Action callback = null, float waitFor = 0f)
         {
-            if (waitFor > 0f)
+            // if (waitFor > 0f)
-                yield return new WaitForSeconds(waitFor);
+            // yield return new WaitForSeconds(waitFor);
 
-            AsyncOperation waitNextScene = SceneManager.LoadSceneAsync(sceneName, LoadSceneMode.Single);
+            // AsyncOperation waitNextScene = SceneManager.LoadSceneAsync(sceneName, LoadSceneMode.Single);
 
-            while (!waitNextScene.isDone)
+            // while (!waitNextScene.isDone)
-                yield return null;
+            // yield return null;
 
-            callback?.Invoke();
+            // callback?.Invoke();
+            await UniTask.Delay(TimeSpan.FromSeconds(waitFor));
+            await SceneManager.LoadSceneAsync(sceneName, LoadSceneMode.Single).ToUniTask();
+            callBack?.Invoke();
         }
 
-        private IEnumerator LoadSceneAsync(int sceneId, Action callback = null, float waitFor = 0f)
+        public async UniTaskVoid LoadSceneAsync(int sceneId, float waitFor = 0f, Action callBack = null)
         {
-            if (waitFor > 0f)
+            await UniTask.WhenAll(
-                yield return new WaitForSeconds(waitFor);
+                UniTask.Delay(TimeSpan.FromSeconds(waitFor)),
-
+                SceneManager.LoadSceneAsync(sceneId, LoadSceneMode.Single).ToUniTask());
-            AsyncOperation waitNextScene = SceneManager.LoadSceneAsync(sceneId, LoadSceneMode.Single);
+            callBack?.Invoke();
-
-            while (!waitNextScene.isDone)
-                yield return null;
-
-            callback?.Invoke();
         }
     }
-} 
+}

Game/CourierOld/Assets/Code/StateMachine/AbstractStateMachine.cs

@@ -8,8 +8,8 @@ namespace Code.StateMachine
         : MonoBehaviour
         where TStateMachineContext : new()
     {
-        public TStateEnum CurrentState { get; private set; }
+        public TStateEnum CurrentState { get; protected set; }
-        public BaseState<TStateMachineContext> CurrentBaseState { get; private set; }
+        public BaseState<TStateMachineContext> CurrentBaseState { get; protected set; }
         private BaseState<TStateMachineContext> _previousBaseState;
 
         protected Dictionary<TStateEnum, BaseState<TStateMachineContext>> States = new();
@@ -37,11 +37,9 @@ namespace Code.StateMachine
         {
             if (!CheckTransitionAllowed(nextState))
             {
-                Debug.LogError("TransitionNotAllowed");
                 return null;
             }
 
-            Debug.Log("Entered " + nextState);
             ResetAllowedTransitions();
             
             _previousBaseState = CurrentBaseState;

Game/CourierOld/Assets/Code/StaticData/IStaticDataService.cs

@@ -1,6 +1,10 @@
 using System;
 using System.Collections.Generic;
+using System.Threading.Tasks;
 using Code.Configs;
+using Cysharp.Threading.Tasks;
+using UnityEngine;
+using UnityEngine.AddressableAssets;
 
 namespace Code.StaticData
 {
@@ -13,5 +17,6 @@ namespace Code.StaticData
         CharacterConfig CharacterConfig { get; }
         UIConfig UIConfig { get; }
         PlayerConfig PlayerConfig { get; }
+        Task<T> InstantiateAsset<T>(AssetReference assetReference) where T : Behaviour;
     }
 }

Game/CourierOld/Assets/Code/StaticData/StaticDataService.cs

@@ -1,6 +1,9 @@
+using System.Threading.Tasks;
 using Code.Configs;
 using Code.Constants;
+using Cysharp.Threading.Tasks;
 using UnityEngine;
+using UnityEngine.AddressableAssets;
 
 namespace Code.StaticData
 {
@@ -12,7 +15,7 @@ namespace Code.StaticData
         public CharacterConfig CharacterConfig { get; private set; }
         public UIConfig UIConfig { get; private set; }
         public PlayerConfig PlayerConfig { get; private set; }
-
+        
         public void Load()
         {
             InputConfig = Resources.Load<InputConfig>(string.Format(StringPaths.ConfigSingle, "App", "InputConfig"));
@@ -22,5 +25,10 @@ namespace Code.StaticData
             UIConfig = Resources.Load<UIConfig>(string.Format(StringPaths.ConfigSingle, "App", "UIConfig"));
             PlayerConfig = Resources.Load<PlayerConfig>(string.Format(StringPaths.ConfigSingle, "App", "PlayerConfig"));
         }
+
+        public async Task<T> InstantiateAsset<T>(AssetReference assetReference) where T : Behaviour
+        {
+            return (await Addressables.InstantiateAsync(assetReference).ToUniTask()).GetComponent<T>();
+        } 
     }
 }

Game/CourierOld/Assets/Code/UI/IUIFactory.cs

@@ -1,10 +1,11 @@
+using Cysharp.Threading.Tasks;
 using UnityEngine;
 
 namespace Code.UI
 {
     public interface IUIFactory
     {
-        Canvas CreateCanvas();
+        UniTask<Canvas> CreateCanvas();
-        UIElement CreatePanel(Canvas canvas, UIPanel uiPanel);
+        UniTask<UIElement> CreatePanel(Canvas canvas, UIPanel uiPanel);
     }
 }

Game/CourierOld/Assets/Code/UI/IUIService.cs

@@ -1,11 +1,13 @@
+using System;
+using Code.UI.Panels;
+
 namespace Code.UI
 {
     public interface IUIService
     {
-        void EnablePanel();
+        void SwitchPanelTo(UIPanel uiPanel, Action callback = null);
-        void DisablePanel();
-        void SwitchPanelTo(UIPanel uiPanel);
         UIElement CurrentPanel { get; }
-        LoadingPanel LoadingScreen { get; }
+        LoadingScreen LoadingScreen { get; }
+        void Initialize(LoadingScreen loadingScreen);
     }
 }

Game/CourierOld/Assets/Code/UI/Panels/LoadingPanel.cs

@@ -1,18 +0,0 @@
-using UnityEngine;
-using UnityEngine.UI;
-
-namespace Code.UI
-{
-    public class LoadingPanel : UIElement
-    {
-        [SerializeField] private Image _background;
-        public override void Hide()
-        {
-            _background.enabled = false;
-        }
-        public override void Show()
-        {
-            _background.enabled = true;
-        }
-    }
-}

Game/CourierOld/Assets/Code/UI/Panels/LoadingScreen.cs

@@ -0,0 +1,22 @@
+using TMPro;
+using UnityEngine;
+using UnityEngine.UI;
+
+namespace Code.UI.Panels
+{
+    public class LoadingScreen : UIElement
+    {
+        [SerializeField] private Image background;
+        [SerializeField] private TMP_Text loadingTitle;
+        public override void Hide()
+        {
+            background.enabled = false;
+            loadingTitle.enabled = false;
+        }
+        public override void Show()
+        {
+            background.enabled = true;
+            loadingTitle.enabled = true;
+        }
+    }
+}

Game/CourierOld/Assets/Code/UI/UIFactory.cs

@@ -1,24 +1,36 @@
+using Code.Configs;
+using Cysharp.Threading.Tasks;
 using Reflex.Attributes;
 using UnityEngine;
+using UnityEngine.AddressableAssets;
+using UnityEngine.ResourceManagement.AsyncOperations;
+using Object = UnityEngine.Object;
 
 namespace Code.UI
 {
     public class UIFactory : IUIFactory
     {
-        [Inject] private UIElement[] _uiPanelsPrefabs;
+        private AssetReference _canvasAssetReference;
-        [Inject] private Canvas _canvasPrefab;
+        private AssetReference[] _uiPanelsAssetReferences;
 
-        public Canvas CreateCanvas()
+        public UIFactory(UIConfig uiConfig)
         {
-            Canvas canvas = Object.Instantiate(_canvasPrefab);
+            _canvasAssetReference = uiConfig.canvasAssetReference;
+            _uiPanelsAssetReferences = uiConfig.uiPanelsAssetReferences;
+        }
+        public async UniTask<Canvas> CreateCanvas()
+        {
+            // Canvas canvasPrefab = await Addressables.LoadAssetAsync<Canvas>(_canvasAssetReference);
+            Canvas canvas = (await Addressables.InstantiateAsync(_canvasAssetReference).ToUniTask()).GetComponent<Canvas>();
+            
             Object.DontDestroyOnLoad(canvas);
             
             return canvas;
         }
 
-        public UIElement CreatePanel(Canvas canvas, UIPanel uiPanel)
+        public async UniTask<UIElement> CreatePanel(Canvas canvas, UIPanel uiPanel)
         {
-            return Object.Instantiate(_uiPanelsPrefabs[(int)uiPanel], canvas.transform);
+            return (await Addressables.InstantiateAsync(_uiPanelsAssetReferences[(int)uiPanel], canvas.transform).ToUniTask()).GetComponent<UIElement>();
         }
     }
 }

Game/CourierOld/Assets/Code/UI/UIService.cs

@@ -1,4 +1,10 @@
+using System;
+using System.Threading;
+using Code.UI.Panels;
+using Cysharp.Threading.Tasks;
 using UnityEngine;
+using UnityEngine.AddressableAssets;
+using Object = UnityEngine.Object;
 
 namespace Code.UI
 {
@@ -8,24 +14,31 @@ namespace Code.UI
         private IUIFactory _factory;
         
         public UIElement CurrentPanel { get; private set; }
-        public LoadingPanel LoadingScreen { get; private set; }
+        
+        public LoadingScreen LoadingScreen { get; private set; }
         
         public UIService(IUIFactory factory)
         {
             _factory = factory;
-            _canvas = _factory.CreateCanvas();
+        }
+
+        public async void Initialize(LoadingScreen loadingScreen)
+        {
+            LoadingScreen = loadingScreen;
+            LoadingScreen.Show();
             
-            LoadingScreen = (LoadingPanel) _factory.CreatePanel(_canvas,UIPanel.Loading);
+            _canvas = await _factory.CreateCanvas();
         }
         
-        public void EnablePanel() => CurrentPanel.gameObject.SetActive(true);
+        public async void SwitchPanelTo(UIPanel uiPanel, Action callback = null)
-        public void DisablePanel() => CurrentPanel.gameObject.SetActive(false);
-        
-        public void SwitchPanelTo(UIPanel uiPanel)
         {
-            if(CurrentPanel) Object.Destroy(CurrentPanel.gameObject);
+            if (!_canvas) await UniTask.WaitUntil(() => _canvas );
             
-            CurrentPanel = _factory.CreatePanel(_canvas, uiPanel);
+            if(CurrentPanel) Addressables.ReleaseInstance(CurrentPanel.gameObject);//Object.Destroy(CurrentPanel.gameObject);
+            
+            CurrentPanel = await _factory.CreatePanel(_canvas, uiPanel);
+            
+            callback?.Invoke();
         }
     }
 }

Game/CourierOld/Assets/Resources/Configs/App/CameraConfig.asset

@@ -22,6 +22,5 @@ MonoBehaviour:
   minVerticalAngle: -70
   maxVerticalAngle: 70
   defaultVerticalAngle: 10
-  defaultCameraMode: 0
   defaultFollowPosition: {x: 0, y: 0, z: 0}
   cameraPrefab: {fileID: 374984699890489845, guid: 8b8bf5712dc5a42c7bd8e22cddb884c3, type: 3}

Game/CourierOld/Assets/Resources/Configs/App/UIConfig.asset

@@ -12,9 +12,30 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: feaa36c74e094e0aa24b3983957a6e4e, type: 3}
   m_Name: UIConfig
   m_EditorClassIdentifier: Assembly-CSharp::Code.Configs.UIConfig
-  uiElementsPrefabs:
+  uiPanelsAssetReferences:
-  - {fileID: 3884205628991346111, guid: f23b9fce9594618e5b75845f1cae50de, type: 3}
+  - m_AssetGUID: f23b9fce9594618e5b75845f1cae50de
-  - {fileID: 6346323538546406952, guid: c566fc932edefbbee9e53271eac3c560, type: 3}
+    m_SubObjectName: 
-  - {fileID: 1153528220012302015, guid: 23e11d2c8a4f12f4ea9a7a43d1118464, type: 3}
+    m_SubObjectType: 
-  - {fileID: 1024894541486592765, guid: b2e8dc2aeb0311cd8a826b51cf8e94dc, type: 3}
+    m_SubObjectGUID: 
-  canvasPrefab: {fileID: 1289568913299077295, guid: 48aebfe8826dc0df79d047b5afbf8f5b, type: 3}
+    m_EditorAssetChanged: 1
+  - m_AssetGUID: c566fc932edefbbee9e53271eac3c560
+    m_SubObjectName: 
+    m_SubObjectType: 
+    m_SubObjectGUID: 
+    m_EditorAssetChanged: 0
+  - m_AssetGUID: 23e11d2c8a4f12f4ea9a7a43d1118464
+    m_SubObjectName: 
+    m_SubObjectType: 
+    m_SubObjectGUID: 
+    m_EditorAssetChanged: 0
+  - m_AssetGUID: b2e8dc2aeb0311cd8a826b51cf8e94dc
+    m_SubObjectName: 
+    m_SubObjectType: 
+    m_SubObjectGUID: 
+    m_EditorAssetChanged: 1
+  canvasAssetReference:
+    m_AssetGUID: 48aebfe8826dc0df79d047b5afbf8f5b
+    m_SubObjectName: 
+    m_SubObjectType: 
+    m_SubObjectGUID: 
+    m_EditorAssetChanged: 0

Game/CourierOld/Assets/Resources/Scenes/Initial.unity

@@ -163,8 +163,110 @@ Transform:
   m_Children: []
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1001 &1883358809
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 1289568913299077295, guid: 70a878a1d7f1c360fb0d882850b60079, type: 3}
+      propertyPath: m_SortingOrder
+      value: 5
+      objectReference: {fileID: 0}
+    - target: {fileID: 6466339271797533664, guid: 70a878a1d7f1c360fb0d882850b60079, type: 3}
+      propertyPath: m_Name
+      value: LoadingCanvas
+      objectReference: {fileID: 0}
+    - target: {fileID: 8109840523973613115, guid: 70a878a1d7f1c360fb0d882850b60079, type: 3}
+      propertyPath: m_Pivot.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8109840523973613115, guid: 70a878a1d7f1c360fb0d882850b60079, type: 3}
+      propertyPath: m_Pivot.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8109840523973613115, guid: 70a878a1d7f1c360fb0d882850b60079, type: 3}
+      propertyPath: m_AnchorMax.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8109840523973613115, guid: 70a878a1d7f1c360fb0d882850b60079, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8109840523973613115, guid: 70a878a1d7f1c360fb0d882850b60079, type: 3}
+      propertyPath: m_AnchorMin.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8109840523973613115, guid: 70a878a1d7f1c360fb0d882850b60079, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8109840523973613115, guid: 70a878a1d7f1c360fb0d882850b60079, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8109840523973613115, guid: 70a878a1d7f1c360fb0d882850b60079, type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8109840523973613115, guid: 70a878a1d7f1c360fb0d882850b60079, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8109840523973613115, guid: 70a878a1d7f1c360fb0d882850b60079, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8109840523973613115, guid: 70a878a1d7f1c360fb0d882850b60079, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8109840523973613115, guid: 70a878a1d7f1c360fb0d882850b60079, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 8109840523973613115, guid: 70a878a1d7f1c360fb0d882850b60079, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8109840523973613115, guid: 70a878a1d7f1c360fb0d882850b60079, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8109840523973613115, guid: 70a878a1d7f1c360fb0d882850b60079, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8109840523973613115, guid: 70a878a1d7f1c360fb0d882850b60079, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8109840523973613115, guid: 70a878a1d7f1c360fb0d882850b60079, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8109840523973613115, guid: 70a878a1d7f1c360fb0d882850b60079, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8109840523973613115, guid: 70a878a1d7f1c360fb0d882850b60079, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8109840523973613115, guid: 70a878a1d7f1c360fb0d882850b60079, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 70a878a1d7f1c360fb0d882850b60079, type: 3}
 --- !u!1660057539 &9223372036854775807
 SceneRoots:
   m_ObjectHideFlags: 0
   m_Roots:
   - {fileID: 1253837929}
+  - {fileID: 1883358809}

Game/CourierOld/Assets/Resources/UI/Fonts/SOUTHGHETTO SDF.asset

@@ -60,8 +60,122 @@ MonoBehaviour:
   m_SourceFontFilePath: 
   m_AtlasPopulationMode: 1
   InternalDynamicOS: 0
-  m_GlyphTable: []
+  m_GlyphTable:
-  m_CharacterTable: []
+  - m_Index: 30
+    m_Metrics:
+      m_Width: 51.296875
+      m_Height: 63
+      m_HorizontalBearingX: 2.703125
+      m_HorizontalBearingY: 63
+      m_HorizontalAdvance: 56.703125
+    m_GlyphRect:
+      m_X: 10
+      m_Y: 10
+      m_Width: 52
+      m_Height: 63
+    m_Scale: 1
+    m_AtlasIndex: 0
+    m_ClassDefinitionType: 0
+  - m_Index: 60
+    m_Metrics:
+      m_Width: 49.234375
+      m_Height: 63
+      m_HorizontalBearingX: 2.703125
+      m_HorizontalBearingY: 63
+      m_HorizontalAdvance: 54.625
+    m_GlyphRect:
+      m_X: 10
+      m_Y: 92
+      m_Width: 50
+      m_Height: 63
+    m_Scale: 1
+    m_AtlasIndex: 0
+    m_ClassDefinitionType: 0
+  - m_Index: 67
+    m_Metrics:
+      m_Width: 49.234375
+      m_Height: 63
+      m_HorizontalBearingX: 2.703125
+      m_HorizontalBearingY: 63
+      m_HorizontalAdvance: 54.625
+    m_GlyphRect:
+      m_X: 10
+      m_Y: 174
+      m_Width: 50
+      m_Height: 63
+    m_Scale: 1
+    m_AtlasIndex: 0
+    m_ClassDefinitionType: 0
+  - m_Index: 64
+    m_Metrics:
+      m_Width: 31.40625
+      m_Height: 63
+      m_HorizontalBearingX: 2.703125
+      m_HorizontalBearingY: 63
+      m_HorizontalAdvance: 36.8125
+    m_GlyphRect:
+      m_X: 10
+      m_Y: 256
+      m_Width: 33
+      m_Height: 63
+    m_Scale: 1
+    m_AtlasIndex: 0
+    m_ClassDefinitionType: 0
+  - m_Index: 77
+    m_Metrics:
+      m_Width: 53.09375
+      m_Height: 63
+      m_HorizontalBearingX: 2.703125
+      m_HorizontalBearingY: 63
+      m_HorizontalAdvance: 58.5
+    m_GlyphRect:
+      m_X: 10
+      m_Y: 338
+      m_Width: 54
+      m_Height: 63
+    m_Scale: 1
+    m_AtlasIndex: 0
+    m_ClassDefinitionType: 0
+  - m_Index: 73
+    m_Metrics:
+      m_Width: 52.203125
+      m_Height: 63
+      m_HorizontalBearingX: 2.703125
+      m_HorizontalBearingY: 63
+      m_HorizontalAdvance: 55.984375
+    m_GlyphRect:
+      m_X: 62
+      m_Y: 256
+      m_Width: 53
+      m_Height: 63
+    m_Scale: 1
+    m_AtlasIndex: 0
+    m_ClassDefinitionType: 0
+  m_CharacterTable:
+  - m_ElementType: 1
+    m_Unicode: 68
+    m_GlyphIndex: 30
+    m_Scale: 1
+  - m_ElementType: 1
+    m_Unicode: 101
+    m_GlyphIndex: 60
+    m_Scale: 1
+  - m_ElementType: 1
+    m_Unicode: 108
+    m_GlyphIndex: 67
+    m_Scale: 1
+  - m_ElementType: 1
+    m_Unicode: 105
+    m_GlyphIndex: 64
+    m_Scale: 1
+  - m_ElementType: 1
+    m_Unicode: 118
+    m_GlyphIndex: 77
+    m_Scale: 1
+  - m_ElementType: 1
+    m_Unicode: 114
+    m_GlyphIndex: 73
+    m_Scale: 1
   m_AtlasTextures:
   - {fileID: 688428377202190775}
   m_AtlasTextureIndex: 0
@@ -72,12 +186,52 @@ MonoBehaviour:
   m_AtlasHeight: 1024
   m_AtlasPadding: 9
   m_AtlasRenderMode: 4165
-  m_UsedGlyphRects: []
+  m_UsedGlyphRects:
-  m_FreeGlyphRects:
   - m_X: 0
     m_Y: 0
+    m_Width: 71
+    m_Height: 82
+  - m_X: 0
+    m_Y: 82
+    m_Width: 69
+    m_Height: 82
+  - m_X: 0
+    m_Y: 164
+    m_Width: 69
+    m_Height: 82
+  - m_X: 0
+    m_Y: 246
+    m_Width: 52
+    m_Height: 82
+  - m_X: 0
+    m_Y: 328
+    m_Width: 73
+    m_Height: 82
+  - m_X: 52
+    m_Y: 246
+    m_Width: 72
+    m_Height: 82
+  m_FreeGlyphRects:
+  - m_X: 0
+    m_Y: 410
     m_Width: 1023
+    m_Height: 613
+  - m_X: 71
+    m_Y: 0
+    m_Width: 952
+    m_Height: 246
+  - m_X: 73
+    m_Y: 328
+    m_Width: 950
+    m_Height: 695
+  - m_X: 124
+    m_Y: 0
+    m_Width: 899
     m_Height: 1023
+  - m_X: 69
+    m_Y: 82
+    m_Width: 954
+    m_Height: 164
   m_FontFeatureTable:
     m_MultipleSubstitutionRecords: []
     m_LigatureSubstitutionRecords: []
@@ -153,9 +307,9 @@ Texture2D:
     Hash: 00000000000000000000000000000000
   m_IsAlphaChannelOptional: 0
   serializedVersion: 4
-  m_Width: 1
+  m_Width: 1024
-  m_Height: 1
+  m_Height: 1024
-  m_CompleteImageSize: 1
+  m_CompleteImageSize: 1048576
   m_MipsStripped: 0
   m_TextureFormat: 1
   m_MipCount: 1
@@ -180,8 +334,8 @@ Texture2D:
   m_LightmapFormat: 0
   m_ColorSpace: 1
   m_PlatformBlob: 
-  image data: 1
+  image data: 1048576
-  _typelessdata: 00
+  _typelessdata: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000407090a131313131313131313131313131212121212121212121212121212121212121212110f0d0a070604010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000050b101416172020202020202020202020201f1f1f1f1f1f1f1f1f1f1f1f1f1f1f1f1f1f1f1f1e1e1c1a171413110d08010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000Line truncated
   m_StreamData:
     serializedVersion: 2
     offset: 0

Game/CourierOld/Assets/Resources/UI/Fonts/VCR_OSD_MONO_1.001 SDF.asset

@@ -60,8 +60,293 @@ MonoBehaviour:
   m_SourceFontFilePath: 
   m_AtlasPopulationMode: 1
   InternalDynamicOS: 0
-  m_GlyphTable: []
+  m_GlyphTable:
-  m_CharacterTable: []
+  - m_Index: 185
+    m_Metrics:
+      m_Width: 43.953125
+      m_Height: 8.796875
+      m_HorizontalBearingX: 4.390625
+      m_HorizontalBearingY: 13.1875
+      m_HorizontalAdvance: 52.734375
+    m_GlyphRect:
+      m_X: 10
+      m_Y: 10
+      m_Width: 45
+      m_Height: 10
+    m_Scale: 1
+    m_AtlasIndex: 0
+    m_ClassDefinitionType: 0
+  - m_Index: 66
+    m_Metrics:
+      m_Width: 52.734375
+      m_Height: 8.796875
+      m_HorizontalBearingX: 0
+      m_HorizontalBearingY: 8.796875
+      m_HorizontalAdvance: 52.734375
+    m_GlyphRect:
+      m_X: 74
+      m_Y: 10
+      m_Width: 53
+      m_Height: 9
+    m_Scale: 1
+    m_AtlasIndex: 0
+    m_ClassDefinitionType: 0
+  - m_Index: 47
+    m_Metrics:
+      m_Width: 43.953125
+      m_Height: 61.53125
+      m_HorizontalBearingX: 4.390625
+      m_HorizontalBearingY: 65.921875
+      m_HorizontalAdvance: 52.734375
+    m_GlyphRect:
+      m_X: 146
+      m_Y: 10
+      m_Width: 45
+      m_Height: 62
+    m_Scale: 1
+    m_AtlasIndex: 0
+    m_ClassDefinitionType: 0
+  - m_Index: 82
+    m_Metrics:
+      m_Width: 43.953125
+      m_Height: 48.34375
+      m_HorizontalBearingX: 4.390625
+      m_HorizontalBearingY: 52.734375
+      m_HorizontalAdvance: 52.734375
+    m_GlyphRect:
+      m_X: 74
+      m_Y: 38
+      m_Width: 45
+      m_Height: 49
+    m_Scale: 1
+    m_AtlasIndex: 0
+    m_ClassDefinitionType: 0
+  - m_Index: 68
+    m_Metrics:
+      m_Width: 43.953125
+      m_Height: 52.734375
+      m_HorizontalBearingX: 4.390625
+      m_HorizontalBearingY: 57.125
+      m_HorizontalAdvance: 52.734375
+    m_GlyphRect:
+      m_X: 10
+      m_Y: 39
+      m_Width: 45
+      m_Height: 54
+    m_Scale: 1
+    m_AtlasIndex: 0
+    m_ClassDefinitionType: 0
+  - m_Index: 71
+    m_Metrics:
+      m_Width: 43.953125
+      m_Height: 61.53125
+      m_HorizontalBearingX: 4.390625
+      m_HorizontalBearingY: 65.921875
+      m_HorizontalAdvance: 52.734375
+    m_GlyphRect:
+      m_X: 210
+      m_Y: 10
+      m_Width: 45
+      m_Height: 62
+    m_Scale: 1
+    m_AtlasIndex: 0
+    m_ClassDefinitionType: 0
+  - m_Index: 76
+    m_Metrics:
+      m_Width: 26.359375
+      m_Height: 57.140625
+      m_HorizontalBearingX: 13.1875
+      m_HorizontalBearingY: 61.53125
+      m_HorizontalAdvance: 52.734375
+    m_GlyphRect:
+      m_X: 274
+      m_Y: 10
+      m_Width: 27
+      m_Height: 58
+    m_Scale: 1
+    m_AtlasIndex: 0
+    m_ClassDefinitionType: 0
+  - m_Index: 81
+    m_Metrics:
+      m_Width: 43.953125
+      m_Height: 48.34375
+      m_HorizontalBearingX: 4.390625
+      m_HorizontalBearingY: 52.734375
+      m_HorizontalAdvance: 52.734375
+    m_GlyphRect:
+      m_X: 320
+      m_Y: 10
+      m_Width: 45
+      m_Height: 49
+    m_Scale: 1
+    m_AtlasIndex: 0
+    m_ClassDefinitionType: 0
+  - m_Index: 74
+    m_Metrics:
+      m_Width: 43.953125
+      m_Height: 52.734375
+      m_HorizontalBearingX: 4.390625
+      m_HorizontalBearingY: 57.125
+      m_HorizontalAdvance: 52.734375
+    m_GlyphRect:
+      m_X: 384
+      m_Y: 10
+      m_Width: 45
+      m_Height: 54
+    m_Scale: 1
+    m_AtlasIndex: 0
+    m_ClassDefinitionType: 0
+  - m_Index: 3
+    m_Metrics:
+      m_Width: 0
+      m_Height: 0
+      m_HorizontalBearingX: 0
+      m_HorizontalBearingY: 0
+      m_HorizontalAdvance: 52.734375
+    m_GlyphRect:
+      m_X: 0
+      m_Y: 0
+      m_Width: 0
+      m_Height: 0
+    m_Scale: 1
+    m_AtlasIndex: 0
+    m_ClassDefinitionType: 0
+  - m_Index: 90
+    m_Metrics:
+      m_Width: 43.953125
+      m_Height: 48.34375
+      m_HorizontalBearingX: 4.390625
+      m_HorizontalBearingY: 52.734375
+      m_HorizontalAdvance: 52.734375
+    m_GlyphRect:
+      m_X: 320
+      m_Y: 78
+      m_Width: 45
+      m_Height: 49
+    m_Scale: 1
+    m_AtlasIndex: 0
+    m_ClassDefinitionType: 0
+  - m_Index: 69
+    m_Metrics:
+      m_Width: 43.953125
+      m_Height: 61.53125
+      m_HorizontalBearingX: 4.390625
+      m_HorizontalBearingY: 65.921875
+      m_HorizontalAdvance: 52.734375
+    m_GlyphRect:
+      m_X: 138
+      m_Y: 91
+      m_Width: 45
+      m_Height: 62
+    m_Scale: 1
+    m_AtlasIndex: 0
+    m_ClassDefinitionType: 0
+  - m_Index: 72
+    m_Metrics:
+      m_Width: 43.953125
+      m_Height: 48.34375
+      m_HorizontalBearingX: 4.390625
+      m_HorizontalBearingY: 52.734375
+      m_HorizontalAdvance: 52.734375
+    m_GlyphRect:
+      m_X: 74
+      m_Y: 106
+      m_Width: 45
+      m_Height: 49
+    m_Scale: 1
+    m_AtlasIndex: 0
+    m_ClassDefinitionType: 0
+  - m_Index: 83
+    m_Metrics:
+      m_Width: 43.953125
+      m_Height: 52.734375
+      m_HorizontalBearingX: 4.390625
+      m_HorizontalBearingY: 57.125
+      m_HorizontalAdvance: 52.734375
+    m_GlyphRect:
+      m_X: 10
+      m_Y: 112
+      m_Width: 45
+      m_Height: 54
+    m_Scale: 1
+    m_AtlasIndex: 0
+    m_ClassDefinitionType: 0
+  - m_Index: 87
+    m_Metrics:
+      m_Width: 26.359375
+      m_Height: 61.53125
+      m_HorizontalBearingX: 13.1875
+      m_HorizontalBearingY: 65.921875
+      m_HorizontalAdvance: 52.734375
+    m_GlyphRect:
+      m_X: 274
+      m_Y: 87
+      m_Width: 27
+      m_Height: 62
+    m_Scale: 1
+    m_AtlasIndex: 0
+    m_ClassDefinitionType: 0
+  m_CharacterTable:
+  - m_ElementType: 1
+    m_Unicode: 8230
+    m_GlyphIndex: 185
+    m_Scale: 1
+  - m_ElementType: 1
+    m_Unicode: 95
+    m_GlyphIndex: 66
+    m_Scale: 1
+  - m_ElementType: 1
+    m_Unicode: 76
+    m_GlyphIndex: 47
+    m_Scale: 1
+  - m_ElementType: 1
+    m_Unicode: 111
+    m_GlyphIndex: 82
+    m_Scale: 1
+  - m_ElementType: 1
+    m_Unicode: 97
+    m_GlyphIndex: 68
+    m_Scale: 1
+  - m_ElementType: 1
+    m_Unicode: 100
+    m_GlyphIndex: 71
+    m_Scale: 1
+  - m_ElementType: 1
+    m_Unicode: 105
+    m_GlyphIndex: 76
+    m_Scale: 1
+  - m_ElementType: 1
+    m_Unicode: 110
+    m_GlyphIndex: 81
+    m_Scale: 1
+  - m_ElementType: 1
+    m_Unicode: 103
+    m_GlyphIndex: 74
+    m_Scale: 1
+  - m_ElementType: 1
+    m_Unicode: 32
+    m_GlyphIndex: 3
+    m_Scale: 1
+  - m_ElementType: 1
+    m_Unicode: 119
+    m_GlyphIndex: 90
+    m_Scale: 1
+  - m_ElementType: 1
+    m_Unicode: 98
+    m_GlyphIndex: 69
+    m_Scale: 1
+  - m_ElementType: 1
+    m_Unicode: 101
+    m_GlyphIndex: 72
+    m_Scale: 1
+  - m_ElementType: 1
+    m_Unicode: 112
+    m_GlyphIndex: 83
+    m_Scale: 1
+  - m_ElementType: 1
+    m_Unicode: 116
+    m_GlyphIndex: 87
+    m_Scale: 1
   m_AtlasTextures:
   - {fileID: 948717598527772745}
   m_AtlasTextureIndex: 0
@@ -72,12 +357,100 @@ MonoBehaviour:
   m_AtlasHeight: 1024
   m_AtlasPadding: 9
   m_AtlasRenderMode: 4165
-  m_UsedGlyphRects: []
+  m_UsedGlyphRects:
-  m_FreeGlyphRects:
   - m_X: 0
     m_Y: 0
-    m_Width: 1023
+    m_Width: 64
+    m_Height: 29
+  - m_X: 64
+    m_Y: 0
+    m_Width: 72
+    m_Height: 28
+  - m_X: 136
+    m_Y: 0
+    m_Width: 64
+    m_Height: 81
+  - m_X: 64
+    m_Y: 28
+    m_Width: 64
+    m_Height: 68
+  - m_X: 0
+    m_Y: 29
+    m_Width: 64
+    m_Height: 73
+  - m_X: 200
+    m_Y: 0
+    m_Width: 64
+    m_Height: 81
+  - m_X: 264
+    m_Y: 0
+    m_Width: 46
+    m_Height: 77
+  - m_X: 310
+    m_Y: 0
+    m_Width: 64
+    m_Height: 68
+  - m_X: 374
+    m_Y: 0
+    m_Width: 64
+    m_Height: 73
+  - m_X: 310
+    m_Y: 68
+    m_Width: 64
+    m_Height: 68
+  - m_X: 128
+    m_Y: 81
+    m_Width: 64
+    m_Height: 81
+  - m_X: 64
+    m_Y: 96
+    m_Width: 64
+    m_Height: 68
+  - m_X: 0
+    m_Y: 102
+    m_Width: 64
+    m_Height: 73
+  - m_X: 264
+    m_Y: 77
+    m_Width: 46
+    m_Height: 81
+  m_FreeGlyphRects:
+  - m_X: 438
+    m_Y: 0
+    m_Width: 585
     m_Height: 1023
+  - m_X: 374
+    m_Y: 73
+    m_Width: 649
+    m_Height: 950
+  - m_X: 128
+    m_Y: 28
+    m_Width: 8
+    m_Height: 53
+  - m_X: 128
+    m_Y: 162
+    m_Width: 895
+    m_Height: 861
+  - m_X: 0
+    m_Y: 175
+    m_Width: 1023
+    m_Height: 848
+  - m_X: 64
+    m_Y: 164
+    m_Width: 959
+    m_Height: 859
+  - m_X: 192
+    m_Y: 81
+    m_Width: 72
+    m_Height: 942
+  - m_X: 192
+    m_Y: 158
+    m_Width: 831
+    m_Height: 865
+  - m_X: 310
+    m_Y: 136
+    m_Width: 713
+    m_Height: 887
   m_FontFeatureTable:
     m_MultipleSubstitutionRecords: []
     m_LigatureSubstitutionRecords:
@@ -159,9 +532,9 @@ Texture2D:
     Hash: 00000000000000000000000000000000
   m_IsAlphaChannelOptional: 0
   serializedVersion: 4
-  m_Width: 1
+  m_Width: 1024
-  m_Height: 1
+  m_Height: 1024
-  m_CompleteImageSize: 1
+  m_CompleteImageSize: 1048576
   m_MipsStripped: 0
   m_TextureFormat: 1
   m_MipCount: 1
@@ -186,8 +559,8 @@ Texture2D:
   m_LightmapFormat: 0
   m_ColorSpace: 1
   m_PlatformBlob: 
-  image data: 1
+  image data: 1048576
-  _typelessdata: 00
+  _typelessdata: 000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000005080a0b0e0e0e0e0e0e0e0e0807050200000306070e0e0e0e0e0e0e0e0c0c0a0602000407090a0e0e0e0e0e0e0e0e090806030000000000000000000000050a0f121313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313100f0d090500000000000000000000000005080a0b0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0908060300000000000000000000000000000000000000000000000000000407090a0e0e0e0e0e0e0e0e0e0e0e0e0c0c0a0602000407090a0e0e0e0e0e0e0e0e09080603000000000000000000000000000000000000000000000000000000000000020507080e0e0e0e0e0e0e0e0b0a08050000000000000000000000000005080a0b0e0e0e0e0e0e0e0e08070502000000000000000000000000000000000000000407090a0e0e0e0e0e0e0e0e0908060300000000000000000000000000000000000000000002060a0c0d0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0e0b0a0805000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000060c111517181b1b1b1b1b1b1b1b1514120e090c1012131b1b1b1b1b1b1b1b191816120d0b101416171b1b1b1b1b1b1b1b1615130f0a0400000000000000010910161b1e20202020202020202020202020202020202020202020202020202020202020202020202020202020202020202020202020202020201d1c1915100a030000000000000000060c111517181b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1615130f0a0400000000000000000000000000000000000000000000050b101316161b1b1b1b1b1b1b1b1b1b1b1b191816120d0b101416171b1b1b1b1b1b1b1b1615130f0a04000000000000000000000000000000000000000000000000000003090e1214151b1b1b1b1b1b1b1b171714110c05000000000000000000060c111517181b1b1b1b1b1b1b1b1514120e0903000000000000000000000000000000050b101416171b1b1b1b1b1b1b1b1615130f0a04000000000000000000000000000000000000070d121619191b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b1b171714110c05000000000000000000000000000000000000Line truncated
   m_StreamData:
     serializedVersion: 2
     offset: 0

Game/CourierOld/Assets/Resources/UI/LoadingScreen.prefab

@@ -1,91 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
---- !u!1 &1265158496168560331
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 7726542507327209555}
-  - component: {fileID: 2847325221482566557}
-  - component: {fileID: 5214871017756599939}
-  - component: {fileID: 3884205628991346111}
-  m_Layer: 5
-  m_Name: LoadingScreen
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &7726542507327209555
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1265158496168560331}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 0}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 0}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &2847325221482566557
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1265158496168560331}
-  m_CullTransparentMesh: 1
---- !u!114 &5214871017756599939
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1265158496168560331}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.Image
-  m_Material: {fileID: 0}
-  m_Color: {r: 0, g: 0, b: 0, a: 0.392}
-  m_RaycastTarget: 1
-  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
-  m_Maskable: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-  m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0}
-  m_Type: 1
-  m_PreserveAspect: 0
-  m_FillCenter: 1
-  m_FillMethod: 4
-  m_FillAmount: 1
-  m_FillClockwise: 1
-  m_FillOrigin: 0
-  m_UseSpriteMesh: 0
-  m_PixelsPerUnitMultiplier: 1
---- !u!114 &3884205628991346111
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1265158496168560331}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 8b4a0cb6cea947c6b085269973968c12, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: Assembly-CSharp::Code.UI.LoadingPanel
-  _background: {fileID: 5214871017756599939}

Game/CourierOld/Assets/Resources_moved.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 7d5e1f0b61a30c6399a2fedfe251cc88
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Game/CourierOld/Assets/Resources_moved/Prefabs.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 3cde3ec5e61402c6085992404eb22e00
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Game/CourierOld/Assets/Resources_moved/Prefabs/App.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: ec35c2344f1496d2c8656a5675cea047
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Game/CourierOld/Assets/Resources_moved/UI.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: db68c27b4ca0b008eb7403403f74dbce
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Game/CourierOld/Assets/Resources_moved/UI/LoadingCanvas.prefab

@@ -0,0 +1,248 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &6466339271797533664
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 8109840523973613115}
+  - component: {fileID: 1289568913299077295}
+  - component: {fileID: 3580625140137645467}
+  - component: {fileID: 3828985249605650759}
+  - component: {fileID: 8641845112538475365}
+  m_Layer: 5
+  m_Name: LoadingCanvas
+  m_TagString: LoadingScreen
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &8109840523973613115
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6466339271797533664}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 0, y: 0, z: 0}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 1163370339091459898}
+  m_Father: {fileID: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0, y: 0}
+--- !u!223 &1289568913299077295
+Canvas:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6466339271797533664}
+  m_Enabled: 1
+  serializedVersion: 3
+  m_RenderMode: 0
+  m_Camera: {fileID: 0}
+  m_PlaneDistance: 100
+  m_PixelPerfect: 0
+  m_ReceivesEvents: 1
+  m_OverrideSorting: 0
+  m_OverridePixelPerfect: 0
+  m_SortingBucketNormalizedSize: 0
+  m_VertexColorAlwaysGammaSpace: 0
+  m_AdditionalShaderChannelsFlag: 25
+  m_UpdateRectTransformForStandalone: 0
+  m_SortingLayerID: 0
+  m_SortingOrder: 0
+  m_TargetDisplay: 0
+--- !u!114 &3580625140137645467
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6466339271797533664}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.CanvasScaler
+  m_UiScaleMode: 1
+  m_ReferencePixelsPerUnit: 100
+  m_ScaleFactor: 1
+  m_ReferenceResolution: {x: 1920, y: 1080}
+  m_ScreenMatchMode: 2
+  m_MatchWidthOrHeight: 0
+  m_PhysicalUnit: 3
+  m_FallbackScreenDPI: 96
+  m_DefaultSpriteDPI: 96
+  m_DynamicPixelsPerUnit: 1
+  m_PresetInfoIsWorld: 0
+--- !u!114 &3828985249605650759
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6466339271797533664}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.GraphicRaycaster
+  m_IgnoreReversedGraphics: 1
+  m_BlockingObjects: 0
+  m_BlockingMask:
+    serializedVersion: 2
+    m_Bits: 4294967295
+--- !u!114 &8641845112538475365
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6466339271797533664}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 8b4a0cb6cea947c6b085269973968c12, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: Assembly-CSharp::Code.UI.LoadingPanel
+  background: {fileID: 3693479315240438250}
+  loadingTitle: {fileID: 4606001437437564059}
+--- !u!1001 &8871860720278728553
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 8109840523973613115}
+    m_Modifications:
+    - target: {fileID: 1265158496168560331, guid: f23b9fce9594618e5b75845f1cae50de, type: 3}
+      propertyPath: m_Name
+      value: LoadingScreen
+      objectReference: {fileID: 0}
+    - target: {fileID: 4968846662699318258, guid: f23b9fce9594618e5b75845f1cae50de, type: 3}
+      propertyPath: m_fontSize
+      value: 381.15
+      objectReference: {fileID: 0}
+    - target: {fileID: 7726542507327209555, guid: f23b9fce9594618e5b75845f1cae50de, type: 3}
+      propertyPath: m_Pivot.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 7726542507327209555, guid: f23b9fce9594618e5b75845f1cae50de, type: 3}
+      propertyPath: m_Pivot.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 7726542507327209555, guid: f23b9fce9594618e5b75845f1cae50de, type: 3}
+      propertyPath: m_AnchorMax.x
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 7726542507327209555, guid: f23b9fce9594618e5b75845f1cae50de, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 7726542507327209555, guid: f23b9fce9594618e5b75845f1cae50de, type: 3}
+      propertyPath: m_AnchorMin.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7726542507327209555, guid: f23b9fce9594618e5b75845f1cae50de, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7726542507327209555, guid: f23b9fce9594618e5b75845f1cae50de, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7726542507327209555, guid: f23b9fce9594618e5b75845f1cae50de, type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7726542507327209555, guid: f23b9fce9594618e5b75845f1cae50de, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7726542507327209555, guid: f23b9fce9594618e5b75845f1cae50de, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7726542507327209555, guid: f23b9fce9594618e5b75845f1cae50de, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7726542507327209555, guid: f23b9fce9594618e5b75845f1cae50de, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 7726542507327209555, guid: f23b9fce9594618e5b75845f1cae50de, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7726542507327209555, guid: f23b9fce9594618e5b75845f1cae50de, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7726542507327209555, guid: f23b9fce9594618e5b75845f1cae50de, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7726542507327209555, guid: f23b9fce9594618e5b75845f1cae50de, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7726542507327209555, guid: f23b9fce9594618e5b75845f1cae50de, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7726542507327209555, guid: f23b9fce9594618e5b75845f1cae50de, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7726542507327209555, guid: f23b9fce9594618e5b75845f1cae50de, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7726542507327209555, guid: f23b9fce9594618e5b75845f1cae50de, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents:
+    - {fileID: 3884205628991346111, guid: f23b9fce9594618e5b75845f1cae50de, type: 3}
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: f23b9fce9594618e5b75845f1cae50de, type: 3}
+--- !u!224 &1163370339091459898 stripped
+RectTransform:
+  m_CorrespondingSourceObject: {fileID: 7726542507327209555, guid: f23b9fce9594618e5b75845f1cae50de, type: 3}
+  m_PrefabInstance: {fileID: 8871860720278728553}
+  m_PrefabAsset: {fileID: 0}
+--- !u!114 &3693479315240438250 stripped
+MonoBehaviour:
+  m_CorrespondingSourceObject: {fileID: 5214871017756599939, guid: f23b9fce9594618e5b75845f1cae50de, type: 3}
+  m_PrefabInstance: {fileID: 8871860720278728553}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.Image
+--- !u!114 &4606001437437564059 stripped
+MonoBehaviour:
+  m_CorrespondingSourceObject: {fileID: 4968846662699318258, guid: f23b9fce9594618e5b75845f1cae50de, type: 3}
+  m_PrefabInstance: {fileID: 8871860720278728553}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: Unity.TextMeshPro::TMPro.TextMeshProUGUI

Game/CourierOld/Assets/Resources_moved/UI/LoadingCanvas.prefab.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 70a878a1d7f1c360fb0d882850b60079
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Game/CourierOld/Assets/Resources_moved/UI/LoadingScreen.prefab

@@ -0,0 +1,214 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &1265158496168560331
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 7726542507327209555}
+  - component: {fileID: 2847325221482566557}
+  - component: {fileID: 5214871017756599939}
+  m_Layer: 5
+  m_Name: LoadingScreen
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &7726542507327209555
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1265158496168560331}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 2711475139437937240}
+  m_Father: {fileID: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &2847325221482566557
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1265158496168560331}
+  m_CullTransparentMesh: 1
+--- !u!114 &5214871017756599939
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1265158496168560331}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.Image
+  m_Material: {fileID: 0}
+  m_Color: {r: 0, g: 0, b: 0, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0}
+  m_Type: 1
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!1 &5639516207954169781
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 2711475139437937240}
+  - component: {fileID: 2675659082655514100}
+  - component: {fileID: 4968846662699318258}
+  m_Layer: 5
+  m_Name: LoadingTitle
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &2711475139437937240
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5639516207954169781}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 7726542507327209555}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &2675659082655514100
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5639516207954169781}
+  m_CullTransparentMesh: 1
+--- !u!114 &4968846662699318258
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5639516207954169781}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: Unity.TextMeshPro::TMPro.TextMeshProUGUI
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_text: Loading now be patient
+  m_isRightToLeft: 0
+  m_fontAsset: {fileID: 11400000, guid: a3ba170dcd95c5776a5c39de19dff119, type: 2}
+  m_sharedMaterial: {fileID: 8532510215145708138, guid: a3ba170dcd95c5776a5c39de19dff119, type: 2}
+  m_fontSharedMaterials: []
+  m_fontMaterial: {fileID: 0}
+  m_fontMaterials: []
+  m_fontColor32:
+    serializedVersion: 2
+    rgba: 4294967295
+  m_fontColor: {r: 1, g: 1, b: 1, a: 1}
+  m_enableVertexGradient: 0
+  m_colorMode: 3
+  m_fontColorGradient:
+    topLeft: {r: 1, g: 1, b: 1, a: 1}
+    topRight: {r: 1, g: 1, b: 1, a: 1}
+    bottomLeft: {r: 1, g: 1, b: 1, a: 1}
+    bottomRight: {r: 1, g: 1, b: 1, a: 1}
+  m_fontColorGradientPreset: {fileID: 0}
+  m_spriteAsset: {fileID: 0}
+  m_tintAllSprites: 0
+  m_StyleSheet: {fileID: 0}
+  m_TextStyleHashCode: -1183493901
+  m_overrideHtmlColors: 0
+  m_faceColor:
+    serializedVersion: 2
+    rgba: 4294967295
+  m_fontSize: 49.4
+  m_fontSizeBase: 43.92
+  m_fontWeight: 400
+  m_enableAutoSizing: 1
+  m_fontSizeMin: 1
+  m_fontSizeMax: 1000
+  m_fontStyle: 0
+  m_HorizontalAlignment: 2
+  m_VerticalAlignment: 512
+  m_textAlignment: 65535
+  m_characterSpacing: 0
+  m_wordSpacing: 0
+  m_lineSpacing: 0
+  m_lineSpacingMax: 0
+  m_paragraphSpacing: 0
+  m_charWidthMaxAdj: 0
+  m_TextWrappingMode: 1
+  m_wordWrappingRatios: 0.4
+  m_overflowMode: 0
+  m_linkedTextComponent: {fileID: 0}
+  parentLinkedComponent: {fileID: 0}
+  m_enableKerning: 0
+  m_ActiveFontFeatures: 6e72656b
+  m_enableExtraPadding: 0
+  checkPaddingRequired: 0
+  m_isRichText: 1
+  m_EmojiFallbackSupport: 1
+  m_parseCtrlCharacters: 1
+  m_isOrthographic: 1
+  m_isCullingEnabled: 0
+  m_horizontalMapping: 0
+  m_verticalMapping: 0
+  m_uvLineOffset: 0
+  m_geometrySortingOrder: 0
+  m_IsTextObjectScaleStatic: 0
+  m_VertexBufferAutoSizeReduction: 0
+  m_useMaxVisibleDescender: 1
+  m_pageToDisplay: 1
+  m_margin: {x: 0, y: 0, z: 0, w: 0}
+  m_isUsingLegacyAnimationComponent: 0
+  m_isVolumetricText: 0
+  m_hasFontAssetChanged: 0
+  m_baseMaterial: {fileID: 0}
+  m_maskOffset: {x: 0, y: 0, z: 0, w: 0}

Game/CourierOld/Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Fallback.asset

@@ -215,8 +215,198 @@ MonoBehaviour:
   m_SourceFontFilePath: 
   m_AtlasPopulationMode: 1
   InternalDynamicOS: 0
-  m_GlyphTable: []
+  m_GlyphTable:
-  m_CharacterTable: []
+  - m_Index: 969
+    m_Metrics:
+      m_Width: 48
+      m_Height: 59
+      m_HorizontalBearingX: 7
+      m_HorizontalBearingY: 59
+      m_HorizontalAdvance: 62
+    m_GlyphRect:
+      m_X: 10
+      m_Y: 10
+      m_Width: 48
+      m_Height: 59
+    m_Scale: 1
+    m_AtlasIndex: 0
+    m_ClassDefinitionType: 0
+  - m_Index: 996
+    m_Metrics:
+      m_Width: 24
+      m_Height: 45
+      m_HorizontalBearingX: 5
+      m_HorizontalBearingY: 45
+      m_HorizontalAdvance: 31
+    m_GlyphRect:
+      m_X: 10
+      m_Y: 88
+      m_Width: 24
+      m_Height: 45
+    m_Scale: 1
+    m_AtlasIndex: 0
+    m_ClassDefinitionType: 0
+  - m_Index: 1009
+    m_Metrics:
+      m_Width: 40
+      m_Height: 64
+      m_HorizontalBearingX: 5
+      m_HorizontalBearingY: 46
+      m_HorizontalAdvance: 48
+    m_GlyphRect:
+      m_X: 10
+      m_Y: 152
+      m_Width: 40
+      m_Height: 64
+    m_Scale: 1
+    m_AtlasIndex: 0
+    m_ClassDefinitionType: 0
+  - m_Index: 993
+    m_Metrics:
+      m_Width: 45
+      m_Height: 47
+      m_HorizontalBearingX: 3
+      m_HorizontalBearingY: 46
+      m_HorizontalAdvance: 48
+    m_GlyphRect:
+      m_X: 10
+      m_Y: 235
+      m_Width: 45
+      m_Height: 47
+    m_Scale: 1
+    m_AtlasIndex: 0
+    m_ClassDefinitionType: 0
+  - m_Index: 1011
+    m_Metrics:
+      m_Width: 37
+      m_Height: 45
+      m_HorizontalBearingX: 1
+      m_HorizontalBearingY: 45
+      m_HorizontalAdvance: 39
+    m_GlyphRect:
+      m_X: 53
+      m_Y: 88
+      m_Width: 37
+      m_Height: 45
+    m_Scale: 1
+    m_AtlasIndex: 0
+    m_ClassDefinitionType: 0
+  - m_Index: 1021
+    m_Metrics:
+      m_Width: 37
+      m_Height: 45
+      m_HorizontalBearingX: 5
+      m_HorizontalBearingY: 45
+      m_HorizontalAdvance: 45
+    m_GlyphRect:
+      m_X: 77
+      m_Y: 10
+      m_Width: 37
+      m_Height: 45
+    m_Scale: 1
+    m_AtlasIndex: 0
+    m_ClassDefinitionType: 0
+  - m_Index: 963
+    m_Metrics:
+      m_Width: 46
+      m_Height: 59
+      m_HorizontalBearingX: 7
+      m_HorizontalBearingY: 59
+      m_HorizontalAdvance: 57
+    m_GlyphRect:
+      m_X: 69
+      m_Y: 152
+      m_Width: 46
+      m_Height: 59
+    m_Scale: 1
+    m_AtlasIndex: 0
+    m_ClassDefinitionType: 0
+  - m_Index: 1020
+    m_Metrics:
+      m_Width: 51
+      m_Height: 45
+      m_HorizontalBearingX: 5
+      m_HorizontalBearingY: 45
+      m_HorizontalAdvance: 62
+    m_GlyphRect:
+      m_X: 109
+      m_Y: 74
+      m_Width: 51
+      m_Height: 45
+    m_Scale: 1
+    m_AtlasIndex: 0
+    m_ClassDefinitionType: 0
+  - m_Index: 1002
+    m_Metrics:
+      m_Width: 38
+      m_Height: 63
+      m_HorizontalBearingX: 5
+      m_HorizontalBearingY: 63
+      m_HorizontalAdvance: 48
+    m_GlyphRect:
+      m_X: 10
+      m_Y: 301
+      m_Width: 38
+      m_Height: 63
+    m_Scale: 1
+    m_AtlasIndex: 0
+    m_ClassDefinitionType: 0
+  - m_Index: 1001
+    m_Metrics:
+      m_Width: 38
+      m_Height: 45
+      m_HorizontalBearingX: 5
+      m_HorizontalBearingY: 45
+      m_HorizontalAdvance: 48
+    m_GlyphRect:
+      m_X: 133
+      m_Y: 10
+      m_Width: 38
+      m_Height: 45
+    m_Scale: 1
+    m_AtlasIndex: 0
+    m_ClassDefinitionType: 0
+  m_CharacterTable:
+  - m_ElementType: 1
+    m_Unicode: 1048
+    m_GlyphIndex: 969
+    m_Scale: 1
+  - m_ElementType: 1
+    m_Unicode: 1075
+    m_GlyphIndex: 996
+    m_Scale: 1
+  - m_ElementType: 1
+    m_Unicode: 1088
+    m_GlyphIndex: 1009
+    m_Scale: 1
+  - m_ElementType: 1
+    m_Unicode: 1072
+    m_GlyphIndex: 993
+    m_Scale: 1
+  - m_ElementType: 1
+    m_Unicode: 1090
+    m_GlyphIndex: 1011
+    m_Scale: 1
+  - m_ElementType: 1
+    m_Unicode: 1100
+    m_GlyphIndex: 1021
+    m_Scale: 1
+  - m_ElementType: 1
+    m_Unicode: 1042
+    m_GlyphIndex: 963
+    m_Scale: 1
+  - m_ElementType: 1
+    m_Unicode: 1099
+    m_GlyphIndex: 1020
+    m_Scale: 1
+  - m_ElementType: 1
+    m_Unicode: 1081
+    m_GlyphIndex: 1002
+    m_Scale: 1
+  - m_ElementType: 1
+    m_Unicode: 1080
+    m_GlyphIndex: 1001
+    m_Scale: 1
   m_AtlasTextures:
   - {fileID: 28268798066460806}
   m_AtlasTextureIndex: 0
@@ -227,11 +417,83 @@ MonoBehaviour:
   m_AtlasHeight: 512
   m_AtlasPadding: 9
   m_AtlasRenderMode: 4169
-  m_UsedGlyphRects: []
+  m_UsedGlyphRects:
-  m_FreeGlyphRects:
   - m_X: 0
     m_Y: 0
+    m_Width: 67
+    m_Height: 78
+  - m_X: 0
+    m_Y: 78
+    m_Width: 43
+    m_Height: 64
+  - m_X: 0
+    m_Y: 142
+    m_Width: 59
+    m_Height: 83
+  - m_X: 0
+    m_Y: 225
+    m_Width: 64
+    m_Height: 66
+  - m_X: 43
+    m_Y: 78
+    m_Width: 56
+    m_Height: 64
+  - m_X: 67
+    m_Y: 0
+    m_Width: 56
+    m_Height: 64
+  - m_X: 59
+    m_Y: 142
+    m_Width: 65
+    m_Height: 78
+  - m_X: 99
+    m_Y: 64
+    m_Width: 70
+    m_Height: 64
+  - m_X: 0
+    m_Y: 291
+    m_Width: 57
+    m_Height: 82
+  - m_X: 123
+    m_Y: 0
+    m_Width: 57
+    m_Height: 64
+  m_FreeGlyphRects:
+  - m_X: 59
+    m_Y: 220
+    m_Width: 452
+    m_Height: 5
+  - m_X: 64
+    m_Y: 220
+    m_Width: 447
+    m_Height: 291
+  - m_X: 67
+    m_Y: 64
+    m_Width: 32
+    m_Height: 14
+  - m_X: 99
+    m_Y: 128
+    m_Width: 412
+    m_Height: 14
+  - m_X: 124
+    m_Y: 128
+    m_Width: 387
+    m_Height: 383
+  - m_X: 0
+    m_Y: 373
     m_Width: 511
+    m_Height: 138
+  - m_X: 57
+    m_Y: 291
+    m_Width: 454
+    m_Height: 220
+  - m_X: 169
+    m_Y: 64
+    m_Width: 342
+    m_Height: 447
+  - m_X: 180
+    m_Y: 0
+    m_Width: 331
     m_Height: 511
   m_FontFeatureTable:
     m_MultipleSubstitutionRecords: []
@@ -1153,9 +1415,9 @@ Texture2D:
     Hash: 00000000000000000000000000000000
   m_IsAlphaChannelOptional: 0
   serializedVersion: 4
-  m_Width: 1
+  m_Width: 512
-  m_Height: 1
+  m_Height: 512
-  m_CompleteImageSize: 1
+  m_CompleteImageSize: 262144
   m_MipsStripped: 0
   m_TextureFormat: 1
   m_MipCount: 1
@@ -1180,8 +1442,8 @@ Texture2D:
   m_LightmapFormat: 0
   m_ColorSpace: 0
   m_PlatformBlob: 
-  image data: 1
+  image data: 262144
-  _typelessdata: 00
+  _typelessdata: 0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002080c10121213131313131313131208070502000000000000000000000000000000000000000000000005080a0b131313131313100f0d0a0500000000000000000000000000040613131313131313131313131313131313131313131211110f0c0a0707050100000000000000000000000000000000000000000000000004061313131313131313130b0a080400000000000000000000000000020507081313131313131307070501000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000060d13181c1e1f20202020202020201f1414110e080200000000000000000000000000000000000000060c111517182020202020201d1c1a16110a03000000000000000001070c101320202020202020202020202020202020202020201f1e1d1c19171413110d08040000000000000000000000000000000000000001070c1013202020202020202020171614100b0500000000000000000003090e121415202020202020201413110d08020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000710181f24282b2c2d2d2d2d2d2d2d2d2c21201e19140d0500000000000000000000000000000000000911171d2124252d2d2d2d2d2d2a2926221c150d04000000000000030b12181c1f2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2c2c2b2a28262421201d1913100c0701000000000000000000000000000000030b12181c1f2d2d2d2d2d2d2d2d2d2423211c17100800000000000000060e141a1e21222d2d2d2d2d2d2d21201d19130c05000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000610192229303538393939393939393939392e2d2a251e170e0500000000000000000000000000000009121b22292d30313939393939393635322d271f160d0300000000030d151d23292c39393939393939393939393939393939393939393838373533302e2d29251f1d18120b0300000000000000000000000000030d151d23292c39393939393939393931302d28221a12080000000000060f181f262b2d2e393939393939392e2d2a251e160e0500000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000Line truncated
   m_StreamData:
     serializedVersion: 2
     offset: 0

Game/CourierOld/Packages/manifest.json

@@ -1,6 +1,7 @@
 {
   "dependencies": {
     "com.codewriter.triinspector": "https://github.com/codewriter-packages/Tri-Inspector.git",
+    "com.cysharp.unitask": "https://github.com/Cysharp/UniTask.git?path=src/UniTask/Assets/Plugins/UniTask",
     "com.gustavopsantos.reflex": "https://github.com/gustavopsantos/reflex.git?path=/Assets/Reflex/#13.0.2",
     "com.unity.ai.navigation": "2.0.9",
     "com.unity.collab-proxy": "2.10.0",

Game/CourierOld/Packages/packages-lock.json

@@ -9,6 +9,13 @@
       },
       "hash": "dfa901c9eeef09febe0dfb2f2a52319ea532747f"
     },
+    "com.cysharp.unitask": {
+      "version": "https://github.com/Cysharp/UniTask.git?path=src/UniTask/Assets/Plugins/UniTask",
+      "depth": 0,
+      "source": "git",
+      "dependencies": {},
+      "hash": "73a63b7f672b88f7e9992f6917eb458a8cbb6fa9"
+    },
     "com.gustavopsantos.reflex": {
       "version": "https://github.com/gustavopsantos/reflex.git?path=/Assets/Reflex/#13.0.2",
       "depth": 0,

Game/CourierOld/ProjectSettings/EditorBuildSettings.asset

@@ -22,4 +22,5 @@ EditorBuildSettings:
     guid: d9388377850f132deba2cb3b3c603fdc
   m_configObjects:
     com.unity.addressableassets: {fileID: 11400000, guid: 9338e51d1f2239ddbb8f2c6232a2b678, type: 2}
+    com.unity.input.settings.actions: {fileID: -944628639613478452, guid: 052faaac586de48259a63d0c4782560b, type: 3}
   m_UseUCBPForAssetBundles: 0

Game/CourierOld/ProjectSettings/TagManager.asset

@@ -2,8 +2,9 @@
 %TAG !u! tag:unity3d.com,2011:
 --- !u!78 &1
 TagManager:
-  serializedVersion: 2
+  serializedVersion: 3
-  tags: []
+  tags:
+  - LoadingScreen
   layers:
   - Default
   - TransparentFX
@@ -50,27 +51,3 @@ TagManager:
   - Light Layer 5
   - Light Layer 6
   - Light Layer 7
-  - 
-  - 
-  - 
-  - 
-  - 
-  - 
-  - 
-  - 
-  - 
-  - 
-  - 
-  - 
-  - 
-  - 
-  - 
-  - 
-  - 
-  - 
-  - 
-  - 
-  - 
-  - 
-  - 
-  -