diff --git a/Assets/arts/atlas/ui/arena.asset b/Assets/arts/atlas/ui/arena.asset index 6d27278bd..4655e1524 100644 --- a/Assets/arts/atlas/ui/arena.asset +++ b/Assets/arts/atlas/ui/arena.asset @@ -17,12 +17,16 @@ MonoBehaviour: - {fileID: 21300000, guid: a356b36deef7a1b4a9558d6a724921e1, type: 3} - {fileID: 21300000, guid: 00e143fef26720b478e2733de42dd12c, type: 3} - {fileID: 21300000, guid: 91f1d08e1ed8edf45a0a6368f8c30a19, type: 3} + - {fileID: 21300000, guid: 02a079d6dd048e349a54f81f4d089eef, type: 3} + - {fileID: 21300000, guid: 601d39fa6902e514a8d29cbe8651a35c, type: 3} - {fileID: 21300000, guid: 7b9078892abf72e4688f694d249c4eb3, type: 3} - {fileID: 21300000, guid: dae049b6a2628eb4db9abda297ab6a3b, type: 3} - {fileID: 21300000, guid: 8a50e1a0c6f7c81458874e21047c6977, type: 3} - {fileID: 21300000, guid: 6d0d627d9bdff844cbe27be737d9dc5b, type: 3} - {fileID: 21300000, guid: 3b005179ddd3f794bbfd359c50d9cd07, type: 3} - {fileID: 21300000, guid: 00fd0ae4c09175f46b80c9f75ad9acec, type: 3} + - {fileID: 21300000, guid: 035848b780a057a489b681fb592e2ce4, type: 3} + - {fileID: 21300000, guid: a31c8ba23e9c1024596fee83894b66e4, type: 3} - {fileID: 21300000, guid: 7285006cf10d19f49aa80a8478d10ba8, type: 3} - {fileID: 21300000, guid: cacd951ff412e684e8863cee652eccbd, type: 3} - {fileID: 21300000, guid: 13f9a094640ed874cbb2cb62333523d0, type: 3} @@ -52,4 +56,4 @@ MonoBehaviour: - {fileID: 21300000, guid: 7c3a18c26f0ec664cb74cc6ff5b87f9c, type: 3} - {fileID: 21300000, guid: 0bec9bab93c4b664ebd7b55669932d0b, type: 3} - {fileID: 21300000, guid: bb4a664a5db1bf548ac578c400e3c20b, type: 3} - spriteNameList: ef5c00f8f05c00f8f15c00f8f25c00f8c38565e33162aae71b24d9ebc0ea3ef2afec92ffaae695ffcbf32408ccf32408cdf32408fc9b2608fd9b2608fe9b2608ff9b2608009c2608019c2608029c26089d3958939e3958939f395893231b2d8d241b2d8d251b2d8d261b2d8d271b2d8d50f67c9851f67c9852f67c9853f67c98300321f5310321f5320321f558c3c9ec59c3c9ec5ac3c9ec5bc3c9ec + spriteNameList: ef5c00f8f05c00f8f15c00f8f25c00f8f35c00f8f45c00f8c38565e33162aae71b24d9ebc0ea3ef2afec92ffaae695ff3b294e693c294e69cbf32408ccf32408cdf32408fc9b2608fd9b2608fe9b2608ff9b2608009c2608019c2608029c26089d3958939e3958939f395893231b2d8d241b2d8d251b2d8d261b2d8d271b2d8d50f67c9851f67c9852f67c9853f67c98300321f5310321f5320321f558c3c9ec59c3c9ec5ac3c9ec5bc3c9ec diff --git a/Assets/arts/atlas/ui/arena.spriteatlas b/Assets/arts/atlas/ui/arena.spriteatlas index 6af145793..6f1cd76b1 100644 --- a/Assets/arts/atlas/ui/arena.spriteatlas +++ b/Assets/arts/atlas/ui/arena.spriteatlas @@ -64,6 +64,7 @@ SpriteAtlas: - {fileID: 21300000, guid: 8a50e1a0c6f7c81458874e21047c6977, type: 3} - {fileID: 21300000, guid: 369ef0e04cb680441baa4814f5e7ec28, type: 3} - {fileID: 21300000, guid: 0cf3e3816c4e89140a614c998518d618, type: 3} + - {fileID: 21300000, guid: a31c8ba23e9c1024596fee83894b66e4, type: 3} - {fileID: 21300000, guid: 7c3a18c26f0ec664cb74cc6ff5b87f9c, type: 3} - {fileID: 21300000, guid: 164807247edc9a84a87ac6c4336c9761, type: 3} - {fileID: 21300000, guid: 2bd9e554e73874d43931caf82a6da52d, type: 3} @@ -72,7 +73,9 @@ SpriteAtlas: - {fileID: 21300000, guid: 38c13946aab64e0448ee58b368e0985f, type: 3} - {fileID: 21300000, guid: a56848b6da08710499131bdecf066bb6, type: 3} - {fileID: 21300000, guid: dae049b6a2628eb4db9abda297ab6a3b, type: 3} + - {fileID: 21300000, guid: 02a079d6dd048e349a54f81f4d089eef, type: 3} - {fileID: 21300000, guid: 45ae36870a658a743a0dab135d4701e0, type: 3} + - {fileID: 21300000, guid: 035848b780a057a489b681fb592e2ce4, type: 3} - {fileID: 21300000, guid: 69df5408fe81cbc44a6c5d8e31abbe27, type: 3} - {fileID: 21300000, guid: 3a470558d6b0c8549b39a9169b15733d, type: 3} - {fileID: 21300000, guid: 8a5cf2a87c15a454b8cdc5ce2af7291f, type: 3} @@ -82,6 +85,7 @@ SpriteAtlas: - {fileID: 21300000, guid: 7b9078892abf72e4688f694d249c4eb3, type: 3} - {fileID: 21300000, guid: b1e0c0f9b9c9b6e408330793ff55ab82, type: 3} - {fileID: 21300000, guid: bb4a664a5db1bf548ac578c400e3c20b, type: 3} + - {fileID: 21300000, guid: 601d39fa6902e514a8d29cbe8651a35c, type: 3} - {fileID: 21300000, guid: d3822c1b442d7b549afc110a984d25ff, type: 3} - {fileID: 21300000, guid: dfa97f2b33feb2d42b634eeb4ad5514d, type: 3} - {fileID: 21300000, guid: 0bec9bab93c4b664ebd7b55669932d0b, type: 3} @@ -104,6 +108,7 @@ SpriteAtlas: - arena_btn_ranking - arena_dec_7 - arena_num_silver_4 + - arena_chest_2 - arena_ranking_bg_2 - arena_num_gold_2 - arena_num_bronze_3 @@ -112,7 +117,9 @@ SpriteAtlas: - arena_num_silver_3 - arena_dec_6 - arena_btn_defend + - arena_bg_5 - arena_num_silver_2 + - arena_chest_1 - arena_bg_1 - arena_dec_1 - arena_ranking_1 @@ -122,6 +129,7 @@ SpriteAtlas: - arena_btn_attack - arena_num_bronze_1 - arena_ranking_bg_4 + - arena_bg_6 - arena_dec_3 - arena_dec_2 - arena_ranking_bg_3 diff --git a/Assets/arts/textures/ui/arena/arena_bg_5.png b/Assets/arts/textures/ui/arena/arena_bg_5.png new file mode 100644 index 000000000..5c42f223c Binary files /dev/null and b/Assets/arts/textures/ui/arena/arena_bg_5.png differ diff --git a/Assets/arts/textures/ui/arena/arena_bg_5.png.meta b/Assets/arts/textures/ui/arena/arena_bg_5.png.meta new file mode 100644 index 000000000..937bb9ecb --- /dev/null +++ b/Assets/arts/textures/ui/arena/arena_bg_5.png.meta @@ -0,0 +1,132 @@ +fileFormatVersion: 2 +guid: 02a079d6dd048e349a54f81f4d089eef +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + 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 + 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 + platformSettings: + - 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: 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 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/arts/textures/ui/arena/arena_bg_6.png b/Assets/arts/textures/ui/arena/arena_bg_6.png new file mode 100644 index 000000000..653b98015 Binary files /dev/null and b/Assets/arts/textures/ui/arena/arena_bg_6.png differ diff --git a/Assets/arts/textures/ui/arena/arena_bg_6.png.meta b/Assets/arts/textures/ui/arena/arena_bg_6.png.meta new file mode 100644 index 000000000..6df2c9efc --- /dev/null +++ b/Assets/arts/textures/ui/arena/arena_bg_6.png.meta @@ -0,0 +1,132 @@ +fileFormatVersion: 2 +guid: 601d39fa6902e514a8d29cbe8651a35c +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + 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 + 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 + platformSettings: + - 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: 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 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/arts/textures/ui/arena/arena_chest_1.png b/Assets/arts/textures/ui/arena/arena_chest_1.png new file mode 100644 index 000000000..1e678be75 Binary files /dev/null and b/Assets/arts/textures/ui/arena/arena_chest_1.png differ diff --git a/Assets/arts/textures/ui/arena/arena_chest_1.png.meta b/Assets/arts/textures/ui/arena/arena_chest_1.png.meta new file mode 100644 index 000000000..1344f2ce1 --- /dev/null +++ b/Assets/arts/textures/ui/arena/arena_chest_1.png.meta @@ -0,0 +1,132 @@ +fileFormatVersion: 2 +guid: 035848b780a057a489b681fb592e2ce4 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + 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 + 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 + platformSettings: + - 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: 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 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/arts/textures/ui/arena/arena_chest_2.png b/Assets/arts/textures/ui/arena/arena_chest_2.png new file mode 100644 index 000000000..d2b6e8347 Binary files /dev/null and b/Assets/arts/textures/ui/arena/arena_chest_2.png differ diff --git a/Assets/arts/textures/ui/arena/arena_chest_2.png.meta b/Assets/arts/textures/ui/arena/arena_chest_2.png.meta new file mode 100644 index 000000000..a972dc9a0 --- /dev/null +++ b/Assets/arts/textures/ui/arena/arena_chest_2.png.meta @@ -0,0 +1,132 @@ +fileFormatVersion: 2 +guid: a31c8ba23e9c1024596fee83894b66e4 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + 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 + 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 + platformSettings: + - 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: 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 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/lua/app/common/event_manager.lua.bytes b/Assets/lua/app/common/event_manager.lua.bytes index c03fb879a..945f9693a 100644 Binary files a/Assets/lua/app/common/event_manager.lua.bytes and b/Assets/lua/app/common/event_manager.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 f8be60662..9d1c1adab 100644 Binary files a/Assets/lua/app/config/localization/localization_global_const.lua.bytes and b/Assets/lua/app/config/localization/localization_global_const.lua.bytes differ diff --git a/Assets/lua/app/config/strings/cn/global.lua.bytes b/Assets/lua/app/config/strings/cn/global.lua.bytes index 8d91fb40e..6dc68f95c 100644 Binary files a/Assets/lua/app/config/strings/cn/global.lua.bytes and b/Assets/lua/app/config/strings/cn/global.lua.bytes differ diff --git a/Assets/lua/app/global/global_const.lua.bytes b/Assets/lua/app/global/global_const.lua.bytes index c63f9d7ef..8574834f9 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/arena/arena_manager.lua.bytes b/Assets/lua/app/module/arena/arena_manager.lua.bytes index 52ebbd775..33a1b92d8 100644 Binary files a/Assets/lua/app/module/arena/arena_manager.lua.bytes and b/Assets/lua/app/module/arena/arena_manager.lua.bytes differ diff --git a/Assets/lua/app/module/battle/battle_manager.lua.bytes b/Assets/lua/app/module/battle/battle_manager.lua.bytes index b225d2d65..853d1c850 100644 Binary files a/Assets/lua/app/module/battle/battle_manager.lua.bytes and b/Assets/lua/app/module/battle/battle_manager.lua.bytes differ diff --git a/Assets/lua/app/ui/arena/arena_match_ui.lua.bytes b/Assets/lua/app/ui/arena/arena_match_ui.lua.bytes index 680009b33..162339001 100644 Binary files a/Assets/lua/app/ui/arena/arena_match_ui.lua.bytes and b/Assets/lua/app/ui/arena/arena_match_ui.lua.bytes differ diff --git a/Assets/lua/app/ui/arena/arena_rank_ui.lua.bytes b/Assets/lua/app/ui/arena/arena_rank_ui.lua.bytes index 636014583..cc1ee48f3 100644 Binary files a/Assets/lua/app/ui/arena/arena_rank_ui.lua.bytes and b/Assets/lua/app/ui/arena/arena_rank_ui.lua.bytes differ diff --git a/Assets/lua/app/ui/arena/arena_recent_battle_ui.lua.bytes b/Assets/lua/app/ui/arena/arena_recent_battle_ui.lua.bytes index 8e4a80b48..75525f509 100644 Binary files a/Assets/lua/app/ui/arena/arena_recent_battle_ui.lua.bytes and b/Assets/lua/app/ui/arena/arena_recent_battle_ui.lua.bytes differ diff --git a/Assets/lua/app/ui/arena/arena_season_reward_ui.lua.bytes b/Assets/lua/app/ui/arena/arena_season_reward_ui.lua.bytes index ff43194e7..29a62d925 100644 Binary files a/Assets/lua/app/ui/arena/arena_season_reward_ui.lua.bytes and b/Assets/lua/app/ui/arena/arena_season_reward_ui.lua.bytes differ diff --git a/Assets/lua/app/ui/battle/battle_arena_pause_ui.lua.bytes b/Assets/lua/app/ui/battle/battle_arena_pause_ui.lua.bytes new file mode 100644 index 000000000..6fd495f4b Binary files /dev/null and b/Assets/lua/app/ui/battle/battle_arena_pause_ui.lua.bytes differ diff --git a/Assets/lua/app/ui/battle/battle_arena_pause_ui.lua.bytes.meta b/Assets/lua/app/ui/battle/battle_arena_pause_ui.lua.bytes.meta new file mode 100644 index 000000000..7cb9d414d --- /dev/null +++ b/Assets/lua/app/ui/battle/battle_arena_pause_ui.lua.bytes.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: a8513a236f1e76b41a223d6f261476de +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/lua/app/ui/battle/battle_result_ui.lua.bytes b/Assets/lua/app/ui/battle/battle_result_ui.lua.bytes index dfe664ccc..35a08e204 100644 Binary files a/Assets/lua/app/ui/battle/battle_result_ui.lua.bytes and b/Assets/lua/app/ui/battle/battle_result_ui.lua.bytes differ diff --git a/Assets/lua/app/ui/main_city/component/arena_comp.lua.bytes b/Assets/lua/app/ui/main_city/component/arena_comp.lua.bytes index cce931174..0b3d60012 100644 Binary files a/Assets/lua/app/ui/main_city/component/arena_comp.lua.bytes and b/Assets/lua/app/ui/main_city/component/arena_comp.lua.bytes differ diff --git a/Assets/lua/app/userdata/arena/arena_data.lua.bytes b/Assets/lua/app/userdata/arena/arena_data.lua.bytes index 12429dfc1..5b1daeca6 100644 Binary files a/Assets/lua/app/userdata/arena/arena_data.lua.bytes and b/Assets/lua/app/userdata/arena/arena_data.lua.bytes differ diff --git a/Assets/prefabs/ui/arena/arena_season_reward_ui.prefab b/Assets/prefabs/ui/arena/arena_season_reward_ui.prefab index de9b69cc8..0ccd4bce0 100644 --- a/Assets/prefabs/ui/arena/arena_season_reward_ui.prefab +++ b/Assets/prefabs/ui/arena/arena_season_reward_ui.prefab @@ -162,7 +162,7 @@ RectTransform: m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 1} + m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &8668006497814700202 MonoBehaviour: m_ObjectHideFlags: 0 @@ -275,7 +275,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &8923372071560847492 RectTransform: m_ObjectHideFlags: 0 @@ -288,7 +288,8 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 6246938009665053168} - - {fileID: 5930105813674255147} + - {fileID: 7039743765158754409} + - {fileID: 1383864869254271691} - {fileID: 2610680172550319464} - {fileID: 7756406257592275374} - {fileID: 9210514292934894122} @@ -505,7 +506,7 @@ RectTransform: m_Children: - {fileID: 5309802127113536257} m_Father: {fileID: 8923372071560847492} - m_RootOrder: 3 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -592,12 +593,12 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 5930105813674255147} - m_RootOrder: 0 + m_Father: {fileID: 8923372071560847492} + 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: -25} + m_AnchoredPosition: {x: 0, y: 290} m_SizeDelta: {x: 500, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1119491754794191383 @@ -838,7 +839,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 8923372071560847492} - m_RootOrder: 5 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 0} @@ -1084,82 +1085,6 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!1 &4002501930901536824 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 5930105813674255147} - - component: {fileID: 7069478958466182035} - - component: {fileID: 8009376355178442713} - m_Layer: 5 - m_Name: img_grading - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &5930105813674255147 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4002501930901536824} - 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: - - {fileID: 1383864869254271691} - m_Father: {fileID: 8923372071560847492} - 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: 30} - m_SizeDelta: {x: 115, y: 80} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &7069478958466182035 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4002501930901536824} - m_CullTransparentMesh: 1 ---- !u!114 &8009376355178442713 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4002501930901536824} - 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: 7285006cf10d19f49aa80a8478d10ba8, 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 &4294031155073456404 GameObject: m_ObjectHideFlags: 0 @@ -1429,7 +1354,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 8923372071560847492} - m_RootOrder: 4 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} @@ -1826,12 +1751,12 @@ RectTransform: m_Children: - {fileID: 8554352846027844476} m_Father: {fileID: 8923372071560847492} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: -180} - m_SizeDelta: {x: 520, y: 160} + m_SizeDelta: {x: 333.42, y: 160} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3500969342668629093 CanvasRenderer: @@ -1908,7 +1833,7 @@ MonoBehaviour: bfCell: {fileID: 5532600738515094605} topRecoveryOffset: 0 downRecoveryOffset: 0 - direction: 1 + direction: 0 reverse: 0 cellWidth: 130 cellHeight: 130 @@ -2256,6 +2181,41 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &8192514131854377738 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7039743765158754409} + m_Layer: 5 + m_Name: spine_root + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7039743765158754409 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8192514131854377738} + 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: 8923372071560847492} + 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: 110} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &8658105362980943105 GameObject: m_ObjectHideFlags: 0 @@ -2290,7 +2250,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: 220} + m_AnchoredPosition: {x: 0, y: 260} m_SizeDelta: {x: 490, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7043297350434503316 @@ -2514,10 +2474,10 @@ MonoBehaviour: hashName: 686273357 objectType: 0 gameObject: {fileID: 8658105362980943105} - - name: arena_season_reward_ui.bg.last_reward.img_grading - hashName: 3005525223 + - name: arena_season_reward_ui.bg.last_reward.spine_root + hashName: 1674691279 objectType: 0 - gameObject: {fileID: 4002501930901536824} + gameObject: {fileID: 8192514131854377738} - name: arena_season_reward_ui.bg.last_reward.img_grading.tx_grading hashName: 2323079040 objectType: 0 @@ -2721,7 +2681,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &7364845412254584281 RectTransform: m_ObjectHideFlags: 0 @@ -2769,7 +2729,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_AnchorMin.x @@ -2777,7 +2737,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_SizeDelta.x @@ -2825,11 +2785,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 150.62 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -72 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -2884,7 +2844,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_AnchorMin.x @@ -2892,7 +2852,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_SizeDelta.x @@ -2940,11 +2900,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 420.62 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -72 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -2964,16 +2924,16 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} ---- !u!224 &4013881403996199919 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} - m_PrefabInstance: {fileID: 1446430846471842747} - m_PrefabAsset: {fileID: 0} --- !u!1 &5271702898511314481 stripped GameObject: m_CorrespondingSourceObject: {fileID: 6717709196054680970, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} m_PrefabInstance: {fileID: 1446430846471842747} m_PrefabAsset: {fileID: 0} +--- !u!224 &4013881403996199919 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} + m_PrefabInstance: {fileID: 1446430846471842747} + m_PrefabAsset: {fileID: 0} --- !u!1001 &4934259979207552968 PrefabInstance: m_ObjectHideFlags: 0 @@ -3126,7 +3086,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_AnchorMin.x @@ -3134,7 +3094,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_SizeDelta.x @@ -3182,11 +3142,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 285.62 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -72 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -3210,16 +3170,16 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} ---- !u!1 &1492455505333699851 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 6717709196054680970, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} - m_PrefabInstance: {fileID: 5299712789962231937} - m_PrefabAsset: {fileID: 0} --- !u!224 &7650127415693893845 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} m_PrefabInstance: {fileID: 5299712789962231937} m_PrefabAsset: {fileID: 0} +--- !u!1 &1492455505333699851 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 6717709196054680970, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} + m_PrefabInstance: {fileID: 5299712789962231937} + m_PrefabAsset: {fileID: 0} --- !u!1001 &6295365359207410690 PrefabInstance: m_ObjectHideFlags: 0 @@ -3245,7 +3205,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_AnchorMin.x @@ -3253,7 +3213,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_SizeDelta.x @@ -3301,11 +3261,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 555.62 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -72 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_LocalEulerAnglesHint.x diff --git a/Assets/prefabs/ui/battle/battle_result_ui.prefab b/Assets/prefabs/ui/battle/battle_result_ui.prefab index e267aef6f..b482fafc8 100644 --- a/Assets/prefabs/ui/battle/battle_result_ui.prefab +++ b/Assets/prefabs/ui/battle/battle_result_ui.prefab @@ -1106,8 +1106,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: 159.04, y: 0} - m_SizeDelta: {x: 185.91, y: 100} + m_AnchoredPosition: {x: 125, y: 0} + m_SizeDelta: {x: 174, y: 78} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6268264058416500573 CanvasRenderer: @@ -1329,7 +1329,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: -465.88} - m_SizeDelta: {x: 556.3, y: 153.6} + m_SizeDelta: {x: 494, y: 148} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1686228162405384228 CanvasRenderer: @@ -1359,8 +1359,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: be8503e1af01f494fbd0e7207b593a5c, type: 3} - m_Type: 1 + m_Sprite: {fileID: 21300000, guid: 02a079d6dd048e349a54f81f4d089eef, type: 3} + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -4260,15 +4260,15 @@ RectTransform: m_GameObject: {fileID: 6956708165739389666} 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_LocalScale: {x: 0.35, y: 0.35, z: 1} m_Children: [] m_Father: {fileID: 4322956751028045404} 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: -146.5, y: 0} - m_SizeDelta: {x: 90, y: 68} + m_AnchoredPosition: {x: -115, y: 25} + m_SizeDelta: {x: 290, y: 262} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6664728097961866892 CanvasRenderer: @@ -4298,7 +4298,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 00fd0ae4c09175f46b80c9f75ad9acec, type: 3} + m_Sprite: {fileID: 21300000, guid: 035848b780a057a489b681fb592e2ce4, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -5041,6 +5041,8 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1679443109954253011} + - component: {fileID: 5776235958264288985} + - component: {fileID: 6762677370373901857} m_Layer: 5 m_Name: tx_get m_TagString: Untagged @@ -5062,11 +5064,108 @@ RectTransform: m_Father: {fileID: 8068479440165697309} 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: 0} - m_SizeDelta: {x: 100, y: 100} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 5} + m_SizeDelta: {x: 0, y: -10} m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5776235958264288985 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7774979664385344905} + m_CullTransparentMesh: 1 +--- !u!114 &6762677370373901857 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7774979664385344905} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, 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_text: + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 9d1aadd9ebaf54ce2b217ab8427fa0db, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: d9526b8cb4bc030488db413ef429c6f9, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 30 + m_fontSizeBase: 36 + m_fontWeight: 400 + m_enableAutoSizing: 1 + m_fontSizeMin: 18 + m_fontSizeMax: 30 + 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: 1 + 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 &7840130698723737052 GameObject: m_ObjectHideFlags: 0 @@ -5985,8 +6084,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: -146.5, y: -37.52} - m_SizeDelta: {x: 200, y: 50} + m_AnchoredPosition: {x: -115, y: -40} + m_SizeDelta: {x: 235, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5177685932959120571 CanvasRenderer: @@ -6043,15 +6142,15 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 36 + m_fontSize: 26 m_fontSizeBase: 36 m_fontWeight: 400 - m_enableAutoSizing: 0 + m_enableAutoSizing: 1 m_fontSizeMin: 18 - m_fontSizeMax: 72 + m_fontSizeMax: 26 m_fontStyle: 0 - m_HorizontalAlignment: 1 - m_VerticalAlignment: 256 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 m_wordSpacing: 0 @@ -6411,6 +6510,22 @@ MonoBehaviour: hashName: 4036993011 objectType: 0 gameObject: {fileID: 1008296922414108458} + - name: battle_result_ui.arena_box_node.img_box + hashName: 1705126190 + objectType: 0 + gameObject: {fileID: 6956708165739389666} + - name: battle_result_ui.arena_box_node.tx_box + hashName: 3843531729 + objectType: 0 + gameObject: {fileID: 8716183704726160552} + - name: battle_result_ui.arena_box_node.btn_get + hashName: 4289408210 + objectType: 0 + gameObject: {fileID: 2919543877299131780} + - name: battle_result_ui.arena_box_node.btn_get.tx_get + hashName: 1383773111 + objectType: 0 + gameObject: {fileID: 7774979664385344905} --- !u!1 &8897498284405031625 GameObject: m_ObjectHideFlags: 0 @@ -6907,16 +7022,16 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 4f7cf840d6e73e14781807788b817568, type: 3} ---- !u!224 &7770004333418327666 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} - m_PrefabInstance: {fileID: 4837857829111055852} - m_PrefabAsset: {fileID: 0} --- !u!1 &6379174579643197588 stripped GameObject: m_CorrespondingSourceObject: {fileID: 1991971382385470840, guid: 4f7cf840d6e73e14781807788b817568, type: 3} m_PrefabInstance: {fileID: 4837857829111055852} m_PrefabAsset: {fileID: 0} +--- !u!224 &7770004333418327666 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + m_PrefabInstance: {fileID: 4837857829111055852} + m_PrefabAsset: {fileID: 0} --- !u!1001 &8282062698798163606 PrefabInstance: m_ObjectHideFlags: 0 @@ -7018,16 +7133,16 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 4f7cf840d6e73e14781807788b817568, type: 3} ---- !u!224 &6492171901736340744 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} - m_PrefabInstance: {fileID: 8282062698798163606} - m_PrefabAsset: {fileID: 0} --- !u!1 &7587205619442306030 stripped GameObject: m_CorrespondingSourceObject: {fileID: 1991971382385470840, guid: 4f7cf840d6e73e14781807788b817568, type: 3} m_PrefabInstance: {fileID: 8282062698798163606} m_PrefabAsset: {fileID: 0} +--- !u!224 &6492171901736340744 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + m_PrefabInstance: {fileID: 8282062698798163606} + m_PrefabAsset: {fileID: 0} --- !u!1001 &8813075811754304613 PrefabInstance: m_ObjectHideFlags: 0