diff --git a/Assets/arts/atlas/ui/common.asset b/Assets/arts/atlas/ui/common.asset index b1fa99887..b6bd0c1cb 100644 --- a/Assets/arts/atlas/ui/common.asset +++ b/Assets/arts/atlas/ui/common.asset @@ -56,6 +56,7 @@ MonoBehaviour: - {fileID: 21300000, guid: 769955952967445c4880e9db82df6b7d, type: 3} - {fileID: 21300000, guid: 2ea0b70e315bb48a49bac0278c8aaa02, type: 3} - {fileID: 21300000, guid: d716c5505f7f54fe4bdb624b55141012, type: 3} + - {fileID: 21300000, guid: f26e07a00be5c469c92ffb50eaf4482d, type: 3} - {fileID: 21300000, guid: 4d5eca674cfc87745bd0c368f2270a6c, type: 3} - {fileID: 21300000, guid: 7232d781b35ea8742abca796fec7106d, type: 3} - {fileID: 21300000, guid: b143f69564fbebd479463ddf96a9685a, type: 3} @@ -296,4 +297,4 @@ MonoBehaviour: - {fileID: 21300000, guid: bb8268a6f00cf454181fe75a9832cdff, type: 3} - {fileID: 21300000, guid: 56c233d89e320ac4891f34a6706ffc0c, type: 3} - {fileID: 21300000, guid: d1a0b8eb4c42f7748acb13df7b748132, type: 3} - spriteNameList: e9a43d8deba43d8deca43d8d0ae27a1a2757a7712857a7712957a7712a57a7712b57a7712c57a7712d57a7712e57a771b1ff831a37ebefa68b243e8d056d861a066d861a076d861a086d861a096d861a0a6d861a0b6d861a0c6d861a0d6d861a0e6d861a8c243e8d246d861a256d861a266d861a276d861a286d861a2b6d861a2c6d861a2d6d861a8d243e8d436d861a446d861a456d861a466d861a476d861a486d861a496d861a4a6d861a8e243e8d8f243e8d90243e8d91243e8d92243e8d93243e8d5ff0dec4c48e80a0ec49916fc5f39782c6f39782c7f39782c8f39782c9f39782caf39782cbf39782ccf39782cdf39782ed49916fe3f39782e4f39782e5f39782e6f39782e7f39782e8f39782e9f39782eaf39782ebf39782ecf39782ee49916f02f4978203f4978204f4978205f4978206f4978207f4978208f4978209f497820af497820bf49782ef49916f21f4978222f4978223f4978224f4978225f49782f049916ff149916ff249916ff349916ff449916ff549916fc58e80a00b4a916f0c4a916f0d4a916f0e4a916f0f4a916f104a916f114a916f124a916f134a916fc68e80a02f4a916f304a916fc78e80a0c88e80a0c98e80a0ca8e80a0cb8e80a0cc8e80a085d402ef86d402ef87d402eff7dba86df8dba86df9dba86dfadba86dbed8328da3c7820ca4c7820ca5c7820ca8c7820c3220c78d01853b1974546eb8c22f500f90c9348dbe2eb195bf2eb195c02eb195f92eb195e8945815e9945815ea9458158538368dfbcc388d8cc2e922b76e26590c8b0b1a0d8b0b1a0e8b0b1aa49b7ac547776d277d33eeca7e33eeca7f33eeca8133eeca8233eecab833eecab415951a1fecadc920ecadc922ecadc9a4a1213856d43fb6e0c7a11a50349739513497395234973953349739543497395534973956349739573497395834973959349739e1c7a11a6f349739703497397134973972349739733497397434973975349739763497397734973978349739e2c7a11ae3c7a11ae4c7a11ae5c7a11ae6c7a11ae7c7a11ae8c7a11a34e166e68eb7ba30922baf4357abe63dbff20842160398e369606d8f83e25472704398e36c4b965e4ac4708f826e418db4e19f42b5e19f42b6e19f427a737b477b737b477c737b477d737b477e737b477f737b4780737b4781737b47ffce428df116cb47f216cb47252af848262af848272af8484c159f46fefd2e1b6e97448da07f7c4ea17f7c4ea27f7c4e3c864f1beef28685eff286857351fb6991c62c357451fb69f03a2d357551fb694faf2d357651fb69ae232e357751fb699d83f5979e83f5979f83f597a083f597a183f5976e3feee1794eaac0611e220557aa025458aa025459aa02545aaa0254b36a811bb46a811bb56a811bed355bf9f022f4ccf122f4ccf222f4ccf322f4ccf422f4cce44e1d55a15c468d14c42155be552355bf552355c0552355b6ad7c4f3a0919a03b0919a03c0919a03d0919a03e0919a03f0919a0400919a0410919a0420919a0430919a0b7ad7c4fb8ad7c4fb9ad7c4fbaad7c4fbbad7c4fbcad7c4fbdad7c4fbead7c4fc569b158c669b158 + spriteNameList: e9a43d8deba43d8deca43d8d0ae27a1a2757a7712857a7712957a7712a57a7712b57a7712c57a7712d57a7712e57a771b1ff831a37ebefa68b243e8d056d861a066d861a076d861a086d861a096d861a0a6d861a0b6d861a0c6d861a0d6d861a0e6d861a8c243e8d246d861a256d861a266d861a276d861a286d861a2b6d861a2c6d861a2d6d861a8d243e8d436d861a446d861a456d861a466d861a476d861a486d861a496d861a4a6d861a4b6d861a8e243e8d8f243e8d90243e8d91243e8d92243e8d93243e8d5ff0dec4c48e80a0ec49916fc5f39782c6f39782c7f39782c8f39782c9f39782caf39782cbf39782ccf39782cdf39782ed49916fe3f39782e4f39782e5f39782e6f39782e7f39782e8f39782e9f39782eaf39782ebf39782ecf39782ee49916f02f4978203f4978204f4978205f4978206f4978207f4978208f4978209f497820af497820bf49782ef49916f21f4978222f4978223f4978224f4978225f49782f049916ff149916ff249916ff349916ff449916ff549916fc58e80a00b4a916f0c4a916f0d4a916f0e4a916f0f4a916f104a916f114a916f124a916f134a916fc68e80a02f4a916f304a916fc78e80a0c88e80a0c98e80a0ca8e80a0cb8e80a0cc8e80a085d402ef86d402ef87d402eff7dba86df8dba86df9dba86dfadba86dbed8328da3c7820ca4c7820ca5c7820ca8c7820c3220c78d01853b1974546eb8c22f500f90c9348dbe2eb195bf2eb195c02eb195f92eb195e8945815e9945815ea9458158538368dfbcc388d8cc2e922b76e26590c8b0b1a0d8b0b1a0e8b0b1aa49b7ac547776d277d33eeca7e33eeca7f33eeca8133eeca8233eecab833eecab415951a1fecadc920ecadc922ecadc9a4a1213856d43fb6e0c7a11a50349739513497395234973953349739543497395534973956349739573497395834973959349739e1c7a11a6f349739703497397134973972349739733497397434973975349739763497397734973978349739e2c7a11ae3c7a11ae4c7a11ae5c7a11ae6c7a11ae7c7a11ae8c7a11a34e166e68eb7ba30922baf4357abe63dbff20842160398e369606d8f83e25472704398e36c4b965e4ac4708f826e418db4e19f42b5e19f42b6e19f427a737b477b737b477c737b477d737b477e737b477f737b4780737b4781737b47ffce428df116cb47f216cb47252af848262af848272af8484c159f46fefd2e1b6e97448da07f7c4ea17f7c4ea27f7c4e3c864f1beef28685eff286857351fb6991c62c357451fb69f03a2d357551fb694faf2d357651fb69ae232e357751fb699d83f5979e83f5979f83f597a083f597a183f5976e3feee1794eaac0611e220557aa025458aa025459aa02545aaa0254b36a811bb46a811bb56a811bed355bf9f022f4ccf122f4ccf222f4ccf322f4ccf422f4cce44e1d55a15c468d14c42155be552355bf552355c0552355b6ad7c4f3a0919a03b0919a03c0919a03d0919a03e0919a03f0919a0400919a0410919a0420919a0430919a0b7ad7c4fb8ad7c4fb9ad7c4fbaad7c4fbbad7c4fbcad7c4fbdad7c4fbead7c4fc569b158c669b158 diff --git a/Assets/arts/atlas/ui/common.spriteatlas b/Assets/arts/atlas/ui/common.spriteatlas index c7583deef..0d5a5f2c5 100644 --- a/Assets/arts/atlas/ui/common.spriteatlas +++ b/Assets/arts/atlas/ui/common.spriteatlas @@ -71,6 +71,7 @@ SpriteAtlas: - {fileID: 21300000, guid: 0068587080dd0488dad9da673f466698, type: 3} - {fileID: 21300000, guid: a806bb907d2075d44a8ea0a190a92c52, type: 3} - {fileID: 21300000, guid: 3dd545a09127741f68ada89e6e81ddaa, type: 3} + - {fileID: 21300000, guid: f26e07a00be5c469c92ffb50eaf4482d, type: 3} - {fileID: 21300000, guid: 3df1f1c0900d28e48958abf63b77fd5e, type: 3} - {fileID: 21300000, guid: 7e76c5c0bc5094487819ae959505d911, type: 3} - {fileID: 21300000, guid: 046389c0de1f04c26bf53a473a599d73, type: 3} @@ -355,6 +356,7 @@ SpriteAtlas: - common_btn_close_2 - common_title_2 - common_bg_27 + - common_bg_38 - common_title_1 - common_arrow_8 - common_btn_yellow_l diff --git a/Assets/arts/atlas/ui/daily_challenge.asset b/Assets/arts/atlas/ui/daily_challenge.asset index 8918271fb..bd310157f 100644 --- a/Assets/arts/atlas/ui/daily_challenge.asset +++ b/Assets/arts/atlas/ui/daily_challenge.asset @@ -24,7 +24,8 @@ MonoBehaviour: - {fileID: 21300000, guid: 4a52eb43a927eb945b31f20bbb5e9b64, type: 3} - {fileID: 21300000, guid: b3e4a58ca4cdfbb4c82b0db93117f65a, type: 3} - {fileID: 21300000, guid: a9054252af098f94e8d742fed787259c, type: 3} + - {fileID: 21300000, guid: 7ece3ac025ec248eb9c2aa2f3530b120, type: 3} - {fileID: 21300000, guid: dc54318f908891e4a819c6f9cde70ad4, type: 3} - {fileID: 21300000, guid: e843643442bc8f84a85ab9f65f8331a0, type: 3} - {fileID: 21300000, guid: 390d6248a7a2fcf408d0a276582978e7, type: 3} - spriteNameList: 2b54c4932c54c493f917902afa17902afb17902afc17902afd17902afe17902a32428e2733428e2734428e2778f3912addb467b1deb467b1 + spriteNameList: 2b54c4932c54c493f917902afa17902afb17902afc17902afd17902afe17902a32428e2733428e2734428e2735428e2778f3912addb467b1deb467b1 diff --git a/Assets/arts/atlas/ui/daily_challenge.spriteatlas b/Assets/arts/atlas/ui/daily_challenge.spriteatlas index 5a69ea4f1..1f57f0d16 100644 --- a/Assets/arts/atlas/ui/daily_challenge.spriteatlas +++ b/Assets/arts/atlas/ui/daily_challenge.spriteatlas @@ -63,6 +63,7 @@ SpriteAtlas: m_MasterAtlas: {fileID: 0} m_PackedSprites: - {fileID: 21300000, guid: 45b80e20fe688ef45b04e1b37bb26b83, type: 3} + - {fileID: 21300000, guid: 7ece3ac025ec248eb9c2aa2f3530b120, type: 3} - {fileID: 21300000, guid: 1a7e7b21f70f64c32b044b4a467354df, type: 3} - {fileID: 21300000, guid: a9054252af098f94e8d742fed787259c, type: 3} - {fileID: 21300000, guid: 8e2ea7e29fa354444bb33f2a55d2139e, type: 3} @@ -78,6 +79,7 @@ SpriteAtlas: - {fileID: 21300000, guid: a150c6af80b59fc4082e6075d19f9f45, type: 3} m_PackedSpriteNamesToIndex: - daily_challenge_bg_2 + - daily_challenge_dec_4 - daily_challenge_bg_5 - daily_challenge_dec_3 - daily_buff_1 diff --git a/Assets/arts/textures/background/summon/bg_cj_1_shixiang01.png b/Assets/arts/textures/background/summon/bg_a_cj_shixiang01.png similarity index 100% rename from Assets/arts/textures/background/summon/bg_cj_1_shixiang01.png rename to Assets/arts/textures/background/summon/bg_a_cj_shixiang01.png diff --git a/Assets/arts/textures/background/summon/bg_cj_1_shixiang01.png.meta b/Assets/arts/textures/background/summon/bg_a_cj_shixiang01.png.meta similarity index 98% rename from Assets/arts/textures/background/summon/bg_cj_1_shixiang01.png.meta rename to Assets/arts/textures/background/summon/bg_a_cj_shixiang01.png.meta index 67a40a1d4..a3107c2cc 100644 --- a/Assets/arts/textures/background/summon/bg_cj_1_shixiang01.png.meta +++ b/Assets/arts/textures/background/summon/bg_a_cj_shixiang01.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: a25b5fe857cef45c3811f39ee9e5701e +guid: c49dc768977f1466fbf84e9777696b02 TextureImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/Assets/arts/textures/ui/common/common_bg_38.png b/Assets/arts/textures/ui/common/common_bg_38.png new file mode 100644 index 000000000..3935ee6fd Binary files /dev/null and b/Assets/arts/textures/ui/common/common_bg_38.png differ diff --git a/Assets/arts/textures/ui/common/common_bg_38.png.meta b/Assets/arts/textures/ui/common/common_bg_38.png.meta new file mode 100644 index 000000000..4857fc10a --- /dev/null +++ b/Assets/arts/textures/ui/common/common_bg_38.png.meta @@ -0,0 +1,147 @@ +fileFormatVersion: 2 +guid: f26e07a00be5c469c92ffb50eaf4482d +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/daily_challenge/daily_challenge_dec_4.png b/Assets/arts/textures/ui/daily_challenge/daily_challenge_dec_4.png new file mode 100644 index 000000000..e89ddf6dd Binary files /dev/null and b/Assets/arts/textures/ui/daily_challenge/daily_challenge_dec_4.png differ diff --git a/Assets/arts/textures/ui/daily_challenge/daily_challenge_dec_4.png.meta b/Assets/arts/textures/ui/daily_challenge/daily_challenge_dec_4.png.meta new file mode 100644 index 000000000..0c72db344 --- /dev/null +++ b/Assets/arts/textures/ui/daily_challenge/daily_challenge_dec_4.png.meta @@ -0,0 +1,147 @@ +fileFormatVersion: 2 +guid: 7ece3ac025ec248eb9c2aa2f3530b120 +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/module/chapter/chapter_manager.lua.bytes b/Assets/lua/app/module/chapter/chapter_manager.lua.bytes index c1d6171e4..e1653919a 100644 Binary files a/Assets/lua/app/module/chapter/chapter_manager.lua.bytes and b/Assets/lua/app/module/chapter/chapter_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 38e524c6c..be34b38ed 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/summon/summon_unlock_ui.lua.bytes b/Assets/lua/app/ui/summon/summon_unlock_ui.lua.bytes index 914b56997..e41e4c1c8 100644 Binary files a/Assets/lua/app/ui/summon/summon_unlock_ui.lua.bytes and b/Assets/lua/app/ui/summon/summon_unlock_ui.lua.bytes differ diff --git a/Assets/lua/app/userdata/chapter/chapter_data.lua.bytes b/Assets/lua/app/userdata/chapter/chapter_data.lua.bytes index ac5b77040..a577d958c 100644 Binary files a/Assets/lua/app/userdata/chapter/chapter_data.lua.bytes and b/Assets/lua/app/userdata/chapter/chapter_data.lua.bytes differ diff --git a/Assets/prefabs/ui/battle/battle_result_ui.prefab b/Assets/prefabs/ui/battle/battle_result_ui.prefab index f6b120457..e8077d132 100644 --- a/Assets/prefabs/ui/battle/battle_result_ui.prefab +++ b/Assets/prefabs/ui/battle/battle_result_ui.prefab @@ -2073,6 +2073,7 @@ GameObject: - component: {fileID: 1178603058965124914} - component: {fileID: 5099369366038059848} - component: {fileID: 8128543844693019939} + - component: {fileID: 8028845014987800763} m_Layer: 5 m_Name: bg m_TagString: Untagged @@ -2087,7 +2088,7 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5006573747825110255} - 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 @@ -2097,7 +2098,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 &5099369366038059848 @@ -2138,6 +2139,28 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!114 &8028845014987800763 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5006573747825110255} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b42a195b47491d34b9bcbc40898bcb29, type: 3} + m_Name: + m_EditorClassIdentifier: + skeletonGraphic: {fileID: 356588543674280203} + initializeOnAwake: 1 + boneName: diban + followBoneRotation: 1 + followSkeletonFlip: 1 + followLocalScale: 0 + followParentWorldScale: 0 + followXYPosition: 1 + followZPosition: 1 + maintainedAxisOrientation: 1 --- !u!1 &5046246927649095494 GameObject: m_ObjectHideFlags: 0 @@ -6314,6 +6337,17 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 4f7cf840d6e73e14781807788b817568, type: 3} +--- !u!114 &356588543674280203 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 2505651998029909099, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + m_PrefabInstance: {fileID: 2753676652289451360} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4437137689668192280} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d85b887af7e6c3f45a2e2d2920d641bc, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!224 &1062877572076605182 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} diff --git a/Assets/prefabs/ui/common/message_box.prefab b/Assets/prefabs/ui/common/message_box.prefab index 072a1ceca..6d167555c 100644 --- a/Assets/prefabs/ui/common/message_box.prefab +++ b/Assets/prefabs/ui/common/message_box.prefab @@ -28,13 +28,14 @@ RectTransform: 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: 7060983534625811695} 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: 47, y: 61} + m_AnchoredPosition: {x: 47, y: 0} m_SizeDelta: {x: 330, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &832590403912408616 @@ -68,7 +69,7 @@ MonoBehaviour: m_text: m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 9d1aadd9ebaf54ce2b217ab8427fa0db, type: 2} - m_sharedMaterial: {fileID: 2100000, guid: d9526b8cb4bc030488db413ef429c6f9, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: 09210edd46ea1463596717e00ea9e8be, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -162,6 +163,7 @@ RectTransform: 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: 5535816440748046611} m_RootOrder: 0 @@ -235,16 +237,17 @@ RectTransform: 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: 3319119855870404306} m_Father: {fileID: 4002258812364763181} - m_RootOrder: 6 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 144} + m_AnchoredPosition: {x: 0, y: 37} m_SizeDelta: {x: 550, y: 174} - m_Pivot: {x: 0.5, y: 1} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1376661816950440271 GameObject: m_ObjectHideFlags: 0 @@ -273,14 +276,15 @@ RectTransform: 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: 4002258812364763181} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 66} - m_SizeDelta: {x: 554, y: 203} + m_AnchoredPosition: {x: 0, y: 37} + m_SizeDelta: {x: 574, y: 208} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8754930572931908129 CanvasRenderer: @@ -310,8 +314,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 182116de280b5e64884b108d91b70b93, type: 3} - m_Type: 0 + m_Sprite: {fileID: 21300000, guid: 6fcfdf7ba1e7f4441a15bd5d888541d0, type: 3} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -348,6 +352,7 @@ RectTransform: 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: 6412234626851302671} m_RootOrder: 0 @@ -378,15 +383,15 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2} - m_Color: {r: 1, g: 1, b: 1, a: 0.8627451} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 89783d5ddc9ab034687ff93732ebdfe0, type: 3} - m_Type: 1 + m_Sprite: {fileID: 21300000, guid: f26e07a00be5c469c92ffb50eaf4482d, type: 3} + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -424,6 +429,7 @@ RectTransform: 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: 8169818512845020679} - {fileID: 2479030491461019998} @@ -432,8 +438,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: -124, y: 0} - m_SizeDelta: {x: 208, y: 98} + m_AnchoredPosition: {x: 133, y: 0} + m_SizeDelta: {x: 218, y: 92} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1773644531866514412 CanvasRenderer: @@ -463,8 +469,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 5758461464520334caa2a2487dca2fc6, type: 3} - m_Type: 1 + m_Sprite: {fileID: 21300000, guid: 9bc39501344a8494daeaf1035cb736db, type: 3} + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -486,81 +492,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: IsShowClickAnimation: 1 ---- !u!1 &3730224170299656146 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 5424090435795889818} - - component: {fileID: 8626968315535379403} - - component: {fileID: 5393573390123955283} - m_Layer: 5 - m_Name: title_img - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &5424090435795889818 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3730224170299656146} - 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_Children: [] - m_Father: {fileID: 4002258812364763181} - m_RootOrder: 4 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 1} - m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 0, y: 25} - m_SizeDelta: {x: 648, y: 96} - m_Pivot: {x: 0.5, y: 1} ---- !u!222 &8626968315535379403 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3730224170299656146} - m_CullTransparentMesh: 1 ---- !u!114 &5393573390123955283 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3730224170299656146} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 0 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 1f0e6d68246796849961cb0680d4f226, 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 &4214823675495668826 GameObject: m_ObjectHideFlags: 0 @@ -589,15 +520,16 @@ RectTransform: 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: 4002258812364763181} - m_RootOrder: 5 + 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: 0, y: 3} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 43, y: -40} m_SizeDelta: {x: 200, y: 40} - m_Pivot: {x: 0.5, y: 1} + m_Pivot: {x: 0, y: 0.5} --- !u!222 &4149158187376799623 CanvasRenderer: m_ObjectHideFlags: 0 @@ -653,8 +585,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 35 - m_fontSizeBase: 35 + m_fontSize: 36 + m_fontSizeBase: 36 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -723,6 +655,7 @@ RectTransform: 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: 5535816440748046611} m_RootOrder: 1 @@ -855,15 +788,16 @@ RectTransform: 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: 5535816440748046611} - {fileID: 3647064225284467116} m_Father: {fileID: 4002258812364763181} - m_RootOrder: 7 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: -120} + m_AnchoredPosition: {x: 0, y: -168} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &4918340139958855498 @@ -894,16 +828,17 @@ RectTransform: 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: 6412234626851302671} - {fileID: 7209293347416129617} m_Father: {fileID: 4002258812364763181} - m_RootOrder: 2 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: -123} - m_SizeDelta: {x: 568, y: 174} + m_AnchoredPosition: {x: 0, y: -93} + m_SizeDelta: {x: 568, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8443484724216762890 CanvasRenderer: @@ -972,6 +907,7 @@ RectTransform: 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: 8597320429581163801} m_Father: {fileID: 6936090947867396111} @@ -979,8 +915,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: 124, y: 0} - m_SizeDelta: {x: 208, y: 98} + m_AnchoredPosition: {x: -133, y: 0} + m_SizeDelta: {x: 218, y: 92} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8218460421123803817 CanvasRenderer: @@ -1010,8 +946,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: c005d0dc9d400304ca941b48135dcb04, type: 3} - m_Type: 1 + m_Sprite: {fileID: 21300000, guid: 883d58dd339d5e346b504cdff1be6351, type: 3} + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -1061,12 +997,10 @@ RectTransform: 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: 3270613892521539612} - - {fileID: 3161288776437297628} - {fileID: 7060983534625811695} - - {fileID: 9188324771489412851} - - {fileID: 5424090435795889818} - {fileID: 4944297764618943666} - {fileID: 7062665755871776357} - {fileID: 6936090947867396111} @@ -1076,7 +1010,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 576, y: 426} + m_SizeDelta: {x: 620, y: 496} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &929043086436108139 CanvasRenderer: @@ -1106,82 +1040,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: fdf319adad718e34d90445fc9339fae8, 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 &6031080545313226091 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 9188324771489412851} - - component: {fileID: 7198605246285803238} - - component: {fileID: 261904068184616245} - m_Layer: 5 - m_Name: image - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!224 &9188324771489412851 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6031080545313226091} - 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_Children: [] - m_Father: {fileID: 4002258812364763181} - m_RootOrder: 3 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 552, y: 402} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &7198605246285803238 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6031080545313226091} - m_CullTransparentMesh: 1 ---- !u!114 &261904068184616245 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6031080545313226091} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 0 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 1a3eea633d6dc9249b5caf2aee32cdfa, type: 3} + m_Sprite: {fileID: 21300000, guid: d9c23e0c2fdbcda4ab03e9917f66a4d8, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1219,14 +1078,15 @@ RectTransform: 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: 6412234626851302671} 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: 3, y: 4} - m_SizeDelta: {x: 36.6, y: 32.4} + m_AnchoredPosition: {x: 3, y: 3} + m_SizeDelta: {x: 36, y: 26} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1562677465284346290 CanvasRenderer: @@ -1256,7 +1116,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 6257321a157c2d24abce62bfdffa3d3b, type: 3} + m_Sprite: {fileID: 21300000, guid: 87f8bd23582a24c81a676a5b6d1e4e85, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1295,6 +1155,7 @@ RectTransform: 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: 7390582371138297497} m_RootOrder: 0 @@ -1384,6 +1245,7 @@ RectTransform: 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: 235819629000327658} - {fileID: 4002258812364763181} @@ -1502,81 +1364,6 @@ MonoBehaviour: hashName: 1800690425 objectType: 0 gameObject: {fileID: 4847684170095283056} ---- !u!1 &7764244692022379159 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 3161288776437297628} - - component: {fileID: 9063726392972117621} - - component: {fileID: 2907489567658645789} - m_Layer: 5 - m_Name: line_img - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &3161288776437297628 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7764244692022379159} - 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_Children: [] - m_Father: {fileID: 4002258812364763181} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: -35} - m_SizeDelta: {x: 554, y: 4} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &9063726392972117621 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7764244692022379159} - m_CullTransparentMesh: 1 ---- !u!114 &2907489567658645789 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7764244692022379159} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 0 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 14da6211cc49d5a4a8c31d4e949b3135, type: 3} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 --- !u!1 &7884661295923494243 GameObject: m_ObjectHideFlags: 0 @@ -1605,6 +1392,7 @@ RectTransform: 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: 3647064225284467116} m_RootOrder: 0 @@ -1739,15 +1527,16 @@ RectTransform: 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: 7062665755871776357} m_RootOrder: 0 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: -8} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 510, y: 152} - m_Pivot: {x: 0.5, y: 1} + m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1112107140792425333 CanvasRenderer: m_ObjectHideFlags: 0 @@ -1779,7 +1568,7 @@ MonoBehaviour: m_text: m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 9d1aadd9ebaf54ce2b217ab8427fa0db, type: 2} - m_sharedMaterial: {fileID: 2100000, guid: d9526b8cb4bc030488db413ef429c6f9, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: 09210edd46ea1463596717e00ea9e8be, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -1874,6 +1663,7 @@ RectTransform: 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: 6264130056691076904} - {fileID: 6472706703626902746} @@ -1882,7 +1672,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: -45, y: 61} + m_AnchoredPosition: {x: -45, y: 0} m_SizeDelta: {x: 50, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8138152585163357604 diff --git a/Assets/prefabs/ui/daily_challenge/daily_challenge_ui.prefab b/Assets/prefabs/ui/daily_challenge/daily_challenge_ui.prefab index d6a71513a..06597b4c7 100644 --- a/Assets/prefabs/ui/daily_challenge/daily_challenge_ui.prefab +++ b/Assets/prefabs/ui/daily_challenge/daily_challenge_ui.prefab @@ -195,7 +195,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} 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: @@ -304,12 +304,12 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 24 + m_fontSize: 20 m_fontSizeBase: 36 m_fontWeight: 400 m_enableAutoSizing: 1 m_fontSizeMin: 18 - m_fontSizeMax: 24 + m_fontSizeMax: 20 m_fontStyle: 0 m_HorizontalAlignment: 2 m_VerticalAlignment: 512 @@ -385,7 +385,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: -424} + m_AnchoredPosition: {x: 0, y: -404} m_SizeDelta: {x: 288, y: 118} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6554589511208922406 @@ -501,7 +501,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2} m_Color: {r: 0, g: 0, b: 0, a: 0.9411765} - m_RaycastTarget: 1 + m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: @@ -563,11 +563,11 @@ RectTransform: m_Father: {fileID: 4476004844096841350} 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: 586} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 97} m_SizeDelta: {x: 604, y: 376} - m_Pivot: {x: 0.5, y: 0} + m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &157606685918462965 CanvasRenderer: m_ObjectHideFlags: 0 @@ -590,7 +590,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} 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: @@ -665,7 +665,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2} m_Color: {r: 0, g: 0, b: 0, a: 0.9411765} - m_RaycastTarget: 1 + m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: @@ -803,8 +803,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: -68} - m_SizeDelta: {x: 400, y: 100} + m_AnchoredPosition: {x: 0, y: -50} + m_SizeDelta: {x: 400, y: 126} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1313070341834142519 MonoBehaviour: @@ -892,7 +892,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} 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: @@ -941,10 +941,10 @@ RectTransform: m_Father: {fileID: 4971726588839284321} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: -12, y: -12} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: -28} + m_SizeDelta: {x: 48, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6267450281999421883 CanvasRenderer: @@ -1017,7 +1017,7 @@ MonoBehaviour: m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_enableWordWrapping: 0 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} @@ -1136,8 +1136,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 24 - m_fontSizeBase: 24 + m_fontSize: 20 + m_fontSizeBase: 20 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -1509,7 +1509,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: @@ -1735,7 +1735,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2} m_Color: {r: 0, g: 0, b: 0, a: 0.9411765} - m_RaycastTarget: 1 + m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: @@ -2105,8 +2105,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: -304} - m_SizeDelta: {x: 156, y: 68} + m_AnchoredPosition: {x: 0, y: -171} + m_SizeDelta: {x: 156, y: 58} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2386563011081099375 CanvasRenderer: @@ -2278,14 +2278,14 @@ MonoBehaviour: hashName: 273667318 objectType: 0 gameObject: {fileID: 7197139559494529798} - - name: daily_challenge_ui.buffs.buff.btn_buff - hashName: 2271378187 + - name: daily_challenge_ui.buffs.buff + hashName: 4078704537 objectType: 0 - gameObject: {fileID: 3820565228612370093} - - name: daily_challenge_ui.buffs.debuff.btn_debuff - hashName: 3281877995 + gameObject: {fileID: 4758520848168355254} + - name: daily_challenge_ui.buffs.debuff + hashName: 2667266586 objectType: 0 - gameObject: {fileID: 5824678109636714794} + gameObject: {fileID: 7242870151585524972} - name: daily_challenge_ui.task.icon_task1 hashName: 3292509815 objectType: 0 @@ -2492,8 +2492,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: -196} - m_SizeDelta: {x: 400, y: 80} + m_AnchoredPosition: {x: 0, y: -257} + m_SizeDelta: {x: 400, y: 82} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3413572464311536574 CanvasRenderer: @@ -2517,7 +2517,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2} m_Color: {r: 1, g: 1, b: 1, a: 0.27450982} - m_RaycastTarget: 1 + m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: @@ -2550,7 +2550,7 @@ MonoBehaviour: m_Right: 0 m_Top: 0 m_Bottom: 10 - m_ChildAlignment: 4 + m_ChildAlignment: 1 m_Spacing: 28 m_ChildForceExpandWidth: 0 m_ChildForceExpandHeight: 0 @@ -2620,7 +2620,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: @@ -2710,7 +2710,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: @@ -2763,8 +2763,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: 240, y: -304} - m_SizeDelta: {x: 156, y: 68} + m_AnchoredPosition: {x: 166, y: -171} + m_SizeDelta: {x: 60, y: 60} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2733361000646276660 CanvasRenderer: @@ -2794,8 +2794,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: c692df1f4d1dfed42a66007b4e4cb315, type: 3} - m_Type: 1 + m_Sprite: {fileID: 21300000, guid: 7ece3ac025ec248eb9c2aa2f3530b120, type: 3} + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -2848,9 +2848,9 @@ RectTransform: m_Father: {fileID: 4476004844096841350} 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: 0, y: 644} + 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: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &7242870151585524972 @@ -2967,7 +2967,7 @@ RectTransform: 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: -254} + m_AnchoredPosition: {x: 0, y: -256} m_SizeDelta: {x: 140, y: 34} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2258472133316994714 @@ -2992,7 +2992,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: @@ -3144,7 +3144,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} 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: @@ -3615,7 +3615,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: @@ -3691,7 +3691,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} 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/summon/summon_main_ui.prefab b/Assets/prefabs/ui/summon/summon_main_ui.prefab index ce5b38400..a35062dab 100644 --- a/Assets/prefabs/ui/summon/summon_main_ui.prefab +++ b/Assets/prefabs/ui/summon/summon_main_ui.prefab @@ -3528,7 +3528,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Texture: {fileID: 2800000, guid: a25b5fe857cef45c3811f39ee9e5701e, type: 3} + m_Texture: {fileID: 2800000, guid: c49dc768977f1466fbf84e9777696b02, type: 3} m_UVRect: serializedVersion: 2 x: 0 @@ -4157,7 +4157,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: 8.5, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 1280, y: 1800} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3615303308011153387 diff --git a/Assets/prefabs/ui/summon/summon_unlock_ui.prefab b/Assets/prefabs/ui/summon/summon_unlock_ui.prefab index 20197a701..968c3dae8 100644 --- a/Assets/prefabs/ui/summon/summon_unlock_ui.prefab +++ b/Assets/prefabs/ui/summon/summon_unlock_ui.prefab @@ -1,5 +1,65 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &1653201186271226230 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4835860963127684843} + - component: {fileID: 3776817900304392562} + m_Layer: 5 + m_Name: hero_bg + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4835860963127684843 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1653201186271226230} + 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: 6866967745778826238} + m_Father: {fileID: 4165930251451731960} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 80.99158} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &3776817900304392562 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1653201186271226230} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b42a195b47491d34b9bcbc40898bcb29, type: 3} + m_Name: + m_EditorClassIdentifier: + skeletonGraphic: {fileID: 1256636945707210060} + initializeOnAwake: 1 + boneName: hero + followBoneRotation: 1 + followSkeletonFlip: 1 + followLocalScale: 0 + followParentWorldScale: 0 + followXYPosition: 1 + followZPosition: 1 + maintainedAxisOrientation: 1 --- !u!1 &1833628690766626713 GameObject: m_ObjectHideFlags: 0 @@ -25,18 +85,18 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1833628690766626713} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + 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: 7710701202099920379} - m_Father: {fileID: 4165930251451731960} - m_RootOrder: 5 + m_Father: {fileID: 3459056006576154992} + 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: 20, y: -187} + m_AnchoredPosition: {x: 20, y: 0} m_SizeDelta: {x: 100, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4720627916871877258 @@ -147,6 +207,7 @@ GameObject: - component: {fileID: 7671553057238440610} - component: {fileID: 2101762181280292810} - component: {fileID: 2667032660871933275} + - component: {fileID: 6365693979620316018} m_Layer: 5 m_Name: qlt_bg m_TagString: Untagged @@ -161,7 +222,7 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2793342556732217366} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalRotation: {x: -0, y: -0, z: -3.5009262e-10, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 @@ -172,7 +233,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: 175, y: 219} + m_AnchoredPosition: {x: 182.47668, y: 217.71619} m_SizeDelta: {x: 103, y: 62} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2101762181280292810 @@ -213,6 +274,28 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!114 &6365693979620316018 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2793342556732217366} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b42a195b47491d34b9bcbc40898bcb29, type: 3} + m_Name: + m_EditorClassIdentifier: + skeletonGraphic: {fileID: 1256636945707210060} + initializeOnAwake: 1 + boneName: ziti2 + followBoneRotation: 1 + followSkeletonFlip: 1 + followLocalScale: 0 + followParentWorldScale: 0 + followXYPosition: 1 + followZPosition: 1 + maintainedAxisOrientation: 1 --- !u!1 &2950452145034450706 GameObject: m_ObjectHideFlags: 0 @@ -359,6 +442,7 @@ GameObject: - component: {fileID: 6460882298150030607} - component: {fileID: 1369767326934294805} - component: {fileID: 8518135506779323168} + - component: {fileID: 4242477207139284805} m_Layer: 0 m_Name: name_tx m_TagString: Untagged @@ -373,7 +457,7 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5735925761599006443} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + 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 @@ -383,7 +467,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: -129} + m_AnchoredPosition: {x: 0.000030517578, y: -127.17676} m_SizeDelta: {x: 200, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1369767326934294805 @@ -483,6 +567,28 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!114 &4242477207139284805 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5735925761599006443} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b42a195b47491d34b9bcbc40898bcb29, type: 3} + m_Name: + m_EditorClassIdentifier: + skeletonGraphic: {fileID: 1256636945707210060} + initializeOnAwake: 1 + boneName: ziti3 + followBoneRotation: 1 + followSkeletonFlip: 1 + followLocalScale: 0 + followParentWorldScale: 0 + followXYPosition: 1 + followZPosition: 1 + maintainedAxisOrientation: 1 --- !u!1 &5982327864506076969 GameObject: m_ObjectHideFlags: 0 @@ -506,17 +612,17 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5982327864506076969} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + 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: 4165930251451731960} - m_RootOrder: 3 + m_Father: {fileID: 4835860963127684843} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: -60} + m_AnchoredPosition: {x: 0, y: -120} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &6444110946143625643 @@ -665,6 +771,7 @@ GameObject: - component: {fileID: 3895416728187857425} - component: {fileID: 8025753409084457780} - component: {fileID: 5149909000559811823} + - component: {fileID: 6216430781035466986} m_Layer: 5 m_Name: title_bg m_TagString: Untagged @@ -679,7 +786,7 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7562392946507848591} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: -0, y: -0, z: 1.934978e-10, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 @@ -690,7 +797,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: 379} + m_AnchoredPosition: {x: -0.000030517578, y: 373.83368} m_SizeDelta: {x: 396, y: 82} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8025753409084457780 @@ -731,6 +838,28 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!114 &6216430781035466986 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7562392946507848591} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b42a195b47491d34b9bcbc40898bcb29, type: 3} + m_Name: + m_EditorClassIdentifier: + skeletonGraphic: {fileID: 1256636945707210060} + initializeOnAwake: 1 + boneName: ziti1 + followBoneRotation: 1 + followSkeletonFlip: 1 + followLocalScale: 0 + followParentWorldScale: 0 + followXYPosition: 1 + followZPosition: 1 + maintainedAxisOrientation: 1 --- !u!1 &8517754770405570962 GameObject: m_ObjectHideFlags: 0 @@ -979,9 +1108,9 @@ RectTransform: - {fileID: 1964337197154071225} - {fileID: 3895416728187857425} - {fileID: 485724790640539441} - - {fileID: 6866967745778826238} + - {fileID: 4835860963127684843} - {fileID: 6460882298150030607} - - {fileID: 7396162589541422639} + - {fileID: 3459056006576154992} - {fileID: 7671553057238440610} m_Father: {fileID: 0} m_RootOrder: 0 @@ -1042,8 +1171,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: prefabList: - - name: summon_unlock_ui.hero_node - hashName: 3474311434 + - name: summon_unlock_ui.hero_bg.hero_node + hashName: 4009010118 objectType: 0 gameObject: {fileID: 5982327864506076969} - name: summon_unlock_ui.title_bg.title_tx @@ -1058,12 +1187,12 @@ MonoBehaviour: hashName: 1602505563 objectType: 0 gameObject: {fileID: 5735925761599006443} - - name: summon_unlock_ui.match_tx - hashName: 889026811 + - name: summon_unlock_ui.match_node.match_tx + hashName: 4019299027 objectType: 0 gameObject: {fileID: 1833628690766626713} - - name: summon_unlock_ui.match_tx.match_img - hashName: 378750230 + - name: summon_unlock_ui.match_node.match_tx.match_img + hashName: 3921608942 objectType: 0 gameObject: {fileID: 8550196138116247995} - name: summon_unlock_ui.qlt_bg @@ -1129,6 +1258,66 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: IsShowClickAnimation: 0 +--- !u!1 &9080152717151480164 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3459056006576154992} + - component: {fileID: 7173141533487018449} + m_Layer: 5 + m_Name: match_node + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3459056006576154992 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9080152717151480164} + 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: 7396162589541422639} + m_Father: {fileID: 4165930251451731960} + m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0.000030517578, y: -186.43555} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &7173141533487018449 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9080152717151480164} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b42a195b47491d34b9bcbc40898bcb29, type: 3} + m_Name: + m_EditorClassIdentifier: + skeletonGraphic: {fileID: 1256636945707210060} + initializeOnAwake: 1 + boneName: ziti4 + followBoneRotation: 1 + followSkeletonFlip: 1 + followLocalScale: 0 + followParentWorldScale: 0 + followXYPosition: 1 + followZPosition: 1 + maintainedAxisOrientation: 1 --- !u!1001 &3726066319944096039 PrefabInstance: m_ObjectHideFlags: 0 @@ -1238,6 +1427,17 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 4f7cf840d6e73e14781807788b817568, type: 3} +--- !u!114 &1256636945707210060 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 2505651998029909099, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + m_PrefabInstance: {fileID: 3726066319944096039} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2887162471322547295} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d85b887af7e6c3f45a2e2d2920d641bc, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!224 &1964337197154071225 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3}