From f57b4758b956ef539b144d3dea5485c92589a075 Mon Sep 17 00:00:00 2001 From: "aube.lee" Date: Wed, 19 Feb 2025 11:25:40 +0900 Subject: [PATCH] =?UTF-8?q?feat:=20player=20icon=20load=20=EB=A1=9C?= =?UTF-8?q?=EC=A7=81=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Character Face.meta} | 2 +- .../Player/Character Face/Black_Angry.png | 3 + .../Character Face/Black_Angry.png.meta} | 28 +--- .../Character Face/Black_Idle.png} | 0 .../Character Face/Black_Idle.png.meta} | 28 +--- .../Player/Character Face/Black_Oh.png | 3 + .../Player/Character Face/Black_Oh.png.meta | 127 ++++++++++++++++++ .../Player/Character Face/Black_Sad.png | 3 + .../Player/Character Face/Black_Sad.png.meta | 127 ++++++++++++++++++ .../Player/Character Face/Black_Smile.png | 3 + .../Character Face/Black_Smile.png.meta | 127 ++++++++++++++++++ .../Player/Character Face/White_Angry.png | 3 + .../Character Face/White_Angry.png.meta | 127 ++++++++++++++++++ .../Character Face/White_Idle.png} | 0 .../Player/Character Face/White_Idle.png.meta | 127 ++++++++++++++++++ .../Player/Character Face/White_Oh.png | 3 + .../Player/Character Face/White_Oh.png.meta | 127 ++++++++++++++++++ .../Player/Character Face/White_Sad.png | 3 + .../Player/Character Face/White_Sad.png.meta | 127 ++++++++++++++++++ .../Player/Character Face/White_Smile.png | 3 + .../Character Face/White_Smile.png.meta | 127 ++++++++++++++++++ .../Gameton/Scripts/Common/AssetManager.cs | 13 +- .../Assets/Gameton/Scripts/UI/LobbyUI.cs | 2 +- 23 files changed, 1055 insertions(+), 58 deletions(-) rename Gameton-06/Assets/Gameton/Resources/{UI/Player.meta => Player/Character Face.meta} (77%) create mode 100644 Gameton-06/Assets/Gameton/Resources/Player/Character Face/Black_Angry.png rename Gameton-06/Assets/Gameton/Resources/{UI/Player/Black_Cat.png.meta => Player/Character Face/Black_Angry.png.meta} (79%) rename Gameton-06/Assets/Gameton/Resources/{UI/Player/Black_Cat.png => Player/Character Face/Black_Idle.png} (100%) rename Gameton-06/Assets/Gameton/Resources/{UI/Player/White_Cat.png.meta => Player/Character Face/Black_Idle.png.meta} (79%) create mode 100644 Gameton-06/Assets/Gameton/Resources/Player/Character Face/Black_Oh.png create mode 100644 Gameton-06/Assets/Gameton/Resources/Player/Character Face/Black_Oh.png.meta create mode 100644 Gameton-06/Assets/Gameton/Resources/Player/Character Face/Black_Sad.png create mode 100644 Gameton-06/Assets/Gameton/Resources/Player/Character Face/Black_Sad.png.meta create mode 100644 Gameton-06/Assets/Gameton/Resources/Player/Character Face/Black_Smile.png create mode 100644 Gameton-06/Assets/Gameton/Resources/Player/Character Face/Black_Smile.png.meta create mode 100644 Gameton-06/Assets/Gameton/Resources/Player/Character Face/White_Angry.png create mode 100644 Gameton-06/Assets/Gameton/Resources/Player/Character Face/White_Angry.png.meta rename Gameton-06/Assets/Gameton/Resources/{UI/Player/White_Cat.png => Player/Character Face/White_Idle.png} (100%) create mode 100644 Gameton-06/Assets/Gameton/Resources/Player/Character Face/White_Idle.png.meta create mode 100644 Gameton-06/Assets/Gameton/Resources/Player/Character Face/White_Oh.png create mode 100644 Gameton-06/Assets/Gameton/Resources/Player/Character Face/White_Oh.png.meta create mode 100644 Gameton-06/Assets/Gameton/Resources/Player/Character Face/White_Sad.png create mode 100644 Gameton-06/Assets/Gameton/Resources/Player/Character Face/White_Sad.png.meta create mode 100644 Gameton-06/Assets/Gameton/Resources/Player/Character Face/White_Smile.png create mode 100644 Gameton-06/Assets/Gameton/Resources/Player/Character Face/White_Smile.png.meta diff --git a/Gameton-06/Assets/Gameton/Resources/UI/Player.meta b/Gameton-06/Assets/Gameton/Resources/Player/Character Face.meta similarity index 77% rename from Gameton-06/Assets/Gameton/Resources/UI/Player.meta rename to Gameton-06/Assets/Gameton/Resources/Player/Character Face.meta index 366a4a96..a9d469b8 100644 --- a/Gameton-06/Assets/Gameton/Resources/UI/Player.meta +++ b/Gameton-06/Assets/Gameton/Resources/Player/Character Face.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 322ef63ec844c004da32db771f1a24b9 +guid: ed9d756744fb3da459caa9c0a384b452 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Gameton-06/Assets/Gameton/Resources/Player/Character Face/Black_Angry.png b/Gameton-06/Assets/Gameton/Resources/Player/Character Face/Black_Angry.png new file mode 100644 index 00000000..43e242ec --- /dev/null +++ b/Gameton-06/Assets/Gameton/Resources/Player/Character Face/Black_Angry.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e39e615f3c48513d7580a5f847c26caaccbd319543d11a6eea7905547373cdc7 +size 10526 diff --git a/Gameton-06/Assets/Gameton/Resources/UI/Player/Black_Cat.png.meta b/Gameton-06/Assets/Gameton/Resources/Player/Character Face/Black_Angry.png.meta similarity index 79% rename from Gameton-06/Assets/Gameton/Resources/UI/Player/Black_Cat.png.meta rename to Gameton-06/Assets/Gameton/Resources/Player/Character Face/Black_Angry.png.meta index 2f4eed84..78c9e4f9 100644 --- a/Gameton-06/Assets/Gameton/Resources/UI/Player/Black_Cat.png.meta +++ b/Gameton-06/Assets/Gameton/Resources/Player/Character Face/Black_Angry.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: a85895f4cc5fe1549821006bc05ec4b4 +guid: db2babac7f78ce3479df3e756de8d7e2 TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -93,19 +93,6 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: WebGL - 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 @@ -119,19 +106,6 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Windows Store Apps - 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: [] diff --git a/Gameton-06/Assets/Gameton/Resources/UI/Player/Black_Cat.png b/Gameton-06/Assets/Gameton/Resources/Player/Character Face/Black_Idle.png similarity index 100% rename from Gameton-06/Assets/Gameton/Resources/UI/Player/Black_Cat.png rename to Gameton-06/Assets/Gameton/Resources/Player/Character Face/Black_Idle.png diff --git a/Gameton-06/Assets/Gameton/Resources/UI/Player/White_Cat.png.meta b/Gameton-06/Assets/Gameton/Resources/Player/Character Face/Black_Idle.png.meta similarity index 79% rename from Gameton-06/Assets/Gameton/Resources/UI/Player/White_Cat.png.meta rename to Gameton-06/Assets/Gameton/Resources/Player/Character Face/Black_Idle.png.meta index c6f509c5..7f1a246e 100644 --- a/Gameton-06/Assets/Gameton/Resources/UI/Player/White_Cat.png.meta +++ b/Gameton-06/Assets/Gameton/Resources/Player/Character Face/Black_Idle.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: fc24fbd0976b9d747bc95814ad27b36a +guid: 3182ba9eb959496448df75ecd5cba377 TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -93,19 +93,6 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: WebGL - 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 @@ -119,19 +106,6 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Windows Store Apps - 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: [] diff --git a/Gameton-06/Assets/Gameton/Resources/Player/Character Face/Black_Oh.png b/Gameton-06/Assets/Gameton/Resources/Player/Character Face/Black_Oh.png new file mode 100644 index 00000000..b0cedbc2 --- /dev/null +++ b/Gameton-06/Assets/Gameton/Resources/Player/Character Face/Black_Oh.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a4ef32ebc0c2a3b51cc1a117f29c646d7d357041126960b9a88d686c1d5cf6d9 +size 8305 diff --git a/Gameton-06/Assets/Gameton/Resources/Player/Character Face/Black_Oh.png.meta b/Gameton-06/Assets/Gameton/Resources/Player/Character Face/Black_Oh.png.meta new file mode 100644 index 00000000..368c5a47 --- /dev/null +++ b/Gameton-06/Assets/Gameton/Resources/Player/Character Face/Black_Oh.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: 465689ad1ddd7ae4ea47fc33c0779780 +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/Player/Character Face/Black_Sad.png b/Gameton-06/Assets/Gameton/Resources/Player/Character Face/Black_Sad.png new file mode 100644 index 00000000..74d745cd --- /dev/null +++ b/Gameton-06/Assets/Gameton/Resources/Player/Character Face/Black_Sad.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:638bbeb6836f86473aac96575c7c294255d570b4c4dd811b661771cbb9fb06e6 +size 7943 diff --git a/Gameton-06/Assets/Gameton/Resources/Player/Character Face/Black_Sad.png.meta b/Gameton-06/Assets/Gameton/Resources/Player/Character Face/Black_Sad.png.meta new file mode 100644 index 00000000..116d8b21 --- /dev/null +++ b/Gameton-06/Assets/Gameton/Resources/Player/Character Face/Black_Sad.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: 704a43ee66191c840b2c71f756fbf44f +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/Player/Character Face/Black_Smile.png b/Gameton-06/Assets/Gameton/Resources/Player/Character Face/Black_Smile.png new file mode 100644 index 00000000..4265d541 --- /dev/null +++ b/Gameton-06/Assets/Gameton/Resources/Player/Character Face/Black_Smile.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:349ea0619c5d82458e9a191096e9ed92c5dc6613d33fae66c606e034b0d2814c +size 7990 diff --git a/Gameton-06/Assets/Gameton/Resources/Player/Character Face/Black_Smile.png.meta b/Gameton-06/Assets/Gameton/Resources/Player/Character Face/Black_Smile.png.meta new file mode 100644 index 00000000..59635ef4 --- /dev/null +++ b/Gameton-06/Assets/Gameton/Resources/Player/Character Face/Black_Smile.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: f4cfd9a105879de4191bbb9dae94230c +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/Player/Character Face/White_Angry.png b/Gameton-06/Assets/Gameton/Resources/Player/Character Face/White_Angry.png new file mode 100644 index 00000000..20c13350 --- /dev/null +++ b/Gameton-06/Assets/Gameton/Resources/Player/Character Face/White_Angry.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7d87ff97f14a68181085bcf2cf677121625df9212d0a7665a3b63fa13ce42092 +size 10530 diff --git a/Gameton-06/Assets/Gameton/Resources/Player/Character Face/White_Angry.png.meta b/Gameton-06/Assets/Gameton/Resources/Player/Character Face/White_Angry.png.meta new file mode 100644 index 00000000..8d47caa2 --- /dev/null +++ b/Gameton-06/Assets/Gameton/Resources/Player/Character Face/White_Angry.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: 2ab5f796991f5a04ab80733d958dc389 +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/Player/White_Cat.png b/Gameton-06/Assets/Gameton/Resources/Player/Character Face/White_Idle.png similarity index 100% rename from Gameton-06/Assets/Gameton/Resources/UI/Player/White_Cat.png rename to Gameton-06/Assets/Gameton/Resources/Player/Character Face/White_Idle.png diff --git a/Gameton-06/Assets/Gameton/Resources/Player/Character Face/White_Idle.png.meta b/Gameton-06/Assets/Gameton/Resources/Player/Character Face/White_Idle.png.meta new file mode 100644 index 00000000..c4ad1ed0 --- /dev/null +++ b/Gameton-06/Assets/Gameton/Resources/Player/Character Face/White_Idle.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: ae95bc3111dfa38448dc2fda87b27702 +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/Player/Character Face/White_Oh.png b/Gameton-06/Assets/Gameton/Resources/Player/Character Face/White_Oh.png new file mode 100644 index 00000000..7daaeb47 --- /dev/null +++ b/Gameton-06/Assets/Gameton/Resources/Player/Character Face/White_Oh.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:354b67bfdca38cb6685044ee7606f40473e5be25030050ba9be89b8259b8fe30 +size 8490 diff --git a/Gameton-06/Assets/Gameton/Resources/Player/Character Face/White_Oh.png.meta b/Gameton-06/Assets/Gameton/Resources/Player/Character Face/White_Oh.png.meta new file mode 100644 index 00000000..0c34c38a --- /dev/null +++ b/Gameton-06/Assets/Gameton/Resources/Player/Character Face/White_Oh.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: 06ca4332f09591948bc10857b10c6750 +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/Player/Character Face/White_Sad.png b/Gameton-06/Assets/Gameton/Resources/Player/Character Face/White_Sad.png new file mode 100644 index 00000000..dd05bd51 --- /dev/null +++ b/Gameton-06/Assets/Gameton/Resources/Player/Character Face/White_Sad.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7a6944ae60e1b106e7640d82572c83d65dab6cc5b82ab2ba2b4c931b941f8431 +size 7866 diff --git a/Gameton-06/Assets/Gameton/Resources/Player/Character Face/White_Sad.png.meta b/Gameton-06/Assets/Gameton/Resources/Player/Character Face/White_Sad.png.meta new file mode 100644 index 00000000..84b18c96 --- /dev/null +++ b/Gameton-06/Assets/Gameton/Resources/Player/Character Face/White_Sad.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: 3aab4aace340f444ca0df3d0c14387fc +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/Player/Character Face/White_Smile.png b/Gameton-06/Assets/Gameton/Resources/Player/Character Face/White_Smile.png new file mode 100644 index 00000000..707869f6 --- /dev/null +++ b/Gameton-06/Assets/Gameton/Resources/Player/Character Face/White_Smile.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8ee063646214d4423ec46ff2c8fb8dc0573df5a4f01ad6bd836e5c6bf59d7971 +size 7977 diff --git a/Gameton-06/Assets/Gameton/Resources/Player/Character Face/White_Smile.png.meta b/Gameton-06/Assets/Gameton/Resources/Player/Character Face/White_Smile.png.meta new file mode 100644 index 00000000..295df1fe --- /dev/null +++ b/Gameton-06/Assets/Gameton/Resources/Player/Character Face/White_Smile.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: ca0f8727285e17f41a3f386d9d472cd0 +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/Scripts/Common/AssetManager.cs b/Gameton-06/Assets/Gameton/Scripts/Common/AssetManager.cs index 3172b934..279571f1 100644 --- a/Gameton-06/Assets/Gameton/Scripts/Common/AssetManager.cs +++ b/Gameton-06/Assets/Gameton/Scripts/Common/AssetManager.cs @@ -5,6 +5,15 @@ using UnityEngine; namespace TON { + public enum FaceStatue + { + Idle, + Angry, + Sad, + Oh, + Smile + } + public class AssetManager : SingletonBase { @@ -19,10 +28,10 @@ namespace TON return LoadAsset($"UI/Skill Icon/skill_icon_{skillId}", out result); } - public bool LoadPlayerIcon(string playerType, out Sprite result) + public bool LoadPlayerIcon(string playerType, FaceStatue status, out Sprite result) { var playerColor = playerType == "b" ? "Black" : "White"; - return LoadAsset($"UI/Player/{playerColor}_Cat", out result); + return LoadAsset($"Player/Character Face/{playerColor}_{status}", out result); } public bool LoadStageIcon(string stageId, out Sprite result) diff --git a/Gameton-06/Assets/Gameton/Scripts/UI/LobbyUI.cs b/Gameton-06/Assets/Gameton/Scripts/UI/LobbyUI.cs index e97aedbf..bd9fd5b3 100644 --- a/Gameton-06/Assets/Gameton/Scripts/UI/LobbyUI.cs +++ b/Gameton-06/Assets/Gameton/Scripts/UI/LobbyUI.cs @@ -40,7 +40,7 @@ namespace TON PlayerData player = PlayerDataManager.Singleton.player; Image playerObj = GameObject.Find("TON.Player").GetComponent(); - playerObj.sprite = AssetManager.Singleton.LoadPlayerIcon(player.type, out Sprite playerImage) ? playerImage : null; + playerObj.sprite = AssetManager.Singleton.LoadPlayerIcon(player.type, FaceStatue.Idle, out Sprite playerImage) ? playerImage : null; characterName.text = player.name; characterHp.text = $"{player.hp}";