diff --git a/Assets/AddressableAssetsData/AddressableAssetSettings.asset b/Assets/AddressableAssetsData/AddressableAssetSettings.asset index fe141dd..09ae7b9 100644 --- a/Assets/AddressableAssetsData/AddressableAssetSettings.asset +++ b/Assets/AddressableAssetsData/AddressableAssetSettings.asset @@ -15,7 +15,7 @@ MonoBehaviour: m_DefaultGroup: ab759628f97301541855b12ebefe30d5 m_currentHash: serializedVersion: 2 - Hash: 00000000000000000000000000000000 + Hash: 8f454002bfecf27088db2529e681b4a3 m_OptimizeCatalogSize: 0 m_BuildRemoteCatalog: 1 m_CatalogRequestsTimeout: 0 diff --git a/Assets/Resources/Textures/1_Bell.png b/Assets/Resources/Textures/1_Bell.png index 298b50c..660e69e 100644 Binary files a/Assets/Resources/Textures/1_Bell.png and b/Assets/Resources/Textures/1_Bell.png differ diff --git a/Assets/Resources/Textures/1_Bell.png.meta b/Assets/Resources/Textures/1_Bell.png.meta index 3ff08c0..2bcc454 100644 --- a/Assets/Resources/Textures/1_Bell.png.meta +++ b/Assets/Resources/Textures/1_Bell.png.meta @@ -1,9 +1,12 @@ fileFormatVersion: 2 guid: b9e2da0d0623b8c428078fd693ab0b1c TextureImporter: - internalIDToNameTable: [] + internalIDToNameTable: + - first: + 213: -8382183449146272224 + second: 1_Bell_0 externalObjects: {} - serializedVersion: 12 + serializedVersion: 13 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -20,11 +23,12 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 + flipGreenChannel: 0 isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 vTOnly: 0 - ignoreMasterTextureLimit: 0 + ignoreMipmapLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -47,7 +51,7 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 512 + spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 @@ -63,21 +67,23 @@ TextureImporter: textureFormatSet: 0 ignorePngGamma: 0 applyGammaDecoding: 0 + swizzle: 50462976 cookieLightType: 0 platformSettings: - - serializedVersion: 3 + - serializedVersion: 4 buildTarget: DefaultTexturePlatform maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 2 + textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 + - serializedVersion: 4 buildTarget: Standalone maxTextureSize: 2048 resizeAlgorithm: 0 @@ -87,9 +93,10 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 + - serializedVersion: 4 buildTarget: Android maxTextureSize: 2048 resizeAlgorithm: 0 @@ -99,24 +106,36 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Server - 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: [] + sprites: + - serializedVersion: 2 + name: 1_Bell_0 + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 56 + height: 64 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: 0265a7f40908cab80800000000000000 + internalID: -8382183449146272224 + vertices: [] + indices: + edges: [] + weights: [] outline: [] + customData: physicsShape: [] bones: [] spriteID: 5e97eb03825dee720800000000000000 @@ -126,10 +145,11 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] + spriteCustomMetadata: + entries: [] nameFileIdTable: {} - spritePackingTag: + mipmapLimitGroupName: pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Resources/Textures/ProductIcons.meta b/Assets/Resources/Textures/ProductIcons.meta deleted file mode 100644 index 03455e3..0000000 --- a/Assets/Resources/Textures/ProductIcons.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 0560a6ed6b888cb48907873ed8ea53ec -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Resources/Textures/ProductIcons/Delete_Ad.Png b/Assets/Resources/Textures/ProductIcons/Delete_Ad.Png deleted file mode 100644 index 1c700ff..0000000 Binary files a/Assets/Resources/Textures/ProductIcons/Delete_Ad.Png and /dev/null differ diff --git a/Assets/Resources/Textures/ProductIcons/Delete_Ad.Png.meta b/Assets/Resources/Textures/ProductIcons/Delete_Ad.Png.meta deleted file mode 100644 index 8b8120f..0000000 --- a/Assets/Resources/Textures/ProductIcons/Delete_Ad.Png.meta +++ /dev/null @@ -1,135 +0,0 @@ -fileFormatVersion: 2 -guid: f969b67c899c7184a9e289e56b7f67a4 -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 12 - 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 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 - ignoreMasterTextureLimit: 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: 1 - 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 - cookieLightType: 0 - platformSettings: - - serializedVersion: 3 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 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 - 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 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Server - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: 5e97eb03825dee720800000000000000 - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - nameFileIdTable: {} - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Resources/Textures/ProductIcons/Heart.Png b/Assets/Resources/Textures/ProductIcons/Heart.Png deleted file mode 100644 index e01456f..0000000 Binary files a/Assets/Resources/Textures/ProductIcons/Heart.Png and /dev/null differ diff --git a/Assets/Resources/Textures/ProductIcons/Heart.Png.meta b/Assets/Resources/Textures/ProductIcons/Heart.Png.meta deleted file mode 100644 index db0e831..0000000 --- a/Assets/Resources/Textures/ProductIcons/Heart.Png.meta +++ /dev/null @@ -1,135 +0,0 @@ -fileFormatVersion: 2 -guid: c5528c35c6e336a4681887ab33b3d5f8 -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 12 - 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 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 - ignoreMasterTextureLimit: 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: 1 - 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 - cookieLightType: 0 - platformSettings: - - serializedVersion: 3 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 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 - 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 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Server - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: 5e97eb03825dee720800000000000000 - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - nameFileIdTable: {} - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Resources/Textures/ProductIcons/Key.Png b/Assets/Resources/Textures/ProductIcons/Key.Png deleted file mode 100644 index 14e2cbb..0000000 Binary files a/Assets/Resources/Textures/ProductIcons/Key.Png and /dev/null differ diff --git a/Assets/Resources/Textures/ProductIcons/Key.Png.meta b/Assets/Resources/Textures/ProductIcons/Key.Png.meta deleted file mode 100644 index 8aadc42..0000000 --- a/Assets/Resources/Textures/ProductIcons/Key.Png.meta +++ /dev/null @@ -1,135 +0,0 @@ -fileFormatVersion: 2 -guid: 8797b341f0c1c3443bfb3a32de5b5d6f -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 12 - 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 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 - ignoreMasterTextureLimit: 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: 1 - 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 - cookieLightType: 0 - platformSettings: - - serializedVersion: 3 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 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 - 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 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Server - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: 5e97eb03825dee720800000000000000 - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - nameFileIdTable: {} - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scenes/Main.unity b/Assets/Scenes/Main.unity index f5c260b..50730a3 100644 --- a/Assets/Scenes/Main.unity +++ b/Assets/Scenes/Main.unity @@ -7507,7 +7507,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 7.5} + m_AnchoredPosition: {x: 31.700012, y: 0.40000153} m_SizeDelta: {x: 0, y: -15} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &180925339 @@ -7530,7 +7530,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: "2\uC810" + m_text: "00\uC810" m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: cf1ae75e65a967946b23286a5ffbb812, type: 2} m_sharedMaterial: {fileID: -6508382273668546854, guid: cf1ae75e65a967946b23286a5ffbb812, type: 2} @@ -7541,13 +7541,13 @@ MonoBehaviour: serializedVersion: 2 rgba: 4294967295 m_fontColor: {r: 1, g: 1, b: 1, a: 1} - m_enableVertexGradient: 1 - m_colorMode: 2 + m_enableVertexGradient: 0 + m_colorMode: 0 m_fontColorGradient: topLeft: {r: 1, g: 0.82740134, b: 0.023584902, a: 1} topRight: {r: 1, g: 0.82740134, b: 0.023584902, a: 1} - bottomLeft: {r: 1, g: 0.9624786, b: 0.7877358, a: 1} - bottomRight: {r: 1, g: 0.9624786, b: 0.7877358, a: 1} + bottomLeft: {r: 1, g: 0.82740134, b: 0.023584902, a: 1} + bottomRight: {r: 1, g: 0.82740134, b: 0.023584902, a: 1} m_fontColorGradientPreset: {fileID: 0} m_spriteAsset: {fileID: 0} m_tintAllSprites: 0 @@ -7557,8 +7557,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 50 - m_fontSizeBase: 50 + m_fontSize: 40 + m_fontSizeBase: 40 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -30621,7 +30621,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: d9db1dc34f04b504c81d580af199f03c, type: 3} + m_Sprite: {fileID: 21300000, guid: 397469bf9c525f5468b0b034bb559bba, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -31370,15 +31370,15 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: - m_Material: {fileID: 2100000, guid: 4a5139d6ec91e62458dc16e84fdc10a7, type: 2} - m_Color: {r: 0.4380387, g: 0.828, b: 0.39530325, a: 1} + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 0 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 6cb86050c51b63d4883875645fcb1c55, type: 3} + m_Sprite: {fileID: 21300000, guid: 262016b2334bb76438f712c049bfa9af, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -38339,8 +38339,8 @@ 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: -150.4, y: -21.4} - m_SizeDelta: {x: 45, y: 45} + m_AnchoredPosition: {x: -145.1, y: 3.4} + m_SizeDelta: {x: 64, y: 64} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &547456225 MonoBehaviour: @@ -38362,7 +38362,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 8a860a365a3ee478c819168fddfc98d7, type: 3} + m_Sprite: {fileID: 21300000, guid: bc2c17814857bcc4a82dfc5e8fa0f68a, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -38590,6 +38590,97 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 572845982} m_CullTransparentMesh: 1 +--- !u!1 &584493144 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 584493145} + - component: {fileID: 584493148} + - component: {fileID: 584493147} + - component: {fileID: 584493146} + m_Layer: 5 + m_Name: aibg + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &584493145 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 584493144} + 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: + - {fileID: 1632661772} + m_Father: {fileID: 1230258420} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 116.6, y: -138.6} + m_SizeDelta: {x: 169.3, y: 253} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &584493146 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 584493144} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3312d7739989d2b4e91e6319e9a96d76, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: {x: 0, y: 0, z: 0, w: 0} + m_Softness: {x: 0, y: 0} +--- !u!114 &584493147 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 584493144} + 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: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 8388c990b53b08c41b9911ee6e007e62, 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!222 &584493148 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 584493144} + m_CullTransparentMesh: 1 --- !u!1 &599836672 GameObject: m_ObjectHideFlags: 0 @@ -43933,9 +44024,9 @@ RectTransform: - {fileID: 1217728025} m_Father: {fileID: 1230258420} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0} - m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: -39.100037, y: -41} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 446, y: 30.100037} m_SizeDelta: {x: 70, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &627208745 @@ -43987,8 +44078,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 20, y: -17.75} - m_SizeDelta: {x: -60, y: -45.5} + m_AnchoredPosition: {x: 39.7, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &632370172 MonoBehaviour: @@ -44010,7 +44101,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: "1023\uB0E5" + m_text: "0000\uB9CC 0000\uB0E5" m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: cf1ae75e65a967946b23286a5ffbb812, type: 2} m_sharedMaterial: {fileID: -6508382273668546854, guid: cf1ae75e65a967946b23286a5ffbb812, type: 2} @@ -44019,8 +44110,8 @@ MonoBehaviour: m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4284474367 - m_fontColor: {r: 1, g: 0.8907182, b: 0.3726415, a: 1} + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -44037,17 +44128,17 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 45 - m_fontSizeBase: 45 + m_fontSize: 40 + m_fontSizeBase: 40 m_fontWeight: 400 - m_enableAutoSizing: 1 + m_enableAutoSizing: 0 m_fontSizeMin: 30 m_fontSizeMax: 45 m_fontStyle: 0 - m_HorizontalAlignment: 1 - m_VerticalAlignment: 256 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 4096 m_textAlignment: 65535 - m_characterSpacing: 5 + m_characterSpacing: -5 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 @@ -44638,17 +44729,17 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 644550602} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + 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: - {fileID: 1181629650} - m_Father: {fileID: 1230258420} + m_Father: {fileID: 1972504265} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0} - m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: -127, y: -37.299988} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 100, y: 60} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &644550604 @@ -56136,7 +56227,9 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: CardSlotPrefab: {fileID: 8311175157444695672, guid: 35d59081fc3bc2a418fe56d3e0969df1, type: 3} + go_toppanel: {fileID: 302272076} cg: {fileID: 771770705} + i_ai: {fileID: 1632661773} AINameTMP: {fileID: 1889396053} AIGoldTMP: {fileID: 632370172} CenterDeckRT: {fileID: 936323066} @@ -73780,7 +73873,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: 10.5, y: 0} + m_AnchoredPosition: {x: -60.2, y: 0} m_SizeDelta: {x: 200, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1181629651 @@ -73803,10 +73896,10 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: "1\uACE0" + m_text: "0\uACE0" m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: cf1ae75e65a967946b23286a5ffbb812, type: 2} - m_sharedMaterial: {fileID: 2100000, guid: 1cd9f54883d04fa4a8273aaf06ef64e9, type: 2} + m_sharedMaterial: {fileID: -6508382273668546854, guid: cf1ae75e65a967946b23286a5ffbb812, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -73814,7 +73907,7 @@ MonoBehaviour: serializedVersion: 2 rgba: 4294967295 m_fontColor: {r: 1, g: 1, b: 1, a: 1} - m_enableVertexGradient: 1 + m_enableVertexGradient: 0 m_colorMode: 2 m_fontColorGradient: topLeft: {r: 0.99215686, g: 0.9764706, b: 0.44313726, a: 1} @@ -73830,8 +73923,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 55 - m_fontSizeBase: 55 + m_fontSize: 40 + m_fontSizeBase: 40 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -74179,8 +74272,6 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1230258420} - - component: {fileID: 1230258422} - - component: {fileID: 1230258421} m_Layer: 5 m_Name: AIPanel m_TagString: Untagged @@ -74200,11 +74291,11 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: + - {fileID: 584493145} - {fileID: 1281600454} - {fileID: 1080531574} - {fileID: 1669603720} - {fileID: 1972504265} - - {fileID: 644550603} - {fileID: 627208744} - {fileID: 1627414016} m_Father: {fileID: 771770700} @@ -74214,44 +74305,6 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 350} m_Pivot: {x: 0.5, y: 1} ---- !u!114 &1230258421 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1230258419} - 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: 0.12428801, g: 0.46226418, b: 0.34970072, a: 1} - m_RaycastTarget: 0 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 0 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 6cb86050c51b63d4883875645fcb1c55, 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!222 &1230258422 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1230258419} - m_CullTransparentMesh: 1 --- !u!1 &1230955784 GameObject: m_ObjectHideFlags: 0 @@ -75277,8 +75330,6 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1281600454} - - component: {fileID: 1281600456} - - component: {fileID: 1281600455} m_Layer: 5 m_Name: AIHandPanel m_TagString: Untagged @@ -75303,47 +75354,9 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: -12.5, y: 12.5} + m_AnchoredPosition: {x: -46, y: 248} m_SizeDelta: {x: 395, y: 61} m_Pivot: {x: 1, y: 0} ---- !u!114 &1281600455 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1281600453} - 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: 0.084905654, g: 0.33962262, b: 0.25669155, a: 1} - m_RaycastTarget: 0 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 6cb86050c51b63d4883875645fcb1c55, 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!222 &1281600456 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1281600453} - m_CullTransparentMesh: 1 --- !u!1 &1285024408 GameObject: m_ObjectHideFlags: 0 @@ -108980,17 +108993,17 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1590602762} - m_LocalRotation: {x: 0, y: 0, z: -0.17364825, w: 0.9848078} + 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: 1627414016} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: -20} + 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: 0} - m_SizeDelta: {x: 80, y: 80} + m_SizeDelta: {x: 56, y: 64} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1590602764 MonoBehaviour: @@ -109012,7 +109025,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: b9e2da0d0623b8c428078fd693ab0b1c, type: 3} + m_Sprite: {fileID: 21300000, guid: cc97734c8adea6445a7b4b0c95c64395, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -114447,9 +114460,9 @@ RectTransform: - {fileID: 1667541526} m_Father: {fileID: 1230258420} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0} - m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: 61, y: -41} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 546.10004, y: 30.100006} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1627414017 @@ -114617,6 +114630,81 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &1632661771 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1632661772} + - component: {fileID: 1632661774} + - component: {fileID: 1632661773} + m_Layer: 5 + m_Name: aiimage + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1632661772 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1632661771} + 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: 584493145} + 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: 0} + m_SizeDelta: {x: 256, y: 256} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1632661773 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1632661771} + 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: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 38a15265403765a409102601fda4f9aa, 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!222 &1632661774 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1632661771} + m_CullTransparentMesh: 1 --- !u!1 &1643606553 GameObject: m_ObjectHideFlags: 0 @@ -115198,7 +115286,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: 36.1, y: 0} + m_AnchoredPosition: {x: 51, y: 0} m_SizeDelta: {x: 50, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1667541527 @@ -115410,8 +115498,8 @@ RectTransform: 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: -91} - m_SizeDelta: {x: 350, y: 100} + m_AnchoredPosition: {x: 11.700012, y: 4} + m_SizeDelta: {x: 380, y: 65} m_Pivot: {x: 0, y: 0} --- !u!114 &1669603721 MonoBehaviour: @@ -115426,15 +115514,15 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.1254902, g: 0.4627451, b: 0.3529412, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 0 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 6cb86050c51b63d4883875645fcb1c55, type: 3} - m_Type: 0 + m_Sprite: {fileID: 21300000, guid: ef226a8e1f67ac844b66328f57d48c02, type: 3} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -142280,12 +142368,12 @@ GameObject: - component: {fileID: 1889396054} - component: {fileID: 1889396053} m_Layer: 5 - m_Name: AINameTMP + m_Name: AILvTMP m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &1889396052 RectTransform: m_ObjectHideFlags: 0 @@ -152940,13 +153028,14 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: + - {fileID: 644550603} - {fileID: 180925338} m_Father: {fileID: 1230258420} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 1, y: 0} - m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: 0, y: -80} - m_SizeDelta: {x: 410.5, y: 80} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 541, y: -101} + m_SizeDelta: {x: 320, y: 62} m_Pivot: {x: 1, y: 0} --- !u!114 &1972504266 MonoBehaviour: @@ -152961,15 +153050,15 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.1254902, g: 0.4627451, b: 0.3529412, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 0 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 6cb86050c51b63d4883875645fcb1c55, type: 3} - m_Type: 0 + m_Sprite: {fileID: 21300000, guid: ef226a8e1f67ac844b66328f57d48c02, type: 3} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 diff --git a/Assets/Scripts/UI/GameDataSynchronizer.cs b/Assets/Scripts/UI/GameDataSynchronizer.cs index a879c1b..950e87a 100644 --- a/Assets/Scripts/UI/GameDataSynchronizer.cs +++ b/Assets/Scripts/UI/GameDataSynchronizer.cs @@ -1,5 +1,3 @@ -using System.Collections; -using System.Collections.Generic; using UnityEngine; public class GameDataSynchronizer : MonoBehaviour @@ -20,7 +18,7 @@ public class GameDataSynchronizer : MonoBehaviour switch (type) { case EGameDataType.Go: - tmp.text = "0ฐํ"; + tmp.text = "0๊ณ "; break; case EGameDataType.Bbug: tmp.text = "0"; @@ -45,7 +43,7 @@ public class GameDataSynchronizer : MonoBehaviour { case EGameDataType.Go: int goNum = isPlayer ? GamePanel.Instance.Player_Go : GamePanel.Instance.AI_Go; - tmp.text = $"{goNum}ฐํ"; + tmp.text = $"{goNum}๊ณ "; break; case EGameDataType.Bbug: tmp.text = isPlayer ? GamePanel.Instance.Player_Bbug.ToString() : GamePanel.Instance.AI_Bbug.ToString(); diff --git a/Assets/Scripts/UI/GamePanel/GamePanel.cs b/Assets/Scripts/UI/GamePanel/GamePanel.cs index 089d829..aede8e6 100644 --- a/Assets/Scripts/UI/GamePanel/GamePanel.cs +++ b/Assets/Scripts/UI/GamePanel/GamePanel.cs @@ -1,8 +1,7 @@ +using CodeJay.Enum; using System.Collections.Generic; using UnityEngine; -using CodeJay.Enum; -using UnityEngine.UIElements; -using Firebase.Analytics; +using Image = UnityEngine.UI.Image; public partial class GamePanel : MonoBehaviour @@ -17,8 +16,9 @@ public partial class GamePanel : MonoBehaviour public static float GameSpeed = 1f; public static GamePanel Instance; - public GameObject CardSlotPrefab; + public GameObject CardSlotPrefab, go_toppanel; public CanvasGroup cg; + public Image i_ai; public TMPro.TextMeshProUGUI AINameTMP; public TMPro.TextMeshProUGUI AIGoldTMP; private List _lstCardSlots; @@ -152,6 +152,7 @@ public partial class GamePanel : MonoBehaviour { if (gameObject.activeInHierarchy != b) this.gameObject.SetActive(b); + } private void StartNormalGame() @@ -345,6 +346,8 @@ public partial class GamePanel : MonoBehaviour GameManager.Sound.PlayBGM(EBGMType.BGM_2); UseSepYulgget_To_Pee = false; this.GamePanelEnabled(true); + go_toppanel.SetActive(false); + i_ai.sprite = DB_HuntingData.GetEntity(GameManager.DB.GetUnlockTargetIndex(true) << 1).DBF_UnlockImage; GameManager.Event.InvokeEvent(EEventType.OnInitializeGame); GameManager.Event.InvokeEvent(EEventType.OnSynchronizeGold); diff --git a/Assets/Scripts/UI/ScoreSynchronizer.cs b/Assets/Scripts/UI/ScoreSynchronizer.cs index e3d9b3d..d0e82a6 100644 --- a/Assets/Scripts/UI/ScoreSynchronizer.cs +++ b/Assets/Scripts/UI/ScoreSynchronizer.cs @@ -28,11 +28,11 @@ public class ScoreSynchronizer : MonoBehaviour private void OnInitializeGame() { - tmp.text = "0 มก"; + tmp.text = "00์ "; } private void OnSynchronizeScore() { - tmp.text = GamePanel.Instance.GetTotalScore(IsPlayer, false).ToString() + " มก"; + tmp.text = $"{GamePanel.Instance.GetTotalScore(IsPlayer, false)} ์ "; } }