From 19fb3ff6aaefff5516d5e56df9996c8063572ff2 Mon Sep 17 00:00:00 2001 From: "aube.lee" Date: Wed, 26 Feb 2025 12:22:28 +0900 Subject: [PATCH] =?UTF-8?q?feat:=20UI=20=EB=94=94=EC=9E=90=EC=9D=B8=20?= =?UTF-8?q?=EC=A0=81=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Gameton/Art/UI Image/ad_button2.png | 3 + .../Gameton/Art/UI Image/ad_button2.png.meta | 127 +++++++ .../Assets/Gameton/Art/UI Image/continue.png | 3 + .../Gameton/Art/UI Image/continue.png.meta | 127 +++++++ .../Gameton/Art/UI Image/continue_push.png | 3 + .../Art/UI Image/continue_push.png.meta | 127 +++++++ .../Assets/Gameton/Art/UI Image/ranking.png | 3 + .../Gameton/Art/UI Image/ranking.png.meta | 127 +++++++ .../Gameton/Art/UI Image/ranking_push.png | 3 + .../Art/UI Image/ranking_push.png.meta | 127 +++++++ .../Gameton/Art/UI Image/recharge_button.png | 3 + .../Art/UI Image/recharge_button.png.meta | 127 +++++++ .../Prefabs/Common Button/RetryButton.prefab | 6 +- .../Resources/UI/Prefabs/UI.GameOverUI.prefab | 312 +++++++++++++++- .../Resources/UI/Prefabs/UI.GameWinUI.prefab | 336 +++++++++++++++++- .../Resources/UI/Prefabs/UI.LobbyUI.prefab | 211 ++++++++++- .../Resources/UI/Prefabs/UI.OptionUI.prefab | 141 +++++--- .../Resources/UI/Prefabs/UI.PauseUI.prefab | 100 +++++- 18 files changed, 1807 insertions(+), 79 deletions(-) create mode 100644 Gameton-06/Assets/Gameton/Art/UI Image/ad_button2.png create mode 100644 Gameton-06/Assets/Gameton/Art/UI Image/ad_button2.png.meta create mode 100644 Gameton-06/Assets/Gameton/Art/UI Image/continue.png create mode 100644 Gameton-06/Assets/Gameton/Art/UI Image/continue.png.meta create mode 100644 Gameton-06/Assets/Gameton/Art/UI Image/continue_push.png create mode 100644 Gameton-06/Assets/Gameton/Art/UI Image/continue_push.png.meta create mode 100644 Gameton-06/Assets/Gameton/Art/UI Image/ranking.png create mode 100644 Gameton-06/Assets/Gameton/Art/UI Image/ranking.png.meta create mode 100644 Gameton-06/Assets/Gameton/Art/UI Image/ranking_push.png create mode 100644 Gameton-06/Assets/Gameton/Art/UI Image/ranking_push.png.meta create mode 100644 Gameton-06/Assets/Gameton/Art/UI Image/recharge_button.png create mode 100644 Gameton-06/Assets/Gameton/Art/UI Image/recharge_button.png.meta diff --git a/Gameton-06/Assets/Gameton/Art/UI Image/ad_button2.png b/Gameton-06/Assets/Gameton/Art/UI Image/ad_button2.png new file mode 100644 index 00000000..2eca826c --- /dev/null +++ b/Gameton-06/Assets/Gameton/Art/UI Image/ad_button2.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0804a77504ed89d3b52fffe62efe90b0f1df6948bd1cadef2814fd6765d801ae +size 266 diff --git a/Gameton-06/Assets/Gameton/Art/UI Image/ad_button2.png.meta b/Gameton-06/Assets/Gameton/Art/UI Image/ad_button2.png.meta new file mode 100644 index 00000000..c5d26bf0 --- /dev/null +++ b/Gameton-06/Assets/Gameton/Art/UI Image/ad_button2.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: 2a3e209be2a7e15459ea87cf5f85663b +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 + - serializedVersion: 3 + 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: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Gameton-06/Assets/Gameton/Art/UI Image/continue.png b/Gameton-06/Assets/Gameton/Art/UI Image/continue.png new file mode 100644 index 00000000..a8c4817d --- /dev/null +++ b/Gameton-06/Assets/Gameton/Art/UI Image/continue.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8cc97cbd788f2deeb43c527d728ab72663dd0c409f098a54b7e1b09f91242631 +size 349 diff --git a/Gameton-06/Assets/Gameton/Art/UI Image/continue.png.meta b/Gameton-06/Assets/Gameton/Art/UI Image/continue.png.meta new file mode 100644 index 00000000..758be950 --- /dev/null +++ b/Gameton-06/Assets/Gameton/Art/UI Image/continue.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: c792ed5e3103e37498a60162b116b4d4 +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 + - serializedVersion: 3 + 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: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Gameton-06/Assets/Gameton/Art/UI Image/continue_push.png b/Gameton-06/Assets/Gameton/Art/UI Image/continue_push.png new file mode 100644 index 00000000..18f6846e --- /dev/null +++ b/Gameton-06/Assets/Gameton/Art/UI Image/continue_push.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7fd652ada970be8a0b6b0014613875ed9f9c3cbceffca54eb6029f615f0618c0 +size 321 diff --git a/Gameton-06/Assets/Gameton/Art/UI Image/continue_push.png.meta b/Gameton-06/Assets/Gameton/Art/UI Image/continue_push.png.meta new file mode 100644 index 00000000..be0b27d0 --- /dev/null +++ b/Gameton-06/Assets/Gameton/Art/UI Image/continue_push.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: 0946270987dfe4844ae8d9030d680770 +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 + - serializedVersion: 3 + 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: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Gameton-06/Assets/Gameton/Art/UI Image/ranking.png b/Gameton-06/Assets/Gameton/Art/UI Image/ranking.png new file mode 100644 index 00000000..52e4d211 --- /dev/null +++ b/Gameton-06/Assets/Gameton/Art/UI Image/ranking.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a3cd3ef0259e522156ad2ca88c0aae3c893d0eb39025aa9a061d17147e2855ba +size 343 diff --git a/Gameton-06/Assets/Gameton/Art/UI Image/ranking.png.meta b/Gameton-06/Assets/Gameton/Art/UI Image/ranking.png.meta new file mode 100644 index 00000000..8dfa5eaa --- /dev/null +++ b/Gameton-06/Assets/Gameton/Art/UI Image/ranking.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: 060b5f2a38fe2dc4e826ec7e0cf6f207 +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 + - serializedVersion: 3 + 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: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Gameton-06/Assets/Gameton/Art/UI Image/ranking_push.png b/Gameton-06/Assets/Gameton/Art/UI Image/ranking_push.png new file mode 100644 index 00000000..5fbc5370 --- /dev/null +++ b/Gameton-06/Assets/Gameton/Art/UI Image/ranking_push.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e10a6d3b45a7b224bda37ed42f904aefc9f41d79c10f6ca7d7d2083a7e7009dc +size 323 diff --git a/Gameton-06/Assets/Gameton/Art/UI Image/ranking_push.png.meta b/Gameton-06/Assets/Gameton/Art/UI Image/ranking_push.png.meta new file mode 100644 index 00000000..34ffbb96 --- /dev/null +++ b/Gameton-06/Assets/Gameton/Art/UI Image/ranking_push.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: c9b68b7fe732b69469f8034f946dcee7 +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 + - serializedVersion: 3 + 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: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Gameton-06/Assets/Gameton/Art/UI Image/recharge_button.png b/Gameton-06/Assets/Gameton/Art/UI Image/recharge_button.png new file mode 100644 index 00000000..b00bbc02 --- /dev/null +++ b/Gameton-06/Assets/Gameton/Art/UI Image/recharge_button.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6c02e3a94dc2677b78f5ba6f9b408ee7db3915b9ccab2fb25922dfa27e63ee9c +size 256 diff --git a/Gameton-06/Assets/Gameton/Art/UI Image/recharge_button.png.meta b/Gameton-06/Assets/Gameton/Art/UI Image/recharge_button.png.meta new file mode 100644 index 00000000..dededa0c --- /dev/null +++ b/Gameton-06/Assets/Gameton/Art/UI Image/recharge_button.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: b98d1c80bf77f2140ab377494aca3eca +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 + - serializedVersion: 3 + 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: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/Common Button/RetryButton.prefab b/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/Common Button/RetryButton.prefab index 49940357..2f2cf29b 100644 --- a/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/Common Button/RetryButton.prefab +++ b/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/Common Button/RetryButton.prefab @@ -268,14 +268,14 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.6037736, g: 0.6037736, b: 0.6037736, a: 1} + m_Color: {r: 1, g: 0.9764151, b: 0.9764151, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 0} + m_Sprite: {fileID: 21300000, guid: 28b266cfd2f9b424886bb59e829c4f86, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -556,6 +556,6 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: -10} m_SizeDelta: {x: 60, y: 50} m_Pivot: {x: 1, y: 0.5} diff --git a/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/UI.GameOverUI.prefab b/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/UI.GameOverUI.prefab index b0442013..6cbc8d08 100644 --- a/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/UI.GameOverUI.prefab +++ b/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/UI.GameOverUI.prefab @@ -191,7 +191,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: -100} + m_AnchoredPosition: {x: 0, y: -180} m_SizeDelta: {x: 0, y: 120} m_Pivot: {x: 0.5, y: 1} --- !u!222 &5455828379085399267 @@ -231,8 +231,8 @@ MonoBehaviour: m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4278190080 - m_fontColor: {r: 0, g: 0, b: 0, a: 1} + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -434,7 +434,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 0} + m_Sprite: {fileID: 21300000, guid: d760a0797ff5f944d91cb5fa7ceeda4c, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -516,18 +516,254 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 6219218969724791845} m_Modifications: + - target: {fileID: 246481818441231560, guid: 2d44c81128276784fb0eb99899564f21, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: b98d1c80bf77f2140ab377494aca3eca, type: 3} + - target: {fileID: 246481818441231560, guid: 2d44c81128276784fb0eb99899564f21, type: 3} + propertyPath: m_Color.b + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 246481818441231560, guid: 2d44c81128276784fb0eb99899564f21, type: 3} + propertyPath: m_Color.g + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 246481818441231560, guid: 2d44c81128276784fb0eb99899564f21, type: 3} + propertyPath: m_Color.r + value: 1 + objectReference: {fileID: 0} - target: {fileID: 402912502388894867, guid: 2d44c81128276784fb0eb99899564f21, type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target value: objectReference: {fileID: 6052408660768764205} + - target: {fileID: 794245964940712043, guid: 2d44c81128276784fb0eb99899564f21, type: 3} + propertyPath: m_HorizontalAlignment + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 1436730112537106667, guid: 2d44c81128276784fb0eb99899564f21, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: d760a0797ff5f944d91cb5fa7ceeda4c, type: 3} + - target: {fileID: 1549689399514869068, guid: 2d44c81128276784fb0eb99899564f21, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1549689399514869068, guid: 2d44c81128276784fb0eb99899564f21, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1549689399514869068, guid: 2d44c81128276784fb0eb99899564f21, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1549689399514869068, guid: 2d44c81128276784fb0eb99899564f21, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1785022472181068078, guid: 2d44c81128276784fb0eb99899564f21, type: 3} + propertyPath: m_SizeDelta.x + value: -35 + objectReference: {fileID: 0} + - target: {fileID: 1785022472181068078, guid: 2d44c81128276784fb0eb99899564f21, type: 3} + propertyPath: m_AnchoredPosition.x + value: -7.5 + objectReference: {fileID: 0} + - target: {fileID: 1861742913930843804, guid: 2d44c81128276784fb0eb99899564f21, type: 3} + propertyPath: m_Type + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1861742913930843804, guid: 2d44c81128276784fb0eb99899564f21, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 5e69cabca1c1dc646a2482d03818c73c, type: 3} + - target: {fileID: 2242981177223311762, guid: 2d44c81128276784fb0eb99899564f21, type: 3} + propertyPath: m_Pivot.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2242981177223311762, guid: 2d44c81128276784fb0eb99899564f21, type: 3} + propertyPath: m_Pivot.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2242981177223311762, guid: 2d44c81128276784fb0eb99899564f21, type: 3} + propertyPath: m_SizeDelta.x + value: 100 + objectReference: {fileID: 0} + - target: {fileID: 2242981177223311762, guid: 2d44c81128276784fb0eb99899564f21, type: 3} + propertyPath: m_SizeDelta.y + value: 100 + objectReference: {fileID: 0} + - target: {fileID: 2242981177223311762, guid: 2d44c81128276784fb0eb99899564f21, type: 3} + propertyPath: m_AnchoredPosition.x + value: 10 + objectReference: {fileID: 0} + - target: {fileID: 2242981177223311762, guid: 2d44c81128276784fb0eb99899564f21, type: 3} + propertyPath: m_AnchoredPosition.y + value: 10 + objectReference: {fileID: 0} + - target: {fileID: 2257186861593382155, guid: 2d44c81128276784fb0eb99899564f21, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 3512de9d1b6b4394e9c7707d698f8d9d, type: 3} + - target: {fileID: 3192504945255333577, guid: 2d44c81128276784fb0eb99899564f21, type: 3} + propertyPath: m_HorizontalAlignment + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3672958874907036809, guid: 2d44c81128276784fb0eb99899564f21, type: 3} + propertyPath: m_Transition + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3672958874907036809, guid: 2d44c81128276784fb0eb99899564f21, type: 3} + propertyPath: m_SpriteState.m_PressedSprite + value: + objectReference: {fileID: 21300000, guid: 04c2e0596725d4f4092cabf1c670614f, type: 3} + - target: {fileID: 3672958874907036809, guid: 2d44c81128276784fb0eb99899564f21, type: 3} + propertyPath: m_SpriteState.m_DisabledSprite + value: + objectReference: {fileID: 21300000, guid: 5e69cabca1c1dc646a2482d03818c73c, type: 3} + - target: {fileID: 3672958874907036809, guid: 2d44c81128276784fb0eb99899564f21, type: 3} + propertyPath: m_SpriteState.m_SelectedSprite + value: + objectReference: {fileID: 21300000, guid: 5e69cabca1c1dc646a2482d03818c73c, type: 3} + - target: {fileID: 3672958874907036809, guid: 2d44c81128276784fb0eb99899564f21, type: 3} + propertyPath: m_SpriteState.m_HighlightedSprite + value: + objectReference: {fileID: 21300000, guid: 5e69cabca1c1dc646a2482d03818c73c, type: 3} - target: {fileID: 3672958874907036809, guid: 2d44c81128276784fb0eb99899564f21, type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target value: objectReference: {fileID: 6052408660768764205} + - target: {fileID: 3699579080123267124, guid: 2d44c81128276784fb0eb99899564f21, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 2a3e209be2a7e15459ea87cf5f85663b, type: 3} + - target: {fileID: 3699579080123267124, guid: 2d44c81128276784fb0eb99899564f21, type: 3} + propertyPath: m_Color.b + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3699579080123267124, guid: 2d44c81128276784fb0eb99899564f21, type: 3} + propertyPath: m_Color.g + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3699579080123267124, guid: 2d44c81128276784fb0eb99899564f21, type: 3} + propertyPath: m_Color.r + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3804954890496141361, guid: 2d44c81128276784fb0eb99899564f21, type: 3} + propertyPath: m_SizeDelta.x + value: -35 + objectReference: {fileID: 0} + - target: {fileID: 3804954890496141361, guid: 2d44c81128276784fb0eb99899564f21, type: 3} + propertyPath: m_AnchoredPosition.x + value: -7.5 + objectReference: {fileID: 0} + - target: {fileID: 3856723725386980953, guid: 2d44c81128276784fb0eb99899564f21, type: 3} + propertyPath: m_AnchoredPosition.x + value: 25 + objectReference: {fileID: 0} + - target: {fileID: 4432629629121045589, guid: 2d44c81128276784fb0eb99899564f21, type: 3} + propertyPath: m_AnchoredPosition.y + value: -110 + objectReference: {fileID: 0} + - target: {fileID: 4920630151240741887, guid: 2d44c81128276784fb0eb99899564f21, type: 3} + propertyPath: m_SizeDelta.x + value: 50 + objectReference: {fileID: 0} + - target: {fileID: 4920630151240741887, guid: 2d44c81128276784fb0eb99899564f21, type: 3} + propertyPath: m_SizeDelta.y + value: 50 + objectReference: {fileID: 0} + - target: {fileID: 5095632286367331797, guid: 2d44c81128276784fb0eb99899564f21, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5095632286367331797, guid: 2d44c81128276784fb0eb99899564f21, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5095632286367331797, guid: 2d44c81128276784fb0eb99899564f21, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5095632286367331797, guid: 2d44c81128276784fb0eb99899564f21, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5467912925671892954, guid: 2d44c81128276784fb0eb99899564f21, type: 3} + propertyPath: m_SizeDelta.x + value: -35 + objectReference: {fileID: 0} + - target: {fileID: 5467912925671892954, guid: 2d44c81128276784fb0eb99899564f21, type: 3} + propertyPath: m_AnchoredPosition.x + value: -7.5 + objectReference: {fileID: 0} + - target: {fileID: 5518467409582749611, guid: 2d44c81128276784fb0eb99899564f21, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: b98d1c80bf77f2140ab377494aca3eca, type: 3} + - target: {fileID: 5518467409582749611, guid: 2d44c81128276784fb0eb99899564f21, type: 3} + propertyPath: m_Color.b + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5518467409582749611, guid: 2d44c81128276784fb0eb99899564f21, type: 3} + propertyPath: m_Color.g + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5518467409582749611, guid: 2d44c81128276784fb0eb99899564f21, type: 3} + propertyPath: m_Color.r + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5796256256971116357, guid: 2d44c81128276784fb0eb99899564f21, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5796256256971116357, guid: 2d44c81128276784fb0eb99899564f21, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5796256256971116357, guid: 2d44c81128276784fb0eb99899564f21, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5796256256971116357, guid: 2d44c81128276784fb0eb99899564f21, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5839110261931200977, guid: 2d44c81128276784fb0eb99899564f21, type: 3} + propertyPath: m_SizeDelta.x + value: 50 + objectReference: {fileID: 0} + - target: {fileID: 5839110261931200977, guid: 2d44c81128276784fb0eb99899564f21, type: 3} + propertyPath: m_SizeDelta.y + value: 50 + objectReference: {fileID: 0} - target: {fileID: 6116023833204837588, guid: 2d44c81128276784fb0eb99899564f21, type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target value: objectReference: {fileID: 6052408660768764205} + - target: {fileID: 6216152695498325825, guid: 2d44c81128276784fb0eb99899564f21, type: 3} + propertyPath: m_HorizontalAlignment + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 6389698515160094263, guid: 2d44c81128276784fb0eb99899564f21, type: 3} + propertyPath: m_SizeDelta.x + value: 50 + objectReference: {fileID: 0} + - target: {fileID: 6389698515160094263, guid: 2d44c81128276784fb0eb99899564f21, type: 3} + propertyPath: m_SizeDelta.y + value: 50 + objectReference: {fileID: 0} + - target: {fileID: 7426328563346280442, guid: 2d44c81128276784fb0eb99899564f21, type: 3} + propertyPath: m_HorizontalAlignment + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 7624057330393836039, guid: 2d44c81128276784fb0eb99899564f21, type: 3} + propertyPath: m_SizeDelta.x + value: -35 + objectReference: {fileID: 0} + - target: {fileID: 7624057330393836039, guid: 2d44c81128276784fb0eb99899564f21, type: 3} + propertyPath: m_AnchoredPosition.x + value: -7.5 + objectReference: {fileID: 0} - target: {fileID: 7651361864453505488, guid: 2d44c81128276784fb0eb99899564f21, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -608,10 +844,42 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 7904471239220862428, guid: 2d44c81128276784fb0eb99899564f21, type: 3} + propertyPath: m_fontSize + value: 42 + objectReference: {fileID: 0} + - target: {fileID: 7904471239220862428, guid: 2d44c81128276784fb0eb99899564f21, type: 3} + propertyPath: m_fontAsset + value: + objectReference: {fileID: 11400000, guid: 3116464c7616674448f2fb05b50bf91b, type: 2} + - target: {fileID: 7904471239220862428, guid: 2d44c81128276784fb0eb99899564f21, type: 3} + propertyPath: m_fontSizeBase + value: 42 + objectReference: {fileID: 0} + - target: {fileID: 7904471239220862428, guid: 2d44c81128276784fb0eb99899564f21, type: 3} + propertyPath: m_sharedMaterial + value: + objectReference: {fileID: -5364670637895760327, guid: 3116464c7616674448f2fb05b50bf91b, type: 2} + - target: {fileID: 7904471239220862428, guid: 2d44c81128276784fb0eb99899564f21, type: 3} + propertyPath: m_hasFontAssetChanged + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7918921319920736299, guid: 2d44c81128276784fb0eb99899564f21, type: 3} + propertyPath: m_SizeDelta.x + value: 50 + objectReference: {fileID: 0} + - target: {fileID: 7918921319920736299, guid: 2d44c81128276784fb0eb99899564f21, type: 3} + propertyPath: m_SizeDelta.y + value: 50 + objectReference: {fileID: 0} - target: {fileID: 8781420841271139302, guid: 2d44c81128276784fb0eb99899564f21, type: 3} propertyPath: m_Name value: UI.RechargeModal objectReference: {fileID: 0} + - target: {fileID: 8781420841271139302, guid: 2d44c81128276784fb0eb99899564f21, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: 9061853702595776447, guid: 2d44c81128276784fb0eb99899564f21, type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target value: @@ -753,10 +1021,46 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 4385301954289545436} m_Modifications: + - target: {fileID: 1772307645768026371, guid: ffb3a6e5566636947b80328e8c2b0a84, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: dc94514061a9a4548a89c01aed77e390, type: 3} + - target: {fileID: 1772307645768026371, guid: ffb3a6e5566636947b80328e8c2b0a84, type: 3} + propertyPath: m_Color.b + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1772307645768026371, guid: ffb3a6e5566636947b80328e8c2b0a84, type: 3} + propertyPath: m_Color.g + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1772307645768026371, guid: ffb3a6e5566636947b80328e8c2b0a84, type: 3} + propertyPath: m_Color.r + value: 1 + objectReference: {fileID: 0} - target: {fileID: 2959050394324341213, guid: ffb3a6e5566636947b80328e8c2b0a84, type: 3} propertyPath: m_text value: Home objectReference: {fileID: 0} + - target: {fileID: 3924096021625724153, guid: ffb3a6e5566636947b80328e8c2b0a84, type: 3} + propertyPath: m_Transition + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3924096021625724153, guid: ffb3a6e5566636947b80328e8c2b0a84, type: 3} + propertyPath: m_SpriteState.m_PressedSprite + value: + objectReference: {fileID: 21300000, guid: a4571d604c9a41944bf50a4f438b4ba8, type: 3} + - target: {fileID: 3924096021625724153, guid: ffb3a6e5566636947b80328e8c2b0a84, type: 3} + propertyPath: m_SpriteState.m_DisabledSprite + value: + objectReference: {fileID: 21300000, guid: dc94514061a9a4548a89c01aed77e390, type: 3} + - target: {fileID: 3924096021625724153, guid: ffb3a6e5566636947b80328e8c2b0a84, type: 3} + propertyPath: m_SpriteState.m_SelectedSprite + value: + objectReference: {fileID: 21300000, guid: dc94514061a9a4548a89c01aed77e390, type: 3} + - target: {fileID: 3924096021625724153, guid: ffb3a6e5566636947b80328e8c2b0a84, type: 3} + propertyPath: m_SpriteState.m_HighlightedSprite + value: + objectReference: {fileID: 21300000, guid: dc94514061a9a4548a89c01aed77e390, type: 3} - target: {fileID: 3924096021625724153, guid: ffb3a6e5566636947b80328e8c2b0a84, type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target value: diff --git a/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/UI.GameWinUI.prefab b/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/UI.GameWinUI.prefab index 6a26d586..359bda6c 100644 --- a/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/UI.GameWinUI.prefab +++ b/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/UI.GameWinUI.prefab @@ -34,7 +34,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: -100} + m_AnchoredPosition: {x: 0, y: -180} m_SizeDelta: {x: 0, y: 120} m_Pivot: {x: 0.5, y: 1} --- !u!222 &711880738575507552 @@ -74,8 +74,8 @@ MonoBehaviour: m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4278190080 - m_fontColor: {r: 0, g: 0, b: 0, a: 1} + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -166,9 +166,9 @@ RectTransform: m_Children: [] m_Father: {fileID: 5658636051620795267} 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 166.66666, y: -50} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2751382176233722607 @@ -225,7 +225,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &5658636051620795267 RectTransform: m_ObjectHideFlags: 0 @@ -308,7 +308,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} - m_AnchoredPosition: {x: 0, y: -50} + m_AnchoredPosition: {x: 0, y: 15} m_SizeDelta: {x: -300, y: 200} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &209346434847492026 @@ -383,7 +383,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: -200} + m_AnchoredPosition: {x: 0, y: -135} m_SizeDelta: {x: 300, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8814088337764190289 @@ -456,9 +456,9 @@ RectTransform: m_Children: [] m_Father: {fileID: 5658636051620795267} 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 283.3333, y: -50} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &539426218041914393 @@ -499,6 +499,81 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &1516306857119650150 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7380919440161512014} + - component: {fileID: 2683065080388328236} + - component: {fileID: 8623571119819932357} + m_Layer: 5 + m_Name: Ad icon + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7380919440161512014 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1516306857119650150} + 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: 3424995613435958743} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: 30, y: 0} + m_SizeDelta: {x: 50, y: 50} + m_Pivot: {x: 0, y: 0.5} +--- !u!222 &2683065080388328236 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1516306857119650150} + m_CullTransparentMesh: 1 +--- !u!114 &8623571119819932357 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1516306857119650150} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 3512de9d1b6b4394e9c7707d698f8d9d, 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!1 &4183783038133039772 GameObject: m_ObjectHideFlags: 0 @@ -569,7 +644,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 0} + m_Sprite: {fileID: 21300000, guid: d760a0797ff5f944d91cb5fa7ceeda4c, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -614,7 +689,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: 0, y: 30} + m_AnchoredPosition: {x: 0, y: 100} m_SizeDelta: {x: 0, y: 150} m_Pivot: {x: 0.5, y: 0} --- !u!1 &5529114822580807353 @@ -649,9 +724,9 @@ RectTransform: m_Children: [] m_Father: {fileID: 5658636051620795267} 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 50, y: -50} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4168202942415139985 @@ -849,6 +924,142 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: rechargeModal: {fileID: 1972388524902894549} +--- !u!1 &8534738795301660310 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1210120942033475722} + - component: {fileID: 8936891670283436626} + - component: {fileID: 7099139699412653814} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1210120942033475722 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8534738795301660310} + 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: 3424995613435958743} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 1, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: -80, y: 50} + m_Pivot: {x: 1, y: 0.5} +--- !u!222 &8936891670283436626 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8534738795301660310} + m_CullTransparentMesh: 1 +--- !u!114 &7099139699412653814 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8534738795301660310} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: 'double + + gold' + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 3116464c7616674448f2fb05b50bf91b, type: 2} + m_sharedMaterial: {fileID: -5364670637895760327, guid: 3116464c7616674448f2fb05b50bf91b, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 24 + m_fontSizeBase: 24 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} --- !u!1001 &685096132383014060 PrefabInstance: m_ObjectHideFlags: 0 @@ -857,10 +1068,46 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 7654468693448300772} m_Modifications: + - target: {fileID: 1772307645768026371, guid: ffb3a6e5566636947b80328e8c2b0a84, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: dc94514061a9a4548a89c01aed77e390, type: 3} + - target: {fileID: 1772307645768026371, guid: ffb3a6e5566636947b80328e8c2b0a84, type: 3} + propertyPath: m_Color.b + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1772307645768026371, guid: ffb3a6e5566636947b80328e8c2b0a84, type: 3} + propertyPath: m_Color.g + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1772307645768026371, guid: ffb3a6e5566636947b80328e8c2b0a84, type: 3} + propertyPath: m_Color.r + value: 1 + objectReference: {fileID: 0} - target: {fileID: 2959050394324341213, guid: ffb3a6e5566636947b80328e8c2b0a84, type: 3} propertyPath: m_text value: Home objectReference: {fileID: 0} + - target: {fileID: 3924096021625724153, guid: ffb3a6e5566636947b80328e8c2b0a84, type: 3} + propertyPath: m_Transition + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3924096021625724153, guid: ffb3a6e5566636947b80328e8c2b0a84, type: 3} + propertyPath: m_SpriteState.m_PressedSprite + value: + objectReference: {fileID: 21300000, guid: a4571d604c9a41944bf50a4f438b4ba8, type: 3} + - target: {fileID: 3924096021625724153, guid: ffb3a6e5566636947b80328e8c2b0a84, type: 3} + propertyPath: m_SpriteState.m_DisabledSprite + value: + objectReference: {fileID: 21300000, guid: dc94514061a9a4548a89c01aed77e390, type: 3} + - target: {fileID: 3924096021625724153, guid: ffb3a6e5566636947b80328e8c2b0a84, type: 3} + propertyPath: m_SpriteState.m_SelectedSprite + value: + objectReference: {fileID: 21300000, guid: dc94514061a9a4548a89c01aed77e390, type: 3} + - target: {fileID: 3924096021625724153, guid: ffb3a6e5566636947b80328e8c2b0a84, type: 3} + propertyPath: m_SpriteState.m_HighlightedSprite + value: + objectReference: {fileID: 21300000, guid: dc94514061a9a4548a89c01aed77e390, type: 3} - target: {fileID: 3924096021625724153, guid: ffb3a6e5566636947b80328e8c2b0a84, type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target value: @@ -1232,10 +1479,46 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 7654468693448300772} m_Modifications: + - target: {fileID: 1772307645768026371, guid: ffb3a6e5566636947b80328e8c2b0a84, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 8dcf3ce2c13b46740a8f553a3e66f4c0, type: 3} + - target: {fileID: 1772307645768026371, guid: ffb3a6e5566636947b80328e8c2b0a84, type: 3} + propertyPath: m_Color.b + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1772307645768026371, guid: ffb3a6e5566636947b80328e8c2b0a84, type: 3} + propertyPath: m_Color.g + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1772307645768026371, guid: ffb3a6e5566636947b80328e8c2b0a84, type: 3} + propertyPath: m_Color.r + value: 1 + objectReference: {fileID: 0} - target: {fileID: 2959050394324341213, guid: ffb3a6e5566636947b80328e8c2b0a84, type: 3} propertyPath: m_text - value: Home + value: Gold X 2 objectReference: {fileID: 0} + - target: {fileID: 3924096021625724153, guid: ffb3a6e5566636947b80328e8c2b0a84, type: 3} + propertyPath: m_Transition + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3924096021625724153, guid: ffb3a6e5566636947b80328e8c2b0a84, type: 3} + propertyPath: m_SpriteState.m_PressedSprite + value: + objectReference: {fileID: 21300000, guid: 10480026ec0d5034880fb137839b53ef, type: 3} + - target: {fileID: 3924096021625724153, guid: ffb3a6e5566636947b80328e8c2b0a84, type: 3} + propertyPath: m_SpriteState.m_DisabledSprite + value: + objectReference: {fileID: 21300000, guid: 8dcf3ce2c13b46740a8f553a3e66f4c0, type: 3} + - target: {fileID: 3924096021625724153, guid: ffb3a6e5566636947b80328e8c2b0a84, type: 3} + propertyPath: m_SpriteState.m_SelectedSprite + value: + objectReference: {fileID: 21300000, guid: 8dcf3ce2c13b46740a8f553a3e66f4c0, type: 3} + - target: {fileID: 3924096021625724153, guid: ffb3a6e5566636947b80328e8c2b0a84, type: 3} + propertyPath: m_SpriteState.m_HighlightedSprite + value: + objectReference: {fileID: 21300000, guid: 8dcf3ce2c13b46740a8f553a3e66f4c0, type: 3} - target: {fileID: 3924096021625724153, guid: ffb3a6e5566636947b80328e8c2b0a84, type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target value: @@ -1252,6 +1535,10 @@ PrefabInstance: propertyPath: m_Name value: Ad Button objectReference: {fileID: 0} + - target: {fileID: 5145976964309320401, guid: ffb3a6e5566636947b80328e8c2b0a84, type: 3} + propertyPath: m_SizeDelta.x + value: 200 + objectReference: {fileID: 0} - target: {fileID: 5490627752139354865, guid: ffb3a6e5566636947b80328e8c2b0a84, type: 3} propertyPath: m_Pivot.x value: 1 @@ -1334,7 +1621,13 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] - m_AddedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 5145976964309320401, guid: ffb3a6e5566636947b80328e8c2b0a84, type: 3} + insertIndex: -1 + addedObject: {fileID: 7380919440161512014} + - targetCorrespondingSourceObject: {fileID: 5145976964309320401, guid: ffb3a6e5566636947b80328e8c2b0a84, type: 3} + insertIndex: -1 + addedObject: {fileID: 1210120942033475722} m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: ffb3a6e5566636947b80328e8c2b0a84, type: 3} --- !u!224 &2652771142115649015 stripped @@ -1342,3 +1635,8 @@ RectTransform: m_CorrespondingSourceObject: {fileID: 5490627752139354865, guid: ffb3a6e5566636947b80328e8c2b0a84, type: 3} m_PrefabInstance: {fileID: 7557648848435222278} m_PrefabAsset: {fileID: 0} +--- !u!224 &3424995613435958743 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 5145976964309320401, guid: ffb3a6e5566636947b80328e8c2b0a84, type: 3} + m_PrefabInstance: {fileID: 7557648848435222278} + m_PrefabAsset: {fileID: 0} diff --git a/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/UI.LobbyUI.prefab b/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/UI.LobbyUI.prefab index e2683460..b69c8495 100644 --- a/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/UI.LobbyUI.prefab +++ b/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/UI.LobbyUI.prefab @@ -2379,6 +2379,126 @@ RectTransform: m_AnchoredPosition: {x: -10, y: 0} m_SizeDelta: {x: 80, y: 50} m_Pivot: {x: 1, y: 0.5} +--- !u!1 &4995537144516970256 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2703896683695017490} + - component: {fileID: 7223870744096005940} + - component: {fileID: 1252712799053612167} + - component: {fileID: 4020183437506060859} + m_Layer: 5 + m_Name: Rank Button + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2703896683695017490 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4995537144516970256} + 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: 905340339734798737} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 0, y: -50} + m_SizeDelta: {x: 120, y: 120} + m_Pivot: {x: 0.5, y: 1} +--- !u!222 &7223870744096005940 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4995537144516970256} + m_CullTransparentMesh: 1 +--- !u!114 &1252712799053612167 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4995537144516970256} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 060b5f2a38fe2dc4e826ec7e0cf6f207, 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 &4020183437506060859 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4995537144516970256} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 2 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 21300000, guid: 060b5f2a38fe2dc4e826ec7e0cf6f207, type: 3} + m_PressedSprite: {fileID: 21300000, guid: c9b68b7fe732b69469f8034f946dcee7, type: 3} + m_SelectedSprite: {fileID: 21300000, guid: 060b5f2a38fe2dc4e826ec7e0cf6f207, type: 3} + m_DisabledSprite: {fileID: 21300000, guid: 060b5f2a38fe2dc4e826ec7e0cf6f207, type: 3} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 1252712799053612167} + m_OnClick: + m_PersistentCalls: + m_Calls: [] --- !u!1 &5119398873303754634 GameObject: m_ObjectHideFlags: 0 @@ -3111,7 +3231,8 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 2703896683695017490} m_Father: {fileID: 3280644615170995712} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -5384,6 +5505,22 @@ PrefabInstance: propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target value: objectReference: {fileID: 0} + - target: {fileID: 1052716525872595245, guid: 337e10d50a493a74f9362a255e6df564, type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 1052716525872595245, guid: 337e10d50a493a74f9362a255e6df564, type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 1052716525872595245, guid: 337e10d50a493a74f9362a255e6df564, type: 3} + propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 1052716525872595245, guid: 337e10d50a493a74f9362a255e6df564, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 1252597083677857153, guid: 337e10d50a493a74f9362a255e6df564, type: 3} propertyPath: m_Pivot.x value: 0 @@ -5464,6 +5601,34 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 1291051461726293967, guid: 337e10d50a493a74f9362a255e6df564, type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 1291051461726293967, guid: 337e10d50a493a74f9362a255e6df564, type: 3} + propertyPath: m_AnchorMin.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1291051461726293967, guid: 337e10d50a493a74f9362a255e6df564, type: 3} + propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 1291051461726293967, guid: 337e10d50a493a74f9362a255e6df564, type: 3} + propertyPath: m_SizeDelta.x + value: 100 + objectReference: {fileID: 0} + - target: {fileID: 1291051461726293967, guid: 337e10d50a493a74f9362a255e6df564, type: 3} + propertyPath: m_SizeDelta.y + value: 80 + objectReference: {fileID: 0} + - target: {fileID: 1291051461726293967, guid: 337e10d50a493a74f9362a255e6df564, type: 3} + propertyPath: m_AnchoredPosition.x + value: -50 + objectReference: {fileID: 0} + - target: {fileID: 1369038594870352454, guid: 337e10d50a493a74f9362a255e6df564, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 2728462664568427272, guid: 337e10d50a493a74f9362a255e6df564, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -5492,6 +5657,10 @@ PrefabInstance: propertyPath: m_Name value: Heart Controller objectReference: {fileID: 0} + - target: {fileID: 5387242277701919627, guid: 337e10d50a493a74f9362a255e6df564, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 042147ed597077d428e0bfc7a9c418a3, type: 3} - target: {fileID: 6191435713966186740, guid: 337e10d50a493a74f9362a255e6df564, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -5540,6 +5709,46 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 8352075515778809451, guid: 337e10d50a493a74f9362a255e6df564, type: 3} + propertyPath: m_fontSize + value: 40 + objectReference: {fileID: 0} + - target: {fileID: 8352075515778809451, guid: 337e10d50a493a74f9362a255e6df564, type: 3} + propertyPath: m_fontAsset + value: + objectReference: {fileID: 11400000, guid: 3116464c7616674448f2fb05b50bf91b, type: 2} + - target: {fileID: 8352075515778809451, guid: 337e10d50a493a74f9362a255e6df564, type: 3} + propertyPath: m_fontSizeBase + value: 40 + objectReference: {fileID: 0} + - target: {fileID: 8352075515778809451, guid: 337e10d50a493a74f9362a255e6df564, type: 3} + propertyPath: m_sharedMaterial + value: + objectReference: {fileID: -5364670637895760327, guid: 3116464c7616674448f2fb05b50bf91b, type: 2} + - target: {fileID: 8352075515778809451, guid: 337e10d50a493a74f9362a255e6df564, type: 3} + propertyPath: m_VerticalAlignment + value: 4096 + objectReference: {fileID: 0} + - target: {fileID: 8352075515778809451, guid: 337e10d50a493a74f9362a255e6df564, type: 3} + propertyPath: m_hasFontAssetChanged + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8590572366810970214, guid: 337e10d50a493a74f9362a255e6df564, type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 8590572366810970214, guid: 337e10d50a493a74f9362a255e6df564, type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 8590572366810970214, guid: 337e10d50a493a74f9362a255e6df564, type: 3} + propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 8590572366810970214, guid: 337e10d50a493a74f9362a255e6df564, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] diff --git a/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/UI.OptionUI.prefab b/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/UI.OptionUI.prefab index 20c9d925..194155f0 100644 --- a/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/UI.OptionUI.prefab +++ b/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/UI.OptionUI.prefab @@ -34,8 +34,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 25, y: 5} - m_SizeDelta: {x: 80, y: -10} + m_AnchoredPosition: {x: 25, y: 0} + m_SizeDelta: {x: 80, y: 0} m_Pivot: {x: 0, y: 0.5} --- !u!222 &2681826212309937980 CanvasRenderer: @@ -148,7 +148,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 180, y: 90} + m_SizeDelta: {x: 250, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7587492074973768813 CanvasRenderer: @@ -178,7 +178,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: -4802492265496317460, guid: 3316aabd5dd7e2743ad1214e35350560, type: 3} + m_Sprite: {fileID: 21300000, guid: 042147ed597077d428e0bfc7a9c418a3, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -220,10 +220,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 4950687460265832273} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 1, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -65, y: 5} - m_SizeDelta: {x: 100, y: -10} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 1, y: 0.5} + m_AnchoredPosition: {x: 27.5, y: 0} + m_SizeDelta: {x: -105, y: 90} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3716471423665746930 CanvasRenderer: @@ -255,8 +255,8 @@ MonoBehaviour: m_Calls: [] m_text: 0 m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontAsset: {fileID: 11400000, guid: 3116464c7616674448f2fb05b50bf91b, type: 2} + m_sharedMaterial: {fileID: -5364670637895760327, guid: 3116464c7616674448f2fb05b50bf91b, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -280,14 +280,14 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 20 - m_fontSizeBase: 20 + m_fontSize: 32 + m_fontSizeBase: 32 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 m_fontSizeMax: 72 m_fontStyle: 0 - m_HorizontalAlignment: 2 + m_HorizontalAlignment: 4 m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 @@ -349,15 +349,15 @@ RectTransform: m_GameObject: {fileID: 4515136283427101088} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 2, y: 2, z: 0} + m_LocalScale: {x: 1, y: 1, z: 0} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 5842397375322101965} + m_Father: {fileID: 644337214924361488} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 1, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 100, y: 0} - m_SizeDelta: {x: 100, y: 0} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 1, y: 0.5} + m_AnchoredPosition: {x: 27.5, y: 0} + m_SizeDelta: {x: -105, y: 90} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6924833374851718585 CanvasRenderer: @@ -389,8 +389,8 @@ MonoBehaviour: m_Calls: [] m_text: 0 m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontAsset: {fileID: 11400000, guid: 3116464c7616674448f2fb05b50bf91b, type: 2} + m_sharedMaterial: {fileID: -5364670637895760327, guid: 3116464c7616674448f2fb05b50bf91b, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -414,14 +414,14 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 20 - m_fontSizeBase: 20 + m_fontSize: 32 + m_fontSizeBase: 32 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 m_fontSizeMax: 72 m_fontStyle: 0 - m_HorizontalAlignment: 2 + m_HorizontalAlignment: 4 m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 @@ -492,10 +492,10 @@ RectTransform: - {fileID: 4047522518680092082} m_Father: {fileID: 5857252250657883994} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 1, y: 0.5} + m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} m_AnchoredPosition: {x: -80, y: 0} - m_SizeDelta: {x: 550, y: 100} + m_SizeDelta: {x: -1080, y: 100} m_Pivot: {x: 1, y: 0.5} --- !u!114 &5021670431844709229 MonoBehaviour: @@ -515,7 +515,7 @@ MonoBehaviour: m_Top: 0 m_Bottom: 0 m_ChildAlignment: 5 - m_Spacing: 0 + m_Spacing: 10 m_ChildForceExpandWidth: 0 m_ChildForceExpandHeight: 1 m_ChildControlWidth: 0 @@ -552,14 +552,13 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.5, y: 0.5, z: 0.5} m_ConstrainProportionsScale: 1 - m_Children: - - {fileID: 1437921657760806965} + m_Children: [] m_Father: {fileID: 644337214924361488} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 25, y: 5} - m_SizeDelta: {x: 80, y: -10} + m_AnchoredPosition: {x: 25, y: 0} + m_SizeDelta: {x: 80, y: 0} m_Pivot: {x: 0, y: 0.5} --- !u!222 &9129194075171990163 CanvasRenderer: @@ -750,12 +749,13 @@ RectTransform: m_ConstrainProportionsScale: 1 m_Children: - {fileID: 5842397375322101965} + - {fileID: 1437921657760806965} m_Father: {fileID: 7880194785073738049} 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: 180, y: 90} + m_SizeDelta: {x: 250, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5943371146499282711 CanvasRenderer: @@ -785,7 +785,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: -4802492265496317460, guid: 3316aabd5dd7e2743ad1214e35350560, type: 3} + m_Sprite: {fileID: 21300000, guid: 042147ed597077d428e0bfc7a9c418a3, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -899,22 +899,26 @@ PrefabInstance: propertyPath: m_ConstrainProportionsScale value: 1 objectReference: {fileID: 0} + - target: {fileID: 3903456431948242776, guid: 7841b45ffe1a21446a4f041cdae97841, type: 3} + propertyPath: m_TargetGraphic + value: + objectReference: {fileID: 6504139278206421611} - target: {fileID: 3903456431948242776, guid: 7841b45ffe1a21446a4f041cdae97841, type: 3} propertyPath: m_SpriteState.m_PressedSprite value: - objectReference: {fileID: -791917726251469851, guid: 236587ec711348a4792e0060efb1bf73, type: 3} + objectReference: {fileID: 21300000, guid: edd07526c89c96147bf11175323f20c5, type: 3} - target: {fileID: 3903456431948242776, guid: 7841b45ffe1a21446a4f041cdae97841, type: 3} propertyPath: m_SpriteState.m_DisabledSprite value: - objectReference: {fileID: 2587096180750765086, guid: 236587ec711348a4792e0060efb1bf73, type: 3} + objectReference: {fileID: 21300000, guid: 71ce80b79398a764d8c1f9b2354efa66, type: 3} - target: {fileID: 3903456431948242776, guid: 7841b45ffe1a21446a4f041cdae97841, type: 3} propertyPath: m_SpriteState.m_SelectedSprite value: - objectReference: {fileID: 2587096180750765086, guid: 236587ec711348a4792e0060efb1bf73, type: 3} + objectReference: {fileID: 21300000, guid: 71ce80b79398a764d8c1f9b2354efa66, type: 3} - target: {fileID: 3903456431948242776, guid: 7841b45ffe1a21446a4f041cdae97841, type: 3} propertyPath: m_SpriteState.m_HighlightedSprite value: - objectReference: {fileID: 2587096180750765086, guid: 236587ec711348a4792e0060efb1bf73, type: 3} + objectReference: {fileID: 21300000, guid: 71ce80b79398a764d8c1f9b2354efa66, type: 3} - target: {fileID: 3903456431948242776, guid: 7841b45ffe1a21446a4f041cdae97841, type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.size value: 1 @@ -946,7 +950,7 @@ PrefabInstance: - target: {fileID: 6464168096704815375, guid: 7841b45ffe1a21446a4f041cdae97841, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 2587096180750765086, guid: 236587ec711348a4792e0060efb1bf73, type: 3} + objectReference: {fileID: 21300000, guid: 71ce80b79398a764d8c1f9b2354efa66, type: 3} - target: {fileID: 7205833323206081477, guid: 7841b45ffe1a21446a4f041cdae97841, type: 3} propertyPath: m_Name value: PauseButton @@ -965,6 +969,17 @@ RectTransform: m_CorrespondingSourceObject: {fileID: 279568491784269283, guid: 7841b45ffe1a21446a4f041cdae97841, type: 3} m_PrefabInstance: {fileID: 285431655934995300} m_PrefabAsset: {fileID: 0} +--- !u!114 &6504139278206421611 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 6464168096704815375, guid: 7841b45ffe1a21446a4f041cdae97841, type: 3} + m_PrefabInstance: {fileID: 285431655934995300} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7491260442580799649} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &7491260442580799649 stripped GameObject: m_CorrespondingSourceObject: {fileID: 7205833323206081477, guid: 7841b45ffe1a21446a4f041cdae97841, type: 3} @@ -1074,22 +1089,26 @@ PrefabInstance: propertyPath: m_ConstrainProportionsScale value: 1 objectReference: {fileID: 0} + - target: {fileID: 3903456431948242776, guid: 7841b45ffe1a21446a4f041cdae97841, type: 3} + propertyPath: m_TargetGraphic + value: + objectReference: {fileID: 7097634411681919326} - target: {fileID: 3903456431948242776, guid: 7841b45ffe1a21446a4f041cdae97841, type: 3} propertyPath: m_SpriteState.m_PressedSprite value: - objectReference: {fileID: -6283286399761156809, guid: 236587ec711348a4792e0060efb1bf73, type: 3} + objectReference: {fileID: 21300000, guid: 69047be32315ea149a5b440f1b15ef92, type: 3} - target: {fileID: 3903456431948242776, guid: 7841b45ffe1a21446a4f041cdae97841, type: 3} propertyPath: m_SpriteState.m_DisabledSprite value: - objectReference: {fileID: -2859934928298323863, guid: 236587ec711348a4792e0060efb1bf73, type: 3} + objectReference: {fileID: 21300000, guid: 2d3bac241e505f0478128fe0add4b4a1, type: 3} - target: {fileID: 3903456431948242776, guid: 7841b45ffe1a21446a4f041cdae97841, type: 3} propertyPath: m_SpriteState.m_SelectedSprite value: - objectReference: {fileID: -2859934928298323863, guid: 236587ec711348a4792e0060efb1bf73, type: 3} + objectReference: {fileID: 21300000, guid: 2d3bac241e505f0478128fe0add4b4a1, type: 3} - target: {fileID: 3903456431948242776, guid: 7841b45ffe1a21446a4f041cdae97841, type: 3} propertyPath: m_SpriteState.m_HighlightedSprite value: - objectReference: {fileID: -2859934928298323863, guid: 236587ec711348a4792e0060efb1bf73, type: 3} + objectReference: {fileID: 21300000, guid: 2d3bac241e505f0478128fe0add4b4a1, type: 3} - target: {fileID: 3903456431948242776, guid: 7841b45ffe1a21446a4f041cdae97841, type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.size value: 1 @@ -1121,7 +1140,7 @@ PrefabInstance: - target: {fileID: 6464168096704815375, guid: 7841b45ffe1a21446a4f041cdae97841, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: -2859934928298323863, guid: 236587ec711348a4792e0060efb1bf73, type: 3} + objectReference: {fileID: 21300000, guid: 2d3bac241e505f0478128fe0add4b4a1, type: 3} - target: {fileID: 7205833323206081477, guid: 7841b45ffe1a21446a4f041cdae97841, type: 3} propertyPath: m_Name value: SettingButton @@ -1141,6 +1160,17 @@ GameObject: m_CorrespondingSourceObject: {fileID: 7205833323206081477, guid: 7841b45ffe1a21446a4f041cdae97841, type: 3} m_PrefabInstance: {fileID: 4308408030432809041} m_PrefabAsset: {fileID: 0} +--- !u!114 &7097634411681919326 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 6464168096704815375, guid: 7841b45ffe1a21446a4f041cdae97841, type: 3} + m_PrefabInstance: {fileID: 4308408030432809041} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6902550915144592276} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1001 &4559579840849090302 PrefabInstance: m_ObjectHideFlags: 0 @@ -1245,22 +1275,26 @@ PrefabInstance: propertyPath: m_ConstrainProportionsScale value: 1 objectReference: {fileID: 0} + - target: {fileID: 3903456431948242776, guid: 7841b45ffe1a21446a4f041cdae97841, type: 3} + propertyPath: m_TargetGraphic + value: + objectReference: {fileID: 7418474322875348977} - target: {fileID: 3903456431948242776, guid: 7841b45ffe1a21446a4f041cdae97841, type: 3} propertyPath: m_SpriteState.m_PressedSprite value: - objectReference: {fileID: 4934064125454882497, guid: 236587ec711348a4792e0060efb1bf73, type: 3} + objectReference: {fileID: 21300000, guid: b747a62ee0fbf97479cb8d27409bbf63, type: 3} - target: {fileID: 3903456431948242776, guid: 7841b45ffe1a21446a4f041cdae97841, type: 3} propertyPath: m_SpriteState.m_DisabledSprite value: - objectReference: {fileID: 7477975601068189545, guid: 236587ec711348a4792e0060efb1bf73, type: 3} + objectReference: {fileID: 21300000, guid: c52c0c9097a89df4b80be0fed3fd3c2e, type: 3} - target: {fileID: 3903456431948242776, guid: 7841b45ffe1a21446a4f041cdae97841, type: 3} propertyPath: m_SpriteState.m_SelectedSprite value: - objectReference: {fileID: 7477975601068189545, guid: 236587ec711348a4792e0060efb1bf73, type: 3} + objectReference: {fileID: 21300000, guid: c52c0c9097a89df4b80be0fed3fd3c2e, type: 3} - target: {fileID: 3903456431948242776, guid: 7841b45ffe1a21446a4f041cdae97841, type: 3} propertyPath: m_SpriteState.m_HighlightedSprite value: - objectReference: {fileID: 7477975601068189545, guid: 236587ec711348a4792e0060efb1bf73, type: 3} + objectReference: {fileID: 21300000, guid: c52c0c9097a89df4b80be0fed3fd3c2e, type: 3} - target: {fileID: 3903456431948242776, guid: 7841b45ffe1a21446a4f041cdae97841, type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.size value: 1 @@ -1292,7 +1326,7 @@ PrefabInstance: - target: {fileID: 6464168096704815375, guid: 7841b45ffe1a21446a4f041cdae97841, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 7477975601068189545, guid: 236587ec711348a4792e0060efb1bf73, type: 3} + objectReference: {fileID: 21300000, guid: c52c0c9097a89df4b80be0fed3fd3c2e, type: 3} - target: {fileID: 7205833323206081477, guid: 7841b45ffe1a21446a4f041cdae97841, type: 3} propertyPath: m_Name value: InventoryButton @@ -1312,3 +1346,14 @@ GameObject: m_CorrespondingSourceObject: {fileID: 7205833323206081477, guid: 7841b45ffe1a21446a4f041cdae97841, type: 3} m_PrefabInstance: {fileID: 4559579840849090302} m_PrefabAsset: {fileID: 0} +--- !u!114 &7418474322875348977 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 6464168096704815375, guid: 7841b45ffe1a21446a4f041cdae97841, type: 3} + m_PrefabInstance: {fileID: 4559579840849090302} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6577123043410799931} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: diff --git a/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/UI.PauseUI.prefab b/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/UI.PauseUI.prefab index 87ec885f..d59028d4 100644 --- a/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/UI.PauseUI.prefab +++ b/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/UI.PauseUI.prefab @@ -68,7 +68,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 0} + m_Sprite: {fileID: 21300000, guid: d760a0797ff5f944d91cb5fa7ceeda4c, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -187,7 +187,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: -120} + m_AnchoredPosition: {x: 0, y: -180} m_SizeDelta: {x: 0, y: 120} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8159543166291025693 @@ -227,8 +227,8 @@ MonoBehaviour: m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4278190080 - m_fontColor: {r: 0, g: 0, b: 0, a: 1} + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -517,10 +517,46 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 5193992654960055226} m_Modifications: + - target: {fileID: 1772307645768026371, guid: ffb3a6e5566636947b80328e8c2b0a84, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: dc94514061a9a4548a89c01aed77e390, type: 3} + - target: {fileID: 1772307645768026371, guid: ffb3a6e5566636947b80328e8c2b0a84, type: 3} + propertyPath: m_Color.b + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1772307645768026371, guid: ffb3a6e5566636947b80328e8c2b0a84, type: 3} + propertyPath: m_Color.g + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1772307645768026371, guid: ffb3a6e5566636947b80328e8c2b0a84, type: 3} + propertyPath: m_Color.r + value: 1 + objectReference: {fileID: 0} - target: {fileID: 2959050394324341213, guid: ffb3a6e5566636947b80328e8c2b0a84, type: 3} propertyPath: m_text value: Home objectReference: {fileID: 0} + - target: {fileID: 3924096021625724153, guid: ffb3a6e5566636947b80328e8c2b0a84, type: 3} + propertyPath: m_Transition + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3924096021625724153, guid: ffb3a6e5566636947b80328e8c2b0a84, type: 3} + propertyPath: m_SpriteState.m_PressedSprite + value: + objectReference: {fileID: 21300000, guid: a4571d604c9a41944bf50a4f438b4ba8, type: 3} + - target: {fileID: 3924096021625724153, guid: ffb3a6e5566636947b80328e8c2b0a84, type: 3} + propertyPath: m_SpriteState.m_DisabledSprite + value: + objectReference: {fileID: 21300000, guid: dc94514061a9a4548a89c01aed77e390, type: 3} + - target: {fileID: 3924096021625724153, guid: ffb3a6e5566636947b80328e8c2b0a84, type: 3} + propertyPath: m_SpriteState.m_SelectedSprite + value: + objectReference: {fileID: 21300000, guid: dc94514061a9a4548a89c01aed77e390, type: 3} + - target: {fileID: 3924096021625724153, guid: ffb3a6e5566636947b80328e8c2b0a84, type: 3} + propertyPath: m_SpriteState.m_HighlightedSprite + value: + objectReference: {fileID: 21300000, guid: dc94514061a9a4548a89c01aed77e390, type: 3} - target: {fileID: 3924096021625724153, guid: ffb3a6e5566636947b80328e8c2b0a84, type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target value: @@ -711,6 +747,26 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 6080823142196262866, guid: 0e07e566979a34647848af731786bffa, type: 3} + propertyPath: m_Transition + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 6080823142196262866, guid: 0e07e566979a34647848af731786bffa, type: 3} + propertyPath: m_SpriteState.m_PressedSprite + value: + objectReference: {fileID: 21300000, guid: f1b61869ac048c1478f3b63c06e6ebdc, type: 3} + - target: {fileID: 6080823142196262866, guid: 0e07e566979a34647848af731786bffa, type: 3} + propertyPath: m_SpriteState.m_DisabledSprite + value: + objectReference: {fileID: 21300000, guid: 28b266cfd2f9b424886bb59e829c4f86, type: 3} + - target: {fileID: 6080823142196262866, guid: 0e07e566979a34647848af731786bffa, type: 3} + propertyPath: m_SpriteState.m_SelectedSprite + value: + objectReference: {fileID: 21300000, guid: 28b266cfd2f9b424886bb59e829c4f86, type: 3} + - target: {fileID: 6080823142196262866, guid: 0e07e566979a34647848af731786bffa, type: 3} + propertyPath: m_SpriteState.m_HighlightedSprite + value: + objectReference: {fileID: 21300000, guid: 28b266cfd2f9b424886bb59e829c4f86, type: 3} - target: {fileID: 6080823142196262866, guid: 0e07e566979a34647848af731786bffa, type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target value: @@ -932,6 +988,42 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 5193992654960055226} m_Modifications: + - target: {fileID: 1772307645768026371, guid: ffb3a6e5566636947b80328e8c2b0a84, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: c792ed5e3103e37498a60162b116b4d4, type: 3} + - target: {fileID: 1772307645768026371, guid: ffb3a6e5566636947b80328e8c2b0a84, type: 3} + propertyPath: m_Color.b + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1772307645768026371, guid: ffb3a6e5566636947b80328e8c2b0a84, type: 3} + propertyPath: m_Color.g + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1772307645768026371, guid: ffb3a6e5566636947b80328e8c2b0a84, type: 3} + propertyPath: m_Color.r + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3924096021625724153, guid: ffb3a6e5566636947b80328e8c2b0a84, type: 3} + propertyPath: m_Transition + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3924096021625724153, guid: ffb3a6e5566636947b80328e8c2b0a84, type: 3} + propertyPath: m_SpriteState.m_PressedSprite + value: + objectReference: {fileID: 21300000, guid: 0946270987dfe4844ae8d9030d680770, type: 3} + - target: {fileID: 3924096021625724153, guid: ffb3a6e5566636947b80328e8c2b0a84, type: 3} + propertyPath: m_SpriteState.m_DisabledSprite + value: + objectReference: {fileID: 21300000, guid: c792ed5e3103e37498a60162b116b4d4, type: 3} + - target: {fileID: 3924096021625724153, guid: ffb3a6e5566636947b80328e8c2b0a84, type: 3} + propertyPath: m_SpriteState.m_SelectedSprite + value: + objectReference: {fileID: 21300000, guid: c792ed5e3103e37498a60162b116b4d4, type: 3} + - target: {fileID: 3924096021625724153, guid: ffb3a6e5566636947b80328e8c2b0a84, type: 3} + propertyPath: m_SpriteState.m_HighlightedSprite + value: + objectReference: {fileID: 21300000, guid: c792ed5e3103e37498a60162b116b4d4, type: 3} - target: {fileID: 3924096021625724153, guid: ffb3a6e5566636947b80328e8c2b0a84, type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target value: