diff --git a/.idea/.idea.Infra/.idea/workspace.xml b/.idea/.idea.Infra/.idea/workspace.xml index fd9819b..b03d540 100644 --- a/.idea/.idea.Infra/.idea/workspace.xml +++ b/.idea/.idea.Infra/.idea/workspace.xml @@ -5,26 +5,26 @@ - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + - - - - + @@ -127,4 +128,23 @@ + + + + + file://$PROJECT_DIR$/Assets/Code/Infrastructure/UI/UIFactory.cs + 61 + + + + + + + + + + \ No newline at end of file diff --git a/Assets/AddressableAssetsData/AddressableAssetSettings.asset b/Assets/AddressableAssetsData/AddressableAssetSettings.asset index 6afd719..8de6c68 100644 --- a/Assets/AddressableAssetsData/AddressableAssetSettings.asset +++ b/Assets/AddressableAssetsData/AddressableAssetSettings.asset @@ -15,7 +15,7 @@ MonoBehaviour: m_DefaultGroup: d790534e015d692428ac5a9ce7d2ceb6 m_currentHash: serializedVersion: 2 - Hash: 00000000000000000000000000000000 + Hash: eca7c51e7f74c0fc63e5a8f984ad695f m_OptimizeCatalogSize: 0 m_BuildRemoteCatalog: 0 m_CatalogRequestsTimeout: 0 @@ -102,6 +102,7 @@ MonoBehaviour: - default - SceneConfig - CameraConfig + - UIPanelConfig m_SchemaTemplates: [] m_GroupTemplateObjects: - {fileID: 11400000, guid: af0b5782a0090884db056705d7776701, type: 2} diff --git a/Assets/AddressableAssetsData/AssetGroups/Default Local Group.asset b/Assets/AddressableAssetsData/AssetGroups/Default Local Group.asset index 1d3b89e..681d7c9 100644 --- a/Assets/AddressableAssetsData/AssetGroups/Default Local Group.asset +++ b/Assets/AddressableAssetsData/AssetGroups/Default Local Group.asset @@ -15,6 +15,16 @@ MonoBehaviour: m_GroupName: Default Local Group m_GUID: d790534e015d692428ac5a9ce7d2ceb6 m_SerializeEntries: + - m_GUID: 13852bf3f3ccace4e9deefd844eebb23 + m_Address: Assets/Resources_moved/UI/Panels/LoadingPanel.prefab + m_ReadOnly: 0 + m_SerializedLabels: [] + FlaggedDuringContentUpdateRestriction: 0 + - m_GUID: 17c5e56eb6c99db40b6093c9d543bb4f + m_Address: Assets/Resources_moved/Configs/UI/CanvasSettingsConfig.asset + m_ReadOnly: 0 + m_SerializedLabels: [] + FlaggedDuringContentUpdateRestriction: 0 - m_GUID: 4a97987e3a94e0f43b1b57b6ddccac23 m_Address: Assets/Resources_moved/Configs/Camera/CameraSettingsConfig.asset m_ReadOnly: 0 @@ -27,6 +37,11 @@ MonoBehaviour: m_SerializedLabels: - SceneConfig FlaggedDuringContentUpdateRestriction: 0 + - m_GUID: 4fcdb7f979b60194db1fb5c03b81bf8c + m_Address: UI/Panels/LoadingPanel + m_ReadOnly: 0 + m_SerializedLabels: [] + FlaggedDuringContentUpdateRestriction: 0 - m_GUID: a78f552da8f156b469b95652e4b0209d m_Address: DebugClassConfig m_ReadOnly: 0 @@ -47,16 +62,33 @@ MonoBehaviour: m_ReadOnly: 0 m_SerializedLabels: [] FlaggedDuringContentUpdateRestriction: 0 + - m_GUID: d2750e654bd192d41a48144c43b41302 + m_Address: Assets/Resources_moved/Configs/UI/Logo.asset + m_ReadOnly: 0 + m_SerializedLabels: + - UIPanelConfig + FlaggedDuringContentUpdateRestriction: 0 - m_GUID: d54fabdcc748a594aa0551dcd235c7c2 m_Address: ScenesAssetReferences m_ReadOnly: 0 m_SerializedLabels: [] FlaggedDuringContentUpdateRestriction: 0 + - m_GUID: d87857258eeea2345a3b926b3c671002 + m_Address: Assets/Resources_moved/Configs/UI/Loading.asset + m_ReadOnly: 0 + m_SerializedLabels: + - UIPanelConfig + FlaggedDuringContentUpdateRestriction: 0 - m_GUID: df809fbbdc1f51f43b4d42a7896a0919 m_Address: Assets/Scenes/Gameplay.unity m_ReadOnly: 0 m_SerializedLabels: [] FlaggedDuringContentUpdateRestriction: 0 + - m_GUID: e1fbe5b2798657342b569f723d16c9de + m_Address: UI/Canvas + m_ReadOnly: 0 + m_SerializedLabels: [] + FlaggedDuringContentUpdateRestriction: 0 - m_GUID: eab71c0cf90c4b94294e497d3734cfe1 m_Address: Assets/Resources_moved/Configs/InputServiceConfig.asset m_ReadOnly: 0 diff --git a/Assets/Code/Infrastructure/App/PapaInstaller.cs b/Assets/Code/Infrastructure/App/PapaInstaller.cs index 9ae110e..d4747d3 100644 --- a/Assets/Code/Infrastructure/App/PapaInstaller.cs +++ b/Assets/Code/Infrastructure/App/PapaInstaller.cs @@ -2,7 +2,8 @@ using Code.Infrastructure.Camera; using Code.Infrastructure.Configs; using Code.Infrastructure.Input; using Code.Infrastructure.Loadings; -using Code.Infrastructure.SceneLoader; +using Code.Infrastructure.SceneLoader; +using Code.Infrastructure.UI; using Reflex.Core; using Reflex.Enums; using UnityEngine; @@ -10,7 +11,12 @@ using Resolution = Reflex.Enums.Resolution; namespace Code.Infrastructure.App { - public class PapaInstaller : MonoBehaviour, IInstaller, ISceneConfigsLoadedHandle, IInputServiceInitializedHandle, ICameraInitializedHandle + public class PapaInstaller : MonoBehaviour, IInstaller, + ISceneConfigsLoadedHandle, + IInputServiceInitializedHandle, + ICameraInitializedHandle, + IUIInitializedHandle, + IUIPanelLoaded { public void InstallBindings(ContainerBuilder containerBuilder) { @@ -27,7 +33,16 @@ namespace Code.Infrastructure.App containerBuilder.RegisterType(typeof(CameraFactory), Lifetime.Singleton, Resolution.Lazy); containerBuilder.RegisterType(typeof(CameraStateMachine), Lifetime.Singleton, Resolution.Lazy); containerBuilder.RegisterType(typeof(CameraStateMachineContext), Lifetime.Singleton, Resolution.Lazy); - + + containerBuilder.RegisterType(typeof(UIFactory), new []{typeof(IUIFactory)}, Lifetime.Singleton, Resolution.Eager); + containerBuilder.RegisterType(typeof(UIService), new []{typeof(IUIService)}, Lifetime.Singleton, Resolution.Eager); + + // UIFactory + // Logo + // Scene configs + // Input service + // Camera + _initialLoading = new Loading(5, () => EssentialLoadEnded(_thatRightContainer)); } private Loading _initialLoading; @@ -40,13 +55,12 @@ namespace Code.Infrastructure.App container.Resolve().CreateCameraStateMachine(container.Resolve()).Forget(); - _initialLoading = new Loading(3, () => EssentialLoadEnded(container)); } private void EssentialLoadEnded(Container container) { - container.Resolve().SwitchState(AppStates.Bootstrap).AllowStateTransition(AppStates.Gameplay); container.Resolve().Unsubscribe(this); + container.Resolve().SwitchState(AppStates.Bootstrap).AllowStateTransition(AppStates.Gameplay); } public void SceneConfigsLoaded() @@ -64,7 +78,33 @@ namespace Code.Infrastructure.App _thatRightContainer.Resolve().cameraLoadedData = data; _thatRightContainer.Resolve().SwitchState(CameraMode.None) .AllowStateTransition(CameraMode.FirstPerson); + _initialLoading.DoProgress(); } + + public void UIInitialized() + { + _initialLoading.DoProgress(); + + _thatRightContainer.Resolve().TryLoadPanel(UIPanelType.Logo); + _thatRightContainer.Resolve().TryLoadPanel(UIPanelType.Loading); + } + + public void UILoaded(UIPanelType uiPanelType) + { + if (_initialLoading.Completed) return; + + switch (uiPanelType) + { + case UIPanelType.Logo: + _thatRightContainer.Resolve().OpenPanel(UIPanelType.Logo); + + _initialLoading.DoProgress(); + break; + case UIPanelType.Loading: + // _thatRightContainer.Resolve().OpenPanel(UIPanelType.Logo); + break; + } + } } } \ No newline at end of file diff --git a/Assets/Code/Infrastructure/App/States/BootstrapState.cs b/Assets/Code/Infrastructure/App/States/BootstrapState.cs index 4a1ca4f..0424c65 100644 --- a/Assets/Code/Infrastructure/App/States/BootstrapState.cs +++ b/Assets/Code/Infrastructure/App/States/BootstrapState.cs @@ -31,7 +31,7 @@ namespace Code.Infrastructure.App.States public void OnGameplaySceneLoaded() { - Debug.Log("Spermageddon"); + } } } \ No newline at end of file diff --git a/Assets/Code/Infrastructure/App/States/GameplayState.cs b/Assets/Code/Infrastructure/App/States/GameplayState.cs index 1ad5377..2df25cf 100644 --- a/Assets/Code/Infrastructure/App/States/GameplayState.cs +++ b/Assets/Code/Infrastructure/App/States/GameplayState.cs @@ -25,7 +25,7 @@ namespace Code.Infrastructure.App.States public void OnGameplaySceneLoaded() { - Debug.Log("Spermageddon"); + } } } \ No newline at end of file diff --git a/Assets/Code/Infrastructure/Loadings/Loading.cs b/Assets/Code/Infrastructure/Loadings/Loading.cs index 83b4f49..da0eb5f 100644 --- a/Assets/Code/Infrastructure/Loadings/Loading.cs +++ b/Assets/Code/Infrastructure/Loadings/Loading.cs @@ -5,6 +5,7 @@ namespace Code.Infrastructure.Loadings public class Loading { private int _progress; + public bool Completed { get; private set; } private Action _completed; private Action _loadProgress; @@ -23,7 +24,12 @@ namespace Code.Infrastructure.Loadings { _progress--; _loadProgress?.Invoke(this); - if(_progress <= 0) _completed(); + + if(_progress <= 0) // Зачем инвертировать, если так читается лучше, райдер соси + { + Completed = true; + _completed(); + } } } } \ No newline at end of file diff --git a/Assets/Code/Infrastructure/UI/Panels.meta b/Assets/Code/Infrastructure/UI/Panels.meta new file mode 100644 index 0000000..632de1c --- /dev/null +++ b/Assets/Code/Infrastructure/UI/Panels.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: b66d89a2d3ef45eab0c8a5571e1517b0 +timeCreated: 1768984741 \ No newline at end of file diff --git a/Assets/Code/Infrastructure/UI/Panels/LoadingPanel.cs b/Assets/Code/Infrastructure/UI/Panels/LoadingPanel.cs new file mode 100644 index 0000000..e436da3 --- /dev/null +++ b/Assets/Code/Infrastructure/UI/Panels/LoadingPanel.cs @@ -0,0 +1,15 @@ +namespace Code.Infrastructure.UI.Panels +{ + public class LoadingPanel : UIPanel + { + public override void Open() + { + + } + + public override void Close() + { + + } + } +} \ No newline at end of file diff --git a/Assets/Code/Infrastructure/UI/Panels/LoadingPanel.cs.meta b/Assets/Code/Infrastructure/UI/Panels/LoadingPanel.cs.meta new file mode 100644 index 0000000..5bbd02e --- /dev/null +++ b/Assets/Code/Infrastructure/UI/Panels/LoadingPanel.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: a950957bc3374bb8b1c3acfbb7ad2dd2 +timeCreated: 1768984735 \ No newline at end of file diff --git a/Assets/Code/Infrastructure/UI/Panels/LogoPanel.cs b/Assets/Code/Infrastructure/UI/Panels/LogoPanel.cs new file mode 100644 index 0000000..9bff46d --- /dev/null +++ b/Assets/Code/Infrastructure/UI/Panels/LogoPanel.cs @@ -0,0 +1,16 @@ +using UnityEngine; + +namespace Code.Infrastructure.UI.Panels +{ + public class LogoPanel : UIPanel + { + public override void Open() + { + Debug.Log("Logo panel opened"); + } + + public override void Close() + { + } + } +} \ No newline at end of file diff --git a/Assets/Code/Infrastructure/UI/Panels/LogoPanel.cs.meta b/Assets/Code/Infrastructure/UI/Panels/LogoPanel.cs.meta new file mode 100644 index 0000000..98b7102 --- /dev/null +++ b/Assets/Code/Infrastructure/UI/Panels/LogoPanel.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 4adfc2a9c5ae4354a32b651c09840b40 +timeCreated: 1768984716 \ No newline at end of file diff --git a/Assets/Code/Infrastructure/UI/UIFactory.cs b/Assets/Code/Infrastructure/UI/UIFactory.cs index 09bcfc0..c97581f 100644 --- a/Assets/Code/Infrastructure/UI/UIFactory.cs +++ b/Assets/Code/Infrastructure/UI/UIFactory.cs @@ -4,6 +4,7 @@ using System.Linq; using Code.Infrastructure.Configs; using Code.Infrastructure.EventBus; using Cysharp.Threading.Tasks; +using UnityEngine; using UnityEngine.AddressableAssets; using UnityEngine.ResourceManagement.AsyncOperations; @@ -18,22 +19,27 @@ namespace Code.Infrastructure.UI public class UIFactory : IDisposable, IUIFactory { private Dictionary _configs; + private AssetReference _canvasConfigReference; private string _configsLabel; private EventBus.EventBus _eventBus; private AsyncOperationHandle> _configsHandle; + private AsyncOperationHandle _canvasSettingsHandle; + private CanvasSettingsConfig _canvasConfig; + private GameObject _canvas; public UIFactory(IConfigLocator configLocator, EventBus.EventBus eventBus) { _eventBus = eventBus; _configsLabel = configLocator.TryGetManyConfigAssetReferences(); + _canvasConfigReference = configLocator.TryGetConfigAssetReference(); LoadConfigs().Forget(); } public async UniTaskVoid LoadPanel(UIPanelType panelType) { - var panel = (await Addressables.InstantiateAsync(_configs[panelType]).ToUniTask()).GetComponent(); + var panel = (await Addressables.InstantiateAsync(_configs[panelType].Prefab, _canvas.transform).ToUniTask()).GetComponent(); _eventBus.RaiseEvent(ui => ui.UIPanelLoaded(panel, panelType)); } @@ -46,16 +52,25 @@ namespace Code.Infrastructure.UI private async UniTaskVoid LoadConfigs() { _configsHandle = Addressables.LoadAssetsAsync(_configsLabel); + _canvasSettingsHandle = Addressables.LoadAssetAsync(_canvasConfigReference); await _configsHandle.ToUniTask(); + await _canvasSettingsHandle.ToUniTask(); + + _canvasConfig = _canvasSettingsHandle.Result; _configs = _configsHandle.Result.ToDictionary(c => c.UIPanelType); + + _canvas = await Addressables.InstantiateAsync(_canvasConfig.Prefab).ToUniTask(); + UnityEngine.Object.DontDestroyOnLoad(_canvas); _eventBus.RaiseEvent(ui => ui.UIInitialized()); } public void Dispose() { Addressables.Release(_configsHandle); + Addressables.Release(_canvasSettingsHandle); + Addressables.ReleaseInstance(_canvas); } } diff --git a/Assets/Code/Infrastructure/UI/UIPanelSettings.cs b/Assets/Code/Infrastructure/UI/UIPanelSettings.cs index fd8cc33..76021a1 100644 --- a/Assets/Code/Infrastructure/UI/UIPanelSettings.cs +++ b/Assets/Code/Infrastructure/UI/UIPanelSettings.cs @@ -9,4 +9,10 @@ namespace Code.Infrastructure.UI [ToConfig] public AssetReference Prefab; [ToConfig] public UIPanelType UIPanelType; } + + [Config("Configs/UI/CanvasSettings")] + public class CanvasSettings + { + [ToConfig] public AssetReference Prefab; + } } \ No newline at end of file diff --git a/Assets/Code/Infrastructure/UI/UIService.cs b/Assets/Code/Infrastructure/UI/UIService.cs index 5256616..730d90f 100644 --- a/Assets/Code/Infrastructure/UI/UIService.cs +++ b/Assets/Code/Infrastructure/UI/UIService.cs @@ -1,4 +1,6 @@ +using System; using System.Collections.Generic; +using Code.Infrastructure.EventBus; using Reflex.Core; using Reflex.Extensions; using Reflex.Injectors; @@ -49,11 +51,13 @@ namespace Code.Infrastructure.UI if(panel.InjectMeSenpai) GameObjectInjector.InjectRecursive(panel.gameObject, Container.RootContainer); // GameObjectInjector.InjectRecursive(panel.gameObject, SceneManager.GetActiveScene().GetSceneContainer()); // Скорее всего будут нужны компоненты текущей сцены + + _eventBus.RaiseEvent(ui=> ui.UILoaded(panelType)); } public void TryRemovePanel(UIPanelType panelType) { - // + // TODO Close it RemovePanel(panelType); } @@ -63,4 +67,8 @@ namespace Code.Infrastructure.UI _loadedPanels.Remove(panelType); } } + public interface IUIPanelLoaded : IGlobalSubscriber + { + void UILoaded(UIPanelType uiPanelType); + } } \ No newline at end of file diff --git a/Assets/Resources/SystemConfigsReferences.asset b/Assets/Resources/SystemConfigsReferences.asset index ea1b01e..c892453 100644 --- a/Assets/Resources/SystemConfigsReferences.asset +++ b/Assets/Resources/SystemConfigsReferences.asset @@ -18,17 +18,24 @@ MonoBehaviour: m_SubObjectType: m_SubObjectGUID: m_EditorAssetChanged: 0 - SceneInfo: SceneConfig - InputService: - m_AssetGUID: eab71c0cf90c4b94294e497d3734cfe1 - m_SubObjectName: - m_SubObjectType: - m_SubObjectGUID: - m_EditorAssetChanged: 0 - CameraSettings: CameraConfig GameCamera: m_AssetGUID: c42e39e2fb64cdd45b2ebc4b723d9d0c m_SubObjectName: m_SubObjectType: m_SubObjectGUID: m_EditorAssetChanged: 1 + CameraSettings: CameraConfig + UIPanelSettings: UIPanelConfig + SceneInfo: SceneConfig + CanvasSettings: + m_AssetGUID: 17c5e56eb6c99db40b6093c9d543bb4f + m_SubObjectName: + m_SubObjectType: + m_SubObjectGUID: + m_EditorAssetChanged: 0 + InputService: + m_AssetGUID: eab71c0cf90c4b94294e497d3734cfe1 + m_SubObjectName: + m_SubObjectType: + m_SubObjectGUID: + m_EditorAssetChanged: 0 diff --git a/Assets/Resources/UI/Panels.meta b/Assets/Resources/UI/Panels.meta new file mode 100644 index 0000000..a967767 --- /dev/null +++ b/Assets/Resources/UI/Panels.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 4836e679346ff57429b9b79be17a9969 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/UI/Sprites/GUISprite.png b/Assets/Resources/UI/Sprites/GUISprite.png deleted file mode 100644 index 7668605..0000000 Binary files a/Assets/Resources/UI/Sprites/GUISprite.png and /dev/null differ diff --git a/Assets/Resources/UI/Sprites/GUISprite.png.meta b/Assets/Resources/UI/Sprites/GUISprite.png.meta deleted file mode 100644 index 309f7dc..0000000 --- a/Assets/Resources/UI/Sprites/GUISprite.png.meta +++ /dev/null @@ -1,879 +0,0 @@ -fileFormatVersion: 2 -guid: 0064a3af74ea37140b8c4ebf5751dc7b -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 13 - mipmaps: - mipMapMode: 0 - enableMipMap: 0 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - flipGreenChannel: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 - ignoreMipmapLimit: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 0 - aniso: 1 - mipBias: 0 - wrapU: 1 - wrapV: 1 - wrapW: 0 - nPOTScale: 0 - lightmap: 0 - compressionQuality: 50 - spriteMode: 2 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 1 - spriteTessellationDetail: -1 - textureType: 8 - textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - swizzle: 50462976 - cookieLightType: 0 - platformSettings: - - serializedVersion: 4 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 4 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: - - serializedVersion: 2 - name: GUISprite_0 - rect: - serializedVersion: 2 - x: 16 - y: 192 - width: 16 - height: 16 - alignment: 0 - pivot: {x: 0.5, y: 0.5} - border: {x: 0, y: 0, z: 0, w: 0} - customData: - outline: [] - physicsShape: [] - tessellationDetail: 0 - bones: [] - spriteID: 089b76c6841adfe46a068f651e4453e4 - internalID: 1838387415 - vertices: [] - indices: - edges: [] - weights: [] - - serializedVersion: 2 - name: GUISprite_2 - rect: - serializedVersion: 2 - x: 180 - y: 144 - width: 9 - height: 64 - alignment: 0 - pivot: {x: 0.5, y: 0.5} - border: {x: 0, y: 0, z: 0, w: 0} - customData: - outline: [] - physicsShape: [] - tessellationDetail: 0 - bones: [] - spriteID: cf03fd04ae6d5c645864edfa3694618c - internalID: 1858001036 - vertices: [] - indices: - edges: [] - weights: [] - - serializedVersion: 2 - name: GUISprite_3 - rect: - serializedVersion: 2 - x: 196 - y: 144 - width: 9 - height: 64 - alignment: 0 - pivot: {x: 0.5, y: 0.5} - border: {x: 0, y: 0, z: 0, w: 0} - customData: - outline: [] - physicsShape: [] - tessellationDetail: 0 - bones: [] - spriteID: eb92b53260b181f478a5c0c0538101f4 - internalID: -1332788018 - vertices: [] - indices: - edges: [] - weights: [] - - serializedVersion: 2 - name: GUISprite_4 - rect: - serializedVersion: 2 - x: 226 - y: 162 - width: 43 - height: 43 - alignment: 0 - pivot: {x: 0.5, y: 0.5} - border: {x: 0, y: 0, z: 0, w: 0} - customData: - outline: [] - physicsShape: [] - tessellationDetail: 0 - bones: [] - spriteID: baf35feff6e75524f8e6e6c9c7d5da60 - internalID: -641751681 - vertices: [] - indices: - edges: [] - weights: [] - - serializedVersion: 2 - name: GUISprite_5 - rect: - serializedVersion: 2 - x: 16 - y: 179 - width: 64 - height: 9 - alignment: 0 - pivot: {x: 0.5, y: 0.5} - border: {x: 0, y: 0, z: 0, w: 0} - customData: - outline: [] - physicsShape: [] - tessellationDetail: 0 - bones: [] - spriteID: d4066dcc5f81d0b468b9966e9f191c19 - internalID: -2120558949 - vertices: [] - indices: - edges: [] - weights: [] - - serializedVersion: 2 - name: GUISprite_6 - rect: - serializedVersion: 2 - x: 16 - y: 164 - width: 64 - height: 9 - alignment: 0 - pivot: {x: 0.5, y: 0.5} - border: {x: 0, y: 0, z: 0, w: 0} - customData: - outline: [] - physicsShape: [] - tessellationDetail: 0 - bones: [] - spriteID: 36b6e128d0e8fbe4590217a0c9afca5a - internalID: 2065425591 - vertices: [] - indices: - edges: [] - weights: [] - - serializedVersion: 2 - name: GUISprite_7 - rect: - serializedVersion: 2 - x: 18 - y: 148 - width: 59 - height: 9 - alignment: 0 - pivot: {x: 0.5, y: 0.5} - border: {x: 0, y: 0, z: 0, w: 0} - customData: - outline: [] - physicsShape: [] - tessellationDetail: 0 - bones: [] - spriteID: b733ca1d6aad7f14ba9b70b8366bc5ba - internalID: 1502317813 - vertices: [] - indices: - edges: [] - weights: [] - - serializedVersion: 2 - name: GUISprite_8 - rect: - serializedVersion: 2 - x: 96 - y: 146 - width: 64 - height: 11 - alignment: 0 - pivot: {x: 0.5, y: 0.5} - border: {x: 0, y: 0, z: 0, w: 0} - customData: - outline: [] - physicsShape: [] - tessellationDetail: 0 - bones: [] - spriteID: 5662f99defec4b84dbd65fe5498a366e - internalID: 1125743490 - vertices: [] - indices: - edges: [] - weights: [] - - serializedVersion: 2 - name: GUISprite_9 - rect: - serializedVersion: 2 - x: 18 - y: 132 - width: 59 - height: 9 - alignment: 0 - pivot: {x: 0.5, y: 0.5} - border: {x: 0, y: 0, z: 0, w: 0} - customData: - outline: [] - physicsShape: [] - tessellationDetail: 0 - bones: [] - spriteID: 99076ad6ced57d445a7bfd0252bfac18 - internalID: -1068189995 - vertices: [] - indices: - edges: [] - weights: [] - - serializedVersion: 2 - name: GUISprite_10 - rect: - serializedVersion: 2 - x: 96 - y: 131 - width: 64 - height: 11 - alignment: 0 - pivot: {x: 0.5, y: 0.5} - border: {x: 0, y: 0, z: 0, w: 0} - customData: - outline: [] - physicsShape: [] - tessellationDetail: 0 - bones: [] - spriteID: caeb937b120b36c4baa1a4d5ef1e6ce8 - internalID: 729381716 - vertices: [] - indices: - edges: [] - weights: [] - - serializedVersion: 2 - name: GUISprite_11 - rect: - serializedVersion: 2 - x: 180 - y: 85 - width: 9 - height: 55 - alignment: 0 - pivot: {x: 0.5, y: 0.5} - border: {x: 0, y: 0, z: 0, w: 0} - customData: - outline: [] - physicsShape: [] - tessellationDetail: 0 - bones: [] - spriteID: e58f93de80d52a44da8b1e6f51c1ae06 - internalID: -302797174 - vertices: [] - indices: - edges: [] - weights: [] - - serializedVersion: 2 - name: GUISprite_12 - rect: - serializedVersion: 2 - x: 196 - y: 85 - width: 9 - height: 55 - alignment: 0 - pivot: {x: 0.5, y: 0.5} - border: {x: 0, y: 0, z: 0, w: 0} - customData: - outline: [] - physicsShape: [] - tessellationDetail: 0 - bones: [] - spriteID: a6d7ec229497e8841a5ba2efe91fddc7 - internalID: -1055290072 - vertices: [] - indices: - edges: [] - weights: [] - - serializedVersion: 2 - name: GUISprite_13 - rect: - serializedVersion: 2 - x: 224 - y: 128 - width: 64 - height: 15 - alignment: 0 - pivot: {x: 0.5, y: 0.5} - border: {x: 0, y: 0, z: 0, w: 0} - customData: - outline: [] - physicsShape: [] - tessellationDetail: 0 - bones: [] - spriteID: e5b48da8daf254f4fac40ffb18356203 - internalID: -781605695 - vertices: [] - indices: - edges: [] - weights: [] - - serializedVersion: 2 - name: GUISprite_14 - rect: - serializedVersion: 2 - x: 16 - y: 96 - width: 64 - height: 16 - alignment: 0 - pivot: {x: 0.5, y: 0.5} - border: {x: 0, y: 0, z: 0, w: 0} - customData: - outline: [] - physicsShape: [] - tessellationDetail: 0 - bones: [] - spriteID: 9c0615ce272f674488d6d7325cb7990e - internalID: 1108840114 - vertices: [] - indices: - edges: [] - weights: [] - - serializedVersion: 2 - name: GUISprite_15 - rect: - serializedVersion: 2 - x: 97 - y: 96 - width: 62 - height: 16 - alignment: 0 - pivot: {x: 0.5, y: 0.5} - border: {x: 0, y: 0, z: 0, w: 0} - customData: - outline: [] - physicsShape: [] - tessellationDetail: 0 - bones: [] - spriteID: 700c24cc49083654a8d2ffccefc2fdc4 - internalID: 696862219 - vertices: [] - indices: - edges: [] - weights: [] - - serializedVersion: 2 - name: GUISprite_16 - rect: - serializedVersion: 2 - x: 224 - y: 112 - width: 72 - height: 12 - alignment: 0 - pivot: {x: 0.5, y: 0.5} - border: {x: 0, y: 0, z: 0, w: 0} - customData: - outline: [] - physicsShape: [] - tessellationDetail: 0 - bones: [] - spriteID: 5814773450d69aa4d908725f87a1bace - internalID: 2032746029 - vertices: [] - indices: - edges: [] - weights: [] - - serializedVersion: 2 - name: GUISprite_17 - rect: - serializedVersion: 2 - x: 256 - y: 116 - width: 8 - height: 8 - alignment: 0 - pivot: {x: 0.5, y: 0.5} - border: {x: 0, y: 0, z: 0, w: 0} - customData: - outline: [] - physicsShape: [] - tessellationDetail: 0 - bones: [] - spriteID: bd4f4c070335725429be0c88115cf9d2 - internalID: -1892886356 - vertices: [] - indices: - edges: [] - weights: [] - - serializedVersion: 2 - name: GUISprite_18 - rect: - serializedVersion: 2 - x: 258 - y: 81 - width: 12 - height: 12 - alignment: 0 - pivot: {x: 0.5, y: 0.5} - border: {x: 0, y: 0, z: 0, w: 0} - customData: - outline: [] - physicsShape: [] - tessellationDetail: 0 - bones: [] - spriteID: 97a9237c00e70d3499f40df4ccfceee3 - internalID: 2120036564 - vertices: [] - indices: - edges: [] - weights: [] - - serializedVersion: 2 - name: GUISprite_19 - rect: - serializedVersion: 2 - x: 22 - y: 6 - width: 68 - height: 68 - alignment: 0 - pivot: {x: 0.5, y: 0.5} - border: {x: 0, y: 0, z: 0, w: 0} - customData: - outline: [] - physicsShape: [] - tessellationDetail: 0 - bones: [] - spriteID: 391629d2982ce4647bce02b7ec12cf7c - internalID: -1673088813 - vertices: [] - indices: - edges: [] - weights: [] - - serializedVersion: 2 - name: GUISprite_20 - rect: - serializedVersion: 2 - x: 120 - y: 20 - width: 47 - height: 31 - alignment: 0 - pivot: {x: 0.5, y: 0.5} - border: {x: 0, y: 0, z: 0, w: 0} - customData: - outline: [] - physicsShape: [] - tessellationDetail: 0 - bones: [] - spriteID: 12a1e8783caa0764da319423b1eb83c8 - internalID: 737968868 - vertices: [] - indices: - edges: [] - weights: [] - - serializedVersion: 2 - name: GUISprite_21 - rect: - serializedVersion: 2 - x: 225 - y: 67 - width: 78 - height: 26 - alignment: 0 - pivot: {x: 0.5, y: 0.5} - border: {x: 0, y: 0, z: 0, w: 0} - customData: - outline: [] - physicsShape: [] - tessellationDetail: 0 - bones: [] - spriteID: bba2fd1a9b34f4842b795f4a2539ec4f - internalID: -1215426722 - vertices: [] - indices: - edges: [] - weights: [] - - serializedVersion: 2 - name: GUISprite_22 - rect: - serializedVersion: 2 - x: 195 - y: 20 - width: 73 - height: 38 - alignment: 0 - pivot: {x: 0.5, y: 0.5} - border: {x: 0, y: 0, z: 0, w: 0} - customData: - outline: [] - physicsShape: [] - tessellationDetail: 0 - bones: [] - spriteID: 583112cef3e87714cb6ab80521b71be3 - internalID: -1373860608 - vertices: [] - indices: - edges: [] - weights: [] - - serializedVersion: 2 - name: GUISprite_23 - rect: - serializedVersion: 2 - x: 96 - y: 176 - width: 64 - height: 16 - alignment: 0 - pivot: {x: 0.5, y: 0.5} - border: {x: 0, y: 0, z: 0, w: 0} - customData: - outline: [] - physicsShape: [] - tessellationDetail: 0 - bones: [] - spriteID: 69c31df778aa89c4c8166aaa04bbffaf - internalID: -874798731 - vertices: [] - indices: - edges: [] - weights: [] - - serializedVersion: 2 - name: GUISprite_24 - rect: - serializedVersion: 2 - x: 96 - y: 160 - width: 64 - height: 16 - alignment: 0 - pivot: {x: 0.5, y: 0.5} - border: {x: 0, y: 0, z: 0, w: 0} - customData: - outline: [] - physicsShape: [] - tessellationDetail: 0 - bones: [] - spriteID: c7b0f2821e9bf194a9b6d4a740be5d3d - internalID: -1624481997 - vertices: [] - indices: - edges: [] - weights: [] - - serializedVersion: 2 - name: GUISprite_25 - rect: - serializedVersion: 2 - x: 97 - y: 112 - width: 62 - height: 16 - alignment: 0 - pivot: {x: 0.5, y: 0.5} - border: {x: 0, y: 0, z: 0, w: 0} - customData: - outline: [] - physicsShape: [] - tessellationDetail: 0 - bones: [] - spriteID: 320ce7d56ae37224aa9bcf62ef7155fb - internalID: 1360204005 - vertices: [] - indices: - edges: [] - weights: [] - - serializedVersion: 2 - name: GUISprite_26 - rect: - serializedVersion: 2 - x: 16 - y: 112 - width: 64 - height: 16 - alignment: 0 - pivot: {x: 0.5, y: 0.5} - border: {x: 0, y: 0, z: 0, w: 0} - customData: - outline: [] - physicsShape: [] - tessellationDetail: 0 - bones: [] - spriteID: 5036ab9cc5c81794b9cca7690d67cd4f - internalID: 1909775786 - vertices: [] - indices: - edges: [] - weights: [] - - serializedVersion: 2 - name: GUISprite_27 - rect: - serializedVersion: 2 - x: 32 - y: 192 - width: 16 - height: 16 - alignment: 0 - pivot: {x: 0.5, y: 0.5} - border: {x: 0, y: 0, z: 0, w: 0} - customData: - outline: [] - physicsShape: [] - tessellationDetail: 0 - bones: [] - spriteID: 56481c39533ec66448b558e71e44deab - internalID: -420200479 - vertices: [] - indices: - edges: [] - weights: [] - - serializedVersion: 2 - name: GUISprite_28 - rect: - serializedVersion: 2 - x: 48 - y: 192 - width: 16 - height: 16 - alignment: 0 - pivot: {x: 0.5, y: 0.5} - border: {x: 0, y: 0, z: 0, w: 0} - customData: - outline: [] - physicsShape: [] - tessellationDetail: 0 - bones: [] - spriteID: f8ea3eb1bc0cc394a89deb66c7dc42e6 - internalID: 1415716102 - vertices: [] - indices: - edges: [] - weights: [] - - serializedVersion: 2 - name: GUISprite_29 - rect: - serializedVersion: 2 - x: 64 - y: 192 - width: 16 - height: 16 - alignment: 0 - pivot: {x: 0.5, y: 0.5} - border: {x: 0, y: 0, z: 0, w: 0} - customData: - outline: [] - physicsShape: [] - tessellationDetail: 0 - bones: [] - spriteID: 5a8ea8b1d57a9144a9fda05c267088a0 - internalID: -971486852 - vertices: [] - indices: - edges: [] - weights: [] - - serializedVersion: 2 - name: GUISprite_30 - rect: - serializedVersion: 2 - x: 96 - y: 192 - width: 16 - height: 16 - alignment: 0 - pivot: {x: 0.5, y: 0.5} - border: {x: 0, y: 0, z: 0, w: 0} - customData: - outline: [] - physicsShape: [] - tessellationDetail: 0 - bones: [] - spriteID: 15a9c410459e01d499359205c3658834 - internalID: 1710068736 - vertices: [] - indices: - edges: [] - weights: [] - - serializedVersion: 2 - name: GUISprite_31 - rect: - serializedVersion: 2 - x: 112 - y: 192 - width: 16 - height: 16 - alignment: 0 - pivot: {x: 0.5, y: 0.5} - border: {x: 0, y: 0, z: 0, w: 0} - customData: - outline: [] - physicsShape: [] - tessellationDetail: 0 - bones: [] - spriteID: 08e20be6558b12640a392969ee7dec80 - internalID: 398281043 - vertices: [] - indices: - edges: [] - weights: [] - - serializedVersion: 2 - name: GUISprite_32 - rect: - serializedVersion: 2 - x: 128 - y: 192 - width: 16 - height: 16 - alignment: 0 - pivot: {x: 0.5, y: 0.5} - border: {x: 0, y: 0, z: 0, w: 0} - customData: - outline: [] - physicsShape: [] - tessellationDetail: 0 - bones: [] - spriteID: fb3e093a1f710624eaee06117096be4f - internalID: -250086173 - vertices: [] - indices: - edges: [] - weights: [] - - serializedVersion: 2 - name: GUISprite_33 - rect: - serializedVersion: 2 - x: 144 - y: 192 - width: 16 - height: 16 - alignment: 0 - pivot: {x: 0.5, y: 0.5} - border: {x: 0, y: 0, z: 0, w: 0} - customData: - outline: [] - physicsShape: [] - tessellationDetail: 0 - bones: [] - spriteID: 3056e09ef64ed1843829ffe5d8bb4db6 - internalID: -567583326 - vertices: [] - indices: - edges: [] - weights: [] - outline: [] - customData: - physicsShape: [] - bones: [] - spriteID: d5fca43e825c8974a91c1e5b81c1b358 - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - spriteCustomMetadata: - entries: - - key: SpriteEditor.SliceSettings - value: '{"sliceOnImport":false,"gridCellCount":{"x":1.0,"y":1.0},"gridSpriteSize":{"x":64.0,"y":64.0},"gridSpriteOffset":{"x":0.0,"y":0.0},"gridSpritePadding":{"x":0.0,"y":0.0},"pivot":{"x":0.5,"y":0.5},"pivotPixels":{"x":0.0,"y":0.0},"autoSlicingMethod":0,"spriteAlignment":0,"pivotUnitMode":0,"slicingType":0,"keepEmptyRects":false,"isAlternate":false}' - nameFileIdTable: - GUISprite_0: 1838387415 - GUISprite_1: 1903082313 - GUISprite_10: 729381716 - GUISprite_11: -302797174 - GUISprite_12: -1055290072 - GUISprite_13: -781605695 - GUISprite_14: 1108840114 - GUISprite_15: 696862219 - GUISprite_16: 2032746029 - GUISprite_17: -1892886356 - GUISprite_18: 2120036564 - GUISprite_19: -1673088813 - GUISprite_2: 1858001036 - GUISprite_20: 737968868 - GUISprite_21: -1215426722 - GUISprite_22: -1373860608 - GUISprite_23: -874798731 - GUISprite_24: -1624481997 - GUISprite_25: 1360204005 - GUISprite_26: 1909775786 - GUISprite_27: -420200479 - GUISprite_28: 1415716102 - GUISprite_29: -971486852 - GUISprite_3: -1332788018 - GUISprite_30: 1710068736 - GUISprite_31: 398281043 - GUISprite_32: -250086173 - GUISprite_33: -567583326 - GUISprite_4: -641751681 - GUISprite_5: -2120558949 - GUISprite_6: 2065425591 - GUISprite_7: 1502317813 - GUISprite_8: 1125743490 - GUISprite_9: -1068189995 - mipmapLimitGroupName: - pSDRemoveMatte: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Resources/UI/Sprites/LogoCAlpha.png b/Assets/Resources/UI/Sprites/LogoCAlpha.png new file mode 100644 index 0000000..88daec6 Binary files /dev/null and b/Assets/Resources/UI/Sprites/LogoCAlpha.png differ diff --git a/Assets/Resources/UI/Sprites/LogoCAlpha.png.meta b/Assets/Resources/UI/Sprites/LogoCAlpha.png.meta new file mode 100644 index 0000000..1012bf9 --- /dev/null +++ b/Assets/Resources/UI/Sprites/LogoCAlpha.png.meta @@ -0,0 +1,130 @@ +fileFormatVersion: 2 +guid: 6a573e7bf4b63e34cb6208b9ac29875d +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 0 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 4 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/UI/Sprites/LogoColor.png b/Assets/Resources/UI/Sprites/LogoColor.png new file mode 100644 index 0000000..4d923bd Binary files /dev/null and b/Assets/Resources/UI/Sprites/LogoColor.png differ diff --git a/Assets/Resources/UI/Sprites/LogoColor.png.meta b/Assets/Resources/UI/Sprites/LogoColor.png.meta new file mode 100644 index 0000000..0f5e164 --- /dev/null +++ b/Assets/Resources/UI/Sprites/LogoColor.png.meta @@ -0,0 +1,130 @@ +fileFormatVersion: 2 +guid: 611043c68d1fd3e47a9ae11b9f3dbadb +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 0 + alphaUsage: 0 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 4 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/UI/Sprites/Shit3.jpg b/Assets/Resources/UI/Sprites/Shit3.jpg new file mode 100644 index 0000000..605972e Binary files /dev/null and b/Assets/Resources/UI/Sprites/Shit3.jpg differ diff --git a/Assets/Resources/UI/Sprites/Shit3.jpg.meta b/Assets/Resources/UI/Sprites/Shit3.jpg.meta new file mode 100644 index 0000000..be35cae --- /dev/null +++ b/Assets/Resources/UI/Sprites/Shit3.jpg.meta @@ -0,0 +1,130 @@ +fileFormatVersion: 2 +guid: 2700799b22d90524fa4fa0c4b495bd1a +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 0 + alphaUsage: 0 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 4 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources_moved/Configs/UI.meta b/Assets/Resources_moved/Configs/UI.meta new file mode 100644 index 0000000..da428b7 --- /dev/null +++ b/Assets/Resources_moved/Configs/UI.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 1586c3d7cf90aec439ce7579d4512db6 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources_moved/Configs/UI/CanvasSettingsConfig.asset b/Assets/Resources_moved/Configs/UI/CanvasSettingsConfig.asset new file mode 100644 index 0000000..2d2bd47 --- /dev/null +++ b/Assets/Resources_moved/Configs/UI/CanvasSettingsConfig.asset @@ -0,0 +1,20 @@ +%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: 865301742f93c7b4688d84f5bec5c27e, type: 3} + m_Name: CanvasSettingsConfig + m_EditorClassIdentifier: Assembly-CSharp::Code.Infrastructure.UI.CanvasSettingsConfig + Prefab: + m_AssetGUID: e1fbe5b2798657342b569f723d16c9de + m_SubObjectName: + m_SubObjectType: + m_SubObjectGUID: + m_EditorAssetChanged: 0 diff --git a/Assets/Resources_moved/Configs/UI/CanvasSettingsConfig.asset.meta b/Assets/Resources_moved/Configs/UI/CanvasSettingsConfig.asset.meta new file mode 100644 index 0000000..feef520 --- /dev/null +++ b/Assets/Resources_moved/Configs/UI/CanvasSettingsConfig.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 17c5e56eb6c99db40b6093c9d543bb4f +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources_moved/Configs/UI/Loading.asset b/Assets/Resources_moved/Configs/UI/Loading.asset new file mode 100644 index 0000000..db7f037 --- /dev/null +++ b/Assets/Resources_moved/Configs/UI/Loading.asset @@ -0,0 +1,21 @@ +%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: 17bdede85b436f44e992b27d170ccbc2, type: 3} + m_Name: Loading + m_EditorClassIdentifier: Assembly-CSharp::Code.Infrastructure.UI.UIPanelSettingsConfig + Prefab: + m_AssetGUID: 13852bf3f3ccace4e9deefd844eebb23 + m_SubObjectName: + m_SubObjectType: + m_SubObjectGUID: + m_EditorAssetChanged: 0 + UIPanelType: 1 diff --git a/Assets/Resources_moved/Configs/UI/Loading.asset.meta b/Assets/Resources_moved/Configs/UI/Loading.asset.meta new file mode 100644 index 0000000..2edaa01 --- /dev/null +++ b/Assets/Resources_moved/Configs/UI/Loading.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: d87857258eeea2345a3b926b3c671002 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources_moved/Configs/UI/Logo.asset b/Assets/Resources_moved/Configs/UI/Logo.asset new file mode 100644 index 0000000..c1d8d03 --- /dev/null +++ b/Assets/Resources_moved/Configs/UI/Logo.asset @@ -0,0 +1,21 @@ +%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: 17bdede85b436f44e992b27d170ccbc2, type: 3} + m_Name: Logo + m_EditorClassIdentifier: Assembly-CSharp::Code.Infrastructure.UI.UIPanelSettingsConfig + Prefab: + m_AssetGUID: 4fcdb7f979b60194db1fb5c03b81bf8c + m_SubObjectName: + m_SubObjectType: + m_SubObjectGUID: + m_EditorAssetChanged: 0 + UIPanelType: 0 diff --git a/Assets/Resources_moved/Configs/UI/Logo.asset.meta b/Assets/Resources_moved/Configs/UI/Logo.asset.meta new file mode 100644 index 0000000..4b28bfa --- /dev/null +++ b/Assets/Resources_moved/Configs/UI/Logo.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: d2750e654bd192d41a48144c43b41302 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources_moved/UI.meta b/Assets/Resources_moved/UI.meta new file mode 100644 index 0000000..610c909 --- /dev/null +++ b/Assets/Resources_moved/UI.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: d02d227be3ee72041863fe5389aba80d +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources_moved/UI/Canvas.prefab b/Assets/Resources_moved/UI/Canvas.prefab new file mode 100644 index 0000000..5dc6529 --- /dev/null +++ b/Assets/Resources_moved/UI/Canvas.prefab @@ -0,0 +1,103 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &3093252495306112961 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 85526656748497033} + - component: {fileID: 5474172051638134131} + - component: {fileID: 4522556149065460202} + - component: {fileID: 3454116689055038688} + m_Layer: 5 + m_Name: Canvas + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &85526656748497033 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3093252495306112961} + 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: [] + 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 &5474172051638134131 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3093252495306112961} + 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: 1 + m_AdditionalShaderChannelsFlag: 0 + m_UpdateRectTransformForStandalone: 0 + m_SortingLayerID: 0 + m_SortingOrder: 0 + m_TargetDisplay: 0 +--- !u!114 &4522556149065460202 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3093252495306112961} + 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: 0 + m_ReferencePixelsPerUnit: 100 + m_ScaleFactor: 1 + m_ReferenceResolution: {x: 800, y: 600} + m_ScreenMatchMode: 0 + m_MatchWidthOrHeight: 0 + m_PhysicalUnit: 3 + m_FallbackScreenDPI: 96 + m_DefaultSpriteDPI: 96 + m_DynamicPixelsPerUnit: 1 + m_PresetInfoIsWorld: 0 +--- !u!114 &3454116689055038688 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3093252495306112961} + 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 diff --git a/Assets/Resources_moved/UI/Canvas.prefab.meta b/Assets/Resources_moved/UI/Canvas.prefab.meta new file mode 100644 index 0000000..4adc843 --- /dev/null +++ b/Assets/Resources_moved/UI/Canvas.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: e1fbe5b2798657342b569f723d16c9de +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources_moved/UI/Panels.meta b/Assets/Resources_moved/UI/Panels.meta new file mode 100644 index 0000000..2e2321a --- /dev/null +++ b/Assets/Resources_moved/UI/Panels.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 6a2395826ecae1b4b910f064c78d0363 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources_moved/UI/Panels/LoadingPanel.prefab b/Assets/Resources_moved/UI/Panels/LoadingPanel.prefab new file mode 100644 index 0000000..1d34731 --- /dev/null +++ b/Assets/Resources_moved/UI/Panels/LoadingPanel.prefab @@ -0,0 +1,90 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &892732023062486793 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2931552674433344788} + - component: {fileID: 538597035855631831} + - component: {fileID: 6344482707200828920} + - component: {fileID: 177895377805463577} + m_Layer: 5 + m_Name: LoadingPanel + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2931552674433344788 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 892732023062486793} + 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 &538597035855631831 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 892732023062486793} + m_CullTransparentMesh: 1 +--- !u!114 &6344482707200828920 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 892732023062486793} + 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: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 2700799b22d90524fa4fa0c4b495bd1a, type: 3} + m_Type: 0 + 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 &177895377805463577 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 892732023062486793} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a950957bc3374bb8b1c3acfbb7ad2dd2, type: 3} + m_Name: + m_EditorClassIdentifier: Assembly-CSharp::Code.Infrastructure.UI.Panels.LoadingPanel diff --git a/Assets/Resources_moved/UI/Panels/LoadingPanel.prefab.meta b/Assets/Resources_moved/UI/Panels/LoadingPanel.prefab.meta new file mode 100644 index 0000000..212f03b --- /dev/null +++ b/Assets/Resources_moved/UI/Panels/LoadingPanel.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 13852bf3f3ccace4e9deefd844eebb23 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources_moved/UI/Panels/LogoPanel.prefab b/Assets/Resources_moved/UI/Panels/LogoPanel.prefab new file mode 100644 index 0000000..02cbfc6 --- /dev/null +++ b/Assets/Resources_moved/UI/Panels/LogoPanel.prefab @@ -0,0 +1,90 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &892732023062486793 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2931552674433344788} + - component: {fileID: 538597035855631831} + - component: {fileID: 6344482707200828920} + - component: {fileID: -7669160445001710514} + m_Layer: 5 + m_Name: LogoPanel + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2931552674433344788 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 892732023062486793} + 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 &538597035855631831 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 892732023062486793} + m_CullTransparentMesh: 1 +--- !u!114 &6344482707200828920 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 892732023062486793} + 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: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 6a573e7bf4b63e34cb6208b9ac29875d, type: 3} + m_Type: 0 + 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 &-7669160445001710514 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 892732023062486793} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4adfc2a9c5ae4354a32b651c09840b40, type: 3} + m_Name: + m_EditorClassIdentifier: Assembly-CSharp::Code.Infrastructure.UI.Panels.LogoPanel diff --git a/Assets/Resources_moved/UI/Panels/LogoPanel.prefab.meta b/Assets/Resources_moved/UI/Panels/LogoPanel.prefab.meta new file mode 100644 index 0000000..609ae12 --- /dev/null +++ b/Assets/Resources_moved/UI/Panels/LogoPanel.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 4fcdb7f979b60194db1fb5c03b81bf8c +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/Bootstrap.unity b/Assets/Scenes/Bootstrap.unity index a0fb0c1..1a02658 100644 --- a/Assets/Scenes/Bootstrap.unity +++ b/Assets/Scenes/Bootstrap.unity @@ -26,7 +26,7 @@ RenderSettings: m_AmbientIntensity: 1 m_AmbientMode: 0 m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1} - m_SkyboxMaterial: {fileID: 10304, guid: 0000000000000000f000000000000000, type: 0} + m_SkyboxMaterial: {fileID: 0} m_HaloStrength: 0.5 m_FlareStrength: 1 m_FlareFadeSpeed: 3 @@ -176,8 +176,88 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 5312032623c34414a54ea00e35a7eb8e, type: 3} m_Name: m_EditorClassIdentifier: Reflex::Reflex.Core.ContainerScope +--- !u!1 &364140638 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 364140641} + - component: {fileID: 364140640} + - component: {fileID: 364140639} + m_Layer: 0 + m_Name: EventSystem + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &364140639 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 364140638} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 01614664b831546d2ae94a42149d80ac, type: 3} + m_Name: + m_EditorClassIdentifier: Unity.InputSystem::UnityEngine.InputSystem.UI.InputSystemUIInputModule + m_SendPointerHoverToParent: 1 + m_MoveRepeatDelay: 0.5 + m_MoveRepeatRate: 0.1 + m_XRTrackingOrigin: {fileID: 0} + m_ActionsAsset: {fileID: -944628639613478452, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} + m_PointAction: {fileID: -1654692200621890270, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} + m_MoveAction: {fileID: -8784545083839296357, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} + m_SubmitAction: {fileID: 392368643174621059, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} + m_CancelAction: {fileID: 7727032971491509709, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} + m_LeftClickAction: {fileID: 3001919216989983466, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} + m_MiddleClickAction: {fileID: -2185481485913320682, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} + m_RightClickAction: {fileID: -4090225696740746782, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} + m_ScrollWheelAction: {fileID: 6240969308177333660, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} + m_TrackedDevicePositionAction: {fileID: 6564999863303420839, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} + m_TrackedDeviceOrientationAction: {fileID: 7970375526676320489, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} + m_DeselectOnBackgroundClick: 1 + m_PointerBehavior: 0 + m_CursorLockBehavior: 0 + m_ScrollDeltaPerTick: 6 +--- !u!114 &364140640 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 364140638} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 76c392e42b5098c458856cdf6ecaaaa1, type: 3} + m_Name: + m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.EventSystems.EventSystem + m_FirstSelected: {fileID: 0} + m_sendNavigationEvents: 1 + m_DragThreshold: 10 +--- !u!4 &364140641 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 364140638} + serializedVersion: 2 + 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} --- !u!1660057539 &9223372036854775807 SceneRoots: m_ObjectHideFlags: 0 m_Roots: - {fileID: 60958143} + - {fileID: 364140641} diff --git a/Assets/UnityCodeGen.Generated/CanvasSettingsConfig.Generated.cs b/Assets/UnityCodeGen.Generated/CanvasSettingsConfig.Generated.cs new file mode 100644 index 0000000..da7d4da --- /dev/null +++ b/Assets/UnityCodeGen.Generated/CanvasSettingsConfig.Generated.cs @@ -0,0 +1,16 @@ + +#pragma warning disable CS0105 +using UnityEngine.AddressableAssets; + +using UnityEngine; +using UnityEngine.AddressableAssets; + +namespace Code.Infrastructure.UI{ +#pragma warning restore CS0105 +[CreateAssetMenu(fileName = "CanvasSettingsConfig", menuName = "Configs/UI/CanvasSettings")] +public class CanvasSettingsConfig : ScriptableObject +{ + public UnityEngine.AddressableAssets.AssetReference Prefab; + +} +} diff --git a/Assets/UnityCodeGen.Generated/CanvasSettingsConfig.Generated.cs.meta b/Assets/UnityCodeGen.Generated/CanvasSettingsConfig.Generated.cs.meta new file mode 100644 index 0000000..80ed646 --- /dev/null +++ b/Assets/UnityCodeGen.Generated/CanvasSettingsConfig.Generated.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 865301742f93c7b4688d84f5bec5c27e \ No newline at end of file diff --git a/Assets/UnityCodeGen.Generated/ConfigLocator.Generated.cs b/Assets/UnityCodeGen.Generated/ConfigLocator.Generated.cs index 31b5444..a25c88c 100644 --- a/Assets/UnityCodeGen.Generated/ConfigLocator.Generated.cs +++ b/Assets/UnityCodeGen.Generated/ConfigLocator.Generated.cs @@ -1,9 +1,10 @@ #pragma warning disable CS0105 using Code.Infrastructure.Camera; -using Code.Infrastructure.UI; using Code.Infrastructure.Camera; +using Code.Infrastructure.UI; using Code.Infrastructure.SceneLoader; +using Code.Infrastructure.UI; using Code.Infrastructure.Input; using UnityEngine; @@ -18,14 +19,16 @@ using Code.Infrastructure.Input; { SystemConfigsReferences systemConfigsReferences = Resources.Load("SystemConfigsReferences"); + _singleConfigReferences.Add(typeof(Code.Infrastructure.Camera.GameCameraConfig), systemConfigsReferences.GameCamera); + _multipleConfigReferences.Add(typeof(Code.Infrastructure.Camera.CameraSettingsConfig), systemConfigsReferences.CameraSettings); _multipleConfigReferences.Add(typeof(Code.Infrastructure.UI.UIPanelSettingsConfig), systemConfigsReferences.UIPanelSettings); - _singleConfigReferences.Add(typeof(Code.Infrastructure.Camera.GameCameraConfig), systemConfigsReferences.GameCamera); - _multipleConfigReferences.Add(typeof(Code.Infrastructure.SceneLoader.SceneInfoConfig), systemConfigsReferences.SceneInfo); + _singleConfigReferences.Add(typeof(Code.Infrastructure.UI.CanvasSettingsConfig), systemConfigsReferences.CanvasSettings); + _singleConfigReferences.Add(typeof(Code.Infrastructure.Input.InputServiceConfig), systemConfigsReferences.InputService); //_singleConfigReferences.Add(typeof(ScenesAssetReferences), systemConfigsReferences.scenesAssetReferences); diff --git a/Assets/UnityCodeGen.Generated/SystemConfigsReferences.Generated.cs b/Assets/UnityCodeGen.Generated/SystemConfigsReferences.Generated.cs index 42c7521..a504ecf 100644 --- a/Assets/UnityCodeGen.Generated/SystemConfigsReferences.Generated.cs +++ b/Assets/UnityCodeGen.Generated/SystemConfigsReferences.Generated.cs @@ -1,9 +1,10 @@ #pragma warning disable CS0105 using Code.Infrastructure.Camera; -using Code.Infrastructure.UI; using Code.Infrastructure.Camera; +using Code.Infrastructure.UI; using Code.Infrastructure.SceneLoader; +using Code.Infrastructure.UI; using Code.Infrastructure.Input; using UnityEngine.AddressableAssets; @@ -12,10 +13,11 @@ using Code.Infrastructure.Input; namespace Code.Infrastructure.Configs{ public partial class SystemConfigsReferences { - public string CameraSettings; + public AssetReference GameCamera; +public string CameraSettings; public string UIPanelSettings; -public AssetReference GameCamera; public string SceneInfo; +public AssetReference CanvasSettings; public AssetReference InputService; }