diff --git a/Assets/arts/atlas/ui/common.asset b/Assets/arts/atlas/ui/common.asset index d8c1c069e..da8848ecb 100644 --- a/Assets/arts/atlas/ui/common.asset +++ b/Assets/arts/atlas/ui/common.asset @@ -109,6 +109,7 @@ MonoBehaviour: - {fileID: 21300000, guid: 3a491a78e8f193f428361be7b7a45dfb, type: 3} - {fileID: 21300000, guid: f65bbb56e45988348b8aeb0272f58047, type: 3} - {fileID: 21300000, guid: bda09083248aa4684bbcb15346d7be8d, type: 3} + - {fileID: 21300000, guid: 7f3712612494f4e0a9eeba12df7c0106, type: 3} - {fileID: 21300000, guid: 7e9c0788fba4a824f9213b892c30a542, type: 3} - {fileID: 21300000, guid: 7fd4f0c3c01d5b74da31ef5c8844b95d, type: 3} - {fileID: 21300000, guid: 1dedff3e909ee054b874a2fbaff044c0, type: 3} @@ -184,4 +185,4 @@ MonoBehaviour: - {fileID: 21300000, guid: ea999318fddbe45f3876d9d152fcc20c, type: 3} - {fileID: 21300000, guid: 5aa123eeba3874e96a77af3433b3f977, type: 3} - {fileID: 21300000, guid: 56c233d89e320ac4891f34a6706ffc0c, type: 3} - spriteNameList: e9a43d8deaa43d8d0ae27a1a2757a7712857a7712957a7712a57a7712b57a7712c57a7712d57a7712e57a7712f57a771b1ff831a37ebefa68b243e8d056d861a066d861a076d861a086d861a096d861a0a6d861a0b6d861a0c6d861a0d6d861a0e6d861a8c243e8d246d861a256d861a266d861a276d861a286d861a296d861a2b6d861a2c6d861a2d6d861a8d243e8d436d861a446d861a456d861a466d861a476d861a486d861a496d861a4a6d861a4b6d861a4c6d861a8e243e8d626d861a636d861a646d861a656d861a666d861a676d861a686d861a696d861a6a6d861a6b6d861a8f243e8d816d861a826d861a91243e8d92243e8d93243e8d5ff0dec4f7dba86df8dba86df9dba86dfadba86da3c7820ca4c7820ca5c7820c01853b1974546eb890c9348d7fea0537be2eb195c02eb195f92eb195e8945815e9945815ea9458158538368dfbcc388d8cc2e922b76e26590e8b0b1a47776d27553a6ac67d33eeca7e33eeca7f33eecab833eeca20ecadc9a4a121385034973951349739e1c7a11ae2c7a11ae3c7a11ae4c7a11ae5c7a11ae6c7a11ae7c7a11ae8c7a11a34e166e68eb7ba30160398e369606d8f83e25472704398e34ac4708fb4e19f42b5e19f42b6e19f427a737b477b737b477c737b477d737b477e737b477f737b47f116cb47252af848262af848272af848282af848292af8486e97448da07f7c4ea17f7c4ea27f7c4ea37f7c4e26d06cd827d06cd828d06cd8f03a2d357551fb694faf2d359d83f5979e83f5979f83f597a083f597a183f597611e220557aa025458aa025459aa02545aaa0254b36a811bb46a811bb56a811bb66a811be8a0d140b76a811ba9a4d14003f2ab54ed355bf9f022f4ccf122f4ccf222f4ccf322f4ccf422f4ccf522f4ccf622f4ccf722f4cca15c468dbe552355bf552355c0552355c1552355c2552355c569b158 + spriteNameList: e9a43d8deaa43d8d0ae27a1a2757a7712857a7712957a7712a57a7712b57a7712c57a7712d57a7712e57a7712f57a771b1ff831a37ebefa68b243e8d056d861a066d861a076d861a086d861a096d861a0a6d861a0b6d861a0c6d861a0d6d861a0e6d861a8c243e8d246d861a256d861a266d861a276d861a286d861a296d861a2b6d861a2c6d861a2d6d861a8d243e8d436d861a446d861a456d861a466d861a476d861a486d861a496d861a4a6d861a4b6d861a4c6d861a8e243e8d626d861a636d861a646d861a656d861a666d861a676d861a686d861a696d861a6a6d861a6b6d861a8f243e8d816d861a826d861a91243e8d92243e8d93243e8d5ff0dec4f7dba86df8dba86df9dba86dfadba86da3c7820ca4c7820ca5c7820c01853b1974546eb890c9348d7fea0537be2eb195c02eb195f92eb195e8945815e9945815ea9458158538368dfbcc388d8cc2e922b76e26590e8b0b1a47776d27553a6ac67d33eeca7e33eeca7f33eecab833eeca20ecadc9a4a12138503497395134973952349739e1c7a11ae2c7a11ae3c7a11ae4c7a11ae5c7a11ae6c7a11ae7c7a11ae8c7a11a34e166e68eb7ba30160398e369606d8f83e25472704398e34ac4708fb4e19f42b5e19f42b6e19f427a737b477b737b477c737b477d737b477e737b477f737b47f116cb47252af848262af848272af848282af848292af8486e97448da07f7c4ea17f7c4ea27f7c4ea37f7c4e26d06cd827d06cd828d06cd8f03a2d357551fb694faf2d359d83f5979e83f5979f83f597a083f597a183f597611e220557aa025458aa025459aa02545aaa0254b36a811bb46a811bb56a811bb66a811be8a0d140b76a811ba9a4d14003f2ab54ed355bf9f022f4ccf122f4ccf222f4ccf322f4ccf422f4ccf522f4ccf622f4ccf722f4cca15c468dbe552355bf552355c0552355c1552355c2552355c569b158 diff --git a/Assets/arts/atlas/ui/common.spriteatlas b/Assets/arts/atlas/ui/common.spriteatlas index 9f5a0eaa7..76e4c3ae9 100644 --- a/Assets/arts/atlas/ui/common.spriteatlas +++ b/Assets/arts/atlas/ui/common.spriteatlas @@ -78,6 +78,7 @@ SpriteAtlas: - {fileID: 21300000, guid: c99386416aa7841f690ea6be0021047b, type: 3} - {fileID: 21300000, guid: 8557e6412e7e6464495c2efa8f5f2f78, type: 3} - {fileID: 21300000, guid: 3eb24e516a508b34e95d18d01316747c, type: 3} + - {fileID: 21300000, guid: 7f3712612494f4e0a9eeba12df7c0106, type: 3} - {fileID: 21300000, guid: 7232d781b35ea8742abca796fec7106d, type: 3} - {fileID: 21300000, guid: baeff88190bbfdb4a926b47619fcb1e6, type: 3} - {fileID: 21300000, guid: 96fd70b1d51e00641ab3107096c4994b, type: 3} @@ -250,6 +251,7 @@ SpriteAtlas: - common_bg_15 - common_menu_2 - common_info_1 + - common_dec_12 - common_bg_5 - common_progress_2_2 - common_lock_1 diff --git a/Assets/arts/textures/background/act_sevenday/act_sevenday_bg_2.png b/Assets/arts/textures/background/act_sevenday/act_sevenday_bg_2.png new file mode 100644 index 000000000..b011db8a2 Binary files /dev/null and b/Assets/arts/textures/background/act_sevenday/act_sevenday_bg_2.png differ diff --git a/Assets/arts/textures/background/company/bg_gs_4_weijiesuo.png.meta b/Assets/arts/textures/background/act_sevenday/act_sevenday_bg_2.png.meta similarity index 98% rename from Assets/arts/textures/background/company/bg_gs_4_weijiesuo.png.meta rename to Assets/arts/textures/background/act_sevenday/act_sevenday_bg_2.png.meta index d8ee7b89e..2821de90e 100644 --- a/Assets/arts/textures/background/company/bg_gs_4_weijiesuo.png.meta +++ b/Assets/arts/textures/background/act_sevenday/act_sevenday_bg_2.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 3db43046639a54631861c2df7f1a2519 +guid: 3e9376de3fcbf45ccb574eb68c171dbc TextureImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/Assets/arts/textures/background/company/bg_gs_10_yanfazhongxin.png b/Assets/arts/textures/background/company/bg_gs_10_yanfazhongxin.png deleted file mode 100644 index 33a01767d..000000000 Binary files a/Assets/arts/textures/background/company/bg_gs_10_yanfazhongxin.png and /dev/null differ diff --git a/Assets/arts/textures/background/company/bg_gs_2_guanggaopai.png b/Assets/arts/textures/background/company/bg_gs_2_guanggaopai.png deleted file mode 100644 index a7140e759..000000000 Binary files a/Assets/arts/textures/background/company/bg_gs_2_guanggaopai.png and /dev/null differ diff --git a/Assets/arts/textures/background/company/bg_gs_2_guanggaopai.png.meta b/Assets/arts/textures/background/company/bg_gs_2_guanggaopai.png.meta deleted file mode 100644 index b9720ed6a..000000000 --- a/Assets/arts/textures/background/company/bg_gs_2_guanggaopai.png.meta +++ /dev/null @@ -1,147 +0,0 @@ -fileFormatVersion: 2 -guid: 749dfdfc9ac184a2ea8d031803e97d6f -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: 1 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - 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: 0 - spriteTessellationDetail: -1 - textureType: 0 - 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: 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: 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: - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - nameFileIdTable: {} - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/arts/textures/background/company/bg_gs_3_dikuai.png b/Assets/arts/textures/background/company/bg_gs_3_dikuai.png index aff5b31cc..92e04ed22 100644 Binary files a/Assets/arts/textures/background/company/bg_gs_3_dikuai.png and b/Assets/arts/textures/background/company/bg_gs_3_dikuai.png differ diff --git a/Assets/arts/textures/background/company/bg_gs_4_weijiesuo.png b/Assets/arts/textures/background/company/bg_gs_4_weijiesuo.png deleted file mode 100644 index dd464d4c5..000000000 Binary files a/Assets/arts/textures/background/company/bg_gs_4_weijiesuo.png and /dev/null differ diff --git a/Assets/arts/textures/background/company/bg_gs_5_jianzhuqun01.png b/Assets/arts/textures/background/company/bg_gs_5_jianzhuqun01.png index fee84f2e2..41569d87d 100644 Binary files a/Assets/arts/textures/background/company/bg_gs_5_jianzhuqun01.png and b/Assets/arts/textures/background/company/bg_gs_5_jianzhuqun01.png differ diff --git a/Assets/arts/textures/background/company/bg_gs_6_jianzhuqun02.png b/Assets/arts/textures/background/company/bg_gs_6_jianzhuqun02.png index bad5c3b97..29c9c391f 100644 Binary files a/Assets/arts/textures/background/company/bg_gs_6_jianzhuqun02.png and b/Assets/arts/textures/background/company/bg_gs_6_jianzhuqun02.png differ diff --git a/Assets/arts/textures/background/company/bg_gs_7_jianzhuqun03.png b/Assets/arts/textures/background/company/bg_gs_7_jianzhuqun03.png index 24042d7bf..a15431b3a 100644 Binary files a/Assets/arts/textures/background/company/bg_gs_7_jianzhuqun03.png and b/Assets/arts/textures/background/company/bg_gs_7_jianzhuqun03.png differ diff --git a/Assets/arts/textures/background/company/bg_gs_8_jianzhuqun04.png b/Assets/arts/textures/background/company/bg_gs_8_jianzhuqun04.png index 81329c181..74dc0032b 100644 Binary files a/Assets/arts/textures/background/company/bg_gs_8_jianzhuqun04.png and b/Assets/arts/textures/background/company/bg_gs_8_jianzhuqun04.png differ diff --git a/Assets/arts/textures/background/company/bg_gs_9_jianzhuqun05.png b/Assets/arts/textures/background/company/bg_gs_9_jianzhuqun05.png index 5d8862e7e..c04c16146 100644 Binary files a/Assets/arts/textures/background/company/bg_gs_9_jianzhuqun05.png and b/Assets/arts/textures/background/company/bg_gs_9_jianzhuqun05.png differ diff --git a/Assets/arts/textures/ui/act_sevenday/act_sevenday_bg_1.png b/Assets/arts/textures/ui/act_sevenday/act_sevenday_bg_1.png index c7beb38de..bdc369410 100644 Binary files a/Assets/arts/textures/ui/act_sevenday/act_sevenday_bg_1.png and b/Assets/arts/textures/ui/act_sevenday/act_sevenday_bg_1.png differ diff --git a/Assets/arts/textures/ui/act_sevenday_signin/act_sevenday_signin_bg_3.png b/Assets/arts/textures/ui/act_sevenday_signin/act_sevenday_signin_bg_3.png index 913094d63..ce3b1680f 100644 Binary files a/Assets/arts/textures/ui/act_sevenday_signin/act_sevenday_signin_bg_3.png and b/Assets/arts/textures/ui/act_sevenday_signin/act_sevenday_signin_bg_3.png differ diff --git a/Assets/arts/textures/ui/common/common_dec_12.png b/Assets/arts/textures/ui/common/common_dec_12.png new file mode 100644 index 000000000..8c4d33588 Binary files /dev/null and b/Assets/arts/textures/ui/common/common_dec_12.png differ diff --git a/Assets/arts/textures/background/company/bg_gs_10_yanfazhongxin.png.meta b/Assets/arts/textures/ui/common/common_dec_12.png.meta similarity index 93% rename from Assets/arts/textures/background/company/bg_gs_10_yanfazhongxin.png.meta rename to Assets/arts/textures/ui/common/common_dec_12.png.meta index bbd73302f..febbc64a0 100644 --- a/Assets/arts/textures/background/company/bg_gs_10_yanfazhongxin.png.meta +++ b/Assets/arts/textures/ui/common/common_dec_12.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 4bcfbc2a1379c4085bde91b58365ae58 +guid: 7f3712612494f4e0a9eeba12df7c0106 TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -39,10 +39,10 @@ TextureImporter: wrapU: 1 wrapV: 1 wrapW: 1 - nPOTScale: 1 + nPOTScale: 0 lightmap: 0 compressionQuality: 50 - spriteMode: 0 + spriteMode: 1 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 @@ -51,9 +51,9 @@ TextureImporter: spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 - alphaIsTransparency: 0 + alphaIsTransparency: 1 spriteTessellationDetail: -1 - textureType: 0 + textureType: 8 textureShape: 1 singleChannelComponent: 0 flipbookRows: 1 @@ -90,19 +90,19 @@ TextureImporter: androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 - buildTarget: DefaultTexturePlatform + buildTarget: Standalone maxTextureSize: 2048 resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 + textureFormat: 12 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 - overridden: 0 + overridden: 1 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 - buildTarget: Standalone + buildTarget: DefaultTexturePlatform maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 @@ -131,7 +131,7 @@ TextureImporter: outline: [] physicsShape: [] bones: [] - spriteID: + spriteID: 5e97eb03825dee720800000000000000 internalID: 0 vertices: [] indices: diff --git a/Assets/lua/app/bf/unity/uiprefab_object.lua.bytes b/Assets/lua/app/bf/unity/uiprefab_object.lua.bytes index 6818a8fc8..4fd043f80 100644 Binary files a/Assets/lua/app/bf/unity/uiprefab_object.lua.bytes and b/Assets/lua/app/bf/unity/uiprefab_object.lua.bytes differ diff --git a/Assets/lua/app/config/localization/localization_global_const.lua.bytes b/Assets/lua/app/config/localization/localization_global_const.lua.bytes index 932f05be5..ce85d1760 100644 Binary files a/Assets/lua/app/config/localization/localization_global_const.lua.bytes and b/Assets/lua/app/config/localization/localization_global_const.lua.bytes differ diff --git a/Assets/lua/app/config/strings/cn/global.lua.bytes b/Assets/lua/app/config/strings/cn/global.lua.bytes index 464871357..4e75b6f31 100644 Binary files a/Assets/lua/app/config/strings/cn/global.lua.bytes and b/Assets/lua/app/config/strings/cn/global.lua.bytes differ diff --git a/Assets/lua/app/module/hero/hero_manager.lua.bytes b/Assets/lua/app/module/hero/hero_manager.lua.bytes index 9188ad3d9..b67c64d32 100644 Binary files a/Assets/lua/app/module/hero/hero_manager.lua.bytes and b/Assets/lua/app/module/hero/hero_manager.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 a9d4e3cfe..f30c5097e 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/hero/hero_attr_all_ui.lua.bytes b/Assets/lua/app/ui/hero/hero_attr_all_ui.lua.bytes index 9e606f782..27906aa53 100644 Binary files a/Assets/lua/app/ui/hero/hero_attr_all_ui.lua.bytes and b/Assets/lua/app/ui/hero/hero_attr_all_ui.lua.bytes differ diff --git a/Assets/lua/app/ui/hero/hero_comp.lua.bytes b/Assets/lua/app/ui/hero/hero_comp.lua.bytes index 461828323..2a229b81c 100644 Binary files a/Assets/lua/app/ui/hero/hero_comp.lua.bytes and b/Assets/lua/app/ui/hero/hero_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 7e5368772..53a842573 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/ui/main_city/component/side_bar_comp.lua.bytes b/Assets/lua/app/ui/main_city/component/side_bar_comp.lua.bytes index fe195ae4a..735fcb4d2 100644 Binary files a/Assets/lua/app/ui/main_city/component/side_bar_comp.lua.bytes and b/Assets/lua/app/ui/main_city/component/side_bar_comp.lua.bytes differ diff --git a/Assets/prefabs/ui/activity/act_sevenday/act_sevenday_ui.prefab b/Assets/prefabs/ui/activity/act_sevenday/act_sevenday_ui.prefab index 6969dc07b..cd7446613 100644 --- a/Assets/prefabs/ui/activity/act_sevenday/act_sevenday_ui.prefab +++ b/Assets/prefabs/ui/activity/act_sevenday/act_sevenday_ui.prefab @@ -6814,14 +6814,14 @@ GameObject: m_Component: - component: {fileID: 4290883564404133933} - component: {fileID: 6482230253465983722} - - component: {fileID: 7154628570588357435} + - component: {fileID: 7636867104391313533} m_Layer: 5 m_Name: bg3 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &4290883564404133933 RectTransform: m_ObjectHideFlags: 0 @@ -6839,8 +6839,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: 205, y: 396} - m_SizeDelta: {x: 352, y: 330} + m_AnchoredPosition: {x: 205, y: 308} + m_SizeDelta: {x: 591, y: 570} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6482230253465983722 CanvasRenderer: @@ -6850,7 +6850,7 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4672379216243090482} m_CullTransparentMesh: 1 ---- !u!114 &7154628570588357435 +--- !u!114 &7636867104391313533 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -6859,7 +6859,7 @@ MonoBehaviour: m_GameObject: {fileID: 4672379216243090482} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} @@ -6870,16 +6870,13 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: ca87192a802f541059176174b37e8df8, 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 + m_Texture: {fileID: 2800000, guid: 3e9376de3fcbf45ccb574eb68c171dbc, type: 3} + m_UVRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 --- !u!1 &4749451579435275630 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/prefabs/ui/common/hero_cell.prefab b/Assets/prefabs/ui/common/hero_cell.prefab index 90c4b26ef..892564afd 100644 --- a/Assets/prefabs/ui/common/hero_cell.prefab +++ b/Assets/prefabs/ui/common/hero_cell.prefab @@ -270,6 +270,83 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &1388642421983744172 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4109858167752954265} + - component: {fileID: 4525486107957871270} + - component: {fileID: 3171528040649252915} + m_Layer: 5 + m_Name: in_time_bg + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4109858167752954265 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1388642421983744172} + 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: 8381890399792272681} + m_Father: {fileID: 3357254900952041124} + 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: 30, y: 92} + m_SizeDelta: {x: 102, y: 41} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4525486107957871270 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1388642421983744172} + m_CullTransparentMesh: 1 +--- !u!114 &3171528040649252915 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1388642421983744172} + 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: 7f3712612494f4e0a9eeba12df7c0106, 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 &2599003844770290379 GameObject: m_ObjectHideFlags: 0 @@ -346,82 +423,6 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!1 &3365775747780917783 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 3099069826882414791} - - component: {fileID: 457853508671559177} - - component: {fileID: 2660959725112432527} - m_Layer: 5 - m_Name: check - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &3099069826882414791 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3365775747780917783} - 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: 3365151691530395721} - 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: 46} - m_SizeDelta: {x: 86, y: 61} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &457853508671559177 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3365775747780917783} - m_CullTransparentMesh: 1 ---- !u!114 &2660959725112432527 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3365775747780917783} - 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: 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 &3517938672014188124 GameObject: m_ObjectHideFlags: 0 @@ -535,6 +536,141 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &4757766084329623455 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8381890399792272681} + - component: {fileID: 2651338962020295436} + - component: {fileID: 8452588663842646598} + m_Layer: 0 + m_Name: in_time_tx + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8381890399792272681 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4757766084329623455} + 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: 4109858167752954265} + 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: 4, y: 0} + m_SizeDelta: {x: 80, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2651338962020295436 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4757766084329623455} + m_CullTransparentMesh: 1 +--- !u!114 &8452588663842646598 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4757766084329623455} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, 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_text: + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 9d1aadd9ebaf54ce2b217ab8427fa0db, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: d9526b8cb4bc030488db413ef429c6f9, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 22 + m_fontSizeBase: 22 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 0 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} --- !u!1 &5419043625903708716 GameObject: m_ObjectHideFlags: 0 @@ -777,7 +913,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 2056991763747260404} - - {fileID: 3365151691530395721} + - {fileID: 4109858167752954265} - {fileID: 4885259659328398088} - {fileID: 7485681934836625276} - {fileID: 6555570717243424459} @@ -916,10 +1052,6 @@ MonoBehaviour: hashName: 1739054659 objectType: 0 gameObject: {fileID: 6679154729212616606} - - name: hero_cell.hero_bg.mask - hashName: 2443367351 - objectType: 0 - gameObject: {fileID: 7743758018673867698} - name: hero_cell.hero_bg.match_img hashName: 2543169630 objectType: 0 @@ -956,6 +1088,14 @@ MonoBehaviour: hashName: 2342785070 objectType: 0 gameObject: {fileID: 2599003844770290379} + - name: hero_cell.hero_bg.in_time_bg + hashName: 297637480 + objectType: 0 + gameObject: {fileID: 1388642421983744172} + - name: hero_cell.hero_bg.in_time_bg.in_time_tx + hashName: 2215757666 + objectType: 0 + gameObject: {fileID: 4757766084329623455} --- !u!225 &6876715644725703649 CanvasGroup: m_ObjectHideFlags: 0 @@ -1001,83 +1141,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: IsShowClickAnimation: 1 ---- !u!1 &7743758018673867698 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 3365151691530395721} - - component: {fileID: 398718613166755231} - - component: {fileID: 7097552764340493708} - m_Layer: 5 - m_Name: mask - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &3365151691530395721 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7743758018673867698} - 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: 3099069826882414791} - m_Father: {fileID: 3357254900952041124} - 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: 0} - m_SizeDelta: {x: 162, y: 226} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &398718613166755231 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7743758018673867698} - m_CullTransparentMesh: 1 ---- !u!114 &7097552764340493708 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7743758018673867698} - 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: ebc7d1b99efb72e4f9bd40e27de0fef6, 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 &8583060915826957414 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/prefabs/ui/company/company_comp.prefab b/Assets/prefabs/ui/company/company_comp.prefab index 4d78a9790..0ed04a814 100644 --- a/Assets/prefabs/ui/company/company_comp.prefab +++ b/Assets/prefabs/ui/company/company_comp.prefab @@ -264,7 +264,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} m_AnchoredPosition: {x: 0, y: -1} - m_SizeDelta: {x: 1278, y: 644} + m_SizeDelta: {x: 2048, y: 1024} m_Pivot: {x: 0.5, y: 1} --- !u!222 &1562298238329865213 CanvasRenderer: @@ -337,7 +337,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} m_AnchoredPosition: {x: 0, y: -260} - m_SizeDelta: {x: 1280, y: 870} + m_SizeDelta: {x: 2048, y: 1024} m_Pivot: {x: 0.5, y: 0} --- !u!222 &5315133394986383801 CanvasRenderer: @@ -410,7 +410,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} m_AnchoredPosition: {x: 0, y: -89} - m_SizeDelta: {x: 324, y: 639} + m_SizeDelta: {x: 512, y: 1024} m_Pivot: {x: 0, y: 0.5} --- !u!222 &7903069463596989915 CanvasRenderer: @@ -578,7 +578,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 1280, y: 1771} + m_SizeDelta: {x: 2048, y: 2048} m_Pivot: {x: 0.5, y: 0} --- !u!222 &8713708941025648453 CanvasRenderer: @@ -857,7 +857,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} m_AnchoredPosition: {x: 0, y: -442} - m_SizeDelta: {x: 1278, y: 321} + m_SizeDelta: {x: 2048, y: 512} m_Pivot: {x: 0.5, y: 1} --- !u!222 &5682940148385255639 CanvasRenderer: @@ -930,7 +930,7 @@ RectTransform: m_AnchorMin: {x: 1, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} m_AnchoredPosition: {x: 0, y: 55} - m_SizeDelta: {x: 321, y: 306} + m_SizeDelta: {x: 512, y: 512} m_Pivot: {x: 1, y: 0.5} --- !u!222 &2170176410431113031 CanvasRenderer: diff --git a/Assets/prefabs/ui/hero/hero_ui.prefab b/Assets/prefabs/ui/hero/hero_ui.prefab index 0e022d731..6068daf6b 100644 --- a/Assets/prefabs/ui/hero/hero_ui.prefab +++ b/Assets/prefabs/ui/hero/hero_ui.prefab @@ -100,7 +100,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &8487396325068720001 RectTransform: m_ObjectHideFlags: 0 @@ -122,7 +122,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} m_AnchoredPosition: {x: 227, y: -38} - m_SizeDelta: {x: 188, y: 48} + m_SizeDelta: {x: 196, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6412929410646324255 CanvasRenderer: @@ -152,7 +152,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 591f658b8a0414c2bab105afddb629fc, type: 3} + m_Sprite: {fileID: 21300000, guid: 5cfb92ca440ded943b4fb19835bdf014, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1323,17 +1323,17 @@ RectTransform: m_GameObject: {fileID: 2660129977274815435} 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_LocalScale: {x: 1.2, y: 1.2, z: 1.2} + m_ConstrainProportionsScale: 1 m_Children: - {fileID: 4115008471483581335} - m_Father: {fileID: 8461932745927490369} - m_RootOrder: 2 + m_Father: {fileID: 8025406717187378890} + 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: 864.5} - m_SizeDelta: {x: 249, y: 69} + m_AnchoredPosition: {x: 0, y: -5.5} + m_SizeDelta: {x: 243, y: 77} m_Pivot: {x: 0.5, y: 0} --- !u!222 &4620759532598883476 CanvasRenderer: @@ -1744,7 +1744,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: 12313 + m_text: m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: b0c1339d1d91a8846affd442449dbf31, type: 2} m_sharedMaterial: {fileID: 2100000, guid: 2e0b5790ea0ce0a4eb6bf1b8b43a6bda, type: 2} @@ -1999,6 +1999,7 @@ RectTransform: - {fileID: 4626885041157728153} - {fileID: 9015989329298107672} - {fileID: 1995445718636100113} + - {fileID: 1090551766330371641} m_Father: {fileID: 8461932745927490369} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -2740,7 +2741,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: 75, y: 15} + m_AnchoredPosition: {x: 80, y: 15} m_SizeDelta: {x: 36, y: 38} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2040083802234517251 @@ -2771,7 +2772,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 3eb24e516a508b34e95d18d01316747c, type: 3} + m_Sprite: {fileID: 21300000, guid: 19cb89eba1b174df4b091ee3984e7f9b, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -2828,7 +2829,6 @@ RectTransform: m_Children: - {fileID: 4615284462064543554} - {fileID: 8025406717187378890} - - {fileID: 1090551766330371641} - {fileID: 5468779054327621916} m_Father: {fileID: 0} m_RootOrder: 0 @@ -3033,8 +3033,8 @@ MonoBehaviour: hashName: 118692388 objectType: 0 gameObject: {fileID: 4204460484441565906} - - name: hero_ui.power_img.power_tx - hashName: 4237332952 + - name: hero_ui.formation.power_img.power_tx + hashName: 2449783797 objectType: 0 gameObject: {fileID: 1639158610145774213} - name: hero_ui.bottom_bg @@ -3045,8 +3045,8 @@ MonoBehaviour: hashName: 540582396 objectType: 0 gameObject: {fileID: 4276860147675910969} - - name: hero_ui.power_img - hashName: 3869466324 + - name: hero_ui.formation.power_img + hashName: 3076190231 objectType: 0 gameObject: {fileID: 2660129977274815435} --- !u!1 &6239724426074708179 @@ -3311,7 +3311,7 @@ RectTransform: - {fileID: 5722074793750768464} - {fileID: 8487396325068720001} m_Father: {fileID: 8461932745927490369} - m_RootOrder: 3 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 0} @@ -4400,8 +4400,8 @@ RectTransform: m_GameObject: {fileID: 8922389308208241080} 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_LocalScale: {x: 0.8, y: 0.8, z: 0.8} + m_ConstrainProportionsScale: 1 m_Children: [] m_Father: {fileID: 8487396325068720001} m_RootOrder: 0 @@ -4409,7 +4409,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: -83, y: 0} - m_SizeDelta: {x: 53, y: 57} + m_SizeDelta: {x: 67, y: 71} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1213251406591225090 CanvasRenderer: @@ -4545,7 +4545,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: 471a678dc340f4f43b842474749cf0df, type: 3} propertyPath: m_Pivot.y - value: 1 + value: 0.5 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: 471a678dc340f4f43b842474749cf0df, type: 3} propertyPath: m_RootOrder @@ -4609,7 +4609,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: 471a678dc340f4f43b842474749cf0df, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -113 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: 471a678dc340f4f43b842474749cf0df, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -5208,7 +5208,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: 471a678dc340f4f43b842474749cf0df, type: 3} propertyPath: m_Pivot.y - value: 1 + value: 0.5 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: 471a678dc340f4f43b842474749cf0df, type: 3} propertyPath: m_RootOrder @@ -5272,7 +5272,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: 471a678dc340f4f43b842474749cf0df, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -113 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: 471a678dc340f4f43b842474749cf0df, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -5315,7 +5315,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: 471a678dc340f4f43b842474749cf0df, type: 3} propertyPath: m_Pivot.y - value: 1 + value: 0.5 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: 471a678dc340f4f43b842474749cf0df, type: 3} propertyPath: m_RootOrder @@ -5379,7 +5379,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: 471a678dc340f4f43b842474749cf0df, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -113 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: 471a678dc340f4f43b842474749cf0df, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -5422,7 +5422,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: 471a678dc340f4f43b842474749cf0df, type: 3} propertyPath: m_Pivot.y - value: 1 + value: 0.5 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: 471a678dc340f4f43b842474749cf0df, type: 3} propertyPath: m_RootOrder @@ -5486,7 +5486,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: 471a678dc340f4f43b842474749cf0df, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -113 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: 471a678dc340f4f43b842474749cf0df, type: 3} propertyPath: m_LocalEulerAnglesHint.x