diff --git a/Assets/arts/atlas/ui/common.asset b/Assets/arts/atlas/ui/common.asset index 1a489fb52..66803c781 100644 --- a/Assets/arts/atlas/ui/common.asset +++ b/Assets/arts/atlas/ui/common.asset @@ -70,6 +70,7 @@ MonoBehaviour: - {fileID: 21300000, guid: 1382fc8e2fd70419eb51aaad5a5ec6d9, type: 3} - {fileID: 21300000, guid: 3efda5d47be8a4cf28a2a32f18baf877, type: 3} - {fileID: 21300000, guid: 7232d781b35ea8742abca796fec7106d, type: 3} + - {fileID: 21300000, guid: 4aa5356807eaf4bd6aee0ba92379b68a, type: 3} - {fileID: 21300000, guid: fdc5ec978c307224dbb7465f4698a226, type: 3} - {fileID: 21300000, guid: 3cf1784287669db4f91e9b56d1ebc7e1, type: 3} - {fileID: 21300000, guid: 4b4d73ac48dffca4fa760e7a48e51ad2, type: 3} @@ -178,4 +179,4 @@ MonoBehaviour: - {fileID: 21300000, guid: ea999318fddbe45f3876d9d152fcc20c, type: 3} - {fileID: 21300000, guid: 5aa123eeba3874e96a77af3433b3f977, type: 3} - {fileID: 21300000, guid: 56c233d89e320ac4891f34a6706ffc0c, type: 3} - spriteNameList: e9a43d8deaa43d8d0ae27a1a2757a7712857a7712957a7712a57a7712b57a7712c57a7712d57a7712e57a771b1ff831a37ebefa68b243e8d056d861a066d861a076d861a086d861a096d861a0a6d861a0b6d861a0c6d861a0d6d861a0e6d861a8c243e8d246d861a256d861a266d861a276d861a286d861a296d861a2b6d861a2c6d861a2d6d861a8d243e8d436d861a446d861a456d861a466d861a476d861a486d861a496d861a4a6d861a4b6d861a4c6d861a8e243e8d626d861a636d861a646d861a656d861a666d861a676d861a686d861a696d861a6a6d861a6b6d861a8f243e8d91243e8d92243e8d93243e8d5ff0dec4f7dba86df8dba86df9dba86dfadba86da3c7820ca4c7820ca5c7820c01853b1974546eb890c9348d7fea0537be2eb195c02eb195f92eb195e8945815e9945815ea9458158538368dfbcc388d8cc2e922b76e26590e8b0b1a47776d27553a6ac67d33eeca7e33eeca7f33eecab833eeca20ecadc9a4a1213850349739e1c7a11ae2c7a11ae3c7a11ae4c7a11ae5c7a11ae6c7a11ae7c7a11ae8c7a11a34e166e68eb7ba30160398e369606d8f83e25472704398e34ac4708fb4e19f42b5e19f42b6e19f427a737b477b737b477c737b477d737b477e737b477f737b47f116cb47252af848262af848272af848282af848292af8486e97448da07f7c4ea17f7c4ea27f7c4ea37f7c4e26d06cd827d06cd828d06cd8f03a2d359d83f5979e83f5979f83f597a083f597a183f597611e220557aa025458aa025459aa02545aaa0254b36a811bb46a811bb56a811bb66a811be8a0d140b76a811ba9a4d14003f2ab54ed355bf9f022f4ccf122f4ccf222f4ccf322f4ccf422f4ccf522f4ccf622f4ccf722f4cca15c468dbe552355bf552355c0552355c1552355c2552355c569b158 + spriteNameList: e9a43d8deaa43d8d0ae27a1a2757a7712857a7712957a7712a57a7712b57a7712c57a7712d57a7712e57a771b1ff831a37ebefa68b243e8d056d861a066d861a076d861a086d861a096d861a0a6d861a0b6d861a0c6d861a0d6d861a0e6d861a8c243e8d246d861a256d861a266d861a276d861a286d861a296d861a2b6d861a2c6d861a2d6d861a8d243e8d436d861a446d861a456d861a466d861a476d861a486d861a496d861a4a6d861a4b6d861a4c6d861a8e243e8d626d861a636d861a646d861a656d861a666d861a676d861a686d861a696d861a6a6d861a6b6d861a8f243e8d816d861a91243e8d92243e8d93243e8d5ff0dec4f7dba86df8dba86df9dba86dfadba86da3c7820ca4c7820ca5c7820c01853b1974546eb890c9348d7fea0537be2eb195c02eb195f92eb195e8945815e9945815ea9458158538368dfbcc388d8cc2e922b76e26590e8b0b1a47776d27553a6ac67d33eeca7e33eeca7f33eecab833eeca20ecadc9a4a1213850349739e1c7a11ae2c7a11ae3c7a11ae4c7a11ae5c7a11ae6c7a11ae7c7a11ae8c7a11a34e166e68eb7ba30160398e369606d8f83e25472704398e34ac4708fb4e19f42b5e19f42b6e19f427a737b477b737b477c737b477d737b477e737b477f737b47f116cb47252af848262af848272af848282af848292af8486e97448da07f7c4ea17f7c4ea27f7c4ea37f7c4e26d06cd827d06cd828d06cd8f03a2d359d83f5979e83f5979f83f597a083f597a183f597611e220557aa025458aa025459aa02545aaa0254b36a811bb46a811bb56a811bb66a811be8a0d140b76a811ba9a4d14003f2ab54ed355bf9f022f4ccf122f4ccf222f4ccf322f4ccf422f4ccf522f4ccf622f4ccf722f4cca15c468dbe552355bf552355c0552355c1552355c2552355c569b158 diff --git a/Assets/arts/atlas/ui/common.spriteatlas b/Assets/arts/atlas/ui/common.spriteatlas index 56b41ec85..923e2639c 100644 --- a/Assets/arts/atlas/ui/common.spriteatlas +++ b/Assets/arts/atlas/ui/common.spriteatlas @@ -151,6 +151,7 @@ SpriteAtlas: - {fileID: 21300000, guid: ea999318fddbe45f3876d9d152fcc20c, type: 3} - {fileID: 21300000, guid: 3427d728ce5bf43f5972607e45c43df6, type: 3} - {fileID: 21300000, guid: 42d94e3855ec9bc4f91a0236930bfbee, type: 3} + - {fileID: 21300000, guid: 4aa5356807eaf4bd6aee0ba92379b68a, type: 3} - {fileID: 21300000, guid: 3a491a78e8f193f428361be7b7a45dfb, type: 3} - {fileID: 21300000, guid: cf95f288b0b574656992bee6fdac4224, type: 3} - {fileID: 21300000, guid: 7e9c0788fba4a824f9213b892c30a542, type: 3} @@ -317,6 +318,7 @@ SpriteAtlas: - common_tips_4 - common_btn_find - common_bg_12 + - common_bg_50 - common_circle - common_quality_5 - common_dec_2 diff --git a/Assets/arts/atlas/ui/module.asset b/Assets/arts/atlas/ui/module.asset index 127aecd7f..deb883a5c 100644 --- a/Assets/arts/atlas/ui/module.asset +++ b/Assets/arts/atlas/ui/module.asset @@ -14,13 +14,11 @@ MonoBehaviour: m_EditorClassIdentifier: spriteList: - {fileID: 21300000, guid: 4d07972ef67402145b41dd3f74d617f3, type: 3} - - {fileID: 21300000, guid: 6be553fddd82a3f47ae41e7e3ff8d757, type: 3} - - {fileID: 21300000, guid: 685ef512cce335b499e78b81082a61b7, type: 3} + - {fileID: 21300000, guid: 71c75c6c00cb445c3aa10520de44a670, type: 3} - {fileID: 21300000, guid: ddcd4059618a0504fa0ec381ab948b47, type: 3} - - {fileID: 21300000, guid: 134a5aa805646e140ae431abe42dde91, type: 3} - {fileID: 21300000, guid: 701ba2b5a79411c428a2b9c262bf9003, type: 3} - - {fileID: 21300000, guid: 31f3a208fab39e948a56c165495f8fc4, type: 3} - - {fileID: 21300000, guid: 3798427320fee134d8368add9acaa559, type: 3} + - {fileID: 21300000, guid: 5ea9e707fdf75462d891d9750581bc17, type: 3} + - {fileID: 21300000, guid: 17e1b81a3a5fa4e5fb8619cadfd8193a, type: 3} + - {fileID: 21300000, guid: b2764d2933dc34ebfbec589954e7c5aa, type: 3} - {fileID: 21300000, guid: 0d38908ad3a58e0458098eed1d3adde3, type: 3} - - {fileID: 21300000, guid: da2afc163977e5644893dab941455163, type: 3} - spriteNameList: 3f9597b53217937fc77acdf168bacfb58da9d5e49cc6d6e4021edbe4370f90cd4dbcdbe4e4b62c22 + spriteNameList: 3f9597b5f23e545268bacfb59cc6d6e4dc8cd8e4a935401cb4a5da1c4dbcdbe4 diff --git a/Assets/arts/atlas/ui/module.spriteatlas b/Assets/arts/atlas/ui/module.spriteatlas index 31bf99428..8780a96cd 100644 --- a/Assets/arts/atlas/ui/module.spriteatlas +++ b/Assets/arts/atlas/ui/module.spriteatlas @@ -62,26 +62,22 @@ SpriteAtlas: cachedData: {fileID: 0} m_MasterAtlas: {fileID: 0} m_PackedSprites: - - {fileID: 21300000, guid: 685ef512cce335b499e78b81082a61b7, type: 3} - - {fileID: 21300000, guid: 3798427320fee134d8368add9acaa559, type: 3} - {fileID: 21300000, guid: 701ba2b5a79411c428a2b9c262bf9003, type: 3} - - {fileID: 21300000, guid: da2afc163977e5644893dab941455163, type: 3} - - {fileID: 21300000, guid: 31f3a208fab39e948a56c165495f8fc4, type: 3} - - {fileID: 21300000, guid: 134a5aa805646e140ae431abe42dde91, type: 3} + - {fileID: 21300000, guid: 5ea9e707fdf75462d891d9750581bc17, type: 3} + - {fileID: 21300000, guid: b2764d2933dc34ebfbec589954e7c5aa, type: 3} - {fileID: 21300000, guid: ddcd4059618a0504fa0ec381ab948b47, type: 3} + - {fileID: 21300000, guid: 17e1b81a3a5fa4e5fb8619cadfd8193a, type: 3} - {fileID: 21300000, guid: 0d38908ad3a58e0458098eed1d3adde3, type: 3} - - {fileID: 21300000, guid: 6be553fddd82a3f47ae41e7e3ff8d757, type: 3} + - {fileID: 21300000, guid: 71c75c6c00cb445c3aa10520de44a670, type: 3} - {fileID: 21300000, guid: 4d07972ef67402145b41dd3f74d617f3, type: 3} m_PackedSpriteNamesToIndex: - - module_unlock_dailyshop - - module_unlock_sevenday - module_unlock_idle - - module_unlock_weapon - - module_unlock_rune - - module_unlock_fund + - module_unlock_mall + - module_unlock_talent - module_unlock_equip + - module_unlock_summon - module_unlock_task - - module_unlock_dailychallenge + - module_unlock_dungeon - module_unlock_arena m_RenderDataMap: {} m_Tag: module diff --git a/Assets/arts/atlas/ui/shop.asset b/Assets/arts/atlas/ui/shop.asset index ab42ca2de..4c2c72d21 100644 --- a/Assets/arts/atlas/ui/shop.asset +++ b/Assets/arts/atlas/ui/shop.asset @@ -14,6 +14,7 @@ MonoBehaviour: m_EditorClassIdentifier: spriteList: - {fileID: 21300000, guid: 4808c6ae4ca262b45a174213786a7557, type: 3} + - {fileID: 21300000, guid: e08fc80d560e147379f90667ecd2ea08, type: 3} - {fileID: 21300000, guid: ae6f3b836e27cfa4cb47160a8998ac05, type: 3} - {fileID: 21300000, guid: f566dae1ce3ee1642bcb852f306b6451, type: 3} - {fileID: 21300000, guid: fda3bc6b82a6bb747b789c87dc86d32b, type: 3} @@ -47,4 +48,4 @@ MonoBehaviour: - {fileID: 21300000, guid: 00cc0d307b92abe4584d1d17b7d3259b, type: 3} - {fileID: 21300000, guid: 5cc109b182ff32844b2b78153dd65026, type: 3} - {fileID: 21300000, guid: 9fc80bc86cb958f4d8d0c3b074a1fd1e, type: 3} - spriteNameList: 606293826162938262629382636293826462938265629382666293826762938268629382cf04274bd004274b8510dfcf8610dfcfab44f4cfac44f4cfad44f4cfae44f4cfaf44f4cfb044f4cffd41d5cefe41d5ceff41d5ce0042d5ce0142d5ce0242d5ce5dc22c9fe5073018e6073018e7073018456e1c77466e1c77476e1c77486e1c77496e1c77 + spriteNameList: 60629382d0e9d8cf6162938262629382636293826462938265629382666293826762938268629382cf04274bd004274b8510dfcf8610dfcfab44f4cfac44f4cfad44f4cfae44f4cfaf44f4cfb044f4cffd41d5cefe41d5ceff41d5ce0042d5ce0142d5ce0242d5ce5dc22c9fe5073018e6073018e7073018456e1c77466e1c77476e1c77486e1c77496e1c77 diff --git a/Assets/arts/atlas/ui/shop.spriteatlas b/Assets/arts/atlas/ui/shop.spriteatlas index 682b1a5fe..1bd5732ac 100644 --- a/Assets/arts/atlas/ui/shop.spriteatlas +++ b/Assets/arts/atlas/ui/shop.spriteatlas @@ -92,6 +92,7 @@ SpriteAtlas: - {fileID: 21300000, guid: e409bb3b9f9b8e04a8284c3b38fa3f32, type: 3} - {fileID: 21300000, guid: fda3bc6b82a6bb747b789c87dc86d32b, type: 3} - {fileID: 21300000, guid: f3d537cb7aa9b9043b48d5f30b8a8583, type: 3} + - {fileID: 21300000, guid: e08fc80d560e147379f90667ecd2ea08, type: 3} - {fileID: 21300000, guid: d72627ddfda8c0a4cadb06cf4cebf0db, type: 3} - {fileID: 21300000, guid: b6e2b41ebd2d64246a244bd11a00cf7f, type: 3} - {fileID: 21300000, guid: 4808c6ae4ca262b45a174213786a7557, type: 3} @@ -127,6 +128,7 @@ SpriteAtlas: - shop_bg_9 - shop_bg_4 - shop_dec_2 + - shop_bg_10 - shop_species_2 - shop_board_1 - shop_bg_1 diff --git a/Assets/arts/textures/ui/common/common_bg_50.png b/Assets/arts/textures/ui/common/common_bg_50.png new file mode 100644 index 000000000..2e7e1af2a Binary files /dev/null and b/Assets/arts/textures/ui/common/common_bg_50.png differ diff --git a/Assets/arts/textures/ui/common/common_bg_50.png.meta b/Assets/arts/textures/ui/common/common_bg_50.png.meta new file mode 100644 index 000000000..b2acb76ae --- /dev/null +++ b/Assets/arts/textures/ui/common/common_bg_50.png.meta @@ -0,0 +1,147 @@ +fileFormatVersion: 2 +guid: 4aa5356807eaf4bd6aee0ba92379b68a +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: 26, y: 26, z: 26, w: 26} + 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/module/module_unlock_arena.png b/Assets/arts/textures/ui/module/module_unlock_arena.png index f20252fa5..2b64dd8f2 100644 Binary files a/Assets/arts/textures/ui/module/module_unlock_arena.png and b/Assets/arts/textures/ui/module/module_unlock_arena.png differ diff --git a/Assets/arts/textures/ui/module/module_unlock_arena.png.meta b/Assets/arts/textures/ui/module/module_unlock_arena.png.meta index c53e643a8..1bd391c88 100644 --- a/Assets/arts/textures/ui/module/module_unlock_arena.png.meta +++ b/Assets/arts/textures/ui/module/module_unlock_arena.png.meta @@ -63,20 +63,8 @@ TextureImporter: textureFormatSet: 0 ignorePngGamma: 0 applyGammaDecoding: 0 - cookieLightType: 1 + cookieLightType: 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 @@ -113,6 +101,18 @@ TextureImporter: 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 @@ -143,5 +143,5 @@ TextureImporter: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: - assetBundleName: arts/textures/ui/module.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/textures/ui/module/module_unlock_dailychallenge.png b/Assets/arts/textures/ui/module/module_unlock_dailychallenge.png deleted file mode 100644 index 862e58508..000000000 Binary files a/Assets/arts/textures/ui/module/module_unlock_dailychallenge.png and /dev/null differ diff --git a/Assets/arts/textures/ui/module/module_unlock_dailyshop.png b/Assets/arts/textures/ui/module/module_unlock_dailyshop.png deleted file mode 100644 index 1872e21ce..000000000 Binary files a/Assets/arts/textures/ui/module/module_unlock_dailyshop.png and /dev/null differ diff --git a/Assets/arts/textures/ui/module/module_unlock_dungeon.png b/Assets/arts/textures/ui/module/module_unlock_dungeon.png new file mode 100644 index 000000000..f90c95fba Binary files /dev/null and b/Assets/arts/textures/ui/module/module_unlock_dungeon.png differ diff --git a/Assets/arts/textures/ui/module/module_unlock_fund.png.meta b/Assets/arts/textures/ui/module/module_unlock_dungeon.png.meta similarity index 97% rename from Assets/arts/textures/ui/module/module_unlock_fund.png.meta rename to Assets/arts/textures/ui/module/module_unlock_dungeon.png.meta index 74d7690e9..bd2fa0e48 100644 --- a/Assets/arts/textures/ui/module/module_unlock_fund.png.meta +++ b/Assets/arts/textures/ui/module/module_unlock_dungeon.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 134a5aa805646e140ae431abe42dde91 +guid: 71c75c6c00cb445c3aa10520de44a670 TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -63,20 +63,8 @@ TextureImporter: textureFormatSet: 0 ignorePngGamma: 0 applyGammaDecoding: 0 - cookieLightType: 1 + cookieLightType: 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 @@ -113,6 +101,18 @@ TextureImporter: 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 @@ -143,5 +143,5 @@ TextureImporter: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: - assetBundleName: arts/textures/ui/module.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/textures/ui/module/module_unlock_equip.png b/Assets/arts/textures/ui/module/module_unlock_equip.png index cf191ccfc..36334fe83 100644 Binary files a/Assets/arts/textures/ui/module/module_unlock_equip.png and b/Assets/arts/textures/ui/module/module_unlock_equip.png differ diff --git a/Assets/arts/textures/ui/module/module_unlock_equip.png.meta b/Assets/arts/textures/ui/module/module_unlock_equip.png.meta index af85d9898..c59cec583 100644 --- a/Assets/arts/textures/ui/module/module_unlock_equip.png.meta +++ b/Assets/arts/textures/ui/module/module_unlock_equip.png.meta @@ -63,20 +63,8 @@ TextureImporter: textureFormatSet: 0 ignorePngGamma: 0 applyGammaDecoding: 0 - cookieLightType: 1 + cookieLightType: 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 @@ -113,6 +101,18 @@ TextureImporter: 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 @@ -143,5 +143,5 @@ TextureImporter: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: - assetBundleName: arts/textures/ui/module.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/textures/ui/module/module_unlock_fund.png b/Assets/arts/textures/ui/module/module_unlock_fund.png deleted file mode 100644 index 5fcca84d0..000000000 Binary files a/Assets/arts/textures/ui/module/module_unlock_fund.png and /dev/null differ diff --git a/Assets/arts/textures/ui/module/module_unlock_idle.png b/Assets/arts/textures/ui/module/module_unlock_idle.png index ccea7de4c..6e7d04d92 100644 Binary files a/Assets/arts/textures/ui/module/module_unlock_idle.png and b/Assets/arts/textures/ui/module/module_unlock_idle.png differ diff --git a/Assets/arts/textures/ui/module/module_unlock_idle.png.meta b/Assets/arts/textures/ui/module/module_unlock_idle.png.meta index c7711209a..3fe414e70 100644 --- a/Assets/arts/textures/ui/module/module_unlock_idle.png.meta +++ b/Assets/arts/textures/ui/module/module_unlock_idle.png.meta @@ -63,20 +63,8 @@ TextureImporter: textureFormatSet: 0 ignorePngGamma: 0 applyGammaDecoding: 0 - cookieLightType: 1 + cookieLightType: 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 @@ -113,6 +101,18 @@ TextureImporter: 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 @@ -143,5 +143,5 @@ TextureImporter: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: - assetBundleName: arts/textures/ui/module.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/textures/ui/module/module_unlock_mall.png b/Assets/arts/textures/ui/module/module_unlock_mall.png new file mode 100644 index 000000000..93f8d1bcf Binary files /dev/null and b/Assets/arts/textures/ui/module/module_unlock_mall.png differ diff --git a/Assets/arts/textures/ui/module/module_unlock_dailychallenge.png.meta b/Assets/arts/textures/ui/module/module_unlock_mall.png.meta similarity index 97% rename from Assets/arts/textures/ui/module/module_unlock_dailychallenge.png.meta rename to Assets/arts/textures/ui/module/module_unlock_mall.png.meta index 9fc603a12..a07ff5b35 100644 --- a/Assets/arts/textures/ui/module/module_unlock_dailychallenge.png.meta +++ b/Assets/arts/textures/ui/module/module_unlock_mall.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 6be553fddd82a3f47ae41e7e3ff8d757 +guid: 5ea9e707fdf75462d891d9750581bc17 TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -63,20 +63,8 @@ TextureImporter: textureFormatSet: 0 ignorePngGamma: 0 applyGammaDecoding: 0 - cookieLightType: 1 + cookieLightType: 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 @@ -113,6 +101,18 @@ TextureImporter: 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 @@ -143,5 +143,5 @@ TextureImporter: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: - assetBundleName: arts/textures/ui/module.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/textures/ui/module/module_unlock_rune.png b/Assets/arts/textures/ui/module/module_unlock_rune.png deleted file mode 100644 index 6d5ac4be0..000000000 Binary files a/Assets/arts/textures/ui/module/module_unlock_rune.png and /dev/null differ diff --git a/Assets/arts/textures/ui/module/module_unlock_sevenday.png b/Assets/arts/textures/ui/module/module_unlock_sevenday.png deleted file mode 100644 index dc9188cb5..000000000 Binary files a/Assets/arts/textures/ui/module/module_unlock_sevenday.png and /dev/null differ diff --git a/Assets/arts/textures/ui/module/module_unlock_sevenday.png.meta b/Assets/arts/textures/ui/module/module_unlock_sevenday.png.meta deleted file mode 100644 index a2f5f08ee..000000000 --- a/Assets/arts/textures/ui/module/module_unlock_sevenday.png.meta +++ /dev/null @@ -1,147 +0,0 @@ -fileFormatVersion: 2 -guid: 3798427320fee134d8368add9acaa559 -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: 1 - 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 - - 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: arts/textures/ui/module.ab - assetBundleVariant: diff --git a/Assets/arts/textures/ui/module/module_unlock_summon.png b/Assets/arts/textures/ui/module/module_unlock_summon.png new file mode 100644 index 000000000..9dfed24ff Binary files /dev/null and b/Assets/arts/textures/ui/module/module_unlock_summon.png differ diff --git a/Assets/arts/textures/ui/module/module_unlock_rune.png.meta b/Assets/arts/textures/ui/module/module_unlock_summon.png.meta similarity index 97% rename from Assets/arts/textures/ui/module/module_unlock_rune.png.meta rename to Assets/arts/textures/ui/module/module_unlock_summon.png.meta index 6442a47c0..d567d94b2 100644 --- a/Assets/arts/textures/ui/module/module_unlock_rune.png.meta +++ b/Assets/arts/textures/ui/module/module_unlock_summon.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 31f3a208fab39e948a56c165495f8fc4 +guid: 17e1b81a3a5fa4e5fb8619cadfd8193a TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -63,20 +63,8 @@ TextureImporter: textureFormatSet: 0 ignorePngGamma: 0 applyGammaDecoding: 0 - cookieLightType: 1 + cookieLightType: 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 @@ -113,6 +101,18 @@ TextureImporter: 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 @@ -143,5 +143,5 @@ TextureImporter: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: - assetBundleName: arts/textures/ui/module.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/textures/ui/module/module_unlock_talent.png b/Assets/arts/textures/ui/module/module_unlock_talent.png new file mode 100644 index 000000000..ee1cdb94b Binary files /dev/null and b/Assets/arts/textures/ui/module/module_unlock_talent.png differ diff --git a/Assets/arts/textures/ui/module/module_unlock_dailyshop.png.meta b/Assets/arts/textures/ui/module/module_unlock_talent.png.meta similarity index 97% rename from Assets/arts/textures/ui/module/module_unlock_dailyshop.png.meta rename to Assets/arts/textures/ui/module/module_unlock_talent.png.meta index a37a0422f..3eeb16295 100644 --- a/Assets/arts/textures/ui/module/module_unlock_dailyshop.png.meta +++ b/Assets/arts/textures/ui/module/module_unlock_talent.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 685ef512cce335b499e78b81082a61b7 +guid: b2764d2933dc34ebfbec589954e7c5aa TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -63,20 +63,8 @@ TextureImporter: textureFormatSet: 0 ignorePngGamma: 0 applyGammaDecoding: 0 - cookieLightType: 1 + cookieLightType: 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 @@ -113,6 +101,18 @@ TextureImporter: 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 @@ -143,5 +143,5 @@ TextureImporter: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: - assetBundleName: arts/textures/ui/module.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/textures/ui/module/module_unlock_task.png b/Assets/arts/textures/ui/module/module_unlock_task.png index fe1464dfc..136e09167 100644 Binary files a/Assets/arts/textures/ui/module/module_unlock_task.png and b/Assets/arts/textures/ui/module/module_unlock_task.png differ diff --git a/Assets/arts/textures/ui/module/module_unlock_task.png.meta b/Assets/arts/textures/ui/module/module_unlock_task.png.meta index 612c48de4..52e64e86b 100644 --- a/Assets/arts/textures/ui/module/module_unlock_task.png.meta +++ b/Assets/arts/textures/ui/module/module_unlock_task.png.meta @@ -63,20 +63,8 @@ TextureImporter: textureFormatSet: 0 ignorePngGamma: 0 applyGammaDecoding: 0 - cookieLightType: 1 + cookieLightType: 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 @@ -113,6 +101,18 @@ TextureImporter: 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 @@ -143,5 +143,5 @@ TextureImporter: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: - assetBundleName: arts/textures/ui/module.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/textures/ui/module/module_unlock_weapon.png b/Assets/arts/textures/ui/module/module_unlock_weapon.png deleted file mode 100644 index e5801fbe2..000000000 Binary files a/Assets/arts/textures/ui/module/module_unlock_weapon.png and /dev/null differ diff --git a/Assets/arts/textures/ui/module/module_unlock_weapon.png.meta b/Assets/arts/textures/ui/module/module_unlock_weapon.png.meta deleted file mode 100644 index 7e42c57e3..000000000 --- a/Assets/arts/textures/ui/module/module_unlock_weapon.png.meta +++ /dev/null @@ -1,147 +0,0 @@ -fileFormatVersion: 2 -guid: da2afc163977e5644893dab941455163 -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: 1 - 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 - - 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: arts/textures/ui/module.ab - assetBundleVariant: diff --git a/Assets/arts/textures/ui/shop/shop_bg_1.png b/Assets/arts/textures/ui/shop/shop_bg_1.png index a3e58477d..5c432cf9a 100644 Binary files a/Assets/arts/textures/ui/shop/shop_bg_1.png and b/Assets/arts/textures/ui/shop/shop_bg_1.png differ diff --git a/Assets/arts/textures/ui/shop/shop_bg_10.png b/Assets/arts/textures/ui/shop/shop_bg_10.png new file mode 100644 index 000000000..9cf34863b Binary files /dev/null and b/Assets/arts/textures/ui/shop/shop_bg_10.png differ diff --git a/Assets/arts/textures/ui/shop/shop_bg_10.png.meta b/Assets/arts/textures/ui/shop/shop_bg_10.png.meta new file mode 100644 index 000000000..fb297bdb1 --- /dev/null +++ b/Assets/arts/textures/ui/shop/shop_bg_10.png.meta @@ -0,0 +1,147 @@ +fileFormatVersion: 2 +guid: e08fc80d560e147379f90667ecd2ea08 +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/prefabs/ui/battle/battle_arena_pause_ui.prefab b/Assets/prefabs/ui/battle/battle_arena_pause_ui.prefab index 07cf04888..de57ef8a3 100644 --- a/Assets/prefabs/ui/battle/battle_arena_pause_ui.prefab +++ b/Assets/prefabs/ui/battle/battle_arena_pause_ui.prefab @@ -29,15 +29,16 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 5841676959962843802} m_Father: {fileID: 4201750005051344089} - 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} - m_AnchoredPosition: {x: 137.5, y: -329.5} - m_SizeDelta: {x: 215, y: 85} + m_AnchorMin: {x: 0.5, y: 0} + m_AnchorMax: {x: 0.5, y: 0} + m_AnchoredPosition: {x: 137.5, y: 60} + m_SizeDelta: {x: 156, y: 68} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2103669220548844290 CanvasRenderer: @@ -67,8 +68,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 5758461464520334caa2a2487dca2fc6, type: 3} - m_Type: 1 + m_Sprite: {fileID: 21300000, guid: 1a4363e1856808e4ea0a078472b03c75, type: 3} + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -119,15 +120,16 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1169321492090100802} m_Father: {fileID: 4201750005051344089} - m_RootOrder: 5 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -137.5, y: -329.5} - m_SizeDelta: {x: 215, y: 85} + m_AnchorMin: {x: 0.5, y: 0} + m_AnchorMax: {x: 0.5, y: 0} + m_AnchoredPosition: {x: -137.5, y: 60} + m_SizeDelta: {x: 156, y: 68} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6882938614905743497 CanvasRenderer: @@ -157,8 +159,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 5758461464520334caa2a2487dca2fc6, type: 3} - m_Type: 1 + m_Sprite: {fileID: 21300000, guid: 1a4363e1856808e4ea0a078472b03c75, type: 3} + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -208,6 +210,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8226962108079740363} m_RootOrder: 0 @@ -215,7 +218,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 3.5} - m_SizeDelta: {x: 200, y: 50} + m_SizeDelta: {x: 150, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3408752794356770305 CanvasRenderer: @@ -272,8 +275,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 26 - m_fontSizeBase: 26 + m_fontSize: 24 + m_fontSizeBase: 24 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -343,6 +346,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 933070133340605683} m_Father: {fileID: 4165930251451731960} @@ -350,8 +354,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 124, y: -498} - m_SizeDelta: {x: 208, y: 98} + m_AnchoredPosition: {x: 141, y: -446} + m_SizeDelta: {x: 218, y: 92} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2700759685852093804 CanvasRenderer: @@ -381,8 +385,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 5758461464520334caa2a2487dca2fc6, type: 3} - m_Type: 1 + m_Sprite: {fileID: 21300000, guid: 883d58dd339d5e346b504cdff1be6351, type: 3} + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -431,6 +435,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 8392250597869700003} m_Father: {fileID: 2293282550491031398} @@ -482,6 +487,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8573532777235809205} m_RootOrder: 0 @@ -553,6 +559,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8573532777235809205} m_RootOrder: 1 @@ -625,6 +632,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1309167142472500923} m_RootOrder: 0 @@ -632,7 +640,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 563, y: 92} + m_SizeDelta: {x: 563, y: 80} m_Pivot: {x: 0.5, y: 1} --- !u!222 &913735232607546097 CanvasRenderer: @@ -665,14 +673,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: 4282662702 + m_fontColor: {r: 0.18039216, g: 0.24705882, b: 0.26666668, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -696,8 +704,8 @@ MonoBehaviour: m_fontSizeMin: 18 m_fontSizeMax: 72 m_fontStyle: 0 - m_HorizontalAlignment: 1 - m_VerticalAlignment: 256 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 m_wordSpacing: 0 @@ -759,16 +767,17 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0, y: 0, z: 0} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 8905140842700805960} - {fileID: 1990160717587291054} - {fileID: 2051767952824234520} m_Father: {fileID: 4201750005051344089} - m_RootOrder: 3 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 0, y: -35} + m_AnchoredPosition: {x: 0, y: -18} m_SizeDelta: {x: 589, y: 522} m_Pivot: {x: 0.5, y: 1} --- !u!222 &3185524028580493845 @@ -834,6 +843,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 7435072624845170066} m_RootOrder: 0 @@ -841,7 +851,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 4} - m_SizeDelta: {x: 38, y: 54} + m_SizeDelta: {x: 60, y: 60} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7758938756533484639 CanvasRenderer: @@ -871,7 +881,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: dfc7b64e38bed054fb7f4ae52e1586d6, type: 3} + m_Sprite: {fileID: 21300000, guid: 7fb6239726241f7469104d652a81c1e4, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -892,7 +902,6 @@ GameObject: - component: {fileID: 5689173462703679213} - component: {fileID: 4665553584769559622} - component: {fileID: 5345611366331782609} - - component: {fileID: 3791664887288198329} m_Layer: 5 m_Name: r m_TagString: Untagged @@ -910,14 +919,15 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4201750005051344089} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} m_AnchoredPosition: {x: -187.5, y: 48} - m_SizeDelta: {x: 127, y: 30} + m_SizeDelta: {x: 168, y: 22} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4665553584769559622 CanvasRenderer: @@ -947,7 +957,83 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 720068de3629e3a418a426f8a6ad94b5, type: 3} + m_Sprite: {fileID: 21300000, guid: 67a031dfa138a409f8109c1235244d25, 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 &4789212460799589123 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3878680762159925128} + - component: {fileID: 1600058306624610347} + - component: {fileID: 4720201214053796097} + m_Layer: 5 + m_Name: bg + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3878680762159925128 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4789212460799589123} + 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: 4201750005051344089} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 0, y: -18} + m_SizeDelta: {x: 590, y: 522} + m_Pivot: {x: 0.5, y: 1} +--- !u!222 &1600058306624610347 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4789212460799589123} + m_CullTransparentMesh: 1 +--- !u!114 &4720201214053796097 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4789212460799589123} + 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: 6fcfdf7ba1e7f4441a15bd5d888541d0, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -957,20 +1043,6 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!114 &3791664887288198329 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4182307427987868391} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a825f0792e793476ba49ec4d8054a901, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Horizontal: 1 - m_Veritical: 0 --- !u!1 &5356092318084376832 GameObject: m_ObjectHideFlags: 0 @@ -999,9 +1071,10 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4201750005051344089} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} @@ -1133,6 +1206,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4165930251451731960} m_RootOrder: 0 @@ -1209,6 +1283,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 806034408259357428} m_Father: {fileID: 4165930251451731960} @@ -1216,8 +1291,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -124, y: -498} - m_SizeDelta: {x: 208, y: 98} + m_AnchoredPosition: {x: -141, y: -446} + m_SizeDelta: {x: 218, y: 92} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2006497708903664946 CanvasRenderer: @@ -1247,8 +1322,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: c005d0dc9d400304ca941b48135dcb04, type: 3} - m_Type: 1 + m_Sprite: {fileID: 21300000, guid: 8e279276358266d4abd13f0e7fde1e50, type: 3} + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -1297,6 +1372,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8573532777235809205} m_RootOrder: 2 @@ -1369,6 +1445,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 9154371687382474293} m_RootOrder: 0 @@ -1376,7 +1453,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 4} - m_SizeDelta: {x: 56, y: 58} + m_SizeDelta: {x: 60, y: 60} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1752165177841096906 CanvasRenderer: @@ -1406,7 +1483,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: d860c7ea2dcad1c4a804fe48f07fcdf3, type: 3} + m_Sprite: {fileID: 21300000, guid: 362a3f8557296814681bda923176d19e, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1445,16 +1522,17 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1309167142472500923} m_Father: {fileID: 4201750005051344089} - m_RootOrder: 4 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 1} - m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 0, y: -578} - m_SizeDelta: {x: 563, y: 92} - m_Pivot: {x: 0.5, y: 1} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: -217} + m_SizeDelta: {x: 563, y: 80} + m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1736380185429446506 CanvasRenderer: m_ObjectHideFlags: 0 @@ -1541,6 +1619,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2659394120789691220} m_RootOrder: 0 @@ -1548,7 +1627,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 3.5} - m_SizeDelta: {x: 200, y: 50} + m_SizeDelta: {x: 150, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &222887780921793874 CanvasRenderer: @@ -1605,8 +1684,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 26 - m_fontSizeBase: 26 + m_fontSize: 24 + m_fontSizeBase: 24 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -1675,7 +1754,9 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: + - {fileID: 3878680762159925128} - {fileID: 8624896985186038724} - {fileID: 5689173462703679213} - {fileID: 926392088051768063} @@ -1689,7 +1770,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 426} - m_SizeDelta: {x: 611, y: 813} + m_SizeDelta: {x: 626, y: 750} m_Pivot: {x: 0.5, y: 1} --- !u!222 &8072687670256534369 CanvasRenderer: @@ -1719,7 +1800,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: fdf319adad718e34d90445fc9339fae8, type: 3} + m_Sprite: {fileID: 21300000, guid: 4aa5356807eaf4bd6aee0ba92379b68a, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1758,6 +1839,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 7870804908802134986} - {fileID: 4201750005051344089} @@ -1881,6 +1963,7 @@ GameObject: - component: {fileID: 8624896985186038724} - component: {fileID: 5974192661505873471} - component: {fileID: 5320241066973025853} + - component: {fileID: 5360169137819955860} m_Layer: 5 m_Name: l m_TagString: Untagged @@ -1898,14 +1981,15 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4201750005051344089} - m_RootOrder: 0 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} m_AnchoredPosition: {x: 187.5, y: 48} - m_SizeDelta: {x: 127, y: 30} + m_SizeDelta: {x: 168, y: 22} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5974192661505873471 CanvasRenderer: @@ -1935,8 +2019,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 720068de3629e3a418a426f8a6ad94b5, type: 3} - m_Type: 1 + m_Sprite: {fileID: 21300000, guid: 67a031dfa138a409f8109c1235244d25, type: 3} + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -1945,3 +2029,17 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!114 &5360169137819955860 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9076339327693900707} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a825f0792e793476ba49ec4d8054a901, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Horizontal: 1 + m_Veritical: 0