diff --git a/Assets/arts/atlas/icon/item.asset b/Assets/arts/atlas/icon/item.asset index 48f333ca2..6dae87832 100644 --- a/Assets/arts/atlas/icon/item.asset +++ b/Assets/arts/atlas/icon/item.asset @@ -71,4 +71,5 @@ MonoBehaviour: - {fileID: 21300000, guid: 899882c0d56e96d4caf5d82d2b469729, type: 3} - {fileID: 21300000, guid: d6a5f9cd4e98f4eab8d3ca58d7529fbd, type: 3} - {fileID: 21300000, guid: 91e9e926c6246844aba4b734caefb6f9, type: 3} - spriteNameList: 310000001f060000200600002106000022060000230600002406000025060000260600002706000028060000320000003e0600003f0600004006000041060000420600004306000044060000450600004606000047060000330000005d0600005e0600005f06000060060000610600006206000063060000640600006506000066060000340000007c0600007d0600007e0600007f060000800600008106000082060000830600008406000085060000350000009b0600009c06000036000000370000003800000039000000df0dcedbe00dcedbe10dcedbe20dcedbe30dcedbe40dcedb7ef2dcef + - {fileID: 21300000, guid: d4b21efb128aa8f4093adba3d467d268, type: 3} + spriteNameList: 310000001f060000200600002106000022060000230600002406000025060000260600002706000028060000320000003e0600003f0600004006000041060000420600004306000044060000450600004606000047060000330000005d0600005e0600005f06000060060000610600006206000063060000640600006506000066060000340000007c0600007d0600007e0600007f060000800600008106000082060000830600008406000085060000350000009b0600009c06000036000000370000003800000039000000df0dcedbe00dcedbe10dcedbe20dcedbe30dcedbe40dcedb7ef2dcef0e84dc76 diff --git a/Assets/arts/atlas/ui/arena.asset b/Assets/arts/atlas/ui/arena.asset index 39a187cd4..5725a9a5d 100644 --- a/Assets/arts/atlas/ui/arena.asset +++ b/Assets/arts/atlas/ui/arena.asset @@ -18,12 +18,14 @@ MonoBehaviour: - {fileID: 21300000, guid: 7874c7c7cdea0be468135b9ce02eae3b, type: 3} - {fileID: 21300000, guid: f23950c02c25c4ee39c71a0656a8d5c5, type: 3} - {fileID: 21300000, guid: 378e6814842094f52953d7fb1868a7d9, type: 3} + - {fileID: 21300000, guid: 4ea6b3bb4fd06471a8acd60ae0315384, type: 3} - {fileID: 21300000, guid: 69df5408fe81cbc44a6c5d8e31abbe27, type: 3} - {fileID: 21300000, guid: 8eede3e1b3ffa42df80b57515981d96c, type: 3} - {fileID: 21300000, guid: bfbf532f019cd4c9680a1eb0564f549f, type: 3} - {fileID: 21300000, guid: 90b20ede31d0b482bafc78164e1036ed, type: 3} - {fileID: 21300000, guid: 97665fa60bd5f48a99ed973f02d53b1c, type: 3} - {fileID: 21300000, guid: 03f4ca66f28104539abd9dc3369109b2, type: 3} + - {fileID: 21300000, guid: 60b7bc01d81f94672bc6cf2ba5134d5a, type: 3} - {fileID: 21300000, guid: a356b36deef7a1b4a9558d6a724921e1, type: 3} - {fileID: 21300000, guid: 00e143fef26720b478e2733de42dd12c, type: 3} - {fileID: 21300000, guid: 91f1d08e1ed8edf45a0a6368f8c30a19, type: 3} @@ -51,4 +53,4 @@ MonoBehaviour: - {fileID: 21300000, guid: 369ef0e04cb680441baa4814f5e7ec28, type: 3} - {fileID: 21300000, guid: aa1e20165075b4269a4b0ba00f1f2e33, type: 3} - {fileID: 21300000, guid: 38b0d1351156343c48dc0ae70b00916d, type: 3} - spriteNameList: 70b6df2dcdd30808f7ed40fbced30808566241fbef5c00f821410b0822410b0823410b0824410b0825410b08f05c00f8f15c00f8f25c00f8f35c00f8f45c00f8f55c00f8f65c00f8f75c00f8d6671108cbf32408ccf32408cdf32408fc9b2608b4e3acfcb5e3acfcb6e3acfcb7e3acfcb8e3acfcb9e3acfcfd9b2608fe9b2608ff9b2608009c2608019c2608029c2608039c2608049c2608 + spriteNameList: 70b6df2dcdd30808f7ed40fbced30808566241fbcfd30808ef5c00f821410b0822410b0823410b0824410b0825410b0826410b08f05c00f8f15c00f8f25c00f8f35c00f8f45c00f8f55c00f8f65c00f8f75c00f8d6671108cbf32408ccf32408cdf32408fc9b2608b4e3acfcb5e3acfcb6e3acfcb7e3acfcb8e3acfcb9e3acfcfd9b2608fe9b2608ff9b2608009c2608019c2608029c2608039c2608049c2608 diff --git a/Assets/arts/atlas/ui/arena.spriteatlas b/Assets/arts/atlas/ui/arena.spriteatlas index c38b5e160..b3f7a3db1 100644 --- a/Assets/arts/atlas/ui/arena.spriteatlas +++ b/Assets/arts/atlas/ui/arena.spriteatlas @@ -65,6 +65,7 @@ SpriteAtlas: - {fileID: 21300000, guid: 43d52a80c056f41a3b9604df268e6f12, type: 3} - {fileID: 21300000, guid: f23950c02c25c4ee39c71a0656a8d5c5, type: 3} - {fileID: 21300000, guid: 369ef0e04cb680441baa4814f5e7ec28, type: 3} + - {fileID: 21300000, guid: 60b7bc01d81f94672bc6cf2ba5134d5a, type: 3} - {fileID: 21300000, guid: 89a4b011c2621433f8df0443aad3cb3f, type: 3} - {fileID: 21300000, guid: 8eede3e1b3ffa42df80b57515981d96c, type: 3} - {fileID: 21300000, guid: 91ddc4732fc8b431e8a97536eb73ae72, type: 3} @@ -105,6 +106,7 @@ SpriteAtlas: - arena_dan_3 - arena_bar_2 - arena_dec_7 + - arena_bg_15 - arena_dan_1 - arena_bg_10 - arena_bg_8 diff --git a/Assets/arts/atlas/ui/common.asset b/Assets/arts/atlas/ui/common.asset index 65705abcb..1a489fb52 100644 --- a/Assets/arts/atlas/ui/common.asset +++ b/Assets/arts/atlas/ui/common.asset @@ -102,6 +102,7 @@ MonoBehaviour: - {fileID: 21300000, guid: b3ebf3220061a824c8f4a3919ee39a33, type: 3} - {fileID: 21300000, guid: 9bc39501344a8494daeaf1035cb736db, type: 3} - {fileID: 21300000, guid: 046389c0de1f04c26bf53a473a599d73, type: 3} + - {fileID: 21300000, guid: 33eb4a26b60c789498ae5382b6b6251b, type: 3} - {fileID: 21300000, guid: 3a491a78e8f193f428361be7b7a45dfb, type: 3} - {fileID: 21300000, guid: f65bbb56e45988348b8aeb0272f58047, type: 3} - {fileID: 21300000, guid: 7e9c0788fba4a824f9213b892c30a542, type: 3} @@ -174,5 +175,7 @@ MonoBehaviour: - {fileID: 21300000, guid: b3690164a42104eadbcbe70ee551b72a, type: 3} - {fileID: 21300000, guid: ff122855b832135498d2983ecb71e37b, type: 3} - {fileID: 21300000, guid: a01a4ad0b72a64241a3ecffb906eff54, type: 3} + - {fileID: 21300000, guid: ea999318fddbe45f3876d9d152fcc20c, type: 3} + - {fileID: 21300000, guid: 5aa123eeba3874e96a77af3433b3f977, type: 3} - {fileID: 21300000, guid: 56c233d89e320ac4891f34a6706ffc0c, type: 3} - spriteNameList: e9a43d8deaa43d8d0ae27a1a2757a7712857a7712957a7712a57a7712b57a7712c57a7712d57a7712e57a771b1ff831a37ebefa68b243e8d056d861a066d861a076d861a086d861a096d861a0a6d861a0b6d861a0c6d861a0d6d861a0e6d861a8c243e8d246d861a256d861a266d861a276d861a286d861a296d861a2b6d861a2c6d861a2d6d861a8d243e8d436d861a446d861a456d861a466d861a476d861a486d861a496d861a4a6d861a4b6d861a4c6d861a8e243e8d626d861a636d861a646d861a656d861a666d861a676d861a686d861a696d861a6a6d861a6b6d861a8f243e8d91243e8d92243e8d93243e8d5ff0dec4f7dba86df8dba86df9dba86dfadba86da3c7820ca4c7820ca5c7820c01853b1974546eb890c9348d7fea0537be2eb195c02eb195f92eb195e8945815e9945815ea9458158538368dfbcc388d8cc2e922b76e26590e8b0b1a47776d27553a6ac67d33eeca7e33eeca7f33eecab833eecaa4a1213850349739e1c7a11ae2c7a11ae3c7a11ae4c7a11ae5c7a11ae6c7a11ae7c7a11ae8c7a11a34e166e68eb7ba30160398e369606d8f83e25472704398e34ac4708fb4e19f42b5e19f42b6e19f427a737b477b737b477c737b477d737b477e737b477f737b47f116cb47252af848262af848272af848282af848292af8486e97448da07f7c4ea17f7c4ea27f7c4ea37f7c4e26d06cd827d06cd828d06cd8f03a2d359d83f5979e83f5979f83f597a083f597a183f597611e220557aa025458aa025459aa02545aaa0254b36a811bb46a811bb56a811bb66a811be8a0d140b76a811ba9a4d14003f2ab54ed355bf9f022f4ccf122f4ccf222f4ccf322f4ccf422f4ccf522f4ccf622f4ccf722f4cca15c468dbe552355bf552355c0552355c569b158 + spriteNameList: e9a43d8deaa43d8d0ae27a1a2757a7712857a7712957a7712a57a7712b57a7712c57a7712d57a7712e57a771b1ff831a37ebefa68b243e8d056d861a066d861a076d861a086d861a096d861a0a6d861a0b6d861a0c6d861a0d6d861a0e6d861a8c243e8d246d861a256d861a266d861a276d861a286d861a296d861a2b6d861a2c6d861a2d6d861a8d243e8d436d861a446d861a456d861a466d861a476d861a486d861a496d861a4a6d861a4b6d861a4c6d861a8e243e8d626d861a636d861a646d861a656d861a666d861a676d861a686d861a696d861a6a6d861a6b6d861a8f243e8d91243e8d92243e8d93243e8d5ff0dec4f7dba86df8dba86df9dba86dfadba86da3c7820ca4c7820ca5c7820c01853b1974546eb890c9348d7fea0537be2eb195c02eb195f92eb195e8945815e9945815ea9458158538368dfbcc388d8cc2e922b76e26590e8b0b1a47776d27553a6ac67d33eeca7e33eeca7f33eecab833eeca20ecadc9a4a1213850349739e1c7a11ae2c7a11ae3c7a11ae4c7a11ae5c7a11ae6c7a11ae7c7a11ae8c7a11a34e166e68eb7ba30160398e369606d8f83e25472704398e34ac4708fb4e19f42b5e19f42b6e19f427a737b477b737b477c737b477d737b477e737b477f737b47f116cb47252af848262af848272af848282af848292af8486e97448da07f7c4ea17f7c4ea27f7c4ea37f7c4e26d06cd827d06cd828d06cd8f03a2d359d83f5979e83f5979f83f597a083f597a183f597611e220557aa025458aa025459aa02545aaa0254b36a811bb46a811bb56a811bb66a811be8a0d140b76a811ba9a4d14003f2ab54ed355bf9f022f4ccf122f4ccf222f4ccf322f4ccf422f4ccf522f4ccf622f4ccf722f4cca15c468dbe552355bf552355c0552355c1552355c2552355c569b158 diff --git a/Assets/arts/atlas/ui/common.spriteatlas b/Assets/arts/atlas/ui/common.spriteatlas index 4bf18f951..56b41ec85 100644 --- a/Assets/arts/atlas/ui/common.spriteatlas +++ b/Assets/arts/atlas/ui/common.spriteatlas @@ -133,6 +133,7 @@ SpriteAtlas: - {fileID: 21300000, guid: 3d7caae5e90a442449b68a9427558f6e, type: 3} - {fileID: 21300000, guid: 646ad906d9c5043ae880e677c5b79eae, type: 3} - {fileID: 21300000, guid: f9043e169e5a34f9ab31a2ec7acbaf7f, type: 3} + - {fileID: 21300000, guid: 33eb4a26b60c789498ae5382b6b6251b, type: 3} - {fileID: 21300000, guid: f65bbb56e45988348b8aeb0272f58047, type: 3} - {fileID: 21300000, guid: 8e279276358266d4abd13f0e7fde1e50, type: 3} - {fileID: 21300000, guid: cc36a2865259e6a449af8d0bfe2b7165, type: 3} @@ -147,6 +148,7 @@ SpriteAtlas: - {fileID: 21300000, guid: fdc5ec978c307224dbb7465f4698a226, type: 3} - {fileID: 21300000, guid: 111fa2e75dc3d47c0bad6dce4490f997, type: 3} - {fileID: 21300000, guid: 438379085b5f94865aa21e11bb5fa6c1, type: 3} + - {fileID: 21300000, guid: ea999318fddbe45f3876d9d152fcc20c, type: 3} - {fileID: 21300000, guid: 3427d728ce5bf43f5972607e45c43df6, type: 3} - {fileID: 21300000, guid: 42d94e3855ec9bc4f91a0236930bfbee, type: 3} - {fileID: 21300000, guid: 3a491a78e8f193f428361be7b7a45dfb, type: 3} @@ -218,6 +220,7 @@ SpriteAtlas: - {fileID: 21300000, guid: 1dedff3e909ee054b874a2fbaff044c0, type: 3} - {fileID: 21300000, guid: a6132c5e3e7a04518a1870bc230ee156, type: 3} - {fileID: 21300000, guid: 1382fc8e2fd70419eb51aaad5a5ec6d9, type: 3} + - {fileID: 21300000, guid: 5aa123eeba3874e96a77af3433b3f977, type: 3} - {fileID: 21300000, guid: d28ed00fffa11c7408e4c457ddab242c, type: 3} - {fileID: 21300000, guid: c692df1f4d1dfed42a66007b4e4cb315, type: 3} - {fileID: 21300000, guid: 44e0043f30ae645daa3a3138184c881c, type: 3} @@ -296,6 +299,7 @@ SpriteAtlas: - common_tettle_6 - common_tettle_1 - common_bg_32 + - common_chest_2 - common_dec_10 - common_btn_red_3 - common_menu_1 @@ -310,6 +314,7 @@ SpriteAtlas: - common_bg_7 - common_bg_23 - common_bg_power + - common_tips_4 - common_btn_find - common_bg_12 - common_circle @@ -381,6 +386,7 @@ SpriteAtlas: - common_dec_4 - common_btn_option - common_bg_48 + - common_tips_5 - common_menu_4 - common_btn_blue_1 - common_tettle_2 diff --git a/Assets/arts/textures/ui/arena/arena_bg_15.png b/Assets/arts/textures/ui/arena/arena_bg_15.png new file mode 100644 index 000000000..3a2433057 Binary files /dev/null and b/Assets/arts/textures/ui/arena/arena_bg_15.png differ diff --git a/Assets/arts/textures/ui/arena/arena_bg_15.png.meta b/Assets/arts/textures/ui/arena/arena_bg_15.png.meta new file mode 100644 index 000000000..e785e4fb4 --- /dev/null +++ b/Assets/arts/textures/ui/arena/arena_bg_15.png.meta @@ -0,0 +1,147 @@ +fileFormatVersion: 2 +guid: 60b7bc01d81f94672bc6cf2ba5134d5a +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/arena/arena_bg_2.png b/Assets/arts/textures/ui/arena/arena_bg_2.png index 1613d1770..1fc6ca1f2 100644 Binary files a/Assets/arts/textures/ui/arena/arena_bg_2.png and b/Assets/arts/textures/ui/arena/arena_bg_2.png differ diff --git a/Assets/arts/textures/ui/arena/arena_bg_2.png.meta b/Assets/arts/textures/ui/arena/arena_bg_2.png.meta index 21700e93b..ac7994568 100644 --- a/Assets/arts/textures/ui/arena/arena_bg_2.png.meta +++ b/Assets/arts/textures/ui/arena/arena_bg_2.png.meta @@ -48,7 +48,7 @@ TextureImporter: alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteBorder: {x: 205, y: 0, z: 40, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 alphaIsTransparency: 1 @@ -132,7 +132,7 @@ TextureImporter: physicsShape: [] bones: [] spriteID: 5e97eb03825dee720800000000000000 - internalID: 0 + internalID: 1537655665 vertices: [] indices: edges: [] diff --git a/Assets/arts/textures/ui/common/common_chest_2.png b/Assets/arts/textures/ui/common/common_chest_2.png new file mode 100644 index 000000000..f9b502694 Binary files /dev/null and b/Assets/arts/textures/ui/common/common_chest_2.png differ diff --git a/Assets/arts/textures/ui/common/common_chest_2.png.meta b/Assets/arts/textures/ui/common/common_chest_2.png.meta new file mode 100644 index 000000000..a5eecf87b --- /dev/null +++ b/Assets/arts/textures/ui/common/common_chest_2.png.meta @@ -0,0 +1,147 @@ +fileFormatVersion: 2 +guid: 33eb4a26b60c789498ae5382b6b6251b +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 47 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 50 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 12 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/arts/textures/ui/common/common_tips_4.png b/Assets/arts/textures/ui/common/common_tips_4.png new file mode 100644 index 000000000..dee567379 Binary files /dev/null and b/Assets/arts/textures/ui/common/common_tips_4.png differ diff --git a/Assets/arts/textures/ui/common/common_tips_4.png.meta b/Assets/arts/textures/ui/common/common_tips_4.png.meta new file mode 100644 index 000000000..b15161e28 --- /dev/null +++ b/Assets/arts/textures/ui/common/common_tips_4.png.meta @@ -0,0 +1,147 @@ +fileFormatVersion: 2 +guid: ea999318fddbe45f3876d9d152fcc20c +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: 18, y: 18, z: 18, w: 18} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 47 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 50 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 12 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 1537655665 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/arts/textures/ui/common/common_tips_5.png b/Assets/arts/textures/ui/common/common_tips_5.png new file mode 100644 index 000000000..33f6e1fb4 Binary files /dev/null and b/Assets/arts/textures/ui/common/common_tips_5.png differ diff --git a/Assets/arts/textures/ui/common/common_tips_5.png.meta b/Assets/arts/textures/ui/common/common_tips_5.png.meta new file mode 100644 index 000000000..9097cb942 --- /dev/null +++ b/Assets/arts/textures/ui/common/common_tips_5.png.meta @@ -0,0 +1,147 @@ +fileFormatVersion: 2 +guid: 5aa123eeba3874e96a77af3433b3f977 +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/summon/summon_manager.lua.bytes b/Assets/lua/app/module/summon/summon_manager.lua.bytes index 50974e82b..595b3ee6c 100644 Binary files a/Assets/lua/app/module/summon/summon_manager.lua.bytes and b/Assets/lua/app/module/summon/summon_manager.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 9cf2d253c..f10ebe154 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/cell/arena_rank_cell.lua.bytes b/Assets/lua/app/ui/arena/cell/arena_rank_cell.lua.bytes index 6235b857e..a1c6c3e89 100644 Binary files a/Assets/lua/app/ui/arena/cell/arena_rank_cell.lua.bytes and b/Assets/lua/app/ui/arena/cell/arena_rank_cell.lua.bytes differ 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 ee6af28cb..9ef1c5398 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/common/cell/reward_cell.lua.bytes b/Assets/lua/app/ui/common/cell/reward_cell.lua.bytes index 0a9eb3d66..e9e9d6cbc 100644 Binary files a/Assets/lua/app/ui/common/cell/reward_cell.lua.bytes and b/Assets/lua/app/ui/common/cell/reward_cell.lua.bytes differ diff --git a/Assets/lua/app/ui/tips/formation_tips.lua.bytes b/Assets/lua/app/ui/tips/formation_tips.lua.bytes index 513deabe7..2bff9cac9 100644 Binary files a/Assets/lua/app/ui/tips/formation_tips.lua.bytes and b/Assets/lua/app/ui/tips/formation_tips.lua.bytes differ diff --git a/Assets/prefabs/ui/arena/arena_grading_reward_ui.prefab b/Assets/prefabs/ui/arena/arena_grading_reward_ui.prefab index f7ac1750a..2d1c05596 100644 --- a/Assets/prefabs/ui/arena/arena_grading_reward_ui.prefab +++ b/Assets/prefabs/ui/arena/arena_grading_reward_ui.prefab @@ -1765,7 +1765,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: bab1fb94a3d9e1c4196867c58e30cd79, type: 3} + m_Sprite: {fileID: 21300000, guid: 4ea6b3bb4fd06471a8acd60ae0315384, type: 3} m_FillDirection: 2 m_Value: 0.5 m_FillCenter: 1 diff --git a/Assets/prefabs/ui/arena/arena_rank_ui.prefab b/Assets/prefabs/ui/arena/arena_rank_ui.prefab index ef3230d56..4d1c4649e 100644 --- a/Assets/prefabs/ui/arena/arena_rank_ui.prefab +++ b/Assets/prefabs/ui/arena/arena_rank_ui.prefab @@ -544,8 +544,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 1bf9c73960324d3439e0db7c0390d805, type: 3} - m_Type: 1 + m_Sprite: {fileID: 21300000, guid: 60b7bc01d81f94672bc6cf2ba5134d5a, type: 3} + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -770,158 +770,6 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!1 &3273362167775634050 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 3798168731391243086} - - component: {fileID: 2933230945495852455} - - component: {fileID: 2029747124217660617} - m_Layer: 5 - m_Name: line - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!224 &3798168731391243086 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3273362167775634050} - 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: 1833480338883200684} - m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 4} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &2933230945495852455 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3273362167775634050} - m_CullTransparentMesh: 1 ---- !u!114 &2029747124217660617 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3273362167775634050} - 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: 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: 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 &3403680412620049773 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2820655138155411857} - - component: {fileID: 1925640741260828946} - - component: {fileID: 4263808564495437577} - m_Layer: 5 - m_Name: line - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!224 &2820655138155411857 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3403680412620049773} - 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: 1833480338883200684} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 4} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &1925640741260828946 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3403680412620049773} - m_CullTransparentMesh: 1 ---- !u!114 &4263808564495437577 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3403680412620049773} - 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: 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: 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 &4276669152828525112 GameObject: m_ObjectHideFlags: 0 @@ -1302,7 +1150,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: -220, y: 0} - m_SizeDelta: {x: 62, y: 72} + m_SizeDelta: {x: 68, y: 78} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5311966270161530080 CanvasRenderer: @@ -1332,7 +1180,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 8a5cf2a87c15a454b8cdc5ce2af7291f, type: 3} + m_Sprite: {fileID: 21300000, guid: 3569dfdcd6f978f4ab5fd10e9a6abf83, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1435,8 +1283,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 @@ -1510,15 +1358,13 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 7821513849776069061} - - {fileID: 2820655138155411857} - - {fileID: 3798168731391243086} m_Father: {fileID: 4632207508707230678} m_RootOrder: 2 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: -38} - m_SizeDelta: {x: 590, y: 690} + m_SizeDelta: {x: 590, y: 698} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2879069077392206358 CanvasRenderer: @@ -2332,11 +2178,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8585876331803127136, guid: 89633b703e8121b4a8b3e94fcd3d60ff, type: 3} propertyPath: m_LocalScale.x - value: 0.7 + value: 1 objectReference: {fileID: 0} - target: {fileID: 8585876331803127136, guid: 89633b703e8121b4a8b3e94fcd3d60ff, type: 3} propertyPath: m_LocalScale.y - value: 0.7 + value: 1 objectReference: {fileID: 0} - target: {fileID: 8585876331803127136, guid: 89633b703e8121b4a8b3e94fcd3d60ff, type: 3} propertyPath: m_LocalPosition.x @@ -2386,6 +2232,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 8585876331803127136, guid: 89633b703e8121b4a8b3e94fcd3d60ff, type: 3} + propertyPath: m_ConstrainProportionsScale + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 89633b703e8121b4a8b3e94fcd3d60ff, type: 3} --- !u!1 &811374875070107119 stripped @@ -2459,15 +2309,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8585876331803127136, guid: 89633b703e8121b4a8b3e94fcd3d60ff, type: 3} propertyPath: m_LocalScale.x - value: 0.7 + value: 1 objectReference: {fileID: 0} - target: {fileID: 8585876331803127136, guid: 89633b703e8121b4a8b3e94fcd3d60ff, type: 3} propertyPath: m_LocalScale.y - value: 0.7 + value: 1 objectReference: {fileID: 0} - target: {fileID: 8585876331803127136, guid: 89633b703e8121b4a8b3e94fcd3d60ff, type: 3} propertyPath: m_LocalScale.z - value: 0.7 + value: 1 objectReference: {fileID: 0} - target: {fileID: 8585876331803127136, guid: 89633b703e8121b4a8b3e94fcd3d60ff, type: 3} propertyPath: m_LocalPosition.x @@ -2517,6 +2367,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 8585876331803127136, guid: 89633b703e8121b4a8b3e94fcd3d60ff, type: 3} + propertyPath: m_ConstrainProportionsScale + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 89633b703e8121b4a8b3e94fcd3d60ff, type: 3} --- !u!224 &2115172307209415395 stripped diff --git a/Assets/prefabs/ui/arena/arena_season_reward_ui.prefab b/Assets/prefabs/ui/arena/arena_season_reward_ui.prefab index 08f93b0b7..df7a9d38b 100644 --- a/Assets/prefabs/ui/arena/arena_season_reward_ui.prefab +++ b/Assets/prefabs/ui/arena/arena_season_reward_ui.prefab @@ -222,7 +222,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: 620, y: 816} + m_SizeDelta: {x: 620, y: 856} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8415928778803189660 CanvasRenderer: @@ -925,8 +925,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 06f54b3817430cf48baa1914794db514, type: 3} - m_Type: 0 + m_Sprite: {fileID: 21300000, guid: a356b36deef7a1b4a9558d6a724921e1, type: 3} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -973,7 +973,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 258} - m_SizeDelta: {x: 114, y: 32} + m_SizeDelta: {x: 164, y: 34} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6378590654764381770 CanvasRenderer: @@ -1003,7 +1003,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: cc14e3e6431d3be4cab00cbc97131f86, type: 3} + m_Sprite: {fileID: 21300000, guid: 361db3b3bf17f4fce909a8be3ddceffc, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1282,16 +1282,16 @@ RectTransform: m_GameObject: {fileID: 5905088388343616456} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.8, y: 0.8, z: 1} + m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5231441194932257739} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.5} - m_AnchorMax: {x: 0, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 36, y: 36} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -77, y: 0} + m_SizeDelta: {x: 38, y: 41} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8965477421599216992 CanvasRenderer: @@ -1321,7 +1321,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: f68fde5de9bc3bb4bb20c8c2e8de00e1, type: 3} + m_Sprite: {fileID: 21300000, guid: 7fd4f0c3c01d5b74da31ef5c8844b95d, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1408,8 +1408,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: -78} - m_SizeDelta: {x: 590, y: 618} + m_AnchoredPosition: {x: 0, y: -93} + m_SizeDelta: {x: 590, y: 628} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7888622871868565410 CanvasRenderer: @@ -1657,7 +1657,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: 299} + m_AnchoredPosition: {x: 0, y: 310} m_SizeDelta: {x: 600, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3722527386241716930 @@ -1691,14 +1691,14 @@ 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: [] m_fontColor32: serializedVersion: 2 - rgba: 4294967295 - m_fontColor: {r: 1, g: 1, b: 1, a: 1} + rgba: 4282987565 + m_fontColor: {r: 0.1764706, g: 0.20392157, b: 0.28627452, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -1715,12 +1715,12 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 20 + m_fontSize: 22 m_fontSizeBase: 36 m_fontWeight: 400 m_enableAutoSizing: 1 m_fontSizeMin: 18 - m_fontSizeMax: 20 + m_fontSizeMax: 22 m_fontStyle: 0 m_HorizontalAlignment: 2 m_VerticalAlignment: 512 @@ -1850,8 +1850,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 40 - m_fontSizeBase: 40 + m_fontSize: 36 + m_fontSizeBase: 36 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 diff --git a/Assets/prefabs/ui/arena/cell/arena_grading_cell.prefab b/Assets/prefabs/ui/arena/cell/arena_grading_cell.prefab index 4ff29cdc6..8bd1f8a1f 100644 --- a/Assets/prefabs/ui/arena/cell/arena_grading_cell.prefab +++ b/Assets/prefabs/ui/arena/cell/arena_grading_cell.prefab @@ -35,7 +35,7 @@ RectTransform: 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: 45} + m_AnchoredPosition: {x: 0, y: 36} m_SizeDelta: {x: 80, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2967765712923725404 diff --git a/Assets/prefabs/ui/battle/battle_result_ui.prefab b/Assets/prefabs/ui/battle/battle_result_ui.prefab index 53b2a8301..b58eae8ab 100644 --- a/Assets/prefabs/ui/battle/battle_result_ui.prefab +++ b/Assets/prefabs/ui/battle/battle_result_ui.prefab @@ -1035,7 +1035,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 4b100dc83cc42cb4ca8273dba82da6b1, type: 3} + m_Sprite: {fileID: 21300000, guid: a58b3f1a444704d11b5641961eea3005, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -3055,7 +3055,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 4b100dc83cc42cb4ca8273dba82da6b1, type: 3} + m_Sprite: {fileID: 21300000, guid: a58b3f1a444704d11b5641961eea3005, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -3342,7 +3342,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: c8485a9f3db164b4fb56e6b8008a982d, type: 3} + m_Sprite: {fileID: 21300000, guid: 23f8691ed89b279409896acfe8179617, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -3901,7 +3901,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: c8485a9f3db164b4fb56e6b8008a982d, type: 3} + m_Sprite: {fileID: 21300000, guid: 23f8691ed89b279409896acfe8179617, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -4434,7 +4434,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: c8485a9f3db164b4fb56e6b8008a982d, type: 3} + m_Sprite: {fileID: 21300000, guid: 23f8691ed89b279409896acfe8179617, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -4762,7 +4762,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 4b100dc83cc42cb4ca8273dba82da6b1, type: 3} + m_Sprite: {fileID: 21300000, guid: a58b3f1a444704d11b5641961eea3005, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -4925,7 +4925,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: c8485a9f3db164b4fb56e6b8008a982d, type: 3} + m_Sprite: {fileID: 21300000, guid: 23f8691ed89b279409896acfe8179617, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -5374,7 +5374,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: c8485a9f3db164b4fb56e6b8008a982d, type: 3} + m_Sprite: {fileID: 21300000, guid: 23f8691ed89b279409896acfe8179617, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -6030,7 +6030,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 4b100dc83cc42cb4ca8273dba82da6b1, type: 3} + m_Sprite: {fileID: 21300000, guid: a58b3f1a444704d11b5641961eea3005, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -6929,7 +6929,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 4b100dc83cc42cb4ca8273dba82da6b1, type: 3} + m_Sprite: {fileID: 21300000, guid: a58b3f1a444704d11b5641961eea3005, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -7419,6 +7419,18 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: f2ff04a05639f474f85820cdf1f47de0, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!225 &3938614773036603208 +CanvasGroup: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 297796708359802272} + m_Enabled: 1 + m_Alpha: 1 + m_Interactable: 1 + m_BlocksRaycasts: 1 + m_IgnoreParentGroups: 0 --- !u!224 &8844241197376841854 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} diff --git a/Assets/prefabs/ui/common/reward_cell.prefab b/Assets/prefabs/ui/common/reward_cell.prefab index 22e68c612..bc9c4a060 100644 --- a/Assets/prefabs/ui/common/reward_cell.prefab +++ b/Assets/prefabs/ui/common/reward_cell.prefab @@ -386,6 +386,82 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &5599303507735088667 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 9035234587401628940} + - component: {fileID: 7241662991452672605} + - component: {fileID: 967370450642406176} + m_Layer: 5 + m_Name: right_up_icon + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &9035234587401628940 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5599303507735088667} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.5, y: 0.5, z: 0.5} + m_ConstrainProportionsScale: 1 + m_Children: [] + m_Father: {fileID: 2568998946116628564} + m_RootOrder: 6 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 44, y: 46} + m_SizeDelta: {x: 90, y: 90} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7241662991452672605 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5599303507735088667} + m_CullTransparentMesh: 1 +--- !u!114 &967370450642406176 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5599303507735088667} + 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: a70289eca986ce142b027934f6cdd63c, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!1 &6717709196054680970 GameObject: m_ObjectHideFlags: 0 @@ -421,6 +497,7 @@ RectTransform: - {fileID: 634221655248460473} - {fileID: 7041845166048069519} - {fileID: 4991777902367835397} + - {fileID: 9035234587401628940} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -474,6 +551,10 @@ MonoBehaviour: hashName: 1086992497 objectType: 0 gameObject: {fileID: 4742576949248462820} + - name: reward_cell.right_up_icon + hashName: 3660709886 + objectType: 0 + gameObject: {fileID: 5599303507735088667} --- !u!1 &6856192440986292220 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/prefabs/ui/shop/first_recharge_ui.prefab b/Assets/prefabs/ui/shop/first_recharge_ui.prefab index 4b4e59585..fdb5746d3 100644 --- a/Assets/prefabs/ui/shop/first_recharge_ui.prefab +++ b/Assets/prefabs/ui/shop/first_recharge_ui.prefab @@ -166,12 +166,12 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8461932745927490369} - m_RootOrder: 3 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 474} - m_SizeDelta: {x: 450, y: 50} + m_AnchoredPosition: {x: 0, y: 440} + m_SizeDelta: {x: 400, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1572974857966272460 CanvasRenderer: @@ -204,7 +204,7 @@ MonoBehaviour: m_text: m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 9d1aadd9ebaf54ce2b217ab8427fa0db, type: 2} - m_sharedMaterial: {fileID: 2100000, guid: 09210edd46ea1463596717e00ea9e8be, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: d9526b8cb4bc030488db413ef429c6f9, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -302,7 +302,7 @@ RectTransform: m_Children: - {fileID: 3641798393908367798} m_Father: {fileID: 8461932745927490369} - m_RootOrder: 4 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -1123,7 +1123,7 @@ RectTransform: - {fileID: 4290075035000422323} - {fileID: 7053345344205131943} m_Father: {fileID: 8461932745927490369} - m_RootOrder: 7 + m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -1189,7 +1189,7 @@ RectTransform: - {fileID: 6245588885737329854} - {fileID: 4608207819414556964} m_Father: {fileID: 8461932745927490369} - m_RootOrder: 5 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -1480,7 +1480,7 @@ RectTransform: m_Children: - {fileID: 120445873465733777} m_Father: {fileID: 8461932745927490369} - m_RootOrder: 6 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -1959,6 +1959,7 @@ RectTransform: - {fileID: 6066775465967584477} - {fileID: 5296108970800954699} - {fileID: 1226788473560635264} + - {fileID: 7216805946430886945} - {fileID: 7437306225081421888} - {fileID: 191259227797065283} - {fileID: 4968887959453726093} @@ -2300,6 +2301,82 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &6718627002135110969 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7216805946430886945} + - component: {fileID: 1596371745786395125} + - component: {fileID: 5196516824160233530} + m_Layer: 5 + m_Name: title_bg + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7216805946430886945 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6718627002135110969} + 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: 8461932745927490369} + 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: 440} + m_SizeDelta: {x: 468, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1596371745786395125 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6718627002135110969} + m_CullTransparentMesh: 1 +--- !u!114 &5196516824160233530 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6718627002135110969} + 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: 6b4f6254dcd20462d9665f8635662f56, 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 &7045678525411303028 GameObject: m_ObjectHideFlags: 0 @@ -2333,7 +2410,7 @@ RectTransform: - {fileID: 8871158373761908492} - {fileID: 1900817371421826159} m_Father: {fileID: 8461932745927490369} - m_RootOrder: 9 + m_RootOrder: 10 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -2409,7 +2486,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8461932745927490369} - m_RootOrder: 8 + m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -4208,7 +4285,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} propertyPath: m_AnchoredPosition.y - value: 119 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} propertyPath: m_LocalEulerAnglesHint.x diff --git a/Assets/prefabs/ui/tips/formation_tips.prefab b/Assets/prefabs/ui/tips/formation_tips.prefab index 19a94bc40..38212c6f7 100644 --- a/Assets/prefabs/ui/tips/formation_tips.prefab +++ b/Assets/prefabs/ui/tips/formation_tips.prefab @@ -184,9 +184,9 @@ 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: 0} - m_SizeDelta: {x: 566, y: 166} - m_Pivot: {x: 0.665, y: 1.05} + m_AnchoredPosition: {x: -85, y: 0} + m_SizeDelta: {x: 618, y: 186} + m_Pivot: {x: 0.5, y: 1.1} --- !u!222 &1828475458880524690 CanvasRenderer: m_ObjectHideFlags: 0 @@ -215,7 +215,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: b3690164a42104eadbcbe70ee551b72a, type: 3} + m_Sprite: {fileID: 21300000, guid: ea999318fddbe45f3876d9d152fcc20c, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -242,7 +242,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &3189738921288518417 RectTransform: m_ObjectHideFlags: 0 @@ -260,8 +260,8 @@ 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: 110, y: 17} - m_SizeDelta: {x: 49, y: 29} + m_AnchoredPosition: {x: 80, y: 20} + m_SizeDelta: {x: 42, y: 26} m_Pivot: {x: 0.5, y: 1} --- !u!222 &569324968268049922 CanvasRenderer: @@ -291,7 +291,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 9df002014670a564fa9e8c639162c7f5, type: 3} + m_Sprite: {fileID: 21300000, guid: 5aa123eeba3874e96a77af3433b3f977, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -358,6 +358,78 @@ PrefabInstance: propertyPath: m_Name value: hero_formation_comp objectReference: {fileID: 0} + - target: {fileID: 1169826236029936583, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 1169826236029936583, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 1169826236029936583, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} + propertyPath: m_LocalScale.x + value: 0.66 + objectReference: {fileID: 0} + - target: {fileID: 1169826236029936583, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} + propertyPath: m_LocalScale.y + value: 0.66 + objectReference: {fileID: 0} + - target: {fileID: 1169826236029936583, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} + propertyPath: m_LocalScale.z + value: 0.66 + objectReference: {fileID: 0} + - target: {fileID: 1169826236029936583, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} + propertyPath: m_AnchoredPosition.x + value: 120 + objectReference: {fileID: 0} + - target: {fileID: 1338321943803156293, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 1338321943803156293, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 1338321943803156293, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} + propertyPath: m_LocalScale.x + value: 0.66 + objectReference: {fileID: 0} + - target: {fileID: 1338321943803156293, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} + propertyPath: m_LocalScale.y + value: 0.66 + objectReference: {fileID: 0} + - target: {fileID: 1338321943803156293, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} + propertyPath: m_LocalScale.z + value: 0.66 + objectReference: {fileID: 0} + - target: {fileID: 1338321943803156293, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} + propertyPath: m_AnchoredPosition.x + value: 240 + objectReference: {fileID: 0} + - target: {fileID: 2880284364756664539, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2880284364756664539, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2880284364756664539, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} + propertyPath: m_LocalScale.x + value: 0.66 + objectReference: {fileID: 0} + - target: {fileID: 2880284364756664539, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} + propertyPath: m_LocalScale.y + value: 0.66 + objectReference: {fileID: 0} + - target: {fileID: 2880284364756664539, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} + propertyPath: m_LocalScale.z + value: 0.66 + objectReference: {fileID: 0} + - target: {fileID: 2880284364756664539, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} + propertyPath: m_AnchoredPosition.x + value: -240 + objectReference: {fileID: 0} - target: {fileID: 6010638354984419522, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -388,19 +460,19 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6010638354984419522, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} propertyPath: m_SizeDelta.x - value: 672 + value: 618 objectReference: {fileID: 0} - target: {fileID: 6010638354984419522, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} propertyPath: m_SizeDelta.y - value: 204 + value: 186 objectReference: {fileID: 0} - target: {fileID: 6010638354984419522, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} propertyPath: m_LocalScale.x - value: 0.87 + value: 1 objectReference: {fileID: 0} - target: {fileID: 6010638354984419522, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} propertyPath: m_LocalScale.y - value: 0.87 + value: 1 objectReference: {fileID: 0} - target: {fileID: 6010638354984419522, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} propertyPath: m_LocalPosition.x @@ -436,7 +508,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6010638354984419522, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} propertyPath: m_AnchoredPosition.y - value: -2.199997 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6010638354984419522, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -450,6 +522,54 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 7905590696162383264, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 7905590696162383264, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 7905590696162383264, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} + propertyPath: m_LocalScale.x + value: 0.66 + objectReference: {fileID: 0} + - target: {fileID: 7905590696162383264, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} + propertyPath: m_LocalScale.y + value: 0.66 + objectReference: {fileID: 0} + - target: {fileID: 7905590696162383264, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} + propertyPath: m_LocalScale.z + value: 0.66 + objectReference: {fileID: 0} + - target: {fileID: 7905590696162383264, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8803925704283074769, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 8803925704283074769, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 8803925704283074769, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} + propertyPath: m_LocalScale.x + value: 0.66 + objectReference: {fileID: 0} + - target: {fileID: 8803925704283074769, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} + propertyPath: m_LocalScale.y + value: 0.66 + objectReference: {fileID: 0} + - target: {fileID: 8803925704283074769, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} + propertyPath: m_LocalScale.z + value: 0.66 + objectReference: {fileID: 0} + - target: {fileID: 8803925704283074769, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} + propertyPath: m_AnchoredPosition.x + value: -120 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} --- !u!224 &1387321168749950259 stripped