diff --git a/Assets/01_Scenes/MyProject/GameScene.unity b/Assets/01_Scenes/MyProject/GameScene.unity index 73623898..de22058a 100644 --- a/Assets/01_Scenes/MyProject/GameScene.unity +++ b/Assets/01_Scenes/MyProject/GameScene.unity @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1c57bb97df957d16f70cb5d33e9ca9662c5f82f900e1cd5c55d0afe7945b521d -size 13014866 +oid sha256:f227fea50a9a17c1c4db3dd92227593658a9bfa1e33b5533067d843343b74ffc +size 13050696 diff --git a/Assets/01_Scenes/MyProject/GameStartScene.unity b/Assets/01_Scenes/MyProject/GameStartScene.unity index 8ebe1063..9ef6f996 100644 --- a/Assets/01_Scenes/MyProject/GameStartScene.unity +++ b/Assets/01_Scenes/MyProject/GameStartScene.unity @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b24f34daf03483a7550c86f8747638bd4425b6ac597addcf97e54940255ee9e7 -size 49150 +oid sha256:b3d9ec9cff79b5930601e1dfedf85fc09b128449060d90c32ec2093dc2369ae9 +size 58926 diff --git a/Assets/02_Scripts/Managers/SceneLoadManager.cs b/Assets/02_Scripts/Managers/SceneLoadManager.cs index 92e4ba4a..75e0a804 100644 --- a/Assets/02_Scripts/Managers/SceneLoadManager.cs +++ b/Assets/02_Scripts/Managers/SceneLoadManager.cs @@ -1,4 +1,5 @@ using System; +using System.Runtime.CompilerServices; using System.Threading.Tasks; using UnityEngine; using UnityEngine.SceneManagement; @@ -7,6 +8,7 @@ public class SceneLoadManager : MonoBehaviour { public static SceneLoadManager Instance; + [SerializeField] private GameObject _loadingRoot; [SerializeField] private Camera _loadingCam; [SerializeField] private Transform _loadingCamTargetTransform; [SerializeField] private LoadingScreen _loadingScreen; @@ -30,6 +32,15 @@ private void Start() SceneManager.sceneLoaded += OnSceneLoaded; } + private void Update() + { + if(_loadingCamTargetTransform != null) + { + _loadingCam.transform.position = _loadingCamTargetTransform.position; + _loadingCam.transform.rotation = _loadingCamTargetTransform.rotation; + } + } + private void OnSceneLoaded(Scene scene, LoadSceneMode mode) { // 씬이 로드될 때마다 @@ -56,13 +67,16 @@ public async Awaitable FadeLoadingCanvas(bool isOut,float fadeTime) public async Task SetSceneLoadingActive(bool isActive,float alphaTime) { + if (isActive) + _loadingRoot.SetActive(true); - if(alphaTime > 0f) + if (alphaTime > 0f) { await FadeLoadingCanvas(!isActive,alphaTime); } - _loadingScreen.gameObject.SetActive(isActive); + if (!isActive) + _loadingRoot.SetActive(false); } public void SetSceneLoadingActive(bool isActive) @@ -90,7 +104,7 @@ private async Awaitable SceneChange(string sceneName) { try { - await SetSceneLoadingActive(true,2f); + await SetSceneLoadingActive(true,1f); AsyncOperation op = SceneManager.LoadSceneAsync(sceneName); @@ -133,7 +147,7 @@ private async Awaitable SceneChange(string sceneName) //VR용 로직 //트래킹이 중단되면 안되기 때문에 카메라를 유지해야 한다 _loadingCamTargetTransform = Camera.main.transform; // 새로운 씬의 메인카메라를 따라가게끔 설정 - await SetSceneLoadingActive(false,2f); + await SetSceneLoadingActive(false,1f); //------------------------------------------------------------------------------- Debug.Log("씬 전환됨"); diff --git a/Assets/02_Scripts/UI/LoadingScreen.cs b/Assets/02_Scripts/UI/LoadingScreen.cs index 727798ea..fef9b986 100644 --- a/Assets/02_Scripts/UI/LoadingScreen.cs +++ b/Assets/02_Scripts/UI/LoadingScreen.cs @@ -5,7 +5,6 @@ public class LoadingScreen : MonoBehaviour { public Image LoadingImage; - public Image BackgroundImage; public TextMeshProUGUI LoadingTextMeshProUGUI; public CanvasGroup LoadingScreenCanvasGroup; diff --git a/Assets/06_Font/Hakgyoansim_TteokbokkiB.ttf b/Assets/06_Font/Hakgyoansim_TteokbokkiB.ttf new file mode 100644 index 00000000..5f82b513 --- /dev/null +++ b/Assets/06_Font/Hakgyoansim_TteokbokkiB.ttf @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2f1eba3e4d45e8bf2bd4ae54f0572a4d54ad8e75aa635b8005c2720ea3b71be7 +size 1520868 diff --git a/Assets/06_Font/Hakgyoansim_TteokbokkiB.ttf.meta b/Assets/06_Font/Hakgyoansim_TteokbokkiB.ttf.meta new file mode 100644 index 00000000..eb293930 --- /dev/null +++ b/Assets/06_Font/Hakgyoansim_TteokbokkiB.ttf.meta @@ -0,0 +1,21 @@ +fileFormatVersion: 2 +guid: 1122d0bdca1197e41946cde96c59a45c +TrueTypeFontImporter: + externalObjects: {} + serializedVersion: 4 + fontSize: 16 + forceTextureCase: -2 + characterSpacing: 0 + characterPadding: 1 + includeFontData: 1 + fontNames: + - Hakgyoansim TTeokbokki B + fallbackFontReferences: [] + customCharacters: + fontRenderingMode: 0 + ascentCalculationMode: 1 + useLegacyBoundsCalculation: 0 + shouldRoundAdvanceValue: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/06_Font/Hakgyoansim_TteokbokkiOTFB.otf b/Assets/06_Font/Hakgyoansim_TteokbokkiOTFB.otf new file mode 100644 index 00000000..a94c939a Binary files /dev/null and b/Assets/06_Font/Hakgyoansim_TteokbokkiOTFB.otf differ diff --git a/Assets/06_Font/Hakgyoansim_TteokbokkiOTFB.otf.meta b/Assets/06_Font/Hakgyoansim_TteokbokkiOTFB.otf.meta new file mode 100644 index 00000000..4e62b536 --- /dev/null +++ b/Assets/06_Font/Hakgyoansim_TteokbokkiOTFB.otf.meta @@ -0,0 +1,21 @@ +fileFormatVersion: 2 +guid: 569e44948aacc0c4f9a5f52b0f2fe46f +TrueTypeFontImporter: + externalObjects: {} + serializedVersion: 4 + fontSize: 16 + forceTextureCase: -2 + characterSpacing: 0 + characterPadding: 1 + includeFontData: 1 + fontNames: + - Hakgyoansim Tteokbokki OTF B + fallbackFontReferences: [] + customCharacters: + fontRenderingMode: 0 + ascentCalculationMode: 1 + useLegacyBoundsCalculation: 0 + shouldRoundAdvanceValue: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/06_Font/SDF/Hakgyoansim_TteokbokkiB SDF Material Outline.mat b/Assets/06_Font/SDF/Hakgyoansim_TteokbokkiB SDF Material Outline.mat new file mode 100644 index 00000000..b0314d16 --- /dev/null +++ b/Assets/06_Font/SDF/Hakgyoansim_TteokbokkiB SDF Material Outline.mat @@ -0,0 +1,112 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Hakgyoansim_TteokbokkiB SDF Material Outline + m_Shader: {fileID: 4800000, guid: 68e6db2ebdc24f95958faec2be5558d6, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: + - UNDERLAY_ON + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _Cube: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _FaceTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: -4589865433819228246, guid: eb4302500bb26d946b283d1dbd1bd726, type: 2} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OutlineTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _Ambient: 0.5 + - _Bevel: 0.5 + - _BevelClamp: 0 + - _BevelOffset: 0 + - _BevelRoundness: 0 + - _BevelWidth: 0 + - _BumpFace: 0 + - _BumpOutline: 0 + - _ColorMask: 15 + - _CullMode: 0 + - _Diffuse: 0.5 + - _FaceDilate: 0 + - _FaceUVSpeedX: 0 + - _FaceUVSpeedY: 0 + - _GlowInner: 0.05 + - _GlowOffset: 0 + - _GlowOuter: 0.348 + - _GlowPower: 0.177 + - _GradientScale: 5 + - _LightAngle: 3.1416 + - _MaskSoftnessX: 0 + - _MaskSoftnessY: 0 + - _OutlineSoftness: 0 + - _OutlineUVSpeedX: 0 + - _OutlineUVSpeedY: 0 + - _OutlineWidth: 1 + - _PerspectiveFilter: 0.875 + - _Reflectivity: 10 + - _ScaleRatioA: 0.67368424 + - _ScaleRatioB: 0.65 + - _ScaleRatioC: 0.65 + - _ScaleX: 1 + - _ScaleY: 1 + - _ShaderFlags: 0 + - _Sharpness: 0 + - _SpecularPower: 2 + - _Stencil: 0 + - _StencilComp: 8 + - _StencilOp: 0 + - _StencilReadMask: 255 + - _StencilWriteMask: 255 + - _TextureHeight: 8192 + - _TextureWidth: 8192 + - _UnderlayDilate: 0.1 + - _UnderlayOffsetX: 0 + - _UnderlayOffsetY: 0 + - _UnderlaySoftness: 0 + - _VertexOffsetX: 0 + - _VertexOffsetY: 0 + - _WeightBold: 0.75 + - _WeightNormal: 0 + m_Colors: + - _ClipRect: {r: -32767, g: -32767, b: 32767, a: 32767} + - _EnvMatrixRotation: {r: 0, g: 0, b: 0, a: 0} + - _FaceColor: {r: 1, g: 1, b: 1, a: 1} + - _GlowColor: {r: 0, g: 0, b: 0, a: 1} + - _MaskCoord: {r: 0, g: 0, b: 32767, a: 32767} + - _OutlineColor: {r: 0, g: 0, b: 0, a: 1} + - _ReflectFaceColor: {r: 0, g: 0, b: 0, a: 1} + - _ReflectOutlineColor: {r: 0, g: 0, b: 0, a: 1} + - _SpecularColor: {r: 1, g: 1, b: 1, a: 1} + - _UnderlayColor: {r: 0, g: 0, b: 0, a: 0.5} + m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/06_Font/SDF/Hakgyoansim_TteokbokkiB SDF Material Outline.mat.meta b/Assets/06_Font/SDF/Hakgyoansim_TteokbokkiB SDF Material Outline.mat.meta new file mode 100644 index 00000000..11ec21d9 --- /dev/null +++ b/Assets/06_Font/SDF/Hakgyoansim_TteokbokkiB SDF Material Outline.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 9b02dbd4bc30d604994cd8d19751f565 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/06_Font/SDF/Hakgyoansim_TteokbokkiB SDF.asset b/Assets/06_Font/SDF/Hakgyoansim_TteokbokkiB SDF.asset new file mode 100644 index 00000000..ce6d13b7 --- /dev/null +++ b/Assets/06_Font/SDF/Hakgyoansim_TteokbokkiB SDF.asset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5e3fcd3eea2a571a6a29aaa0fa921a8127b26ecee70c24e8bb5d47efee912881 +size 139125149 diff --git a/Assets/06_Font/SDF/Hakgyoansim_TteokbokkiB SDF.asset.meta b/Assets/06_Font/SDF/Hakgyoansim_TteokbokkiB SDF.asset.meta new file mode 100644 index 00000000..275a7508 --- /dev/null +++ b/Assets/06_Font/SDF/Hakgyoansim_TteokbokkiB SDF.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: eb4302500bb26d946b283d1dbd1bd726 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset index bcd3f402..87dc790e 100644 --- a/ProjectSettings/EditorBuildSettings.asset +++ b/ProjectSettings/EditorBuildSettings.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7b4b65b0aea45c4d7d8810c6a431846fb691f58fb80adb64a6be19e54325752e -size 1156 +oid sha256:7309f1a910df800f3bb868c3820b3b3560c6941b8f998181c733dc3f1612a89b +size 1280 diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 8060e352..572e3093 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8466013c2a54d735b8d325f677531ec751fff51a6ffdd28a993fcb1913ed163f -size 27821 +oid sha256:faee4cf137d82819827b58de43ec883bd9a23c973a4d817837095efc3b3ffcd2 +size 27839