diff --git a/Assets/arts/atlas/icon/hero.spriteatlas b/Assets/arts/atlas/icon/hero.spriteatlas index d5bd7cdc9..76f41b9ad 100644 --- a/Assets/arts/atlas/icon/hero.spriteatlas +++ b/Assets/arts/atlas/icon/hero.spriteatlas @@ -137,6 +137,7 @@ SpriteAtlas: - {fileID: 21300000, guid: 7473e55ef6f1f884b8a1716e8b8d50b8, type: 3} - {fileID: 21300000, guid: eadd8d5ea71f634479a6268bba7bdfb4, type: 3} - {fileID: 21300000, guid: de280cbe7890e5a45802bd120a2b74f4, type: 3} + - {fileID: 21300000, guid: e623b6de58d7e4120ba19a9517c021ef, type: 3} - {fileID: 21300000, guid: fda0b51f55b7e3747b0d57f8016ed335, type: 3} - {fileID: 21300000, guid: d8738d1f5aae3014bb0710c44865f333, type: 3} - {fileID: 21300000, guid: 562c0f2f7317745a18aad2ea182faee5, type: 3} @@ -218,6 +219,7 @@ SpriteAtlas: - 18_2 - frame_small_5 - 16_1 + - mask_2 - 27 - 23 - frame_5 diff --git a/Assets/arts/atlas/ui/common.spriteatlas b/Assets/arts/atlas/ui/common.spriteatlas index cb5713704..2dd5a471a 100644 --- a/Assets/arts/atlas/ui/common.spriteatlas +++ b/Assets/arts/atlas/ui/common.spriteatlas @@ -111,6 +111,7 @@ SpriteAtlas: - {fileID: 21300000, guid: e3a315f26f48db6489d0176ca4c9aad1, type: 3} - {fileID: 21300000, guid: 403f47f28d24b40bc89e8f21b2dc5a8c, type: 3} - {fileID: 21300000, guid: 3600fc23ce24642c08569556c8338882, type: 3} + - {fileID: 21300000, guid: 87f8bd23582a24c81a676a5b6d1e4e85, type: 3} - {fileID: 21300000, guid: 6ef1b543fd626412fa2710c34227ad11, type: 3} - {fileID: 21300000, guid: 792ef1532be4a470aaf22dff9cde4e68, type: 3} - {fileID: 21300000, guid: ba69d1639f9c54fcaa78295c5d38b76e, type: 3} @@ -385,6 +386,7 @@ SpriteAtlas: - common_dec_27 - common_bg_22 - common_btn_odds + - common_dec_tick - common_bg_30 - common_icon_record - common_btn_info diff --git a/Assets/arts/textures/icon/hero/frame_2.png.meta b/Assets/arts/textures/icon/hero/frame_2.png.meta index 5b14e884e..b9a5dcb81 100644 --- a/Assets/arts/textures/icon/hero/frame_2.png.meta +++ b/Assets/arts/textures/icon/hero/frame_2.png.meta @@ -48,7 +48,7 @@ TextureImporter: alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 - spriteBorder: {x: 44, y: 36, z: 44, w: 142} + spriteBorder: {x: 44, y: 36, z: 44, w: 164} 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/arts/textures/icon/hero/frame_3.png.meta b/Assets/arts/textures/icon/hero/frame_3.png.meta index 109d0b668..69d8eb247 100644 --- a/Assets/arts/textures/icon/hero/frame_3.png.meta +++ b/Assets/arts/textures/icon/hero/frame_3.png.meta @@ -48,7 +48,7 @@ TextureImporter: alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 - spriteBorder: {x: 44, y: 36, z: 44, w: 142} + spriteBorder: {x: 44, y: 36, z: 44, w: 164} 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/arts/textures/icon/hero/frame_4.png.meta b/Assets/arts/textures/icon/hero/frame_4.png.meta index b1f7dbaf0..598703a7d 100644 --- a/Assets/arts/textures/icon/hero/frame_4.png.meta +++ b/Assets/arts/textures/icon/hero/frame_4.png.meta @@ -48,7 +48,7 @@ TextureImporter: alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 - spriteBorder: {x: 44, y: 36, z: 44, w: 142} + spriteBorder: {x: 44, y: 36, z: 44, w: 164} 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/arts/textures/icon/hero/frame_5.png.meta b/Assets/arts/textures/icon/hero/frame_5.png.meta index debdc632e..a72e376cd 100644 --- a/Assets/arts/textures/icon/hero/frame_5.png.meta +++ b/Assets/arts/textures/icon/hero/frame_5.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: 44, y: 36, z: 44, w: 164} 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/arts/textures/icon/hero/frame_6.png.meta b/Assets/arts/textures/icon/hero/frame_6.png.meta index db582f55b..fd2280414 100644 --- a/Assets/arts/textures/icon/hero/frame_6.png.meta +++ b/Assets/arts/textures/icon/hero/frame_6.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: 44, y: 36, z: 44, w: 164} 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/arts/textures/icon/hero/mask_2.png b/Assets/arts/textures/icon/hero/mask_2.png new file mode 100644 index 000000000..81f107772 Binary files /dev/null and b/Assets/arts/textures/icon/hero/mask_2.png differ diff --git a/Assets/arts/textures/icon/hero/mask_2.png.meta b/Assets/arts/textures/icon/hero/mask_2.png.meta new file mode 100644 index 000000000..7e78d5c68 --- /dev/null +++ b/Assets/arts/textures/icon/hero/mask_2.png.meta @@ -0,0 +1,147 @@ +fileFormatVersion: 2 +guid: e623b6de58d7e4120ba19a9517c021ef +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_dec_tick.png b/Assets/arts/textures/ui/common/common_dec_tick.png new file mode 100644 index 000000000..5e82179e4 Binary files /dev/null and b/Assets/arts/textures/ui/common/common_dec_tick.png differ diff --git a/Assets/arts/textures/ui/common/common_dec_tick.png.meta b/Assets/arts/textures/ui/common/common_dec_tick.png.meta new file mode 100644 index 000000000..27539fc47 --- /dev/null +++ b/Assets/arts/textures/ui/common/common_dec_tick.png.meta @@ -0,0 +1,147 @@ +fileFormatVersion: 2 +guid: 87f8bd23582a24c81a676a5b6d1e4e85 +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/lua/app/global/global_const.lua.bytes b/Assets/lua/app/global/global_const.lua.bytes index bc2e085e5..2fb44784d 100644 Binary files a/Assets/lua/app/global/global_const.lua.bytes and b/Assets/lua/app/global/global_const.lua.bytes differ diff --git a/Assets/lua/app/ui/common/cell/hero_cell.lua.bytes b/Assets/lua/app/ui/common/cell/hero_cell.lua.bytes index 3665ec067..f5018097b 100644 Binary files a/Assets/lua/app/ui/common/cell/hero_cell.lua.bytes and b/Assets/lua/app/ui/common/cell/hero_cell.lua.bytes differ diff --git a/Assets/lua/app/ui/common/cell/large_hero_cell.lua.bytes b/Assets/lua/app/ui/common/cell/large_hero_cell.lua.bytes index c8c6338c7..836472f3d 100644 Binary files a/Assets/lua/app/ui/common/cell/large_hero_cell.lua.bytes and b/Assets/lua/app/ui/common/cell/large_hero_cell.lua.bytes differ diff --git a/Assets/lua/app/ui/hero/cell/hero_list_cell.lua.bytes b/Assets/lua/app/ui/hero/cell/hero_list_cell.lua.bytes index d2e3fdcad..c1660bab6 100644 Binary files a/Assets/lua/app/ui/hero/cell/hero_list_cell.lua.bytes and b/Assets/lua/app/ui/hero/cell/hero_list_cell.lua.bytes differ diff --git a/Assets/lua/app/ui/hero/hero_info_comp.lua.bytes b/Assets/lua/app/ui/hero/hero_info_comp.lua.bytes index be305f869..ff2b09309 100644 Binary files a/Assets/lua/app/ui/hero/hero_info_comp.lua.bytes and b/Assets/lua/app/ui/hero/hero_info_comp.lua.bytes differ diff --git a/Assets/lua/app/ui/hero/star_info_comp.lua.bytes b/Assets/lua/app/ui/hero/star_info_comp.lua.bytes index 1dd4e9ec1..179cd960b 100644 Binary files a/Assets/lua/app/ui/hero/star_info_comp.lua.bytes and b/Assets/lua/app/ui/hero/star_info_comp.lua.bytes differ diff --git a/Assets/lua/app/userdata/hero/hero_entity.lua.bytes b/Assets/lua/app/userdata/hero/hero_entity.lua.bytes index cb704a867..10d10dba1 100644 Binary files a/Assets/lua/app/userdata/hero/hero_entity.lua.bytes and b/Assets/lua/app/userdata/hero/hero_entity.lua.bytes differ diff --git a/Assets/prefabs/ui/common/hero_cell.prefab b/Assets/prefabs/ui/common/hero_cell.prefab index a0286def9..e006aa370 100644 --- a/Assets/prefabs/ui/common/hero_cell.prefab +++ b/Assets/prefabs/ui/common/hero_cell.prefab @@ -66,7 +66,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: 123123 + m_text: m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 9d1aadd9ebaf54ce2b217ab8427fa0db, type: 2} m_sharedMaterial: {fileID: 2100000, guid: d9526b8cb4bc030488db413ef429c6f9, type: 2} @@ -336,7 +336,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 4c3d0a48af89a864bb285ebc163b77b5, type: 3} + m_Sprite: {fileID: 21300000, guid: 063945c3b6adee543ada4d5f7cdd0a26, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -405,15 +405,15 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2} - m_Color: {r: 0, g: 0, b: 0, a: 0.8627451} + 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: 0} - m_Type: 1 + m_Sprite: {fileID: 21300000, guid: e623b6de58d7e4120ba19a9517c021ef, type: 3} + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -516,8 +516,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: 0, y: 0} - m_SizeDelta: {x: 59, y: 47} + m_AnchoredPosition: {x: 0, y: 46} + m_SizeDelta: {x: 86, y: 61} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &457853508671559177 CanvasRenderer: @@ -547,7 +547,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: d4eff7d3958d69e42b5af7ef40d06263, type: 3} + m_Sprite: {fileID: 21300000, guid: 87f8bd23582a24c81a676a5b6d1e4e85, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -661,7 +661,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: 123123 + m_text: m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: b0c1339d1d91a8846affd442449dbf31, type: 2} m_sharedMaterial: {fileID: 2100000, guid: 2e0b5790ea0ce0a4eb6bf1b8b43a6bda, type: 2} @@ -688,12 +688,12 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 18 + m_fontSize: 20 m_fontSizeBase: 20 m_fontWeight: 400 m_enableAutoSizing: 1 m_fontSizeMin: 16 - m_fontSizeMax: 18 + m_fontSizeMax: 20 m_fontStyle: 0 m_HorizontalAlignment: 2 m_VerticalAlignment: 512 @@ -1435,8 +1435,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: 0, y: 40} - m_SizeDelta: {x: 154, y: 137} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 162, y: 226} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &398718613166755231 CanvasRenderer: @@ -1466,7 +1466,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 2544b8d4685ca40a98b00fe4d8dade53, type: 3} + m_Sprite: {fileID: 21300000, guid: ebc7d1b99efb72e4f9bd40e27de0fef6, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1512,7 +1512,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: -55, y: 90} - m_SizeDelta: {x: 34, y: 34} + m_SizeDelta: {x: 40, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &990496416697403971 CanvasRenderer: @@ -1676,15 +1676,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3101683837968673166, guid: 7f80b9c276e25406cad6f9580bdc8c8e, type: 3} propertyPath: m_LocalScale.x - value: 0.6 + value: 1 objectReference: {fileID: 0} - target: {fileID: 3101683837968673166, guid: 7f80b9c276e25406cad6f9580bdc8c8e, type: 3} propertyPath: m_LocalScale.y - value: 0.6 + value: 1 objectReference: {fileID: 0} - target: {fileID: 3101683837968673166, guid: 7f80b9c276e25406cad6f9580bdc8c8e, type: 3} propertyPath: m_LocalScale.z - value: 0.6 + value: 1 objectReference: {fileID: 0} - target: {fileID: 3101683837968673166, guid: 7f80b9c276e25406cad6f9580bdc8c8e, type: 3} propertyPath: m_LocalPosition.x diff --git a/Assets/prefabs/ui/common/large_hero_cell.prefab b/Assets/prefabs/ui/common/large_hero_cell.prefab index a1585e181..84391e1a1 100644 --- a/Assets/prefabs/ui/common/large_hero_cell.prefab +++ b/Assets/prefabs/ui/common/large_hero_cell.prefab @@ -31,7 +31,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3357254900952041124} - m_RootOrder: 5 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} @@ -168,7 +168,7 @@ RectTransform: m_Children: - {fileID: 4339632539099989829} m_Father: {fileID: 3357254900952041124} - m_RootOrder: 6 + 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} @@ -259,7 +259,7 @@ RectTransform: m_Children: - {fileID: 2224445448740524070} m_Father: {fileID: 3357254900952041124} - m_RootOrder: 7 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -393,82 +393,6 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!1 &3011666068788359289 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4732115990800253894} - - component: {fileID: 1014466458966055837} - - component: {fileID: 351195091662030653} - m_Layer: 5 - m_Name: s - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &4732115990800253894 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3011666068788359289} - 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: 3357254900952041124} - m_RootOrder: 3 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 1, y: 1} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -14, y: -19} - m_SizeDelta: {x: 28, y: 32} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &1014466458966055837 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3011666068788359289} - m_CullTransparentMesh: 1 ---- !u!114 &351195091662030653 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3011666068788359289} - 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: 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: c1d35f3153f12a14c9c8957a905b0b28, 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 &3250757508497117256 GameObject: m_ObjectHideFlags: 0 @@ -787,7 +711,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3357254900952041124} - m_RootOrder: 8 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -865,7 +789,6 @@ RectTransform: - {fileID: 2056991763747260404} - {fileID: 3365151691530395721} - {fileID: 5533497525391191942} - - {fileID: 4732115990800253894} - {fileID: 7485681934836625276} - {fileID: 6555570717243424459} - {fileID: 8122436304585411611} @@ -1025,10 +948,6 @@ MonoBehaviour: hashName: 1871693290 objectType: 0 gameObject: {fileID: 8834974795316754457} - - name: large_hero_cell.hero_bg.s - hashName: 1970060420 - objectType: 0 - gameObject: {fileID: 3011666068788359289} - name: large_hero_cell.hero_bg.dec hashName: 3442442195 objectType: 0 @@ -1186,7 +1105,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3357254900952041124} - m_RootOrder: 4 + 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} diff --git a/Assets/prefabs/ui/hero/cell/star_cell.prefab b/Assets/prefabs/ui/hero/cell/star_cell.prefab index 4545e6fce..4c47a0a65 100644 --- a/Assets/prefabs/ui/hero/cell/star_cell.prefab +++ b/Assets/prefabs/ui/hero/cell/star_cell.prefab @@ -171,7 +171,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 30, y: 30} + m_SizeDelta: {x: 24, y: 24} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2243577424104549121 CanvasRenderer: @@ -201,7 +201,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 77492aece4267bb4cb623f0bcc4253de, type: 3} + m_Sprite: {fileID: 21300000, guid: 8674bea5658936f42a406b8b4655a7cd, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -247,7 +247,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 30, y: 30} + m_SizeDelta: {x: 24, y: 24} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5919676273321473103 CanvasRenderer: @@ -277,7 +277,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 77492aece4267bb4cb623f0bcc4253de, type: 3} + m_Sprite: {fileID: 21300000, guid: 8674bea5658936f42a406b8b4655a7cd, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -323,7 +323,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 30, y: 30} + m_SizeDelta: {x: 24, y: 24} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7020937526943249309 CanvasRenderer: @@ -353,7 +353,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 77492aece4267bb4cb623f0bcc4253de, type: 3} + m_Sprite: {fileID: 21300000, guid: 8674bea5658936f42a406b8b4655a7cd, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -399,7 +399,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 30, y: 30} + m_SizeDelta: {x: 24, y: 24} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6754522324838968588 CanvasRenderer: @@ -429,7 +429,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 77492aece4267bb4cb623f0bcc4253de, type: 3} + m_Sprite: {fileID: 21300000, guid: 8674bea5658936f42a406b8b4655a7cd, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -475,7 +475,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 30, y: 30} + m_SizeDelta: {x: 24, y: 24} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &890434077720592209 CanvasRenderer: @@ -505,7 +505,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 77492aece4267bb4cb623f0bcc4253de, type: 3} + m_Sprite: {fileID: 21300000, guid: 8674bea5658936f42a406b8b4655a7cd, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 diff --git a/Assets/prefabs/ui/hero/hero_ui.prefab b/Assets/prefabs/ui/hero/hero_ui.prefab index b896d1659..cb264ac2e 100644 --- a/Assets/prefabs/ui/hero/hero_ui.prefab +++ b/Assets/prefabs/ui/hero/hero_ui.prefab @@ -520,7 +520,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 704, y: 380} + m_SizeDelta: {x: 704, y: 370} m_Pivot: {x: 0.5, y: 1} --- !u!114 &3930600297206774239 MonoBehaviour: @@ -1250,7 +1250,7 @@ MonoBehaviour: contentTrans: {fileID: 4919397710858056522} bfCell: {fileID: 5054905268533832767} spacing: 0 - topRecoveryOffset: 40 + topRecoveryOffset: 60 downRecoveryOffset: 0 direction: 0 reverse: 0 @@ -1561,7 +1561,7 @@ RectTransform: 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: 304} + m_AnchoredPosition: {x: 0, y: 312} m_SizeDelta: {x: 352, y: 48} m_Pivot: {x: 0.5, y: 0} --- !u!222 &2949573756051292502 @@ -1592,7 +1592,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: af29212d5f9e27c4bbf7322de871ffd0, type: 3} + m_Sprite: {fileID: 21300000, guid: de3a93d4a2390470186bd6f12fa365bd, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -2390,7 +2390,7 @@ RectTransform: 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: 24} + m_AnchoredPosition: {x: 0, y: 36} m_SizeDelta: {x: 704, y: 260} m_Pivot: {x: 0.5, y: 0} --- !u!1 &5064951179178977261 @@ -3830,7 +3830,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 720, y: 1954} + m_SizeDelta: {x: 720, y: 1900} m_Pivot: {x: 0.5, y: 1} --- !u!222 &3231478445068643713 CanvasRenderer: @@ -4371,7 +4371,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 720, y: 510} + m_SizeDelta: {x: 720, y: 606} m_Pivot: {x: 0.5, y: 1} --- !u!1 &8922389308208241080 GameObject: @@ -5529,7 +5529,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: cfa61de4a14c0a74db02811a55d1a8c7, type: 3} propertyPath: m_AnchoredPosition.y - value: -210 + value: -60 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: cfa61de4a14c0a74db02811a55d1a8c7, type: 3} propertyPath: m_LocalEulerAnglesHint.x