diff --git a/Assets/arts/atlas/icon/talent.asset b/Assets/arts/atlas/icon/talent.asset index 2a71e13ee..b2e949a58 100644 --- a/Assets/arts/atlas/icon/talent.asset +++ b/Assets/arts/atlas/icon/talent.asset @@ -29,4 +29,7 @@ MonoBehaviour: - {fileID: 21300000, guid: 6a117d779255a416c9be5d563121d5b1, type: 3} - {fileID: 21300000, guid: fed277177535d4d8e8632cf12836f499, type: 3} - {fileID: 21300000, guid: 4e314a6d6510142ccac00c5b35fdcfaa, type: 3} - spriteNameList: 9e3153db5202138f5302138f5402138f5502138f5602138f5702138f5802138f9f3153dba03153dba13153dba23153dba33153dba43153dba53153dba63153db + - {fileID: 21300000, guid: 11a1c7f9727fd4b1dba6db6c24f391ac, type: 3} + - {fileID: 21300000, guid: 7afd40333fbe64df280e992eaaf36fea, type: 3} + - {fileID: 21300000, guid: 59259941b7a724c8ba9fb6d743963205, type: 3} + spriteNameList: 9e3153db5202138f5302138f5402138f5502138f5602138f5702138f5802138f9f3153dba03153dba13153dba23153dba33153dba43153dba53153dba63153dbc1054e53c2054e53c3054e53 diff --git a/Assets/arts/atlas/icon/talent.spriteatlas b/Assets/arts/atlas/icon/talent.spriteatlas index 53f54a240..1ac28da7f 100644 --- a/Assets/arts/atlas/icon/talent.spriteatlas +++ b/Assets/arts/atlas/icon/talent.spriteatlas @@ -62,6 +62,8 @@ SpriteAtlas: cachedData: {fileID: 0} m_MasterAtlas: {fileID: 0} m_PackedSprites: + - {fileID: 21300000, guid: 59259941b7a724c8ba9fb6d743963205, type: 3} + - {fileID: 21300000, guid: 7afd40333fbe64df280e992eaaf36fea, type: 3} - {fileID: 21300000, guid: addf51745803d41c2baa477bd17bfaa9, type: 3} - {fileID: 21300000, guid: e0113b74d361a4ef7989093bb4efdc38, type: 3} - {fileID: 21300000, guid: af84c455d8e474a0d977cdb1e1bdd696, type: 3} @@ -70,6 +72,7 @@ SpriteAtlas: - {fileID: 21300000, guid: 6a117d779255a416c9be5d563121d5b1, type: 3} - {fileID: 21300000, guid: 9a12b4d9489ad4364bca914095069511, type: 3} - {fileID: 21300000, guid: b57f24f90c6ad4f279b3509d1aeb7119, type: 3} + - {fileID: 21300000, guid: 11a1c7f9727fd4b1dba6db6c24f391ac, type: 3} - {fileID: 21300000, guid: 9d4060ca4d21c4c04a02c0c6b0c40e2e, type: 3} - {fileID: 21300000, guid: 57c0d6fa9ad804f2b954bb3fe09dcb70, type: 3} - {fileID: 21300000, guid: 912dc77b03ac64ed8bc0b206a691fc50, type: 3} @@ -79,6 +82,8 @@ SpriteAtlas: - {fileID: 21300000, guid: aa62394efb9a04927b4475a6fe303ee9, type: 3} - {fileID: 21300000, guid: 83f43bceddd2e449285ac512f6c14512, type: 3} m_PackedSpriteNamesToIndex: + - talent_b_3 + - talent_b_2 - talent_11 - talent_12 - talent_14 @@ -87,6 +92,7 @@ SpriteAtlas: - talent_7 - talent_10 - talent_13 + - talent_b_1 - talent_1 - talent_5 - talent_3 diff --git a/Assets/arts/textures/icon/talent/talent_b_1.png b/Assets/arts/textures/icon/talent/talent_b_1.png new file mode 100644 index 000000000..4ce0d85f7 Binary files /dev/null and b/Assets/arts/textures/icon/talent/talent_b_1.png differ diff --git a/Assets/arts/textures/icon/talent/talent_b_1.png.meta b/Assets/arts/textures/icon/talent/talent_b_1.png.meta new file mode 100644 index 000000000..1e3c08624 --- /dev/null +++ b/Assets/arts/textures/icon/talent/talent_b_1.png.meta @@ -0,0 +1,147 @@ +fileFormatVersion: 2 +guid: 11a1c7f9727fd4b1dba6db6c24f391ac +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: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 47 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 50 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 12 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - 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: 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/arts/textures/icon/talent/talent_b_2.png b/Assets/arts/textures/icon/talent/talent_b_2.png new file mode 100644 index 000000000..b678de1e5 Binary files /dev/null and b/Assets/arts/textures/icon/talent/talent_b_2.png differ diff --git a/Assets/arts/textures/icon/talent/talent_b_2.png.meta b/Assets/arts/textures/icon/talent/talent_b_2.png.meta new file mode 100644 index 000000000..3842d4f66 --- /dev/null +++ b/Assets/arts/textures/icon/talent/talent_b_2.png.meta @@ -0,0 +1,147 @@ +fileFormatVersion: 2 +guid: 7afd40333fbe64df280e992eaaf36fea +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: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 47 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 50 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 12 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - 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: 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/arts/textures/icon/talent/talent_b_3.png b/Assets/arts/textures/icon/talent/talent_b_3.png new file mode 100644 index 000000000..051602e0f Binary files /dev/null and b/Assets/arts/textures/icon/talent/talent_b_3.png differ diff --git a/Assets/arts/textures/icon/talent/talent_b_3.png.meta b/Assets/arts/textures/icon/talent/talent_b_3.png.meta new file mode 100644 index 000000000..14f5d110e --- /dev/null +++ b/Assets/arts/textures/icon/talent/talent_b_3.png.meta @@ -0,0 +1,147 @@ +fileFormatVersion: 2 +guid: 59259941b7a724c8ba9fb6d743963205 +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: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 47 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 50 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 12 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - 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: 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/arts/textures/ui/common/common_tips_3.png.meta b/Assets/arts/textures/ui/common/common_tips_3.png.meta index 056f1d5ff..079f99414 100644 --- a/Assets/arts/textures/ui/common/common_tips_3.png.meta +++ b/Assets/arts/textures/ui/common/common_tips_3.png.meta @@ -48,7 +48,7 @@ TextureImporter: alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteBorder: {x: 26, y: 38, z: 26, w: 28} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 alphaIsTransparency: 1 @@ -132,7 +132,7 @@ TextureImporter: physicsShape: [] bones: [] spriteID: 5e97eb03825dee720800000000000000 - internalID: 0 + internalID: 1537655665 vertices: [] indices: edges: [] diff --git a/Assets/lua/app/ui/daily_challenge/daily_challenge_ui.lua.bytes b/Assets/lua/app/ui/daily_challenge/daily_challenge_ui.lua.bytes index aae7a0c8c..d4a8ffbf5 100644 Binary files a/Assets/lua/app/ui/daily_challenge/daily_challenge_ui.lua.bytes and b/Assets/lua/app/ui/daily_challenge/daily_challenge_ui.lua.bytes differ diff --git a/Assets/lua/app/ui/talent/cell/talent_cell.lua.bytes b/Assets/lua/app/ui/talent/cell/talent_cell.lua.bytes index 303015ed7..833bbc5f9 100644 Binary files a/Assets/lua/app/ui/talent/cell/talent_cell.lua.bytes and b/Assets/lua/app/ui/talent/cell/talent_cell.lua.bytes differ diff --git a/Assets/lua/app/ui/talent/talent_info_ui.lua.bytes b/Assets/lua/app/ui/talent/talent_info_ui.lua.bytes index 9c028e131..f68a46647 100644 Binary files a/Assets/lua/app/ui/talent/talent_info_ui.lua.bytes and b/Assets/lua/app/ui/talent/talent_info_ui.lua.bytes differ diff --git a/Assets/prefabs/ui/battle/battle_result_ui.prefab b/Assets/prefabs/ui/battle/battle_result_ui.prefab index 56e203f94..f6b120457 100644 --- a/Assets/prefabs/ui/battle/battle_result_ui.prefab +++ b/Assets/prefabs/ui/battle/battle_result_ui.prefab @@ -2128,8 +2128,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 25abc92244e96c1499c3f11397048a47, type: 3} - m_Type: 1 + m_Sprite: {fileID: 21300000, guid: ff3920a27572b4e3d9b010273d99b859, type: 3} + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -4856,8 +4856,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 25abc92244e96c1499c3f11397048a47, type: 3} - m_Type: 1 + m_Sprite: {fileID: 21300000, guid: ff3920a27572b4e3d9b010273d99b859, type: 3} + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 diff --git a/Assets/prefabs/ui/daily_challenge/daily_challenge_ui.prefab b/Assets/prefabs/ui/daily_challenge/daily_challenge_ui.prefab index caf2eb476..77d8f2735 100644 --- a/Assets/prefabs/ui/daily_challenge/daily_challenge_ui.prefab +++ b/Assets/prefabs/ui/daily_challenge/daily_challenge_ui.prefab @@ -135,6 +135,82 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &902594011982310612 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 843875783338929037} + - component: {fileID: 8467927365768639098} + - component: {fileID: 5123789182488458416} + m_Layer: 5 + m_Name: check_img + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &843875783338929037 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 902594011982310612} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.7, y: 0.7, z: 0.7} + m_ConstrainProportionsScale: 1 + m_Children: [] + m_Father: {fileID: 4678233844195582208} + m_RootOrder: 0 + 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: 13, y: 1} + m_SizeDelta: {x: 86, y: 61} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8467927365768639098 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 902594011982310612} + m_CullTransparentMesh: 1 +--- !u!114 &5123789182488458416 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 902594011982310612} + 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: 87f8bd23582a24c81a676a5b6d1e4e85, 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 &1206206158123554075 GameObject: m_ObjectHideFlags: 0 @@ -228,6 +304,97 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: IsShowClickAnimation: 1 +--- !u!1 &1272901664021346678 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4678233844195582208} + - component: {fileID: 6349947895044697291} + - component: {fileID: 3551142348912108270} + - component: {fileID: 7612429801637767129} + m_Layer: 5 + m_Name: mask + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4678233844195582208 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1272901664021346678} + 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: 843875783338929037} + m_Father: {fileID: 5172730960187486193} + m_RootOrder: 0 + 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: 74, y: 82} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6349947895044697291 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1272901664021346678} + m_CullTransparentMesh: 1 +--- !u!114 &3551142348912108270 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1272901664021346678} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2} + m_Color: {r: 0, g: 0, b: 0, a: 0.9411765} + 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: 4a52eb43a927eb945b31f20bbb5e9b64, 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 &7612429801637767129 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1272901664021346678} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1069f9c1eb6f9475b8f98a4cbb9dfe01, type: 3} + m_Name: + m_EditorClassIdentifier: + IsShowClickAnimation: 1 --- !u!1 &1308496548908379479 GameObject: m_ObjectHideFlags: 0 @@ -301,6 +468,97 @@ MonoBehaviour: y: 0 width: 1 height: 1 +--- !u!1 &1556702793227498985 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 9191999091733954570} + - component: {fileID: 4609625701599778188} + - component: {fileID: 6982021800196556691} + - component: {fileID: 4957565944018420501} + m_Layer: 5 + m_Name: mask + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &9191999091733954570 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1556702793227498985} + 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: 1858712623462011663} + m_Father: {fileID: 6877306057343581149} + m_RootOrder: 0 + 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: 74, y: 82} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4609625701599778188 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1556702793227498985} + m_CullTransparentMesh: 1 +--- !u!114 &6982021800196556691 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1556702793227498985} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2} + m_Color: {r: 0, g: 0, b: 0, a: 0.9411765} + 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: 4a52eb43a927eb945b31f20bbb5e9b64, 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 &4957565944018420501 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1556702793227498985} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1069f9c1eb6f9475b8f98a4cbb9dfe01, type: 3} + m_Name: + m_EditorClassIdentifier: + IsShowClickAnimation: 1 --- !u!1 &1628900176191188068 GameObject: m_ObjectHideFlags: 0 @@ -439,6 +697,82 @@ MonoBehaviour: m_ChildScaleWidth: 0 m_ChildScaleHeight: 0 m_ReverseArrangement: 0 +--- !u!1 &2258998476027287410 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6374850091526585408} + - component: {fileID: 5935049312148008985} + - component: {fileID: 8052842470286539979} + m_Layer: 5 + m_Name: check_img + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6374850091526585408 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2258998476027287410} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.7, y: 0.7, z: 0.7} + m_ConstrainProportionsScale: 1 + m_Children: [] + m_Father: {fileID: 3567538706249601981} + m_RootOrder: 0 + 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: 13, y: 1} + m_SizeDelta: {x: 86, y: 61} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5935049312148008985 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2258998476027287410} + m_CullTransparentMesh: 1 +--- !u!114 &8052842470286539979 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2258998476027287410} + 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: 87f8bd23582a24c81a676a5b6d1e4e85, 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 &3137636093465348220 GameObject: m_ObjectHideFlags: 0 @@ -934,6 +1268,97 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &4320881214220309169 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3567538706249601981} + - component: {fileID: 3556081100031293291} + - component: {fileID: 5040772650852791356} + - component: {fileID: 3735726826762321407} + m_Layer: 5 + m_Name: mask + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3567538706249601981 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4320881214220309169} + 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: 6374850091526585408} + m_Father: {fileID: 9055100390824285864} + m_RootOrder: 0 + 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: 74, y: 82} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3556081100031293291 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4320881214220309169} + m_CullTransparentMesh: 1 +--- !u!114 &5040772650852791356 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4320881214220309169} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2} + m_Color: {r: 0, g: 0, b: 0, a: 0.9411765} + 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: 4a52eb43a927eb945b31f20bbb5e9b64, 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 &3735726826762321407 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4320881214220309169} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1069f9c1eb6f9475b8f98a4cbb9dfe01, type: 3} + m_Name: + m_EditorClassIdentifier: + IsShowClickAnimation: 1 --- !u!1 &4414464565723630810 GameObject: m_ObjectHideFlags: 0 @@ -1174,16 +1599,17 @@ RectTransform: m_GameObject: {fileID: 5002901690807264222} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.8, y: 0.8, z: 1} + m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 3567538706249601981} m_Father: {fileID: 7811581884657323959} m_RootOrder: 0 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: 89, y: 92} + m_SizeDelta: {x: 74, y: 82} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6824530981751911782 CanvasRenderer: @@ -1213,7 +1639,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: e843643442bc8f84a85ab9f65f8331a0, type: 3} + m_Sprite: {fileID: 21300000, guid: 4a52eb43a927eb945b31f20bbb5e9b64, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1405,6 +1831,18 @@ MonoBehaviour: hashName: 1932305405 objectType: 0 gameObject: {fileID: 7575694260438292892} + - name: daily_challenge_ui.task.icon_task1.mask + hashName: 1793981443 + objectType: 0 + gameObject: {fileID: 4320881214220309169} + - name: daily_challenge_ui.task.icon_task2.mask + hashName: 1822610594 + objectType: 0 + gameObject: {fileID: 1556702793227498985} + - name: daily_challenge_ui.task.icon_task3.mask + hashName: 1851239745 + objectType: 0 + gameObject: {fileID: 1272901664021346678} --- !u!1 &5355798449360728859 GameObject: m_ObjectHideFlags: 0 @@ -1433,16 +1871,17 @@ RectTransform: m_GameObject: {fileID: 5355798449360728859} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.8, y: 0.8, z: 1} + m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 9191999091733954570} m_Father: {fileID: 7811581884657323959} m_RootOrder: 1 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: 89, y: 92} + m_SizeDelta: {x: 74, y: 82} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1553521743030735026 CanvasRenderer: @@ -1472,7 +1911,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: e843643442bc8f84a85ab9f65f8331a0, type: 3} + m_Sprite: {fileID: 21300000, guid: 4a52eb43a927eb945b31f20bbb5e9b64, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1593,7 +2032,7 @@ MonoBehaviour: m_Top: 0 m_Bottom: 10 m_ChildAlignment: 4 - m_Spacing: 6 + m_Spacing: 28 m_ChildForceExpandWidth: 0 m_ChildForceExpandHeight: 0 m_ChildControlWidth: 0 @@ -2308,16 +2747,17 @@ RectTransform: m_GameObject: {fileID: 8387464458021756269} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.8, y: 0.8, z: 1} + m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 4678233844195582208} m_Father: {fileID: 7811581884657323959} m_RootOrder: 2 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: 89, y: 92} + m_SizeDelta: {x: 74, y: 82} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &176638261103501822 CanvasRenderer: @@ -2347,7 +2787,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: e843643442bc8f84a85ab9f65f8331a0, type: 3} + m_Sprite: {fileID: 21300000, guid: 4a52eb43a927eb945b31f20bbb5e9b64, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -2581,6 +3021,82 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &8906282842281654961 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1858712623462011663} + - component: {fileID: 5520714502879588487} + - component: {fileID: 6971304738952437514} + m_Layer: 5 + m_Name: check_img + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1858712623462011663 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8906282842281654961} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.7, y: 0.7, z: 0.7} + m_ConstrainProportionsScale: 1 + m_Children: [] + m_Father: {fileID: 9191999091733954570} + m_RootOrder: 0 + 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: 13, y: 1} + m_SizeDelta: {x: 86, y: 61} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5520714502879588487 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8906282842281654961} + m_CullTransparentMesh: 1 +--- !u!114 &6971304738952437514 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8906282842281654961} + 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: 87f8bd23582a24c81a676a5b6d1e4e85, 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 &8952612997717114849 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/prefabs/ui/shop/box_hero_ui.prefab b/Assets/prefabs/ui/shop/box_hero_ui.prefab index f310e293d..b70034495 100644 --- a/Assets/prefabs/ui/shop/box_hero_ui.prefab +++ b/Assets/prefabs/ui/shop/box_hero_ui.prefab @@ -34,12 +34,12 @@ RectTransform: - {fileID: 940357355365908811} - {fileID: 5020870550719271354} m_Father: {fileID: 6532261956592226185} - m_RootOrder: 4 + m_RootOrder: 5 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: -294} - m_SizeDelta: {x: 365, y: 98} + m_AnchoredPosition: {x: 0, y: -237} + m_SizeDelta: {x: 328, y: 92} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7309468434370995818 CanvasRenderer: @@ -69,8 +69,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 5758461464520334caa2a2487dca2fc6, type: 3} - m_Type: 1 + m_Sprite: {fileID: 21300000, guid: 337ee236388634fe889f619fd7da4b97, type: 3} + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -123,12 +123,12 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 6532261956592226185} - m_RootOrder: 0 + m_RootOrder: 1 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: 346} - m_SizeDelta: {x: 540, y: 100} + m_AnchoredPosition: {x: 0, y: 324} + m_SizeDelta: {x: 300, y: 60} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1572974857966272460 CanvasRenderer: @@ -185,12 +185,12 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 44 + m_fontSize: 40 m_fontSizeBase: 44 m_fontWeight: 400 m_enableAutoSizing: 1 m_fontSizeMin: 18 - m_fontSizeMax: 44 + m_fontSizeMax: 40 m_fontStyle: 0 m_HorizontalAlignment: 2 m_VerticalAlignment: 512 @@ -264,7 +264,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: -10, y: 120} - m_SizeDelta: {x: 216, y: 90} + m_SizeDelta: {x: 174, y: 92} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2790111095513444337 CanvasRenderer: @@ -294,8 +294,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: b143f69564fbebd479463ddf96a9685a, type: 3} - m_Type: 0 + m_Sprite: {fileID: 21300000, guid: a01a4ad0b72a64241a3ecffb906eff54, type: 3} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -337,9 +337,9 @@ RectTransform: m_Father: {fileID: 5380735088143568625} m_RootOrder: 1 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: -52} + m_AnchorMin: {x: 0.5, y: 0} + m_AnchorMax: {x: 0.5, y: 0} + m_AnchoredPosition: {x: 0, y: 17} m_SizeDelta: {x: 100, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4175669829121598356 @@ -397,8 +397,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 26 - m_fontSizeBase: 26 + m_fontSize: 20 + m_fontSizeBase: 20 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -474,7 +474,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: 6} + m_AnchoredPosition: {x: 26, y: 0} m_SizeDelta: {x: 200, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3271154617564282497 @@ -772,12 +772,12 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 6532261956592226185} - m_RootOrder: 5 + m_RootOrder: 6 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: 0, y: -22} - m_SizeDelta: {x: 92, y: 98} + m_SizeDelta: {x: 84, y: 68} m_Pivot: {x: 0.5, y: 1} --- !u!222 &1394063912138427145 CanvasRenderer: @@ -807,7 +807,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 7372681aea33b7b4099e3685b7ee975e, type: 3} + m_Sprite: {fileID: 21300000, guid: 0068587080dd0488dad9da673f466698, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -951,7 +951,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 6532261956592226185} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -1125,7 +1125,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 110, y: 142} + m_SizeDelta: {x: 103, y: 134} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7703701751853361270 CanvasRenderer: @@ -1155,8 +1155,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 7fe65a877ceb7b9438fe3cb364320aa2, type: 3} - m_Type: 1 + m_Sprite: {fileID: 21300000, guid: 91f1d08e1ed8edf45a0a6368f8c30a19, type: 3} + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -1195,6 +1195,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: + - {fileID: 5428585964808643003} - {fileID: 7437306225081421888} - {fileID: 6367979773758997921} - {fileID: 5194395687368136688} @@ -1237,7 +1238,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Texture: {fileID: 2800000, guid: faf861d62904ca945a6e2a5f65fbefdf, type: 3} + m_Texture: {fileID: 2800000, guid: 00e143fef26720b478e2733de42dd12c, type: 3} m_UVRect: serializedVersion: 2 x: 0 @@ -1368,12 +1369,12 @@ RectTransform: - {fileID: 5474555283759120578} - {fileID: 3876298356550912567} m_Father: {fileID: 6532261956592226185} - m_RootOrder: 3 + m_RootOrder: 4 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: -294} - m_SizeDelta: {x: 246, y: 98} + m_AnchoredPosition: {x: 0, y: -237} + m_SizeDelta: {x: 246, y: 92} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2160131368875960573 CanvasRenderer: @@ -1403,8 +1404,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 5758461464520334caa2a2487dca2fc6, type: 3} - m_Type: 1 + m_Sprite: {fileID: 21300000, guid: 337ee236388634fe889f619fd7da4b97, type: 3} + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -1461,7 +1462,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: 6} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 200, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7607175458189154411 @@ -1596,7 +1597,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: -68.4, y: 6} + m_AnchoredPosition: {x: -68.4, y: 0} m_SizeDelta: {x: 70, y: 70} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5900921354279806153 @@ -1670,9 +1671,9 @@ RectTransform: m_Father: {fileID: 1981152942187469396} m_RootOrder: 1 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: -52} + m_AnchorMin: {x: 0.5, y: 0} + m_AnchorMax: {x: 0.5, y: 0} + m_AnchoredPosition: {x: 0, y: 17} m_SizeDelta: {x: 100, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2582467890266452809 @@ -1730,8 +1731,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 26 - m_fontSizeBase: 26 + m_fontSize: 20 + m_fontSizeBase: 20 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -1811,7 +1812,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 110, y: 142} + m_SizeDelta: {x: 103, y: 134} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7616228745954779343 CanvasRenderer: @@ -1841,8 +1842,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 7fe65a877ceb7b9438fe3cb364320aa2, type: 3} - m_Type: 1 + m_Sprite: {fileID: 21300000, guid: 91f1d08e1ed8edf45a0a6368f8c30a19, type: 3} + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -2103,9 +2104,9 @@ RectTransform: m_Father: {fileID: 6137294402458132337} m_RootOrder: 1 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: -52} + m_AnchorMin: {x: 0.5, y: 0} + m_AnchorMax: {x: 0.5, y: 0} + m_AnchoredPosition: {x: 0, y: 17} m_SizeDelta: {x: 100, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1717442306361686106 @@ -2163,8 +2164,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 26 - m_fontSizeBase: 26 + m_fontSize: 20 + m_fontSizeBase: 20 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -2379,7 +2380,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 110, y: 142} + m_SizeDelta: {x: 103, y: 134} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8277944783412004693 CanvasRenderer: @@ -2409,8 +2410,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 7fe65a877ceb7b9438fe3cb364320aa2, type: 3} - m_Type: 1 + m_Sprite: {fileID: 21300000, guid: 91f1d08e1ed8edf45a0a6368f8c30a19, type: 3} + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -2452,9 +2453,9 @@ RectTransform: m_Father: {fileID: 3416454017020524507} m_RootOrder: 1 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: -52} + m_AnchorMin: {x: 0.5, y: 0} + m_AnchorMax: {x: 0.5, y: 0} + m_AnchoredPosition: {x: 0, y: 17} m_SizeDelta: {x: 100, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6161137026779960359 @@ -2512,8 +2513,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 26 - m_fontSizeBase: 26 + m_fontSize: 20 + m_fontSizeBase: 20 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -2594,7 +2595,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 110, y: 142} + m_SizeDelta: {x: 103, y: 134} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4738102304295336647 CanvasRenderer: @@ -2624,8 +2625,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 7fe65a877ceb7b9438fe3cb364320aa2, type: 3} - m_Type: 1 + m_Sprite: {fileID: 21300000, guid: 91f1d08e1ed8edf45a0a6368f8c30a19, type: 3} + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -2669,8 +2670,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: -68.4, y: 6} - m_SizeDelta: {x: 70, y: 37} + m_AnchoredPosition: {x: -65, y: 0} + m_SizeDelta: {x: 46, y: 38} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8792548610819069188 CanvasRenderer: @@ -2700,7 +2701,83 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 608361016deab9a4993d756f0a187d74, type: 3} + m_Sprite: {fileID: 21300000, guid: 4f0b41158f74bfd4a9b0ee0116ff6bb0, 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 &8262401737272147524 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5428585964808643003} + - component: {fileID: 7788751399461615865} + - component: {fileID: 7107202018478077314} + m_Layer: 5 + m_Name: title_bg + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5428585964808643003 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8262401737272147524} + 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: 6532261956592226185} + m_RootOrder: 0 + 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: 324} + m_SizeDelta: {x: 396, y: 82} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7788751399461615865 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8262401737272147524} + m_CullTransparentMesh: 1 +--- !u!114 &7107202018478077314 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8262401737272147524} + 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: 646ad906d9c5043ae880e677c5b79eae, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -2744,11 +2821,11 @@ RectTransform: - {fileID: 3416454017020524507} - {fileID: 1981152942187469396} m_Father: {fileID: 6532261956592226185} - m_RootOrder: 2 + m_RootOrder: 3 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: -125} + m_AnchoredPosition: {x: 0, y: -60} m_SizeDelta: {x: 500, y: 142} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &418165481922312484 @@ -2807,23 +2884,23 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2503787648808692220, guid: 5ca3e95e591a43942878fdef120fc747, type: 3} propertyPath: m_SizeDelta.x - value: 130 + value: 150 objectReference: {fileID: 0} - target: {fileID: 2503787648808692220, guid: 5ca3e95e591a43942878fdef120fc747, type: 3} propertyPath: m_SizeDelta.y - value: 130 + value: 150 objectReference: {fileID: 0} - target: {fileID: 2503787648808692220, guid: 5ca3e95e591a43942878fdef120fc747, type: 3} propertyPath: m_LocalScale.x - value: 0.8 + value: 0.7 objectReference: {fileID: 0} - target: {fileID: 2503787648808692220, guid: 5ca3e95e591a43942878fdef120fc747, type: 3} propertyPath: m_LocalScale.y - value: 0.8 + value: 0.7 objectReference: {fileID: 0} - target: {fileID: 2503787648808692220, guid: 5ca3e95e591a43942878fdef120fc747, type: 3} propertyPath: m_LocalScale.z - value: 0.8 + value: 0.7 objectReference: {fileID: 0} - target: {fileID: 2503787648808692220, guid: 5ca3e95e591a43942878fdef120fc747, type: 3} propertyPath: m_LocalPosition.x @@ -2873,6 +2950,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 2503787648808692220, guid: 5ca3e95e591a43942878fdef120fc747, type: 3} + propertyPath: m_ConstrainProportionsScale + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7471363632449712567, guid: 5ca3e95e591a43942878fdef120fc747, type: 3} propertyPath: m_Name value: item_cell @@ -2926,23 +3007,23 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2503787648808692220, guid: 5ca3e95e591a43942878fdef120fc747, type: 3} propertyPath: m_SizeDelta.x - value: 130 + value: 150 objectReference: {fileID: 0} - target: {fileID: 2503787648808692220, guid: 5ca3e95e591a43942878fdef120fc747, type: 3} propertyPath: m_SizeDelta.y - value: 130 + value: 150 objectReference: {fileID: 0} - target: {fileID: 2503787648808692220, guid: 5ca3e95e591a43942878fdef120fc747, type: 3} propertyPath: m_LocalScale.x - value: 0.8 + value: 0.7 objectReference: {fileID: 0} - target: {fileID: 2503787648808692220, guid: 5ca3e95e591a43942878fdef120fc747, type: 3} propertyPath: m_LocalScale.y - value: 0.8 + value: 0.7 objectReference: {fileID: 0} - target: {fileID: 2503787648808692220, guid: 5ca3e95e591a43942878fdef120fc747, type: 3} propertyPath: m_LocalScale.z - value: 0.8 + value: 0.7 objectReference: {fileID: 0} - target: {fileID: 2503787648808692220, guid: 5ca3e95e591a43942878fdef120fc747, type: 3} propertyPath: m_LocalPosition.x @@ -2992,6 +3073,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 2503787648808692220, guid: 5ca3e95e591a43942878fdef120fc747, type: 3} + propertyPath: m_ConstrainProportionsScale + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7471363632449712567, guid: 5ca3e95e591a43942878fdef120fc747, type: 3} propertyPath: m_Name value: item_cell @@ -3045,23 +3130,23 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2503787648808692220, guid: 5ca3e95e591a43942878fdef120fc747, type: 3} propertyPath: m_SizeDelta.x - value: 130 + value: 150 objectReference: {fileID: 0} - target: {fileID: 2503787648808692220, guid: 5ca3e95e591a43942878fdef120fc747, type: 3} propertyPath: m_SizeDelta.y - value: 130 + value: 150 objectReference: {fileID: 0} - target: {fileID: 2503787648808692220, guid: 5ca3e95e591a43942878fdef120fc747, type: 3} propertyPath: m_LocalScale.x - value: 0.8 + value: 0.7 objectReference: {fileID: 0} - target: {fileID: 2503787648808692220, guid: 5ca3e95e591a43942878fdef120fc747, type: 3} propertyPath: m_LocalScale.y - value: 0.8 + value: 0.7 objectReference: {fileID: 0} - target: {fileID: 2503787648808692220, guid: 5ca3e95e591a43942878fdef120fc747, type: 3} propertyPath: m_LocalScale.z - value: 0.8 + value: 0.7 objectReference: {fileID: 0} - target: {fileID: 2503787648808692220, guid: 5ca3e95e591a43942878fdef120fc747, type: 3} propertyPath: m_LocalPosition.x @@ -3111,6 +3196,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 2503787648808692220, guid: 5ca3e95e591a43942878fdef120fc747, type: 3} + propertyPath: m_ConstrainProportionsScale + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7471363632449712567, guid: 5ca3e95e591a43942878fdef120fc747, type: 3} propertyPath: m_Name value: item_cell @@ -3164,23 +3253,23 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2503787648808692220, guid: 5ca3e95e591a43942878fdef120fc747, type: 3} propertyPath: m_SizeDelta.x - value: 130 + value: 150 objectReference: {fileID: 0} - target: {fileID: 2503787648808692220, guid: 5ca3e95e591a43942878fdef120fc747, type: 3} propertyPath: m_SizeDelta.y - value: 130 + value: 150 objectReference: {fileID: 0} - target: {fileID: 2503787648808692220, guid: 5ca3e95e591a43942878fdef120fc747, type: 3} propertyPath: m_LocalScale.x - value: 0.8 + value: 0.7 objectReference: {fileID: 0} - target: {fileID: 2503787648808692220, guid: 5ca3e95e591a43942878fdef120fc747, type: 3} propertyPath: m_LocalScale.y - value: 0.8 + value: 0.7 objectReference: {fileID: 0} - target: {fileID: 2503787648808692220, guid: 5ca3e95e591a43942878fdef120fc747, type: 3} propertyPath: m_LocalScale.z - value: 0.8 + value: 0.7 objectReference: {fileID: 0} - target: {fileID: 2503787648808692220, guid: 5ca3e95e591a43942878fdef120fc747, type: 3} propertyPath: m_LocalPosition.x @@ -3230,6 +3319,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 2503787648808692220, guid: 5ca3e95e591a43942878fdef120fc747, type: 3} + propertyPath: m_ConstrainProportionsScale + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7471363632449712567, guid: 5ca3e95e591a43942878fdef120fc747, type: 3} propertyPath: m_Name value: item_cell diff --git a/Assets/prefabs/ui/talent/cell/talent_cell.prefab b/Assets/prefabs/ui/talent/cell/talent_cell.prefab index 011b9aebb..466c479d3 100644 --- a/Assets/prefabs/ui/talent/cell/talent_cell.prefab +++ b/Assets/prefabs/ui/talent/cell/talent_cell.prefab @@ -135,6 +135,82 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &2208444971511803204 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5861344624473655845} + - component: {fileID: 2790345145491229438} + - component: {fileID: 5866237639398808807} + m_Layer: 5 + m_Name: bg1 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5861344624473655845 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2208444971511803204} + 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: 3891146818159484927} + m_RootOrder: 0 + 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: 288, y: 374} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2790345145491229438 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2208444971511803204} + m_CullTransparentMesh: 1 +--- !u!114 &5866237639398808807 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2208444971511803204} + 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: 9d4060ca4d21c4c04a02c0c6b0c40e2e, 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 &3271783488240858936 GameObject: m_ObjectHideFlags: 0 @@ -166,7 +242,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3891146818159484927} - m_RootOrder: 0 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -201,7 +277,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 9d4060ca4d21c4c04a02c0c6b0c40e2e, type: 3} + m_Sprite: {fileID: 21300000, guid: 11a1c7f9727fd4b1dba6db6c24f391ac, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -380,9 +456,10 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 2550558642015126864} + - {fileID: 5861344624473655845} - {fileID: 1106958158553028947} - {fileID: 6186608537558105873} + - {fileID: 2550558642015126864} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -416,6 +493,10 @@ MonoBehaviour: hashName: 3255371852 objectType: 0 gameObject: {fileID: 4457103454302141893} + - name: talent_cell.bg1 + hashName: 1862350835 + objectType: 0 + gameObject: {fileID: 2208444971511803204} --- !u!114 &754072199706501517 MonoBehaviour: m_ObjectHideFlags: 0