From 7fa848a063a377c491c109966a9c59fcaed59732 Mon Sep 17 00:00:00 2001 From: HaeinLEE Date: Tue, 13 May 2025 17:35:54 +0900 Subject: [PATCH] =?UTF-8?q?[Feat]=20switching=20=EB=A1=9C=EB=94=A9?= =?UTF-8?q?=ED=8C=A8=EB=84=90=EC=97=90=20=EC=95=A0=EB=8B=88=EB=A9=94?= =?UTF-8?q?=EC=9D=B4=EC=85=98=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../.idea/.gitignore | 13 ++ .../.idea/indexLayout.xml | 8 ++ .../Scripts/UI/SwitchingPanelController.cs | 10 ++ Assets/LIN/Sprites/timer_background.png | 3 + Assets/LIN/Sprites/timer_background.png.meta | 114 ++++++++++++++++++ Assets/LIN/Sprites/timer_cap.png | 3 + Assets/LIN/Sprites/timer_cap.png.meta | 114 ++++++++++++++++++ .../Prefabs/ReHousing/SwitchingImage.prefab | 3 - .../Prefabs/ReHousing/SwitchingPanel.prefab | 3 + ...prefab.meta => SwitchingPanel.prefab.meta} | 0 10 files changed, 268 insertions(+), 3 deletions(-) create mode 100644 .idea/.idea.Degulleo3DReworkLoadingAnim/.idea/.gitignore create mode 100644 .idea/.idea.Degulleo3DReworkLoadingAnim/.idea/indexLayout.xml create mode 100644 Assets/LIN/Sprites/timer_background.png create mode 100644 Assets/LIN/Sprites/timer_background.png.meta create mode 100644 Assets/LIN/Sprites/timer_cap.png create mode 100644 Assets/LIN/Sprites/timer_cap.png.meta delete mode 100644 Assets/Prefabs/ReHousing/SwitchingImage.prefab create mode 100644 Assets/Prefabs/ReHousing/SwitchingPanel.prefab rename Assets/Prefabs/ReHousing/{SwitchingImage.prefab.meta => SwitchingPanel.prefab.meta} (100%) diff --git a/.idea/.idea.Degulleo3DReworkLoadingAnim/.idea/.gitignore b/.idea/.idea.Degulleo3DReworkLoadingAnim/.idea/.gitignore new file mode 100644 index 00000000..b52ee01b --- /dev/null +++ b/.idea/.idea.Degulleo3DReworkLoadingAnim/.idea/.gitignore @@ -0,0 +1,13 @@ +# 디폴트 무시된 파일 +/shelf/ +/workspace.xml +# Rider에서 무시된 파일 +/contentModel.xml +/modules.xml +/projectSettingsUpdater.xml +/.idea.Degulleo3DReworkLoadingAnim.iml +# 에디터 기반 HTTP 클라이언트 요청 +/httpRequests/ +# Datasource local storage ignored files +/dataSources/ +/dataSources.local.xml diff --git a/.idea/.idea.Degulleo3DReworkLoadingAnim/.idea/indexLayout.xml b/.idea/.idea.Degulleo3DReworkLoadingAnim/.idea/indexLayout.xml new file mode 100644 index 00000000..7b08163c --- /dev/null +++ b/.idea/.idea.Degulleo3DReworkLoadingAnim/.idea/indexLayout.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file 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..c77fbbca --- /dev/null +++ b/Assets/LIN/Sprites/timer_background.png.meta @@ -0,0 +1,114 @@ +fileFormatVersion: 2 +guid: 25d385b74dbb0854ea5a43aa2a866dec +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..99402e46 --- /dev/null +++ b/Assets/LIN/Sprites/timer_cap.png.meta @@ -0,0 +1,114 @@ +fileFormatVersion: 2 +guid: 24ebaef40306b434faaf6abfafa8a598 +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/SwitchingImage.prefab b/Assets/Prefabs/ReHousing/SwitchingImage.prefab deleted file mode 100644 index e4eba114..00000000 --- a/Assets/Prefabs/ReHousing/SwitchingImage.prefab +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f797bcff534783fd29d1e08550581ce53c8e270ab0456293948842f131868957 -size 9083 diff --git a/Assets/Prefabs/ReHousing/SwitchingPanel.prefab b/Assets/Prefabs/ReHousing/SwitchingPanel.prefab new file mode 100644 index 00000000..53122568 --- /dev/null +++ b/Assets/Prefabs/ReHousing/SwitchingPanel.prefab @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a21ed3e409b502e0530cd1beba832e4a443774ab36476287ce7b44df9be7b006 +size 18186 diff --git a/Assets/Prefabs/ReHousing/SwitchingImage.prefab.meta b/Assets/Prefabs/ReHousing/SwitchingPanel.prefab.meta similarity index 100% rename from Assets/Prefabs/ReHousing/SwitchingImage.prefab.meta rename to Assets/Prefabs/ReHousing/SwitchingPanel.prefab.meta