diff --git a/Assets/arts/atlas/ui/card.asset b/Assets/arts/atlas/ui/card.asset index 8731408ce..52403bc1d 100644 --- a/Assets/arts/atlas/ui/card.asset +++ b/Assets/arts/atlas/ui/card.asset @@ -13,8 +13,13 @@ MonoBehaviour: m_Name: card m_EditorClassIdentifier: spriteList: + - {fileID: 21300000, guid: 46dd3fee86dbd478e89d6469f3e319a0, type: 3} + - {fileID: 21300000, guid: e75e6d1e8f0f64aab9d428c4e02012dd, type: 3} + - {fileID: 21300000, guid: d57a263694e6143aabb4aef05cb75b07, type: 3} + - {fileID: 21300000, guid: d84bd455aad9242868226251277ba58f, type: 3} - {fileID: 21300000, guid: 849ac75f41b23b540b6ae0b57e0092cb, type: 3} - {fileID: 21300000, guid: cd5fd1dc395fedb4cb3ee3607525d390, type: 3} - {fileID: 21300000, guid: bc7cc8a43dfdd9846ad8fc8ca81838db, type: 3} - {fileID: 21300000, guid: 2f31f97f653fa97479285d128670d8a6, type: 3} - spriteNameList: 45e9563a46e9563a47e9563a48e9563a + - {fileID: 21300000, guid: 5a6ec920891d04fa584c4e037d1e9629, type: 3} + spriteNameList: 86c25cf1e9ea72a7eaea72a7ebea72a745e9563a46e9563a47e9563a48e9563a134f798c diff --git a/Assets/arts/atlas/ui/card.spriteatlas b/Assets/arts/atlas/ui/card.spriteatlas index 89a258626..8191ee565 100644 --- a/Assets/arts/atlas/ui/card.spriteatlas +++ b/Assets/arts/atlas/ui/card.spriteatlas @@ -62,13 +62,23 @@ SpriteAtlas: cachedData: {fileID: 0} m_MasterAtlas: {fileID: 0} m_PackedSprites: + - {fileID: 21300000, guid: 5a6ec920891d04fa584c4e037d1e9629, type: 3} - {fileID: 21300000, guid: bc7cc8a43dfdd9846ad8fc8ca81838db, type: 3} + - {fileID: 21300000, guid: d84bd455aad9242868226251277ba58f, type: 3} + - {fileID: 21300000, guid: d57a263694e6143aabb4aef05cb75b07, type: 3} - {fileID: 21300000, guid: cd5fd1dc395fedb4cb3ee3607525d390, type: 3} + - {fileID: 21300000, guid: e75e6d1e8f0f64aab9d428c4e02012dd, type: 3} + - {fileID: 21300000, guid: 46dd3fee86dbd478e89d6469f3e319a0, type: 3} - {fileID: 21300000, guid: 849ac75f41b23b540b6ae0b57e0092cb, type: 3} - {fileID: 21300000, guid: 2f31f97f653fa97479285d128670d8a6, type: 3} m_PackedSpriteNamesToIndex: + - card_point_1 - card_dec_3 + - card_board_3 + - card_board_2 - card_dec_2 + - card_board_1 + - card_bg_1 - card_dec_1 - card_dec_4 m_RenderDataMap: {} diff --git a/Assets/arts/atlas/ui/common.asset b/Assets/arts/atlas/ui/common.asset index aa1e5c60e..8f5341bd1 100644 --- a/Assets/arts/atlas/ui/common.asset +++ b/Assets/arts/atlas/ui/common.asset @@ -14,6 +14,7 @@ MonoBehaviour: m_EditorClassIdentifier: spriteList: - {fileID: 21300000, guid: 4f0b41158f74bfd4a9b0ee0116ff6bb0, type: 3} + - {fileID: 21300000, guid: eb13070192e9d47a2ac961501207c01b, type: 3} - {fileID: 21300000, guid: 608361016deab9a4993d756f0a187d74, type: 3} - {fileID: 21300000, guid: c9a70ad71344ef54cb824c55bdae85cb, type: 3} - {fileID: 21300000, guid: a70289eca986ce142b027934f6cdd63c, type: 3} @@ -253,6 +254,7 @@ MonoBehaviour: - {fileID: 21300000, guid: 8557e6412e7e6464495c2efa8f5f2f78, type: 3} - {fileID: 21300000, guid: 9abaaf4457b41ea46ba4f998c247ddb6, type: 3} - {fileID: 21300000, guid: d28ed00fffa11c7408e4c457ddab242c, type: 3} + - {fileID: 21300000, guid: ad99be0d8e10448be86abf4ef26ef414, type: 3} - {fileID: 21300000, guid: 2b8cdea68aeddb349b4b8c9010c59bef, type: 3} - {fileID: 21300000, guid: 4bc496e900d136b429d4bc7edfdec432, type: 3} - {fileID: 21300000, guid: c19b6240a169be841a2f5d9bfa607302, type: 3} @@ -336,4 +338,4 @@ MonoBehaviour: - {fileID: 21300000, guid: bb8268a6f00cf454181fe75a9832cdff, type: 3} - {fileID: 21300000, guid: 56c233d89e320ac4891f34a6706ffc0c, type: 3} - {fileID: 21300000, guid: d1a0b8eb4c42f7748acb13df7b748132, type: 3} - spriteNameList: e9a43d8deba43d8deca43d8d0ae27a1a2757a7712857a7712957a7712a57a7712b57a7712c57a7712d57a7712e57a771b1ff831a37ebefa68b243e8d056d861a066d861a076d861a086d861a096d861a0a6d861a0b6d861a0c6d861a0d6d861a0e6d861a8c243e8d246d861a256d861a266d861a276d861a286d861a2b6d861a2c6d861a2d6d861a8d243e8d436d861a446d861a456d861a466d861a476d861a486d861a496d861a4a6d861a4b6d861a4c6d861a8e243e8d626d861a636d861a646d861a656d861a666d861a676d861a686d861a696d861a6a6d861a8f243e8d90243e8d91243e8d92243e8d93243e8d1677c01e5ff0dec416c1dad9c48e80a0ec49916fc5f39782c6f39782c7f39782c8f39782c9f39782caf39782cbf39782ccf39782cdf39782ed49916fe3f39782e4f39782e5f39782e6f39782e7f39782e8f39782e9f39782eaf39782ebf39782ecf39782ee49916f02f4978203f4978204f4978205f4978206f4978207f4978208f4978209f497820af497820bf49782ef49916f21f4978222f4978223f4978224f4978225f49782f049916ff149916ff249916ff349916ff449916ff549916fc58e80a00b4a916f0c4a916f0d4a916f0e4a916f0f4a916f104a916f114a916f124a916f134a916fc68e80a02f4a916f304a916fc78e80a0c88e80a0c98e80a0ca8e80a0cb8e80a0cc8e80a0498e3b3fbb2b915e16dc813f85d402ef86d402ef87d402eff7dba86df8dba86df9dba86dfadba86dbed8328da3c7820ca4c7820ca5c7820ca8c7820c3220c78d01853b1973546eb874546eb8c22f500f90c9348d7fea0537be2eb195bf2eb195c02eb195f92eb195e8945815e9945815ea945815ec9458158538368dfbcc388d8cc2e922b76e26590c8b0b1a0d8b0b1a0e8b0b1aa49b7ac547776d277d33eeca7e33eeca7f33eeca8033eeca8133eeca8233eecab833eecab415951a1fecadc920ecadc922ecadc9a4a1213856d43fb6e0c7a11a50349739513497395234973953349739543497395534973956349739573497395834973959349739e1c7a11a6f349739703497397134973972349739733497397434973975349739763497397734973978349739e2c7a11ae3c7a11ae4c7a11ae5c7a11ae6c7a11ae7c7a11ae8c7a11a34e166e68eb7ba30922baf4357abe63dbff20842160398e369606d8f83e25472704398e36c4b965e4ac4708f826e418db4e19f42b5e19f42b6e19f427a737b477b737b477c737b477d737b477e737b477f737b4780737b4781737b47ffce428df116cb47f216cb47f316cb47297452d3252af848262af848272af848282af8482a2af8482b2af8484c159f46fefd2e1b6e97448da07f7c4ea17f7c4ea27f7c4e3c864f1beef28685eff286857351fb6991c62c357451fb6926d06cd827d06cd828d06cd8f03a2d357551fb694faf2d357651fb69ae232e357751fb699d83f5979e83f5979f83f597a083f597a183f5977449601b6e3feee1794eaac0611e220557aa025458aa025459aa02545aaa0254b36a811ba595d140a695d140b46a811b6699d1406799d140b09961d9b56a811bb66a811be8a0d140b76a811ba9a4d14003f2ab54ed355bf9f022f4ccf122f4ccf222f4ccf322f4ccf422f4cce34e1d55e44e1d55a15c468d14c42155be552355bf552355c0552355b6ad7c4f3a0919a03b0919a03c0919a03d0919a03e0919a03f0919a0400919a0410919a0420919a0430919a0b7ad7c4fb8ad7c4fb9ad7c4fbaad7c4fbbad7c4fbcad7c4fbdad7c4fbead7c4fc569b158c669b158 + spriteNameList: e9a43d8deaa43d8deba43d8deca43d8d0ae27a1a2757a7712857a7712957a7712a57a7712b57a7712c57a7712d57a7712e57a771b1ff831a37ebefa68b243e8d056d861a066d861a076d861a086d861a096d861a0a6d861a0b6d861a0c6d861a0d6d861a0e6d861a8c243e8d246d861a256d861a266d861a276d861a286d861a2b6d861a2c6d861a2d6d861a8d243e8d436d861a446d861a456d861a466d861a476d861a486d861a496d861a4a6d861a4b6d861a4c6d861a8e243e8d626d861a636d861a646d861a656d861a666d861a676d861a686d861a696d861a6a6d861a8f243e8d90243e8d91243e8d92243e8d93243e8d1677c01e5ff0dec416c1dad9c48e80a0ec49916fc5f39782c6f39782c7f39782c8f39782c9f39782caf39782cbf39782ccf39782cdf39782ed49916fe3f39782e4f39782e5f39782e6f39782e7f39782e8f39782e9f39782eaf39782ebf39782ecf39782ee49916f02f4978203f4978204f4978205f4978206f4978207f4978208f4978209f497820af497820bf49782ef49916f21f4978222f4978223f4978224f4978225f49782f049916ff149916ff249916ff349916ff449916ff549916fc58e80a00b4a916f0c4a916f0d4a916f0e4a916f0f4a916f104a916f114a916f124a916f134a916fc68e80a02f4a916f304a916fc78e80a0c88e80a0c98e80a0ca8e80a0cb8e80a0cc8e80a0498e3b3fbb2b915e16dc813f85d402ef86d402ef87d402eff7dba86df8dba86df9dba86dfadba86dbed8328da3c7820ca4c7820ca5c7820ca8c7820c3220c78d01853b1973546eb874546eb8c22f500f90c9348d7fea0537be2eb195bf2eb195c02eb195f92eb195e8945815e9945815ea945815ec9458158538368dfbcc388d8cc2e922b76e26590c8b0b1a0d8b0b1a0e8b0b1aa49b7ac547776d277d33eeca7e33eeca7f33eeca8033eeca8133eeca8233eecab833eecab415951a1fecadc920ecadc922ecadc9a4a1213856d43fb6e0c7a11a50349739513497395234973953349739543497395534973956349739573497395834973959349739e1c7a11a6f349739703497397134973972349739733497397434973975349739763497397734973978349739e2c7a11ae3c7a11ae4c7a11ae5c7a11ae6c7a11ae7c7a11ae8c7a11a34e166e68eb7ba30922baf4357abe63dbff20842160398e369606d8f83e25472704398e36c4b965e4ac4708f826e418db4e19f42b5e19f42b6e19f427a737b477b737b477c737b477d737b477e737b477f737b4780737b4781737b47ffce428df116cb47f216cb47f316cb47297452d3252af848262af848272af848282af848292af8482a2af8482b2af8484c159f46fefd2e1b6e97448da07f7c4ea17f7c4ea27f7c4e3c864f1beef28685eff286857351fb6991c62c357451fb6926d06cd827d06cd828d06cd8f03a2d357551fb694faf2d357651fb69ae232e357751fb699d83f5979e83f5979f83f597a083f597a183f5977449601b6e3feee1794eaac0611e220557aa025458aa025459aa02545aaa0254b36a811ba595d140a695d140b46a811b6699d1406799d140b09961d9b56a811bb66a811be8a0d140b76a811ba9a4d14003f2ab54ed355bf9f022f4ccf122f4ccf222f4ccf322f4ccf422f4cce34e1d55e44e1d55a15c468d14c42155be552355bf552355c0552355b6ad7c4f3a0919a03b0919a03c0919a03d0919a03e0919a03f0919a0400919a0410919a0420919a0430919a0b7ad7c4fb8ad7c4fb9ad7c4fbaad7c4fbbad7c4fbcad7c4fbdad7c4fbead7c4fc569b158c669b158 diff --git a/Assets/arts/atlas/ui/common.spriteatlas b/Assets/arts/atlas/ui/common.spriteatlas index 853b3264e..411a6d43b 100644 --- a/Assets/arts/atlas/ui/common.spriteatlas +++ b/Assets/arts/atlas/ui/common.spriteatlas @@ -84,6 +84,7 @@ SpriteAtlas: - {fileID: 21300000, guid: 608361016deab9a4993d756f0a187d74, type: 3} - {fileID: 21300000, guid: 9df002014670a564fa9e8c639162c7f5, type: 3} - {fileID: 21300000, guid: 9bc39501344a8494daeaf1035cb736db, type: 3} + - {fileID: 21300000, guid: eb13070192e9d47a2ac961501207c01b, type: 3} - {fileID: 21300000, guid: 1a4f780181ba75d4e840fd9a8754eb99, type: 3} - {fileID: 21300000, guid: 58a8fa01577a76a478bb226464b330f7, type: 3} - {fileID: 21300000, guid: 14da6211cc49d5a4a8c31d4e949b3135, type: 3} @@ -409,6 +410,7 @@ SpriteAtlas: - common_ad_3 - common_dec_19 - common_btn_yellow_3 + - common_ad_2 - common_board_106 - common_btn_brown_2 - common_board_111 diff --git a/Assets/arts/textures/ui/card/card_bg_1.png b/Assets/arts/textures/ui/card/card_bg_1.png new file mode 100644 index 000000000..33ba1292d Binary files /dev/null and b/Assets/arts/textures/ui/card/card_bg_1.png differ diff --git a/Assets/arts/textures/ui/card/card_bg_1.png.meta b/Assets/arts/textures/ui/card/card_bg_1.png.meta new file mode 100644 index 000000000..886250808 --- /dev/null +++ b/Assets/arts/textures/ui/card/card_bg_1.png.meta @@ -0,0 +1,147 @@ +fileFormatVersion: 2 +guid: 46dd3fee86dbd478e89d6469f3e319a0 +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: 12, y: 24, z: 12, w: 18} + 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: 1537655665 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/arts/textures/ui/card/card_board_1.png b/Assets/arts/textures/ui/card/card_board_1.png new file mode 100644 index 000000000..0b38fa2eb Binary files /dev/null and b/Assets/arts/textures/ui/card/card_board_1.png differ diff --git a/Assets/arts/textures/ui/card/card_board_1.png.meta b/Assets/arts/textures/ui/card/card_board_1.png.meta new file mode 100644 index 000000000..9289ef53a --- /dev/null +++ b/Assets/arts/textures/ui/card/card_board_1.png.meta @@ -0,0 +1,147 @@ +fileFormatVersion: 2 +guid: e75e6d1e8f0f64aab9d428c4e02012dd +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: 12, y: 12, z: 12, w: 12} + 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: 1537655665 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/arts/textures/ui/card/card_board_2.png b/Assets/arts/textures/ui/card/card_board_2.png new file mode 100644 index 000000000..405a1ca4c Binary files /dev/null and b/Assets/arts/textures/ui/card/card_board_2.png differ diff --git a/Assets/arts/textures/ui/card/card_board_2.png.meta b/Assets/arts/textures/ui/card/card_board_2.png.meta new file mode 100644 index 000000000..fe90e664b --- /dev/null +++ b/Assets/arts/textures/ui/card/card_board_2.png.meta @@ -0,0 +1,147 @@ +fileFormatVersion: 2 +guid: d57a263694e6143aabb4aef05cb75b07 +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: 12, y: 12, z: 12, w: 12} + 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: 1537655665 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/arts/textures/ui/card/card_board_3.png b/Assets/arts/textures/ui/card/card_board_3.png new file mode 100644 index 000000000..f32e13ec5 Binary files /dev/null and b/Assets/arts/textures/ui/card/card_board_3.png differ diff --git a/Assets/arts/textures/ui/card/card_board_3.png.meta b/Assets/arts/textures/ui/card/card_board_3.png.meta new file mode 100644 index 000000000..52c39676b --- /dev/null +++ b/Assets/arts/textures/ui/card/card_board_3.png.meta @@ -0,0 +1,147 @@ +fileFormatVersion: 2 +guid: d84bd455aad9242868226251277ba58f +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/card/card_point_1.png b/Assets/arts/textures/ui/card/card_point_1.png new file mode 100644 index 000000000..404c5cce2 Binary files /dev/null and b/Assets/arts/textures/ui/card/card_point_1.png differ diff --git a/Assets/arts/textures/ui/card/card_point_1.png.meta b/Assets/arts/textures/ui/card/card_point_1.png.meta new file mode 100644 index 000000000..8460174a7 --- /dev/null +++ b/Assets/arts/textures/ui/card/card_point_1.png.meta @@ -0,0 +1,147 @@ +fileFormatVersion: 2 +guid: 5a6ec920891d04fa584c4e037d1e9629 +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_ad_2.png b/Assets/arts/textures/ui/common/common_ad_2.png new file mode 100644 index 000000000..3219b45e7 Binary files /dev/null and b/Assets/arts/textures/ui/common/common_ad_2.png differ diff --git a/Assets/arts/textures/ui/common/common_ad_2.png.meta b/Assets/arts/textures/ui/common/common_ad_2.png.meta new file mode 100644 index 000000000..36cd1092c --- /dev/null +++ b/Assets/arts/textures/ui/common/common_ad_2.png.meta @@ -0,0 +1,147 @@ +fileFormatVersion: 2 +guid: eb13070192e9d47a2ac961501207c01b +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_10.png b/Assets/arts/textures/ui/common/common_dec_10.png index 5c8098d61..b379dd5c2 100644 Binary files a/Assets/arts/textures/ui/common/common_dec_10.png and b/Assets/arts/textures/ui/common/common_dec_10.png 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 fb741b1d0..67e7beca6 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 79d498337..3d9de6add 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/global/global_func.lua.bytes b/Assets/lua/app/global/global_func.lua.bytes index d93abb560..427e691c4 100644 Binary files a/Assets/lua/app/global/global_func.lua.bytes and b/Assets/lua/app/global/global_func.lua.bytes differ diff --git a/Assets/lua/app/ui/common/cell/reward_cell.lua.bytes b/Assets/lua/app/ui/common/cell/reward_cell.lua.bytes index 7d893ce59..9ba833d3b 100644 Binary files a/Assets/lua/app/ui/common/cell/reward_cell.lua.bytes and b/Assets/lua/app/ui/common/cell/reward_cell.lua.bytes differ diff --git a/Assets/lua/app/ui/dungeon/cell/dungeon_gold_cell.lua.bytes b/Assets/lua/app/ui/dungeon/cell/dungeon_gold_cell.lua.bytes index ec7e3e9b5..a394f5c73 100644 Binary files a/Assets/lua/app/ui/dungeon/cell/dungeon_gold_cell.lua.bytes and b/Assets/lua/app/ui/dungeon/cell/dungeon_gold_cell.lua.bytes differ diff --git a/Assets/lua/app/ui/dungeon/cell/dungeon_material_cell.lua.bytes b/Assets/lua/app/ui/dungeon/cell/dungeon_material_cell.lua.bytes index 5079b1d86..8b34eb9bd 100644 Binary files a/Assets/lua/app/ui/dungeon/cell/dungeon_material_cell.lua.bytes and b/Assets/lua/app/ui/dungeon/cell/dungeon_material_cell.lua.bytes differ diff --git a/Assets/lua/app/ui/privilege/comp/free_daily_rewards_comp.lua.bytes b/Assets/lua/app/ui/privilege/comp/free_daily_rewards_comp.lua.bytes index b9caa7b66..32b602c63 100644 Binary files a/Assets/lua/app/ui/privilege/comp/free_daily_rewards_comp.lua.bytes and b/Assets/lua/app/ui/privilege/comp/free_daily_rewards_comp.lua.bytes differ diff --git a/Assets/lua/app/ui/privilege/comp/monthly_card_comp.lua.bytes b/Assets/lua/app/ui/privilege/comp/monthly_card_comp.lua.bytes index 24f81fb3a..cd5906415 100644 Binary files a/Assets/lua/app/ui/privilege/comp/monthly_card_comp.lua.bytes and b/Assets/lua/app/ui/privilege/comp/monthly_card_comp.lua.bytes differ diff --git a/Assets/lua/app/ui/privilege/privilege_main_ui.lua.bytes b/Assets/lua/app/ui/privilege/privilege_main_ui.lua.bytes index 228aa251f..33a8df804 100644 Binary files a/Assets/lua/app/ui/privilege/privilege_main_ui.lua.bytes and b/Assets/lua/app/ui/privilege/privilege_main_ui.lua.bytes differ diff --git a/Assets/prefabs/ui/dungeon/dungeon_daily_main_ui.prefab b/Assets/prefabs/ui/dungeon/dungeon_daily_main_ui.prefab index 7d0e6390b..e6732ed01 100644 --- a/Assets/prefabs/ui/dungeon/dungeon_daily_main_ui.prefab +++ b/Assets/prefabs/ui/dungeon/dungeon_daily_main_ui.prefab @@ -7476,6 +7476,10 @@ PrefabInstance: propertyPath: m_Name value: reward_cell objectReference: {fileID: 0} + - target: {fileID: 6717709196054680970, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7009093410508176747, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_AnchorMax.y value: 0 diff --git a/Assets/prefabs/ui/privilege/privilege_main_ui.prefab b/Assets/prefabs/ui/privilege/privilege_main_ui.prefab index 2169c97d6..fbd5654cb 100644 --- a/Assets/prefabs/ui/privilege/privilege_main_ui.prefab +++ b/Assets/prefabs/ui/privilege/privilege_main_ui.prefab @@ -31,11 +31,11 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8739969702949371759} - 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: -240, y: 17} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: 84, y: 19} m_SizeDelta: {x: 260, y: 70} m_Pivot: {x: 0, y: 0.5} --- !u!222 &5790557598810253035 @@ -396,7 +396,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: f464212c0fbb25b44b373a01fd542c45, type: 3} + m_Sprite: {fileID: 21300000, guid: 5a6ec920891d04fa584c4e037d1e9629, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -443,8 +443,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: -4} - m_SizeDelta: {x: 210, y: 90} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 218, y: 92} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6650552099460452871 CanvasRenderer: @@ -475,7 +475,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_Sprite: {fileID: 21300000, guid: 9bc39501344a8494daeaf1035cb736db, type: 3} - m_Type: 1 + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -632,6 +632,82 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &355614532533881849 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8961090602036418348} + - component: {fileID: 5315416678204245068} + - component: {fileID: 7228141342012931667} + m_Layer: 5 + m_Name: bg + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8961090602036418348 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 355614532533881849} + 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: 5069750572715271705} + 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: 196, y: 112} + m_SizeDelta: {x: 90, y: 28} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5315416678204245068 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 355614532533881849} + m_CullTransparentMesh: 1 +--- !u!114 &7228141342012931667 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 355614532533881849} + 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: d57a263694e6143aabb4aef05cb75b07, type: 3} + m_Type: 1 + 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 &398348107617858830 GameObject: m_ObjectHideFlags: 0 @@ -649,7 +725,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &6127003237476343351 RectTransform: m_ObjectHideFlags: 0 @@ -930,12 +1006,12 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5069750572715271705} - m_RootOrder: 14 + m_RootOrder: 15 m_LocalEulerAnglesHint: {x: 0, y: 0, z: -11} - m_AnchorMin: {x: 0.5, y: 0} - m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: 198, y: 163.80518} - m_SizeDelta: {x: 160, y: 50} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 198, y: -95} + m_SizeDelta: {x: 200, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8913262869834427279 CanvasRenderer: @@ -975,7 +1051,7 @@ MonoBehaviour: m_fontColor32: serializedVersion: 2 rgba: 4294967295 - m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_fontColor: {r: 0.29411766, g: 1, b: 0.3254902, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -1268,7 +1344,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: 160, y: 60} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2534164578581778491 @@ -1302,7 +1378,7 @@ MonoBehaviour: m_text: m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 9d1aadd9ebaf54ce2b217ab8427fa0db, type: 2} - m_sharedMaterial: {fileID: 2100000, guid: 09210edd46ea1463596717e00ea9e8be, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: d9526b8cb4bc030488db413ef429c6f9, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -1403,8 +1479,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: 6} - m_SizeDelta: {x: 180, y: 50} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 200, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &119645077454833503 CanvasRenderer: @@ -1437,7 +1513,7 @@ MonoBehaviour: m_text: m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 9d1aadd9ebaf54ce2b217ab8427fa0db, type: 2} - m_sharedMaterial: {fileID: 2100000, guid: 09210edd46ea1463596717e00ea9e8be, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: d9526b8cb4bc030488db413ef429c6f9, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -1673,7 +1749,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: 7} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 160, y: 60} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3217101333977920208 @@ -1707,7 +1783,7 @@ MonoBehaviour: m_text: m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 9d1aadd9ebaf54ce2b217ab8427fa0db, type: 2} - m_sharedMaterial: {fileID: 2100000, guid: 09210edd46ea1463596717e00ea9e8be, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: d9526b8cb4bc030488db413ef429c6f9, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -1811,7 +1887,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 1} m_AnchoredPosition: {x: 0, y: 115} - m_SizeDelta: {x: 720, y: -283} + m_SizeDelta: {x: 720, y: -255} m_Pivot: {x: 0.5, y: 0} --- !u!222 &8300110228899115550 CanvasRenderer: @@ -1937,7 +2013,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: f464212c0fbb25b44b373a01fd542c45, type: 3} + m_Sprite: {fileID: 21300000, guid: 5a6ec920891d04fa584c4e037d1e9629, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -2056,12 +2132,12 @@ RectTransform: m_Children: - {fileID: 7632915136913288453} m_Father: {fileID: 5069750572715271705} - m_RootOrder: 9 + m_RootOrder: 10 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: 198, y: 59} - m_SizeDelta: {x: 190, y: 89} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 198, y: -149} + m_SizeDelta: {x: 156, y: 68} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2700048531893814488 CanvasRenderer: @@ -2091,8 +2167,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 1f81eb3b68c979f438abb8595d70f379, type: 3} - m_Type: 1 + m_Sprite: {fileID: 21300000, guid: e71034853e8f2eb4e9be049af351872e, type: 3} + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -2180,8 +2256,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 5c537adb5c9044a849752091cf00ea58, type: 3} - m_Type: 1 + m_Sprite: {fileID: 21300000, guid: d84bd455aad9242868226251277ba58f, type: 3} + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -2225,8 +2301,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} - m_AnchoredPosition: {x: 53, y: 0} - m_SizeDelta: {x: 320, y: 40} + m_AnchoredPosition: {x: 58, y: 0} + m_SizeDelta: {x: 240, y: 30} m_Pivot: {x: 0, y: 0.5} --- !u!222 &5505064494372369735 CanvasRenderer: @@ -2356,12 +2432,12 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5069750572715271705} - m_RootOrder: 10 + m_RootOrder: 11 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 61, y: -17} - m_SizeDelta: {x: 120, y: 50} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 196, y: 112} + m_SizeDelta: {x: 90, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2735154670796565074 CanvasRenderer: @@ -2671,6 +2747,82 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &1957436025137821782 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 661425008657998473} + - component: {fileID: 3770523711681232706} + - component: {fileID: 6083266043272061138} + m_Layer: 5 + m_Name: bg + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &661425008657998473 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1957436025137821782} + 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: 8739969702949371759} + 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: 196, y: 95} + m_SizeDelta: {x: 90, y: 28} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3770523711681232706 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1957436025137821782} + m_CullTransparentMesh: 1 +--- !u!114 &6083266043272061138 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1957436025137821782} + 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: d57a263694e6143aabb4aef05cb75b07, type: 3} + m_Type: 1 + 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 &2026685666608098667 GameObject: m_ObjectHideFlags: 0 @@ -2859,11 +3011,11 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8739969702949371759} - m_RootOrder: 7 + m_RootOrder: 8 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: 190.78345, y: 7.593506} + m_AnchoredPosition: {x: 196, y: -2} m_SizeDelta: {x: 206, y: 159} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7180006117855696928 @@ -3096,7 +3248,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} - m_AnchoredPosition: {x: 29, y: 3.5} + m_AnchoredPosition: {x: 31, y: 3.5} m_SizeDelta: {x: 220, y: 50} m_Pivot: {x: 0, y: 0.5} --- !u!222 &155993154657366238 @@ -3213,7 +3365,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &6367091707766232551 RectTransform: m_ObjectHideFlags: 0 @@ -3305,11 +3457,11 @@ RectTransform: - {fileID: 3050804797225175313} - {fileID: 2077395638443766023} m_Father: {fileID: 8739969702949371759} - m_RootOrder: 9 + m_RootOrder: 10 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -44, y: -70} + m_AnchoredPosition: {x: -47, y: -38} m_SizeDelta: {x: 112, y: 112} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &693572808214984782 @@ -3385,7 +3537,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: 160, y: 60} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7290477401052298478 @@ -3419,7 +3571,7 @@ MonoBehaviour: m_text: m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 9d1aadd9ebaf54ce2b217ab8427fa0db, type: 2} - m_sharedMaterial: {fileID: 2100000, guid: 09210edd46ea1463596717e00ea9e8be, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: d9526b8cb4bc030488db413ef429c6f9, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -3448,7 +3600,7 @@ MonoBehaviour: m_fontWeight: 400 m_enableAutoSizing: 1 m_fontSizeMin: 20 - m_fontSizeMax: 26 + m_fontSizeMax: 30 m_fontStyle: 0 m_HorizontalAlignment: 2 m_VerticalAlignment: 512 @@ -3598,8 +3750,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} - m_AnchoredPosition: {x: 53, y: 0} - m_SizeDelta: {x: 320, y: 40} + m_AnchoredPosition: {x: 58, y: 0} + m_SizeDelta: {x: 240, y: 30} m_Pivot: {x: 0, y: 0.5} --- !u!222 &8353987818009669921 CanvasRenderer: @@ -4370,7 +4522,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: 7} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 160, y: 60} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1622745717535905743 @@ -4404,7 +4556,7 @@ MonoBehaviour: m_text: m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 9d1aadd9ebaf54ce2b217ab8427fa0db, type: 2} - m_sharedMaterial: {fileID: 2100000, guid: 09210edd46ea1463596717e00ea9e8be, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: 577ef78bdf3df8a48876ae4d53be9bff, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -4585,7 +4737,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 123} + m_SizeDelta: {x: 0, y: 136} m_Pivot: {x: 0.5, y: 0} --- !u!222 &8068420160505271331 CanvasRenderer: @@ -4615,7 +4767,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 1bf9c73960324d3439e0db7c0390d805, type: 3} + m_Sprite: {fileID: 21300000, guid: 6e494c792605640bdbdf9379172d9404, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -4834,12 +4986,12 @@ RectTransform: m_Children: - {fileID: 388933612725110269} m_Father: {fileID: 5069750572715271705} - m_RootOrder: 8 + m_RootOrder: 9 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: 198, y: 59} - m_SizeDelta: {x: 190, y: 89} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 198, y: -149} + m_SizeDelta: {x: 156, y: 68} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5608292906183302619 CanvasRenderer: @@ -4869,8 +5021,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 9bc39501344a8494daeaf1035cb736db, type: 3} - m_Type: 1 + m_Sprite: {fileID: 21300000, guid: 1a4363e1856808e4ea0a078472b03c75, type: 3} + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -5004,7 +5156,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 1, y: 8} - m_SizeDelta: {x: 200, y: 50} + m_SizeDelta: {x: 120, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7533764614548109453 CanvasRenderer: @@ -5036,8 +5188,8 @@ MonoBehaviour: m_Calls: [] m_text: m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 9d1aadd9ebaf54ce2b217ab8427fa0db, type: 2} - m_sharedMaterial: {fileID: 2100000, guid: d9526b8cb4bc030488db413ef429c6f9, type: 2} + m_fontAsset: {fileID: 11400000, guid: b0c1339d1d91a8846affd442449dbf31, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: 2e0b5790ea0ce0a4eb6bf1b8b43a6bda, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -5171,8 +5323,8 @@ MonoBehaviour: m_Calls: [] m_text: m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 9d1aadd9ebaf54ce2b217ab8427fa0db, type: 2} - m_sharedMaterial: {fileID: 2100000, guid: d9526b8cb4bc030488db413ef429c6f9, type: 2} + m_fontAsset: {fileID: 11400000, guid: b0c1339d1d91a8846affd442449dbf31, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: 2e0b5790ea0ce0a4eb6bf1b8b43a6bda, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -5815,7 +5967,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: f464212c0fbb25b44b373a01fd542c45, type: 3} + m_Sprite: {fileID: 21300000, guid: 5a6ec920891d04fa584c4e037d1e9629, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -5856,11 +6008,11 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8739969702949371759} - m_RootOrder: 4 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 61, y: -17} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 196, y: 95} m_SizeDelta: {x: 120, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4982703623620291328 @@ -5995,8 +6147,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} - m_AnchoredPosition: {x: 53, y: 0} - m_SizeDelta: {x: 320, y: 40} + m_AnchoredPosition: {x: 58, y: 0} + m_SizeDelta: {x: 240, y: 30} m_Pivot: {x: 0, y: 0.5} --- !u!222 &3227985735933535736 CanvasRenderer: @@ -6203,11 +6355,11 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5069750572715271705} - m_RootOrder: 12 + m_RootOrder: 13 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: 190.78345, y: 13.593506} + m_AnchoredPosition: {x: 196, y: 14} m_SizeDelta: {x: 206, y: 159} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2816068483513759874 @@ -6573,12 +6725,12 @@ RectTransform: - {fileID: 4524602462282385534} - {fileID: 6070375241995820869} m_Father: {fileID: 5069750572715271705} - 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: -133, y: 96} - m_SizeDelta: {x: 374, y: 34} + m_AnchoredPosition: {x: -156, y: 91} + m_SizeDelta: {x: 312, y: 34} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1323575328409575362 CanvasRenderer: @@ -6608,7 +6760,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: ae25f604f52cd4e45ad31f31bdea5fbd, type: 3} + m_Sprite: {fileID: 21300000, guid: e75e6d1e8f0f64aab9d428c4e02012dd, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -7360,10 +7512,10 @@ RectTransform: m_Father: {fileID: 1269463075705602695} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 1} - m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: -270, y: -38} - m_SizeDelta: {x: 570, y: 50} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 42, y: -56} + m_SizeDelta: {x: 220, y: 50} m_Pivot: {x: 0, y: 0.5} --- !u!222 &6021217748995115616 CanvasRenderer: @@ -7425,7 +7577,7 @@ MonoBehaviour: m_fontWeight: 400 m_enableAutoSizing: 1 m_fontSizeMin: 20 - m_fontSizeMax: 30 + m_fontSizeMax: 36 m_fontStyle: 0 m_HorizontalAlignment: 1 m_VerticalAlignment: 512 @@ -7479,7 +7631,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &5946202616883296856 RectTransform: m_ObjectHideFlags: 0 @@ -7571,10 +7723,10 @@ RectTransform: m_Father: {fileID: 2634520209456113151} 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: -106, y: 3.5} - m_SizeDelta: {x: 230, y: 50} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: 31, y: 0} + m_SizeDelta: {x: 220, y: 50} m_Pivot: {x: 0, y: 0.5} --- !u!222 &1075675748449011998 CanvasRenderer: @@ -7631,8 +7783,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 22 - m_fontSizeBase: 22 + m_fontSize: 20 + m_fontSizeBase: 20 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 20 @@ -7955,8 +8107,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: -4} - m_SizeDelta: {x: 210, y: 90} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 218, y: 92} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6004643201965678041 CanvasRenderer: @@ -7986,8 +8138,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 1f81eb3b68c979f438abb8595d70f379, type: 3} - m_Type: 1 + m_Sprite: {fileID: 21300000, guid: b7ec10a4771dc744eba18a4cc4491c01, type: 3} + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -8491,7 +8643,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &5952604655382108610 RectTransform: m_ObjectHideFlags: 0 @@ -8507,12 +8659,12 @@ RectTransform: - {fileID: 8797495267163657508} - {fileID: 8616149147701794754} m_Father: {fileID: 5069750572715271705} - m_RootOrder: 5 + 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} - m_AnchoredPosition: {x: -133, y: -30} - m_SizeDelta: {x: 374, y: 34} + m_AnchoredPosition: {x: -156, y: -30} + m_SizeDelta: {x: 312, y: 34} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8628312564425559770 CanvasRenderer: @@ -8542,7 +8694,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: ae25f604f52cd4e45ad31f31bdea5fbd, type: 3} + m_Sprite: {fileID: 21300000, guid: e75e6d1e8f0f64aab9d428c4e02012dd, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -8586,9 +8738,9 @@ RectTransform: m_Father: {fileID: 6003606013773546669} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.5} - m_AnchorMax: {x: 0, y: 0.5} - m_AnchoredPosition: {x: 56, y: -5} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 104, y: 65} m_SizeDelta: {x: 132, y: 96} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6408737136447763040 @@ -8674,6 +8826,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 6127003237476343351} + - {fileID: 8961090602036418348} - {fileID: 5033726160391382817} - {fileID: 5594214733246749124} - {fileID: 6456407436649844012} @@ -8695,7 +8848,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} m_AnchoredPosition: {x: 0, y: -209} - m_SizeDelta: {x: 658, y: 450} + m_SizeDelta: {x: 658, y: 447} m_Pivot: {x: 0.5, y: 1} --- !u!222 &8947234993019769343 CanvasRenderer: @@ -8863,12 +9016,12 @@ RectTransform: - {fileID: 8163991426369790321} - {fileID: 6790204172704288390} m_Father: {fileID: 5069750572715271705} - m_RootOrder: 6 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} - m_AnchoredPosition: {x: 3.5, y: -94} - m_SizeDelta: {x: 297.3315, y: 51} + m_AnchoredPosition: {x: 0, y: -69} + m_SizeDelta: {x: 215, y: 58} m_Pivot: {x: 0, y: 0.5} --- !u!222 &3230359458953380961 CanvasRenderer: @@ -8898,8 +9051,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 9f829ddca22584587ad74666add915d3, type: 3} - m_Type: 0 + m_Sprite: {fileID: 21300000, guid: 46dd3fee86dbd478e89d6469f3e319a0, type: 3} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -8974,7 +9127,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: f464212c0fbb25b44b373a01fd542c45, type: 3} + m_Sprite: {fileID: 21300000, guid: 5a6ec920891d04fa584c4e037d1e9629, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -9015,12 +9168,12 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5069750572715271705} - m_RootOrder: 11 + m_RootOrder: 12 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: 198, y: 122} - m_SizeDelta: {x: 200, y: 50} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 196, y: -70} + m_SizeDelta: {x: 200, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5981016959835817581 CanvasRenderer: @@ -9060,7 +9213,7 @@ MonoBehaviour: m_fontColor32: serializedVersion: 2 rgba: 4294967295 - m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_fontColor: {r: 0.29411766, g: 1, b: 0.3254902, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -9152,12 +9305,12 @@ RectTransform: - {fileID: 5855597044988885596} - {fileID: 36114249799129555} m_Father: {fileID: 5069750572715271705} - 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: -133, y: 12} - m_SizeDelta: {x: 374, y: 34} + m_AnchoredPosition: {x: -156, y: -2} + m_SizeDelta: {x: 312, y: 34} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7604113431973411481 CanvasRenderer: @@ -9187,7 +9340,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: ae25f604f52cd4e45ad31f31bdea5fbd, type: 3} + m_Sprite: {fileID: 21300000, guid: e75e6d1e8f0f64aab9d428c4e02012dd, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -9230,12 +9383,12 @@ RectTransform: - {fileID: 1584185630375426546} - {fileID: 5708025209154822917} m_Father: {fileID: 8739969702949371759} - m_RootOrder: 6 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} - m_AnchoredPosition: {x: 3.5, y: -103} - m_SizeDelta: {x: 255, y: 67} + m_AnchoredPosition: {x: 0, y: -103} + m_SizeDelta: {x: 258, y: 58} m_Pivot: {x: 0, y: 0.5} --- !u!222 &614967024005842685 CanvasRenderer: @@ -9265,7 +9418,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: ae25f604f52cd4e45ad31f31bdea5fbd, type: 3} + m_Sprite: {fileID: 21300000, guid: 46dd3fee86dbd478e89d6469f3e319a0, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -9312,8 +9465,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: 198, y: -30} - m_SizeDelta: {x: 190, y: 89} + m_AnchoredPosition: {x: 196, y: -44} + m_SizeDelta: {x: 156, y: 68} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3670060250211864004 CanvasRenderer: @@ -9343,8 +9496,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 9bc39501344a8494daeaf1035cb736db, type: 3} - m_Type: 1 + m_Sprite: {fileID: 21300000, guid: 1a4363e1856808e4ea0a078472b03c75, type: 3} + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -9397,12 +9550,12 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5069750572715271705} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 1} - m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: -270, y: -70} - m_SizeDelta: {x: 500, y: 50} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: 42, y: 168} + m_SizeDelta: {x: 220, y: 50} m_Pivot: {x: 0, y: 0.5} --- !u!222 &7106664230438632130 CanvasRenderer: @@ -9543,7 +9696,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: 658, y: 188} + m_SizeDelta: {x: 658, y: 224} m_Pivot: {x: 0.5, y: 1} --- !u!222 &1619271725957185211 CanvasRenderer: @@ -9650,12 +9803,12 @@ RectTransform: - {fileID: 8957311720485871295} - {fileID: 4284318273100841224} m_Father: {fileID: 5069750572715271705} - 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: -133, y: 54} - m_SizeDelta: {x: 374, y: 34} + m_AnchoredPosition: {x: -156, y: 46} + m_SizeDelta: {x: 312, y: 34} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7120648500027828210 CanvasRenderer: @@ -9685,7 +9838,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: ae25f604f52cd4e45ad31f31bdea5fbd, type: 3} + m_Sprite: {fileID: 21300000, guid: e75e6d1e8f0f64aab9d428c4e02012dd, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -9782,7 +9935,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} - m_AnchoredPosition: {x: 29, y: 3.5} + m_AnchoredPosition: {x: 31, y: 3.5} m_SizeDelta: {x: 140, y: 50} m_Pivot: {x: 0, y: 0.5} --- !u!222 &7773503047778572459 @@ -9915,11 +10068,11 @@ RectTransform: - {fileID: 4310687898312464489} - {fileID: 1063070491074301729} m_Father: {fileID: 5069750572715271705} - m_RootOrder: 15 + m_RootOrder: 16 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -44, y: -70} + m_AnchoredPosition: {x: -47, y: -38} m_SizeDelta: {x: 112, y: 112} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7350457078390869005 @@ -10219,12 +10372,12 @@ RectTransform: - {fileID: 8317845736527334999} - {fileID: 3643119841592847279} m_Father: {fileID: 5069750572715271705} - m_RootOrder: 7 + m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} - m_AnchoredPosition: {x: 3.5, y: -176.4} - m_SizeDelta: {x: 276, y: 51} + m_AnchoredPosition: {x: 0, y: -151} + m_SizeDelta: {x: 258, y: 58} m_Pivot: {x: 0, y: 0.5} --- !u!222 &6024117611254558684 CanvasRenderer: @@ -10254,8 +10407,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 9f829ddca22584587ad74666add915d3, type: 3} - m_Type: 0 + m_Sprite: {fileID: 21300000, guid: 46dd3fee86dbd478e89d6469f3e319a0, type: 3} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -10724,8 +10877,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: 6} - m_SizeDelta: {x: 180, y: 60} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 200, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6367356191371706087 CanvasRenderer: @@ -10758,7 +10911,7 @@ MonoBehaviour: m_text: m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 9d1aadd9ebaf54ce2b217ab8427fa0db, type: 2} - m_sharedMaterial: {fileID: 2100000, guid: 09210edd46ea1463596717e00ea9e8be, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: 577ef78bdf3df8a48876ae4d53be9bff, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -11228,8 +11381,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} - m_AnchoredPosition: {x: 53, y: 0} - m_SizeDelta: {x: 320, y: 40} + m_AnchoredPosition: {x: 58, y: 0} + m_SizeDelta: {x: 240, y: 30} m_Pivot: {x: 0, y: 0.5} --- !u!222 &4128860853134130815 CanvasRenderer: @@ -11579,8 +11732,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: 198, y: -30} - m_SizeDelta: {x: 190, y: 89} + m_AnchoredPosition: {x: 196, y: -44} + m_SizeDelta: {x: 156, y: 68} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4977629125874730466 CanvasRenderer: @@ -11610,8 +11763,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 1f81eb3b68c979f438abb8595d70f379, type: 3} - m_Type: 1 + m_Sprite: {fileID: 21300000, guid: e71034853e8f2eb4e9be049af351872e, type: 3} + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -11665,6 +11818,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 5946202616883296856} + - {fileID: 661425008657998473} - {fileID: 5984389929148871986} - {fileID: 5603238122622375177} - {fileID: 330897064121492438} @@ -11680,7 +11834,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} m_AnchoredPosition: {x: 0, y: -208} - m_SizeDelta: {x: 658, y: 370} + m_SizeDelta: {x: 658, y: 414} m_Pivot: {x: 0.5, y: 1} --- !u!222 &7301146899469912288 CanvasRenderer: @@ -11807,11 +11961,11 @@ RectTransform: m_Children: - {fileID: 4578177562776515159} m_Father: {fileID: 8739969702949371759} - m_RootOrder: 5 + 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} - m_AnchoredPosition: {x: 198, y: -125} + m_AnchoredPosition: {x: 196, y: -137} m_SizeDelta: {x: 190, y: 89} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6393879075785808688 @@ -12035,7 +12189,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: 160, y: 60} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8929663860397910861 @@ -12069,7 +12223,7 @@ MonoBehaviour: m_text: m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 9d1aadd9ebaf54ce2b217ab8427fa0db, type: 2} - m_sharedMaterial: {fileID: 2100000, guid: 09210edd46ea1463596717e00ea9e8be, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: 577ef78bdf3df8a48876ae4d53be9bff, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -12098,7 +12252,7 @@ MonoBehaviour: m_fontWeight: 400 m_enableAutoSizing: 1 m_fontSizeMin: 20 - m_fontSizeMax: 26 + m_fontSizeMax: 30 m_fontStyle: 0 m_HorizontalAlignment: 2 m_VerticalAlignment: 512 @@ -12377,12 +12531,12 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8739969702949371759} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 1} - m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: -270, y: -70} - m_SizeDelta: {x: 500, y: 50} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 42, y: -56} + m_SizeDelta: {x: 240, y: 50} m_Pivot: {x: 0, y: 0.5} --- !u!222 &4337462707634873061 CanvasRenderer: @@ -12588,12 +12742,12 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8739969702949371759} - 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: -278, y: 17} - m_SizeDelta: {x: 60, y: 60} + m_AnchoredPosition: {x: -282, y: 17} + m_SizeDelta: {x: 46, y: 38} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &493934153383448109 CanvasRenderer: @@ -12623,7 +12777,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: f8e2110391e9ec1479e1c851c821fe14, type: 3} + m_Sprite: {fileID: 21300000, guid: eb13070192e9d47a2ac961501207c01b, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -12670,7 +12824,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_AnchorMax.x - value: 0.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_AnchorMax.y @@ -12678,7 +12832,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_AnchorMin.x - value: 0.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_AnchorMin.y @@ -12734,11 +12888,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_AnchoredPosition.x - value: 156 + value: 291.5 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_AnchoredPosition.y - value: 3.5 + value: 3.4999695 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -12854,7 +13008,7 @@ PrefabInstance: - target: {fileID: 2505651998029909099, guid: 4f7cf840d6e73e14781807788b817568, type: 3} propertyPath: skeletonDataAsset value: - objectReference: {fileID: 11400000, guid: f556b4419fad25a4fa67332dd86fb9f3, type: 2} + objectReference: {fileID: 0} - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -13103,7 +13257,7 @@ PrefabInstance: - target: {fileID: 2505651998029909099, guid: 4f7cf840d6e73e14781807788b817568, type: 3} propertyPath: skeletonDataAsset value: - objectReference: {fileID: 11400000, guid: f556b4419fad25a4fa67332dd86fb9f3, type: 2} + objectReference: {fileID: 0} - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -13114,7 +13268,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} propertyPath: m_RootOrder - value: 13 + value: 14 objectReference: {fileID: 0} - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} propertyPath: m_AnchorMax.x @@ -13352,7 +13506,7 @@ PrefabInstance: - target: {fileID: 2505651998029909099, guid: 4f7cf840d6e73e14781807788b817568, type: 3} propertyPath: skeletonDataAsset value: - objectReference: {fileID: 11400000, guid: f556b4419fad25a4fa67332dd86fb9f3, type: 2} + objectReference: {fileID: 0} - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -13363,7 +13517,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} propertyPath: m_RootOrder - value: 8 + value: 9 objectReference: {fileID: 0} - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} propertyPath: m_AnchorMax.x @@ -13883,7 +14037,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_AnchoredPosition.x - value: 212 + value: 216.5 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_AnchoredPosition.y @@ -14003,7 +14157,7 @@ PrefabInstance: - target: {fileID: 2505651998029909099, guid: 4f7cf840d6e73e14781807788b817568, type: 3} propertyPath: skeletonDataAsset value: - objectReference: {fileID: 11400000, guid: f556b4419fad25a4fa67332dd86fb9f3, type: 2} + objectReference: {fileID: 0} - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -14371,15 +14525,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_LocalScale.x - value: 0.6 + value: 0.5 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_LocalScale.y - value: 0.6 + value: 0.5 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_LocalScale.z - value: 0.6 + value: 0.5 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_LocalPosition.x @@ -14411,7 +14565,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_AnchoredPosition.x - value: 169 + value: 162.5 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_AnchoredPosition.y @@ -14429,6 +14583,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} + propertyPath: m_ConstrainProportionsScale + value: 1 + objectReference: {fileID: 0} - target: {fileID: 4321899004630069736, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -14570,15 +14728,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_LocalScale.x - value: 0.6 + value: 0.5 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_LocalScale.y - value: 0.6 + value: 0.5 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_LocalScale.z - value: 0.6 + value: 0.5 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_LocalPosition.x @@ -14610,11 +14768,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_AnchoredPosition.x - value: -256 + value: -273 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_AnchoredPosition.y - value: -30 + value: -38 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -14628,6 +14786,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} + propertyPath: m_ConstrainProportionsScale + value: 1 + objectReference: {fileID: 0} - target: {fileID: 4321899004630069736, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -14863,6 +15025,10 @@ PrefabInstance: propertyPath: m_Name value: reward_cell_1 objectReference: {fileID: 0} + - target: {fileID: 6717709196054680970, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 7009093410508176747, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_AnchorMax.y value: 0 diff --git a/Assets/prefabs/ui/summon/summon_main_ui.prefab b/Assets/prefabs/ui/summon/summon_main_ui.prefab index 345e4b95d..a3a63abb3 100644 --- a/Assets/prefabs/ui/summon/summon_main_ui.prefab +++ b/Assets/prefabs/ui/summon/summon_main_ui.prefab @@ -1876,7 +1876,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 141} + m_SizeDelta: {x: 0, y: 136} m_Pivot: {x: 0.5, y: 0} --- !u!222 &5403587202297263142 CanvasRenderer: