diff --git a/.idea/.idea.Degulleo3DLoadingAnim/.idea/.gitignore b/.idea/.idea.Degulleo3DLoadingAnim/.idea/.gitignore new file mode 100644 index 00000000..64e42c66 --- /dev/null +++ b/.idea/.idea.Degulleo3DLoadingAnim/.idea/.gitignore @@ -0,0 +1,13 @@ +# 디폴트 무시된 파일 +/shelf/ +/workspace.xml +# Rider에서 무시된 파일 +/projectSettingsUpdater.xml +/modules.xml +/.idea.Degulleo3DLoadingAnim.iml +/contentModel.xml +# 에디터 기반 HTTP 클라이언트 요청 +/httpRequests/ +# Datasource local storage ignored files +/dataSources/ +/dataSources.local.xml diff --git a/.idea/.idea.Degulleo3DLoadingAnim/.idea/indexLayout.xml b/.idea/.idea.Degulleo3DLoadingAnim/.idea/indexLayout.xml new file mode 100644 index 00000000..7b08163c --- /dev/null +++ b/.idea/.idea.Degulleo3DLoadingAnim/.idea/indexLayout.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/Assets/LIN/Prefabs/SwitchingImage.prefab.meta b/Assets/LIN/Prefabs/SwitchingImage.prefab.meta index c0548dcf..1b921f0b 100644 --- a/Assets/LIN/Prefabs/SwitchingImage.prefab.meta +++ b/Assets/LIN/Prefabs/SwitchingImage.prefab.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 5f886fa5087dfb04780f508410f72e46 +guid: 4d515e577b64ebf469f8a0a724ee6a33 PrefabImporter: externalObjects: {} userData: diff --git a/Assets/LIN/Scripts/UI/SwitchingPanelController.cs b/Assets/LIN/Scripts/UI/SwitchingPanelController.cs index a7da2979..ee4bf484 100644 --- a/Assets/LIN/Scripts/UI/SwitchingPanelController.cs +++ b/Assets/LIN/Scripts/UI/SwitchingPanelController.cs @@ -11,6 +11,11 @@ public class SwitchingPanelController : MonoBehaviour [SerializeField] private GameObject Loading_UI; [SerializeField] TMP_Text Loading_text; + [Header("애니메이션")] + [SerializeField] private Image fillImage; + [SerializeField] private Image headCapImage; + [SerializeField] private Image tailCapImage; + private CanvasGroup canvasGroup; private void Awake() @@ -44,6 +49,11 @@ public class SwitchingPanelController : MonoBehaviour percentage = Mathf.Lerp(percentage, async.progress * 100f, past_time); if(percentage >= 90) past_time = 0; } + + fillImage.fillAmount = percentage * 0.01f; + headCapImage.transform.localRotation = + Quaternion.Euler(new Vector3(0, 0, fillImage.fillAmount * -360)); + Loading_text.text = percentage.ToString("0") + "%"; //로딩 퍼센트 표기 } } diff --git a/Assets/LIN/Sprites/timer_background.png b/Assets/LIN/Sprites/timer_background.png new file mode 100644 index 00000000..c8d2bd02 --- /dev/null +++ b/Assets/LIN/Sprites/timer_background.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e2adac06dc72528b2f0dc21f57c0f5ceba418344a0e623e29b2995dcf7a36bdf +size 3895 diff --git a/Assets/LIN/Sprites/timer_background.png.meta b/Assets/LIN/Sprites/timer_background.png.meta new file mode 100644 index 00000000..64003dc1 --- /dev/null +++ b/Assets/LIN/Sprites/timer_background.png.meta @@ -0,0 +1,114 @@ +fileFormatVersion: 2 +guid: 47ae85ef42c2a0e4a8f6209fff427767 +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: 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: 3 + 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: 3 + 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: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/LIN/Sprites/timer_cap.png b/Assets/LIN/Sprites/timer_cap.png new file mode 100644 index 00000000..7a0a24ad --- /dev/null +++ b/Assets/LIN/Sprites/timer_cap.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cedc44c1f3a56a99828d9899d467204e5b6e2c97b578f2ffef048caa710247cc +size 360 diff --git a/Assets/LIN/Sprites/timer_cap.png.meta b/Assets/LIN/Sprites/timer_cap.png.meta new file mode 100644 index 00000000..074f1b96 --- /dev/null +++ b/Assets/LIN/Sprites/timer_cap.png.meta @@ -0,0 +1,114 @@ +fileFormatVersion: 2 +guid: 4f7534a1b757a524bbfb9911f5b89065 +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: 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: 3 + 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: 3 + 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: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/ReHousing/Canvas.prefab b/Assets/Prefabs/ReHousing/Canvas.prefab index 195c6435..2fb79961 100644 --- a/Assets/Prefabs/ReHousing/Canvas.prefab +++ b/Assets/Prefabs/ReHousing/Canvas.prefab @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b58d1e425ae623c58be2dc7e1b656e5b84cd237f9ddef335ca6240e3156fbee8 -size 122602 +oid sha256:c4bf65a14beae4402f9188d374922958ed64ea22facf5a4b5693e74f458e4ea3 +size 122703 diff --git a/Assets/Prefabs/ReHousing/SwitchingPanel.prefab b/Assets/Prefabs/ReHousing/SwitchingPanel.prefab new file mode 100644 index 00000000..f7d3c12a --- /dev/null +++ b/Assets/Prefabs/ReHousing/SwitchingPanel.prefab @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bb823d0d7a69d81d9dbcb1a4929709b2b6d2d84e2f34513a043172280ff5cf00 +size 18177 diff --git a/Assets/Prefabs/ReHousing/SwitchingPanel.prefab.meta b/Assets/Prefabs/ReHousing/SwitchingPanel.prefab.meta new file mode 100644 index 00000000..c0548dcf --- /dev/null +++ b/Assets/Prefabs/ReHousing/SwitchingPanel.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 5f886fa5087dfb04780f508410f72e46 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: