diff --git a/Assets/01_Scenes/MyProject/GameScene.unity b/Assets/01_Scenes/MyProject/GameScene.unity index 733a9994..5ccd2df2 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:6561621899889e195915b340eac3158d2cba7d31a7abcb7149d39b6b45157196 -size 13872031 +oid sha256:5cc238f3a331986a64f912c5ae7662f7ef12ebb179c8aaae99a8a0fddfddb035 +size 13874110 diff --git a/Assets/01_Scenes/MyProject/GameStartScene.unity b/Assets/01_Scenes/MyProject/GameStartScene.unity index fd7c5971..dfc1a5f2 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:d60e849b3c4c45cb671b03d4fc60c281c0064c633ba21b10da00f4def543fb40 -size 287135 +oid sha256:b1d9334fb892d987095c595ca9ef9be82743f2ca6c8fca6c19a4a5780dc83b23 +size 289188 diff --git a/Assets/02_Scripts/Managers/SceneLoadManager.cs b/Assets/02_Scripts/Managers/SceneLoadManager.cs index ff5855c1..9298c12e 100644 --- a/Assets/02_Scripts/Managers/SceneLoadManager.cs +++ b/Assets/02_Scripts/Managers/SceneLoadManager.cs @@ -31,9 +31,7 @@ private void Awake() else { Destroy(gameObject); //이미 인스턴스가 있으면 자신을 파괴 - } - - _loadingScreen = _loadingCam.GetComponentInChildren(); + } if (_supermarketStartSkybox != null) _runtimeStartSkybox = new Material(_supermarketStartSkybox); @@ -64,8 +62,7 @@ private void Update() { if(_loadingCamTargetTransform != null) { - _loadingCam.transform.position = _loadingCamTargetTransform.position; - _loadingCam.transform.rotation = _loadingCamTargetTransform.rotation; + _loadingRoot.transform.position = _loadingCamTargetTransform.position; } } @@ -129,7 +126,10 @@ private async Awaitable FadeSkybox(float from, float to, float duration) public async Awaitable SetSceneLoadingActive(bool isActive,float alphaTime) { if (isActive) + { _loadingRoot.SetActive(true); + } + if (alphaTime > 0f) { diff --git a/Assets/03_Models/BarcodeScaner/Prefabs/BarcodeScaner.prefab b/Assets/03_Models/BarcodeScaner/Prefabs/BarcodeScaner.prefab index 14adb375..40e57d88 100644 --- a/Assets/03_Models/BarcodeScaner/Prefabs/BarcodeScaner.prefab +++ b/Assets/03_Models/BarcodeScaner/Prefabs/BarcodeScaner.prefab @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:55dea3d25df916d95bf0dcfbc1c0aa6ad513f98b01a007ee9f2aa369f06aaaf0 -size 25277 +oid sha256:b450f2d559c5faaf835b85ed69f65561c2bb8489c9c96b36ce19798e7f5eedc3 +size 32977 diff --git a/Assets/99_Settings/Highlight/HighlightProfile_ItemOutline.asset b/Assets/99_Settings/Highlight/HighlightProfile_ItemOutline.asset index 357e4061..8a0c4199 100644 --- a/Assets/99_Settings/Highlight/HighlightProfile_ItemOutline.asset +++ b/Assets/99_Settings/Highlight/HighlightProfile_ItemOutline.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bacf105d03872cffe5ee92eea580880f6d89666ea2753ee5de85247b1a565aca +oid sha256:5e21ec075cccdbf157fdff5308d68735b0a0bb0ca118ac258bec6d62d5546a26 size 6472 diff --git a/Assets/Supermarket Store/Prefabs/RackAssets/ChipsCane.prefab b/Assets/Supermarket Store/Prefabs/RackAssets/ChipsCane.prefab index 7f85a197..54e5bced 100644 --- a/Assets/Supermarket Store/Prefabs/RackAssets/ChipsCane.prefab +++ b/Assets/Supermarket Store/Prefabs/RackAssets/ChipsCane.prefab @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b923cf65430647e0c82278252fc7f9505c6b929e50749fff31a869e3f2326fcd +oid sha256:55550965c71baa76e6fbf379c76275d916efab94291070f5617fb4d343f05862 size 24665 diff --git a/Assets/Supermarket Store/Prefabs/RackAssets/ChocoBar.prefab b/Assets/Supermarket Store/Prefabs/RackAssets/ChocoBar.prefab index 1fa7a511..27f29cc9 100644 --- a/Assets/Supermarket Store/Prefabs/RackAssets/ChocoBar.prefab +++ b/Assets/Supermarket Store/Prefabs/RackAssets/ChocoBar.prefab @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8e479e8c5dfe6d0d76b52739d28d05d670e42ba1c3a1c4c90cbc2b2d8fa947a8 +oid sha256:9b92f0babeb1e736bbafb460b52821e8fdb8d797a6a1bd3e8103d3c93db40699 size 25776 diff --git a/Assets/Supermarket Store/Prefabs/ShoppingCart.prefab b/Assets/Supermarket Store/Prefabs/ShoppingCart.prefab index b134921b..92a20c94 100644 --- a/Assets/Supermarket Store/Prefabs/ShoppingCart.prefab +++ b/Assets/Supermarket Store/Prefabs/ShoppingCart.prefab @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:30c43ad86bff09d399757709d62bc3ba562b81b28aced082d9432c850d9df990 -size 30592 +oid sha256:0df483273974c0057d94e49057cd7cd83043b933ef0807ea94922a199b73fc79 +size 38304