diff --git a/Assets/arts/atlas/ui/common.asset b/Assets/arts/atlas/ui/common.asset index b6bd0c1cb..4a28c93b7 100644 --- a/Assets/arts/atlas/ui/common.asset +++ b/Assets/arts/atlas/ui/common.asset @@ -57,6 +57,7 @@ MonoBehaviour: - {fileID: 21300000, guid: 2ea0b70e315bb48a49bac0278c8aaa02, type: 3} - {fileID: 21300000, guid: d716c5505f7f54fe4bdb624b55141012, type: 3} - {fileID: 21300000, guid: f26e07a00be5c469c92ffb50eaf4482d, type: 3} + - {fileID: 21300000, guid: 5c537adb5c9044a849752091cf00ea58, type: 3} - {fileID: 21300000, guid: 4d5eca674cfc87745bd0c368f2270a6c, type: 3} - {fileID: 21300000, guid: 7232d781b35ea8742abca796fec7106d, type: 3} - {fileID: 21300000, guid: b143f69564fbebd479463ddf96a9685a, type: 3} @@ -297,4 +298,4 @@ MonoBehaviour: - {fileID: 21300000, guid: bb8268a6f00cf454181fe75a9832cdff, type: 3} - {fileID: 21300000, guid: 56c233d89e320ac4891f34a6706ffc0c, type: 3} - {fileID: 21300000, guid: d1a0b8eb4c42f7748acb13df7b748132, type: 3} - spriteNameList: e9a43d8deba43d8deca43d8d0ae27a1a2757a7712857a7712957a7712a57a7712b57a7712c57a7712d57a7712e57a771b1ff831a37ebefa68b243e8d056d861a066d861a076d861a086d861a096d861a0a6d861a0b6d861a0c6d861a0d6d861a0e6d861a8c243e8d246d861a256d861a266d861a276d861a286d861a2b6d861a2c6d861a2d6d861a8d243e8d436d861a446d861a456d861a466d861a476d861a486d861a496d861a4a6d861a4b6d861a8e243e8d8f243e8d90243e8d91243e8d92243e8d93243e8d5ff0dec4c48e80a0ec49916fc5f39782c6f39782c7f39782c8f39782c9f39782caf39782cbf39782ccf39782cdf39782ed49916fe3f39782e4f39782e5f39782e6f39782e7f39782e8f39782e9f39782eaf39782ebf39782ecf39782ee49916f02f4978203f4978204f4978205f4978206f4978207f4978208f4978209f497820af497820bf49782ef49916f21f4978222f4978223f4978224f4978225f49782f049916ff149916ff249916ff349916ff449916ff549916fc58e80a00b4a916f0c4a916f0d4a916f0e4a916f0f4a916f104a916f114a916f124a916f134a916fc68e80a02f4a916f304a916fc78e80a0c88e80a0c98e80a0ca8e80a0cb8e80a0cc8e80a085d402ef86d402ef87d402eff7dba86df8dba86df9dba86dfadba86dbed8328da3c7820ca4c7820ca5c7820ca8c7820c3220c78d01853b1974546eb8c22f500f90c9348dbe2eb195bf2eb195c02eb195f92eb195e8945815e9945815ea9458158538368dfbcc388d8cc2e922b76e26590c8b0b1a0d8b0b1a0e8b0b1aa49b7ac547776d277d33eeca7e33eeca7f33eeca8133eeca8233eecab833eecab415951a1fecadc920ecadc922ecadc9a4a1213856d43fb6e0c7a11a50349739513497395234973953349739543497395534973956349739573497395834973959349739e1c7a11a6f349739703497397134973972349739733497397434973975349739763497397734973978349739e2c7a11ae3c7a11ae4c7a11ae5c7a11ae6c7a11ae7c7a11ae8c7a11a34e166e68eb7ba30922baf4357abe63dbff20842160398e369606d8f83e25472704398e36c4b965e4ac4708f826e418db4e19f42b5e19f42b6e19f427a737b477b737b477c737b477d737b477e737b477f737b4780737b4781737b47ffce428df116cb47f216cb47252af848262af848272af8484c159f46fefd2e1b6e97448da07f7c4ea17f7c4ea27f7c4e3c864f1beef28685eff286857351fb6991c62c357451fb69f03a2d357551fb694faf2d357651fb69ae232e357751fb699d83f5979e83f5979f83f597a083f597a183f5976e3feee1794eaac0611e220557aa025458aa025459aa02545aaa0254b36a811bb46a811bb56a811bed355bf9f022f4ccf122f4ccf222f4ccf322f4ccf422f4cce44e1d55a15c468d14c42155be552355bf552355c0552355b6ad7c4f3a0919a03b0919a03c0919a03d0919a03e0919a03f0919a0400919a0410919a0420919a0430919a0b7ad7c4fb8ad7c4fb9ad7c4fbaad7c4fbbad7c4fbcad7c4fbdad7c4fbead7c4fc569b158c669b158 + spriteNameList: e9a43d8deba43d8deca43d8d0ae27a1a2757a7712857a7712957a7712a57a7712b57a7712c57a7712d57a7712e57a771b1ff831a37ebefa68b243e8d056d861a066d861a076d861a086d861a096d861a0a6d861a0b6d861a0c6d861a0d6d861a0e6d861a8c243e8d246d861a256d861a266d861a276d861a286d861a2b6d861a2c6d861a2d6d861a8d243e8d436d861a446d861a456d861a466d861a476d861a486d861a496d861a4a6d861a4b6d861a4c6d861a8e243e8d8f243e8d90243e8d91243e8d92243e8d93243e8d5ff0dec4c48e80a0ec49916fc5f39782c6f39782c7f39782c8f39782c9f39782caf39782cbf39782ccf39782cdf39782ed49916fe3f39782e4f39782e5f39782e6f39782e7f39782e8f39782e9f39782eaf39782ebf39782ecf39782ee49916f02f4978203f4978204f4978205f4978206f4978207f4978208f4978209f497820af497820bf49782ef49916f21f4978222f4978223f4978224f4978225f49782f049916ff149916ff249916ff349916ff449916ff549916fc58e80a00b4a916f0c4a916f0d4a916f0e4a916f0f4a916f104a916f114a916f124a916f134a916fc68e80a02f4a916f304a916fc78e80a0c88e80a0c98e80a0ca8e80a0cb8e80a0cc8e80a085d402ef86d402ef87d402eff7dba86df8dba86df9dba86dfadba86dbed8328da3c7820ca4c7820ca5c7820ca8c7820c3220c78d01853b1974546eb8c22f500f90c9348dbe2eb195bf2eb195c02eb195f92eb195e8945815e9945815ea9458158538368dfbcc388d8cc2e922b76e26590c8b0b1a0d8b0b1a0e8b0b1aa49b7ac547776d277d33eeca7e33eeca7f33eeca8133eeca8233eecab833eecab415951a1fecadc920ecadc922ecadc9a4a1213856d43fb6e0c7a11a50349739513497395234973953349739543497395534973956349739573497395834973959349739e1c7a11a6f349739703497397134973972349739733497397434973975349739763497397734973978349739e2c7a11ae3c7a11ae4c7a11ae5c7a11ae6c7a11ae7c7a11ae8c7a11a34e166e68eb7ba30922baf4357abe63dbff20842160398e369606d8f83e25472704398e36c4b965e4ac4708f826e418db4e19f42b5e19f42b6e19f427a737b477b737b477c737b477d737b477e737b477f737b4780737b4781737b47ffce428df116cb47f216cb47252af848262af848272af8484c159f46fefd2e1b6e97448da07f7c4ea17f7c4ea27f7c4e3c864f1beef28685eff286857351fb6991c62c357451fb69f03a2d357551fb694faf2d357651fb69ae232e357751fb699d83f5979e83f5979f83f597a083f597a183f5976e3feee1794eaac0611e220557aa025458aa025459aa02545aaa0254b36a811bb46a811bb56a811bed355bf9f022f4ccf122f4ccf222f4ccf322f4ccf422f4cce44e1d55a15c468d14c42155be552355bf552355c0552355b6ad7c4f3a0919a03b0919a03c0919a03d0919a03e0919a03f0919a0400919a0410919a0420919a0430919a0b7ad7c4fb8ad7c4fb9ad7c4fbaad7c4fbbad7c4fbcad7c4fbdad7c4fbead7c4fc569b158c669b158 diff --git a/Assets/arts/atlas/ui/common.spriteatlas b/Assets/arts/atlas/ui/common.spriteatlas index 0d5a5f2c5..c4abeca5a 100644 --- a/Assets/arts/atlas/ui/common.spriteatlas +++ b/Assets/arts/atlas/ui/common.spriteatlas @@ -275,6 +275,7 @@ SpriteAtlas: - {fileID: 21300000, guid: 6fcfdf7ba1e7f4441a15bd5d888541d0, type: 3} - {fileID: 21300000, guid: 591f658b8a0414c2bab105afddb629fc, type: 3} - {fileID: 21300000, guid: 0bf8a7cbeee241d429745b8e3af4b0b3, type: 3} + - {fileID: 21300000, guid: 5c537adb5c9044a849752091cf00ea58, type: 3} - {fileID: 21300000, guid: 198db5ebea9ee4b4d93b4a62cb879ea2, type: 3} - {fileID: 21300000, guid: d1a0b8eb4c42f7748acb13df7b748132, type: 3} - {fileID: 21300000, guid: 19cb89eba1b174df4b091ee3984e7f9b, type: 3} @@ -560,6 +561,7 @@ SpriteAtlas: - common_bg_3 - common_bg_13 - common_btn_green_1 + - common_bg_39 - common_dec_24 - common_toast_2 - common_info_3 diff --git a/Assets/arts/atlas/ui/main.asset b/Assets/arts/atlas/ui/main.asset index 3c85bc578..e543d0ddd 100644 --- a/Assets/arts/atlas/ui/main.asset +++ b/Assets/arts/atlas/ui/main.asset @@ -29,6 +29,7 @@ MonoBehaviour: - {fileID: 21300000, guid: d2243d80c5fd24afb9acdfb451af586c, type: 3} - {fileID: 21300000, guid: ddbd53558e5cd4e7e8ac00499f67d156, type: 3} - {fileID: 21300000, guid: 2eefddfc66c9141f8b27e7eab0d47eb8, type: 3} + - {fileID: 21300000, guid: f7613f2ab84a246758c5af40b0aa87f7, type: 3} - {fileID: 21300000, guid: 3f33d85babbffbb4e86cda9ff18be72e, type: 3} - {fileID: 21300000, guid: ddc829b8adf444b43a57f7ddbd279aa9, type: 3} - {fileID: 21300000, guid: 5962af8bc86575c459b454d2266f805a, type: 3} @@ -54,4 +55,4 @@ MonoBehaviour: - {fileID: 21300000, guid: 64f989e8b40a3fc4ea138aa6d314d7be, type: 3} - {fileID: 21300000, guid: 273a77a38cd5f9648bbcac359fbdfa45, type: 3} - {fileID: 21300000, guid: df3282ede5d4e6740b33cbb893059cb3, type: 3} - spriteNameList: a4fb3c18ff482b2f8513251e00492b2fe487251e7d7901f17e7901f17f7901f1807901f1817901f1827901f1837901f1847901f108dd332f09dd332f0add332f5edc478b348a45df8e8280046b7a72e76c7a72e76d7a72e7ea9fa59e992f0ec35a7dbed43b208104d5cfde8b80658304a5b4b131dafdfdf99b75338ce7ad997bb87f34fa4e958604045919252e11492f2f11492f3011492f3111492f3211492f61a4d796 + spriteNameList: a4fb3c18ff482b2f8513251e00492b2fe487251e7d7901f17e7901f17f7901f1807901f1817901f1827901f1837901f1847901f108dd332f09dd332f0add332f0bdd332f5edc478b348a45df8e8280046b7a72e76c7a72e76d7a72e7ea9fa59e992f0ec35a7dbed43b208104d5cfde8b80658304a5b4b131dafdfdf99b75338ce7ad997bb87f34fa4e958604045919252e11492f2f11492f3011492f3111492f3211492f61a4d796 diff --git a/Assets/arts/atlas/ui/main.spriteatlas b/Assets/arts/atlas/ui/main.spriteatlas index f9cf548e1..18f4bfa6d 100644 --- a/Assets/arts/atlas/ui/main.spriteatlas +++ b/Assets/arts/atlas/ui/main.spriteatlas @@ -87,6 +87,7 @@ SpriteAtlas: - {fileID: 21300000, guid: 3b8b81d91ad1142a7bcfb90a5db97a62, type: 3} - {fileID: 21300000, guid: 45f3e01aee5af463588379bf5fd02876, type: 3} - {fileID: 21300000, guid: 1b39231a2439e764c91127d5180e9960, type: 3} + - {fileID: 21300000, guid: f7613f2ab84a246758c5af40b0aa87f7, type: 3} - {fileID: 21300000, guid: 6a471cbadff649e429c3ca4a54c0fd4b, type: 3} - {fileID: 21300000, guid: 24bbdfcaaebfc48748f8f1c235afa457, type: 3} - {fileID: 21300000, guid: 3f33d85babbffbb4e86cda9ff18be72e, type: 3} @@ -129,6 +130,7 @@ SpriteAtlas: - main_bar_2_bg - main_banner_1 - main_btn_gift_new + - main_btn_4 - main_bg_1 - main_bg_5 - main_btn_arena diff --git a/Assets/arts/textures/ui/common/common_bg_39.png b/Assets/arts/textures/ui/common/common_bg_39.png new file mode 100644 index 000000000..3df9e4692 Binary files /dev/null and b/Assets/arts/textures/ui/common/common_bg_39.png differ diff --git a/Assets/arts/textures/ui/common/common_bg_39.png.meta b/Assets/arts/textures/ui/common/common_bg_39.png.meta new file mode 100644 index 000000000..8167bc1a7 --- /dev/null +++ b/Assets/arts/textures/ui/common/common_bg_39.png.meta @@ -0,0 +1,147 @@ +fileFormatVersion: 2 +guid: 5c537adb5c9044a849752091cf00ea58 +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: 236, y: 36, z: 236, w: 100} + 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/main/main_btn_4.png b/Assets/arts/textures/ui/main/main_btn_4.png new file mode 100644 index 000000000..743752d45 Binary files /dev/null and b/Assets/arts/textures/ui/main/main_btn_4.png differ diff --git a/Assets/arts/textures/ui/main/main_btn_4.png.meta b/Assets/arts/textures/ui/main/main_btn_4.png.meta new file mode 100644 index 000000000..a8f1e980e --- /dev/null +++ b/Assets/arts/textures/ui/main/main_btn_4.png.meta @@ -0,0 +1,147 @@ +fileFormatVersion: 2 +guid: f7613f2ab84a246758c5af40b0aa87f7 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 47 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 50 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 12 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/lua/app/common/data_manager.lua.bytes b/Assets/lua/app/common/data_manager.lua.bytes index 712d5b8ef..3fa314f08 100644 Binary files a/Assets/lua/app/common/data_manager.lua.bytes and b/Assets/lua/app/common/data_manager.lua.bytes differ diff --git a/Assets/lua/app/config/attr.lua.bytes b/Assets/lua/app/config/attr.lua.bytes index a009ad2cd..b68387aef 100644 Binary files a/Assets/lua/app/config/attr.lua.bytes and b/Assets/lua/app/config/attr.lua.bytes differ diff --git a/Assets/lua/app/config/daily_challenge_level.lua.bytes b/Assets/lua/app/config/daily_challenge_level.lua.bytes index cefe0ceec..35801ee75 100644 Binary files a/Assets/lua/app/config/daily_challenge_level.lua.bytes and b/Assets/lua/app/config/daily_challenge_level.lua.bytes differ diff --git a/Assets/lua/app/config/equip.lua.bytes b/Assets/lua/app/config/equip.lua.bytes index d237acd9c..93aade505 100644 Binary files a/Assets/lua/app/config/equip.lua.bytes and b/Assets/lua/app/config/equip.lua.bytes differ diff --git a/Assets/lua/app/config/func_open.lua.bytes b/Assets/lua/app/config/func_open.lua.bytes index 844ca1808..b98680dc3 100644 Binary files a/Assets/lua/app/config/func_open.lua.bytes and b/Assets/lua/app/config/func_open.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 127151999..d56445ea3 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/skill.lua.bytes b/Assets/lua/app/config/skill.lua.bytes index c41e6ffc7..326aa8b96 100644 Binary files a/Assets/lua/app/config/skill.lua.bytes and b/Assets/lua/app/config/skill.lua.bytes differ diff --git a/Assets/lua/app/config/skill_rogue.lua.bytes b/Assets/lua/app/config/skill_rogue.lua.bytes index 9fbb90af8..8154a3676 100644 Binary files a/Assets/lua/app/config/skill_rogue.lua.bytes and b/Assets/lua/app/config/skill_rogue.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 17341ebc9..3dc93e038 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/config/summon.lua.bytes b/Assets/lua/app/config/summon.lua.bytes index bdb1f3b03..f1b943c7a 100644 Binary files a/Assets/lua/app/config/summon.lua.bytes and b/Assets/lua/app/config/summon.lua.bytes differ diff --git a/Assets/lua/app/global/global_const.lua.bytes b/Assets/lua/app/global/global_const.lua.bytes index 9bb8be74c..0d3394f41 100644 Binary files a/Assets/lua/app/global/global_const.lua.bytes and b/Assets/lua/app/global/global_const.lua.bytes differ diff --git a/Assets/lua/app/module/battle/battle_const.lua.bytes b/Assets/lua/app/module/battle/battle_const.lua.bytes index 75c3e1dde..ebb24d2c9 100644 Binary files a/Assets/lua/app/module/battle/battle_const.lua.bytes and b/Assets/lua/app/module/battle/battle_const.lua.bytes differ diff --git a/Assets/lua/app/module/battle/component/battle_unit_comp.lua.bytes b/Assets/lua/app/module/battle/component/battle_unit_comp.lua.bytes index 72bca50f7..850fc9e7d 100644 Binary files a/Assets/lua/app/module/battle/component/battle_unit_comp.lua.bytes and b/Assets/lua/app/module/battle/component/battle_unit_comp.lua.bytes differ diff --git a/Assets/lua/app/module/battle/controller/battle_base_controller.lua.bytes b/Assets/lua/app/module/battle/controller/battle_base_controller.lua.bytes index 3c02cba42..c661e2c0e 100644 Binary files a/Assets/lua/app/module/battle/controller/battle_base_controller.lua.bytes and b/Assets/lua/app/module/battle/controller/battle_base_controller.lua.bytes differ diff --git a/Assets/lua/app/module/battle/skill/battle_rogue_skill_handle.lua.bytes b/Assets/lua/app/module/battle/skill/battle_rogue_skill_handle.lua.bytes index 6b41bf444..24a345b52 100644 Binary files a/Assets/lua/app/module/battle/skill/battle_rogue_skill_handle.lua.bytes and b/Assets/lua/app/module/battle/skill/battle_rogue_skill_handle.lua.bytes differ diff --git a/Assets/lua/app/ui/battle/battle_ui.lua.bytes b/Assets/lua/app/ui/battle/battle_ui.lua.bytes index 610173d71..675d6984f 100644 Binary files a/Assets/lua/app/ui/battle/battle_ui.lua.bytes and b/Assets/lua/app/ui/battle/battle_ui.lua.bytes differ diff --git a/Assets/lua/app/ui/common/message_box.lua.bytes b/Assets/lua/app/ui/common/message_box.lua.bytes index e9e38baf8..c19a287b3 100644 Binary files a/Assets/lua/app/ui/common/message_box.lua.bytes and b/Assets/lua/app/ui/common/message_box.lua.bytes differ diff --git a/Assets/lua/app/ui/common/power_toast_manager.lua.bytes b/Assets/lua/app/ui/common/power_toast_manager.lua.bytes index 89424afda..130b9e4b0 100644 Binary files a/Assets/lua/app/ui/common/power_toast_manager.lua.bytes and b/Assets/lua/app/ui/common/power_toast_manager.lua.bytes differ diff --git a/Assets/lua/app/ui/daily_challenge/daily_challenge_ui.lua.bytes b/Assets/lua/app/ui/daily_challenge/daily_challenge_ui.lua.bytes index be34b38ed..1e09283ae 100644 Binary files a/Assets/lua/app/ui/daily_challenge/daily_challenge_ui.lua.bytes and b/Assets/lua/app/ui/daily_challenge/daily_challenge_ui.lua.bytes differ diff --git a/Assets/lua/app/ui/main_city/chapter_box_ui.lua.bytes b/Assets/lua/app/ui/main_city/chapter_box_ui.lua.bytes index 287b734f9..ef1a32652 100644 Binary files a/Assets/lua/app/ui/main_city/chapter_box_ui.lua.bytes and b/Assets/lua/app/ui/main_city/chapter_box_ui.lua.bytes differ diff --git a/Assets/lua/app/ui/main_city/component/main_comp.lua.bytes b/Assets/lua/app/ui/main_city/component/main_comp.lua.bytes index 383c6800e..4f58753f0 100644 Binary files a/Assets/lua/app/ui/main_city/component/main_comp.lua.bytes and b/Assets/lua/app/ui/main_city/component/main_comp.lua.bytes differ diff --git a/Assets/lua/app/ui/summon/cell/summon_reward_cell.lua.bytes b/Assets/lua/app/ui/summon/cell/summon_reward_cell.lua.bytes index 2b7fbcee7..32417f877 100644 Binary files a/Assets/lua/app/ui/summon/cell/summon_reward_cell.lua.bytes and b/Assets/lua/app/ui/summon/cell/summon_reward_cell.lua.bytes differ diff --git a/Assets/lua/app/ui/summon/summon_main_ui.lua.bytes b/Assets/lua/app/ui/summon/summon_main_ui.lua.bytes index 5c990e210..30cd897a0 100644 Binary files a/Assets/lua/app/ui/summon/summon_main_ui.lua.bytes and b/Assets/lua/app/ui/summon/summon_main_ui.lua.bytes differ diff --git a/Assets/lua/app/ui/talent/talent_info_ui.lua.bytes b/Assets/lua/app/ui/talent/talent_info_ui.lua.bytes index 3a0cf4003..d2898abd7 100644 Binary files a/Assets/lua/app/ui/talent/talent_info_ui.lua.bytes and b/Assets/lua/app/ui/talent/talent_info_ui.lua.bytes differ diff --git a/Assets/lua/app/ui/tips/help_tips.lua.bytes b/Assets/lua/app/ui/tips/help_tips.lua.bytes index 5d4081960..e521f636e 100644 Binary files a/Assets/lua/app/ui/tips/help_tips.lua.bytes and b/Assets/lua/app/ui/tips/help_tips.lua.bytes differ diff --git a/Assets/lua/app/userdata/battle/battle_base_data.lua.bytes b/Assets/lua/app/userdata/battle/battle_base_data.lua.bytes index 46b234977..7db7c3027 100644 Binary files a/Assets/lua/app/userdata/battle/battle_base_data.lua.bytes and b/Assets/lua/app/userdata/battle/battle_base_data.lua.bytes differ diff --git a/Assets/lua/app/userdata/battle/skill/battle_board_skill_entity.lua.bytes b/Assets/lua/app/userdata/battle/skill/battle_board_skill_entity.lua.bytes index 6ab989a86..e71f1b547 100644 Binary files a/Assets/lua/app/userdata/battle/skill/battle_board_skill_entity.lua.bytes and b/Assets/lua/app/userdata/battle/skill/battle_board_skill_entity.lua.bytes differ diff --git a/Assets/lua/app/userdata/battle/skill/battle_buff_entity.lua.bytes b/Assets/lua/app/userdata/battle/skill/battle_buff_entity.lua.bytes index b6ea35bbc..00565ee19 100644 Binary files a/Assets/lua/app/userdata/battle/skill/battle_buff_entity.lua.bytes and b/Assets/lua/app/userdata/battle/skill/battle_buff_entity.lua.bytes differ diff --git a/Assets/lua/app/userdata/battle/skill/battle_skill_entity.lua.bytes b/Assets/lua/app/userdata/battle/skill/battle_skill_entity.lua.bytes index 59ea08e2f..a82501d95 100644 Binary files a/Assets/lua/app/userdata/battle/skill/battle_skill_entity.lua.bytes and b/Assets/lua/app/userdata/battle/skill/battle_skill_entity.lua.bytes differ diff --git a/Assets/lua/app/userdata/battle/team/battle_unit_entity.lua.bytes b/Assets/lua/app/userdata/battle/team/battle_unit_entity.lua.bytes index 5b1b56da7..50f6e00ec 100644 Binary files a/Assets/lua/app/userdata/battle/team/battle_unit_entity.lua.bytes and b/Assets/lua/app/userdata/battle/team/battle_unit_entity.lua.bytes differ diff --git a/Assets/lua/app/userdata/hero/hero_data.lua.bytes b/Assets/lua/app/userdata/hero/hero_data.lua.bytes index 06a12d0de..33f62b58b 100644 Binary files a/Assets/lua/app/userdata/hero/hero_data.lua.bytes and b/Assets/lua/app/userdata/hero/hero_data.lua.bytes differ diff --git a/Assets/lua/app/userdata/hero/hero_entity.lua.bytes b/Assets/lua/app/userdata/hero/hero_entity.lua.bytes index 576bf4e5d..ccbe74346 100644 Binary files a/Assets/lua/app/userdata/hero/hero_entity.lua.bytes and b/Assets/lua/app/userdata/hero/hero_entity.lua.bytes differ diff --git a/Assets/lua/app/userdata/talent/talent_data.lua.bytes b/Assets/lua/app/userdata/talent/talent_data.lua.bytes index 827a9a160..70aaad003 100644 Binary files a/Assets/lua/app/userdata/talent/talent_data.lua.bytes and b/Assets/lua/app/userdata/talent/talent_data.lua.bytes differ diff --git a/Assets/prefabs/ui/arena/arena_ui.prefab b/Assets/prefabs/ui/arena/arena_ui.prefab index 4bf09ad0b..58f0d2ba3 100644 --- a/Assets/prefabs/ui/arena/arena_ui.prefab +++ b/Assets/prefabs/ui/arena/arena_ui.prefab @@ -85,7 +85,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &1464056901880506580 RectTransform: m_ObjectHideFlags: 0 diff --git a/Assets/prefabs/ui/battle/battle_result_ui.prefab b/Assets/prefabs/ui/battle/battle_result_ui.prefab index e8077d132..f57cb3920 100644 --- a/Assets/prefabs/ui/battle/battle_result_ui.prefab +++ b/Assets/prefabs/ui/battle/battle_result_ui.prefab @@ -2156,8 +2156,8 @@ MonoBehaviour: boneName: diban followBoneRotation: 1 followSkeletonFlip: 1 - followLocalScale: 0 - followParentWorldScale: 0 + followLocalScale: 1 + followParentWorldScale: 1 followXYPosition: 1 followZPosition: 1 maintainedAxisOrientation: 1 @@ -4824,6 +4824,7 @@ GameObject: - component: {fileID: 6911264791947976490} - component: {fileID: 8701922404334855556} - component: {fileID: 9217287939990123027} + - component: {fileID: 9017788278560139462} m_Layer: 5 m_Name: bg m_TagString: Untagged @@ -4838,7 +4839,7 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7921166426620139622} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalRotation: {x: -0, y: -0, z: 8.428379e-12, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 @@ -4848,7 +4849,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: 128} + m_AnchoredPosition: {x: 0, y: 133.41003} m_SizeDelta: {x: 598, y: 492} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8701922404334855556 @@ -4889,6 +4890,28 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!114 &9017788278560139462 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7921166426620139622} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b42a195b47491d34b9bcbc40898bcb29, type: 3} + m_Name: + m_EditorClassIdentifier: + skeletonGraphic: {fileID: 7054426090379659655} + initializeOnAwake: 1 + boneName: diban + followBoneRotation: 1 + followSkeletonFlip: 1 + followLocalScale: 1 + followParentWorldScale: 1 + followXYPosition: 1 + followZPosition: 1 + maintainedAxisOrientation: 1 --- !u!1 &7936986928946906401 GameObject: m_ObjectHideFlags: 0 @@ -6484,6 +6507,17 @@ GameObject: m_CorrespondingSourceObject: {fileID: 1991971382385470840, guid: 4f7cf840d6e73e14781807788b817568, type: 3} m_PrefabInstance: {fileID: 4837857829111055852} m_PrefabAsset: {fileID: 0} +--- !u!114 &7054426090379659655 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 2505651998029909099, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + m_PrefabInstance: {fileID: 4837857829111055852} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6379174579643197588} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d85b887af7e6c3f45a2e2d2920d641bc, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!224 &7770004333418327666 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} diff --git a/Assets/prefabs/ui/chapter/chapter_1.prefab b/Assets/prefabs/ui/chapter/chapter_1.prefab index cbe13613d..4eebc70d1 100644 --- a/Assets/prefabs/ui/chapter/chapter_1.prefab +++ b/Assets/prefabs/ui/chapter/chapter_1.prefab @@ -309,7 +309,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: 1800, y: 160} + m_AnchoredPosition: {x: 1732, y: 160} m_SizeDelta: {x: 1732, y: 475} m_Pivot: {x: 0, y: 0} --- !u!222 &8314503688661495172 @@ -360,8 +360,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: speed: -75 - endX: -1800 - resetX: 1800 + endX: -1732 + resetX: 1732 type: 1 canMove: 1 --- !u!1 &3651163719033418054 @@ -844,8 +844,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: speed: -75 - endX: -1800 - resetX: 1800 + endX: -1732 + resetX: 1732 type: 1 canMove: 1 --- !u!1 &5674239360881427173 diff --git a/Assets/prefabs/ui/chapter/chapter_1_1.prefab b/Assets/prefabs/ui/chapter/chapter_1_1.prefab index 9ae069ce8..21339d90c 100644 --- a/Assets/prefabs/ui/chapter/chapter_1_1.prefab +++ b/Assets/prefabs/ui/chapter/chapter_1_1.prefab @@ -1229,8 +1229,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: speed: -75 - endX: -1800 - resetX: 1800 + endX: -1732 + resetX: 1732 type: 1 canMove: 0 --- !u!1 &5574386308499448284 diff --git a/Assets/prefabs/ui/common/message_box.prefab b/Assets/prefabs/ui/common/message_box.prefab index 6d167555c..013fc315b 100644 --- a/Assets/prefabs/ui/common/message_box.prefab +++ b/Assets/prefabs/ui/common/message_box.prefab @@ -1040,7 +1040,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: d9c23e0c2fdbcda4ab03e9917f66a4d8, type: 3} + m_Sprite: {fileID: 21300000, guid: 5c537adb5c9044a849752091cf00ea58, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 diff --git a/Assets/prefabs/ui/common/power_change_toast.prefab b/Assets/prefabs/ui/common/power_change_toast.prefab index 5d321e46e..6d3f7c022 100644 --- a/Assets/prefabs/ui/common/power_change_toast.prefab +++ b/Assets/prefabs/ui/common/power_change_toast.prefab @@ -238,7 +238,7 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6700394301120604060} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalRotation: {x: -0, y: -0, z: 0.0025315974, w: 0.9999968} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 @@ -363,10 +363,10 @@ MonoBehaviour: skeletonGraphic: {fileID: 1393678009553441721} initializeOnAwake: 1 boneName: ziti2 - followBoneRotation: 0 + followBoneRotation: 1 followSkeletonFlip: 1 followLocalScale: 1 - followParentWorldScale: 0 + followParentWorldScale: 1 followXYPosition: 1 followZPosition: 1 maintainedAxisOrientation: 1 @@ -506,7 +506,7 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8943408973971808984} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: -0, y: -0, z: -3.7304354e-10, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 @@ -631,10 +631,10 @@ MonoBehaviour: skeletonGraphic: {fileID: 1393678009553441721} initializeOnAwake: 1 boneName: ziti1 - followBoneRotation: 0 + followBoneRotation: 1 followSkeletonFlip: 1 followLocalScale: 1 - followParentWorldScale: 0 + followParentWorldScale: 1 followXYPosition: 1 followZPosition: 1 maintainedAxisOrientation: 1 diff --git a/Assets/prefabs/ui/daily_challenge/daily_challenge_ui.prefab b/Assets/prefabs/ui/daily_challenge/daily_challenge_ui.prefab index 06597b4c7..7d6b829a0 100644 --- a/Assets/prefabs/ui/daily_challenge/daily_challenge_ui.prefab +++ b/Assets/prefabs/ui/daily_challenge/daily_challenge_ui.prefab @@ -381,7 +381,7 @@ RectTransform: - {fileID: 8208622899822353587} - {fileID: 4159116984310726332} m_Father: {fileID: 4476004844096841350} - m_RootOrder: 11 + m_RootOrder: 12 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -799,7 +799,7 @@ RectTransform: - {fileID: 5262307373085457783} - {fileID: 1575012484665666931} m_Father: {fileID: 4476004844096841350} - 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} @@ -832,6 +832,141 @@ MonoBehaviour: m_ChildScaleWidth: 0 m_ChildScaleHeight: 0 m_ReverseArrangement: 0 +--- !u!1 &2202686619822390286 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1700850112196008679} + - component: {fileID: 8303831664053208066} + - component: {fileID: 6935888170346422278} + m_Layer: 5 + m_Name: diff_tx + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1700850112196008679 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2202686619822390286} + 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: 4476004844096841350} + m_RootOrder: 7 + 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: 0, y: -330} + m_SizeDelta: {x: 200, y: 36} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8303831664053208066 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2202686619822390286} + m_CullTransparentMesh: 1 +--- !u!114 &6935888170346422278 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2202686619822390286} + 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: 0.94509804, b: 0.58431375, 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: 30 + m_fontSizeBase: 30 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 50 + 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 &2258998476027287410 GameObject: m_ObjectHideFlags: 0 @@ -2101,7 +2236,7 @@ RectTransform: - {fileID: 1045303882048620576} - {fileID: 1568120362827251322} m_Father: {fileID: 4476004844096841350} - m_RootOrder: 9 + m_RootOrder: 10 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -2197,6 +2332,7 @@ RectTransform: - {fileID: 7239148063482177012} - {fileID: 244475786994935081} - {fileID: 1046794097527127380} + - {fileID: 1700850112196008679} - {fileID: 2187274201200544790} - {fileID: 7811581884657323959} - {fileID: 8459337451272864974} @@ -2362,6 +2498,10 @@ MonoBehaviour: hashName: 3700312116 objectType: 0 gameObject: {fileID: 2885546295425357298} + - name: daily_challenge_ui.diff_tx + hashName: 3431791462 + objectType: 0 + gameObject: {fileID: 2202686619822390286} --- !u!1 &5355798449360728859 GameObject: m_ObjectHideFlags: 0 @@ -2488,7 +2628,7 @@ RectTransform: - {fileID: 6877306057343581149} - {fileID: 5172730960187486193} m_Father: {fileID: 4476004844096841350} - m_RootOrder: 8 + m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -2759,7 +2899,7 @@ RectTransform: m_Children: - {fileID: 8668008813031153306} m_Father: {fileID: 4476004844096841350} - m_RootOrder: 10 + m_RootOrder: 11 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -3192,7 +3332,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4476004844096841350} - m_RootOrder: 12 + m_RootOrder: 13 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} diff --git a/Assets/prefabs/ui/main_city/chapter_box_ui.prefab b/Assets/prefabs/ui/main_city/chapter_box_ui.prefab index b199e012e..e34fa05d2 100644 --- a/Assets/prefabs/ui/main_city/chapter_box_ui.prefab +++ b/Assets/prefabs/ui/main_city/chapter_box_ui.prefab @@ -199,7 +199,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2} m_Color: {r: 0, g: 0, b: 0, a: 0.972549} - m_RaycastTarget: 0 + m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: @@ -1622,6 +1622,10 @@ MonoBehaviour: hashName: 3933325847 objectType: 0 gameObject: {fileID: 3667392929336993867} + - name: chapter_box_ui.mask + hashName: 1689331360 + objectType: 0 + gameObject: {fileID: 655792883980138453} --- !u!1 &6004071191184161953 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/prefabs/ui/main_city/main_comp.prefab b/Assets/prefabs/ui/main_city/main_comp.prefab index 263d1946e..5117dd732 100644 --- a/Assets/prefabs/ui/main_city/main_comp.prefab +++ b/Assets/prefabs/ui/main_city/main_comp.prefab @@ -436,6 +436,86 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &652738065456230559 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8142123836619694507} + - component: {fileID: 7524202431669216165} + - component: {fileID: 2354960575712794093} + - component: {fileID: 3242999174749136799} + m_Layer: 5 + m_Name: hero_3 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8142123836619694507 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 652738065456230559} + 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: 2696292581255991796} + m_RootOrder: 2 + 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: 150} + m_SizeDelta: {x: 178, y: 148} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7524202431669216165 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 652738065456230559} + m_CullTransparentMesh: 1 +--- !u!114 &2354960575712794093 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 652738065456230559} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ea6cc73146e6042cdae5988a604bca31, 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: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &3242999174749136799 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 652738065456230559} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1069f9c1eb6f9475b8f98a4cbb9dfe01, type: 3} + m_Name: + m_EditorClassIdentifier: + IsShowClickAnimation: 0 --- !u!1 &692272256868286215 GameObject: m_ObjectHideFlags: 0 @@ -1117,7 +1197,7 @@ RectTransform: - {fileID: 8280797223657093639} - {fileID: 5092944775009203527} m_Father: {fileID: 798722318349559671} - m_RootOrder: 10 + m_RootOrder: 11 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} @@ -1405,6 +1485,86 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &2580655513728869588 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3585001323606120001} + - component: {fileID: 940129905190934171} + - component: {fileID: 4832158754948529143} + - component: {fileID: 5366172472579795700} + m_Layer: 5 + m_Name: hero_4 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3585001323606120001 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2580655513728869588} + 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: 2696292581255991796} + m_RootOrder: 3 + 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: 116, y: 150} + m_SizeDelta: {x: 178, y: 148} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &940129905190934171 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2580655513728869588} + m_CullTransparentMesh: 1 +--- !u!114 &4832158754948529143 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2580655513728869588} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ea6cc73146e6042cdae5988a604bca31, 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: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &5366172472579795700 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2580655513728869588} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1069f9c1eb6f9475b8f98a4cbb9dfe01, type: 3} + m_Name: + m_EditorClassIdentifier: + IsShowClickAnimation: 0 --- !u!1 &2658200718793269410 GameObject: m_ObjectHideFlags: 0 @@ -1689,6 +1849,7 @@ RectTransform: - {fileID: 2666403596400479694} - {fileID: 5448066805804347266} - {fileID: 4468223697779892111} + - {fileID: 2696292581255991796} - {fileID: 1181225094277687160} - {fileID: 8594075434309620769} - {fileID: 7122331712852872337} @@ -1940,6 +2101,26 @@ MonoBehaviour: hashName: 1391589176 objectType: 0 gameObject: {fileID: 1958952317761683943} + - name: main_comp.formation.hero_1 + hashName: 428377090 + objectType: 0 + gameObject: {fileID: 5878577460156407246} + - name: main_comp.formation.hero_2 + hashName: 428377091 + objectType: 0 + gameObject: {fileID: 7435358911713614768} + - name: main_comp.formation.hero_3 + hashName: 428377092 + objectType: 0 + gameObject: {fileID: 652738065456230559} + - name: main_comp.formation.hero_4 + hashName: 428377093 + objectType: 0 + gameObject: {fileID: 2580655513728869588} + - name: main_comp.formation.hero_5 + hashName: 428377094 + objectType: 0 + gameObject: {fileID: 7989783026923556121} --- !u!1 &3527937743732191498 GameObject: m_ObjectHideFlags: 0 @@ -2227,6 +2408,47 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &4297182078568663681 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2696292581255991796} + m_Layer: 5 + m_Name: formation + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2696292581255991796 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4297182078568663681} + 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: 5708959566298316026} + - {fileID: 8551615982644749219} + - {fileID: 8142123836619694507} + - {fileID: 3585001323606120001} + - {fileID: 8697940472030769365} + m_Father: {fileID: 798722318349559671} + 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: 0, y: -14} + m_SizeDelta: {x: 720, y: 402} + m_Pivot: {x: 0.5, y: 0} --- !u!1 &4402495589589348180 GameObject: m_ObjectHideFlags: 0 @@ -2759,7 +2981,7 @@ RectTransform: m_Children: - {fileID: 5600268008639676793} m_Father: {fileID: 798722318349559671} - 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} @@ -2837,7 +3059,7 @@ RectTransform: m_Children: - {fileID: 3279536590676722431} m_Father: {fileID: 798722318349559671} - m_RootOrder: 12 + m_RootOrder: 13 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 0} @@ -3561,6 +3783,86 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &5878577460156407246 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5708959566298316026} + - component: {fileID: 2061894571078676352} + - component: {fileID: 4339128392097375640} + - component: {fileID: 1962574113785054538} + m_Layer: 5 + m_Name: hero_1 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5708959566298316026 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5878577460156407246} + 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: 2696292581255991796} + m_RootOrder: 0 + 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: -232, y: 150} + m_SizeDelta: {x: 178, y: 148} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2061894571078676352 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5878577460156407246} + m_CullTransparentMesh: 1 +--- !u!114 &4339128392097375640 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5878577460156407246} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ea6cc73146e6042cdae5988a604bca31, 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: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &1962574113785054538 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5878577460156407246} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1069f9c1eb6f9475b8f98a4cbb9dfe01, type: 3} + m_Name: + m_EditorClassIdentifier: + IsShowClickAnimation: 0 --- !u!1 &5930561707168188416 GameObject: m_ObjectHideFlags: 0 @@ -3809,7 +4111,7 @@ RectTransform: - {fileID: 3621294381135618011} - {fileID: 8920339549923429235} m_Father: {fileID: 798722318349559671} - m_RootOrder: 13 + m_RootOrder: 14 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.45} m_AnchorMax: {x: 0.5, y: 0.45} @@ -4334,7 +4636,7 @@ RectTransform: m_Children: - {fileID: 9177107261643846996} m_Father: {fileID: 798722318349559671} - 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} @@ -4837,6 +5139,86 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: IsShowClickAnimation: 1 +--- !u!1 &7435358911713614768 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8551615982644749219} + - component: {fileID: 2287471765051430703} + - component: {fileID: 8654622089840134836} + - component: {fileID: 2892670652112369573} + m_Layer: 5 + m_Name: hero_2 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8551615982644749219 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7435358911713614768} + 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: 2696292581255991796} + m_RootOrder: 1 + 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: -116, y: 150} + m_SizeDelta: {x: 178, y: 148} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2287471765051430703 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7435358911713614768} + m_CullTransparentMesh: 1 +--- !u!114 &8654622089840134836 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7435358911713614768} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ea6cc73146e6042cdae5988a604bca31, 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: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &2892670652112369573 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7435358911713614768} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1069f9c1eb6f9475b8f98a4cbb9dfe01, type: 3} + m_Name: + m_EditorClassIdentifier: + IsShowClickAnimation: 0 --- !u!1 &7453364899677791863 GameObject: m_ObjectHideFlags: 0 @@ -5098,6 +5480,86 @@ MonoBehaviour: y: 0 width: 1 height: 1 +--- !u!1 &7989783026923556121 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8697940472030769365} + - component: {fileID: 8479504404807326333} + - component: {fileID: 4456046012338529482} + - component: {fileID: 3137792852246261639} + m_Layer: 5 + m_Name: hero_5 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8697940472030769365 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7989783026923556121} + 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: 2696292581255991796} + m_RootOrder: 4 + 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: 232, y: 150} + m_SizeDelta: {x: 178, y: 148} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8479504404807326333 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7989783026923556121} + m_CullTransparentMesh: 1 +--- !u!114 &4456046012338529482 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7989783026923556121} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ea6cc73146e6042cdae5988a604bca31, 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: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &3137792852246261639 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7989783026923556121} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1069f9c1eb6f9475b8f98a4cbb9dfe01, type: 3} + m_Name: + m_EditorClassIdentifier: + IsShowClickAnimation: 0 --- !u!1 &9153139342430293660 GameObject: m_ObjectHideFlags: 0 @@ -5206,7 +5668,7 @@ RectTransform: m_Children: - {fileID: 7421796325169503915} m_Father: {fileID: 798722318349559671} - m_RootOrder: 11 + m_RootOrder: 12 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} diff --git a/Assets/prefabs/ui/summon/cell/summon_reward_cell.prefab b/Assets/prefabs/ui/summon/cell/summon_reward_cell.prefab index ed1c5cfb8..d4f4e198c 100644 --- a/Assets/prefabs/ui/summon/cell/summon_reward_cell.prefab +++ b/Assets/prefabs/ui/summon/cell/summon_reward_cell.prefab @@ -748,7 +748,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2215335907605344149, guid: ad07cf805706e24488cdd8192edfb6e8, type: 3} propertyPath: m_AnchoredPosition.y - value: 20 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2215335907605344149, guid: ad07cf805706e24488cdd8192edfb6e8, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -903,7 +903,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4467708573080403943, guid: f77156c45ee34d84da1971ee0ac2f6ac, type: 3} propertyPath: m_AnchoredPosition.y - value: 20 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4467708573080403943, guid: f77156c45ee34d84da1971ee0ac2f6ac, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -1054,7 +1054,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2385570651820488633, guid: 64689a8fb5ce5fe4fb587bdf6a95ce02, type: 3} propertyPath: m_AnchoredPosition.y - value: 20 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2385570651820488633, guid: 64689a8fb5ce5fe4fb587bdf6a95ce02, type: 3} propertyPath: m_LocalEulerAnglesHint.x diff --git a/Assets/prefabs/ui/talent/talent_info_ui.prefab b/Assets/prefabs/ui/talent/talent_info_ui.prefab index 4261a9591..1282b4ef3 100644 --- a/Assets/prefabs/ui/talent/talent_info_ui.prefab +++ b/Assets/prefabs/ui/talent/talent_info_ui.prefab @@ -9,6 +9,9 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 2780316087535550777} + - component: {fileID: 3879747934089267835} + - component: {fileID: 2828580426486619974} + - component: {fileID: 5004634597769085665} m_Layer: 5 m_Name: node m_TagString: Untagged @@ -35,8 +38,59 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 98} - m_SizeDelta: {x: 0, y: 0} + m_SizeDelta: {x: 720, y: 500} m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3879747934089267835 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1274827387045759549} + m_CullTransparentMesh: 1 +--- !u!114 &2828580426486619974 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1274827387045759549} + 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: a70289eca986ce142b027934f6cdd63c, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!114 &5004634597769085665 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1274827387045759549} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1069f9c1eb6f9475b8f98a4cbb9dfe01, type: 3} + m_Name: + m_EditorClassIdentifier: + IsShowClickAnimation: 0 --- !u!1 &5312408455988329922 GameObject: m_ObjectHideFlags: 0 @@ -371,7 +425,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2} m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 + m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: diff --git a/Assets/prefabs/ui/tips/help_tips.prefab b/Assets/prefabs/ui/tips/help_tips.prefab index 9f8e5ef8f..1da5043f0 100644 --- a/Assets/prefabs/ui/tips/help_tips.prefab +++ b/Assets/prefabs/ui/tips/help_tips.prefab @@ -647,10 +647,10 @@ RectTransform: m_Father: {fileID: 7684827902120262743} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 1, y: 1} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 360} + m_SizeDelta: {x: 550, y: 360} m_Pivot: {x: 0.5, y: 1} --- !u!222 &3299212247292666330 CanvasRenderer: