diff --git a/Assets/arts/atlas/ui/act_fourteen.spriteatlas b/Assets/arts/atlas/ui/act_fourteen.spriteatlas deleted file mode 100644 index b4e969161..000000000 --- a/Assets/arts/atlas/ui/act_fourteen.spriteatlas +++ /dev/null @@ -1,66 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!687078895 &4343727234628468602 -SpriteAtlas: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: act_fourteen - m_EditorData: - serializedVersion: 2 - textureSettings: - serializedVersion: 2 - anisoLevel: 0 - compressionQuality: 0 - maxTextureSize: 0 - textureCompression: 0 - filterMode: 1 - generateMipMaps: 0 - readable: 0 - crunchedCompression: 0 - sRGB: 1 - platformSettings: - - serializedVersion: 3 - m_BuildTarget: Android - m_MaxTextureSize: 2048 - m_ResizeAlgorithm: 0 - m_TextureFormat: 47 - m_TextureCompression: 1 - m_CompressionQuality: 50 - m_CrunchedCompression: 0 - m_AllowsAlphaSplitting: 0 - m_Overridden: 1 - m_AndroidETC2FallbackOverride: 0 - m_ForceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - m_BuildTarget: iPhone - m_MaxTextureSize: 2048 - m_ResizeAlgorithm: 0 - m_TextureFormat: 50 - m_TextureCompression: 1 - m_CompressionQuality: 50 - m_CrunchedCompression: 0 - m_AllowsAlphaSplitting: 0 - m_Overridden: 1 - m_AndroidETC2FallbackOverride: 0 - m_ForceMaximumCompressionQuality_BC6H_BC7: 0 - packingSettings: - serializedVersion: 2 - padding: 4 - blockOffset: 0 - allowAlphaSplitting: 0 - enableRotation: 0 - enableTightPacking: 0 - secondaryTextureSettings: {} - variantMultiplier: 1 - packables: [] - bindAsDefault: 1 - isAtlasV2: 0 - cachedData: {fileID: 0} - m_MasterAtlas: {fileID: 0} - m_PackedSprites: [] - m_PackedSpriteNamesToIndex: [] - m_RenderDataMap: {} - m_Tag: act_fourteen - m_IsVariant: 0 diff --git a/Assets/arts/atlas/ui/act_fourteen.spriteatlas.meta b/Assets/arts/atlas/ui/act_fourteen.spriteatlas.meta deleted file mode 100644 index cb9a0cc6e..000000000 --- a/Assets/arts/atlas/ui/act_fourteen.spriteatlas.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: dad0cdc530ffce142b27e3ce5cfcd065 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 4343727234628468602 - userData: - assetBundleName: arts/textures/ui/act_fourteen.ab - assetBundleVariant: diff --git a/Assets/arts/atlas/ui/common.spriteatlas b/Assets/arts/atlas/ui/common.spriteatlas index 7fcfa4ac4..59cfcdd0d 100644 --- a/Assets/arts/atlas/ui/common.spriteatlas +++ b/Assets/arts/atlas/ui/common.spriteatlas @@ -72,6 +72,7 @@ SpriteAtlas: - {fileID: 21300000, guid: 9bc39501344a8494daeaf1035cb736db, type: 3} - {fileID: 21300000, guid: 1a4f780181ba75d4e840fd9a8754eb99, type: 3} - {fileID: 21300000, guid: 14da6211cc49d5a4a8c31d4e949b3135, type: 3} + - {fileID: 21300000, guid: 2b61c72119833dc47ad00f1de32145c3, type: 3} - {fileID: 21300000, guid: fd69d13156e74d540ae80d30ed9b638f, type: 3} - {fileID: 21300000, guid: 8557e6412e7e6464495c2efa8f5f2f78, type: 3} - {fileID: 21300000, guid: 447f8a5186ac53a4dab1c33c3a83cc08, type: 3} @@ -87,6 +88,7 @@ SpriteAtlas: - {fileID: 21300000, guid: f9818742fe98d6a45bd01d434ce7976b, type: 3} - {fileID: 21300000, guid: 71f19a527145f7a45a86a88e809c66ba, type: 3} - {fileID: 21300000, guid: b9543992e195f2f47a68966feb242e7a, type: 3} + - {fileID: 21300000, guid: 4e52f863d256e2b45aa84ecbf844ee89, type: 3} - {fileID: 21300000, guid: 1a3eea633d6dc9249b5caf2aee32cdfa, type: 3} - {fileID: 21300000, guid: 1bc3c283a34da0449809b61f0f78ec7a, type: 3} - {fileID: 21300000, guid: 78476f8317662dd4bb348718015e3658, type: 3} @@ -137,6 +139,7 @@ SpriteAtlas: - {fileID: 21300000, guid: c4514947f60678c4e90c498ef095db61, type: 3} - {fileID: 21300000, guid: 841a1467a1c47414c91ac18891f9c65d, type: 3} - {fileID: 21300000, guid: 4d5eca674cfc87745bd0c368f2270a6c, type: 3} + - {fileID: 21300000, guid: fdc5ec978c307224dbb7465f4698a226, type: 3} - {fileID: 21300000, guid: c9a70ad71344ef54cb824c55bdae85cb, type: 3} - {fileID: 21300000, guid: cfbd8cf77f2c1e941911324a3717bcf1, type: 3} - {fileID: 21300000, guid: baac6818c7f9ee248a78358bd8adf2ed, type: 3} @@ -243,6 +246,7 @@ SpriteAtlas: - common_btn_yellow_3 - common_board_106 - common_board_111 + - common_board_132 - common_board_101 - common_menu_2 - common_dec_21 @@ -258,6 +262,7 @@ SpriteAtlas: - common_title_11 - common_title_15 - common_title_6 + - common_board_131 - common_board_2 - common_board_25 - common_board_105 @@ -308,6 +313,7 @@ SpriteAtlas: - common_progress_4 - common_title_10 - common_bg_4 + - common_bg_7 - common_ad_4 - common_board_118 - common_board_13 diff --git a/Assets/arts/atlas/ui/daily_challenge.spriteatlas b/Assets/arts/atlas/ui/daily_challenge.spriteatlas index 991d1da69..498be8a9d 100644 --- a/Assets/arts/atlas/ui/daily_challenge.spriteatlas +++ b/Assets/arts/atlas/ui/daily_challenge.spriteatlas @@ -62,25 +62,19 @@ SpriteAtlas: m_MasterAtlas: {fileID: 0} m_PackedSprites: - {fileID: 21300000, guid: 45b80e20fe688ef45b04e1b37bb26b83, type: 3} - - {fileID: 21300000, guid: dc8a3702ac6dee74b9ecb91d0dc7f1f2, type: 3} - {fileID: 21300000, guid: 8e2ea7e29fa354444bb33f2a55d2139e, type: 3} - {fileID: 21300000, guid: e843643442bc8f84a85ab9f65f8331a0, type: 3} - {fileID: 21300000, guid: bd513be42a90eb34fa3e2c08bea32d99, type: 3} - - {fileID: 21300000, guid: 65f16667047638445b0a1726b5d82d81, type: 3} - {fileID: 21300000, guid: bb24738731881e742b8b668f9e12ec10, type: 3} - {fileID: 21300000, guid: 390d6248a7a2fcf408d0a276582978e7, type: 3} - - {fileID: 21300000, guid: f913666b4ff2e6d47880874f3b8924fa, type: 3} - {fileID: 21300000, guid: dc54318f908891e4a819c6f9cde70ad4, type: 3} m_PackedSpriteNamesToIndex: - daily_challenge_bg_2 - - daily_bg_3 - daily_buff_1 - daily_task_1 - daily_buff_2 - - daily_bg_1 - daily_challenge_bg_1 - daily_task_2 - - daily_bg_2 - daily_challenge_fire m_RenderDataMap: {} m_Tag: daily_challenge diff --git a/Assets/arts/textures/ui/daily_challenge/daily_bg_3.png b/Assets/arts/textures/ui/common/common_bg_7.png similarity index 100% rename from Assets/arts/textures/ui/daily_challenge/daily_bg_3.png rename to Assets/arts/textures/ui/common/common_bg_7.png diff --git a/Assets/arts/textures/ui/dungeon_armor/dungeon_armor_bg_10.png.meta b/Assets/arts/textures/ui/common/common_bg_7.png.meta similarity index 97% rename from Assets/arts/textures/ui/dungeon_armor/dungeon_armor_bg_10.png.meta rename to Assets/arts/textures/ui/common/common_bg_7.png.meta index d5699931c..64ccf8722 100644 --- a/Assets/arts/textures/ui/dungeon_armor/dungeon_armor_bg_10.png.meta +++ b/Assets/arts/textures/ui/common/common_bg_7.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: db1d18829278b4341829f6bfc6673cca +guid: fdc5ec978c307224dbb7465f4698a226 TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -128,5 +128,5 @@ TextureImporter: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: - assetBundleName: arts/textures/ui/dungeon_armor.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/textures/ui/dungeon_armor/dungeon_armor_bg_9.png b/Assets/arts/textures/ui/common/common_board_131.png similarity index 100% rename from Assets/arts/textures/ui/dungeon_armor/dungeon_armor_bg_9.png rename to Assets/arts/textures/ui/common/common_board_131.png diff --git a/Assets/arts/textures/ui/dungeon_armor/dungeon_armor_bg_9.png.meta b/Assets/arts/textures/ui/common/common_board_131.png.meta similarity index 97% rename from Assets/arts/textures/ui/dungeon_armor/dungeon_armor_bg_9.png.meta rename to Assets/arts/textures/ui/common/common_board_131.png.meta index 749c283c2..9a174a088 100644 --- a/Assets/arts/textures/ui/dungeon_armor/dungeon_armor_bg_9.png.meta +++ b/Assets/arts/textures/ui/common/common_board_131.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 132d84bd9510b644189b993123381e5c +guid: 4e52f863d256e2b45aa84ecbf844ee89 TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -128,5 +128,5 @@ TextureImporter: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: - assetBundleName: arts/textures/ui/dungeon_armor.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/textures/ui/daily_challenge/daily_bg_2.png b/Assets/arts/textures/ui/common/common_board_132.png similarity index 100% rename from Assets/arts/textures/ui/daily_challenge/daily_bg_2.png rename to Assets/arts/textures/ui/common/common_board_132.png diff --git a/Assets/arts/textures/ui/daily_challenge/daily_bg_3.png.meta b/Assets/arts/textures/ui/common/common_board_132.png.meta similarity index 97% rename from Assets/arts/textures/ui/daily_challenge/daily_bg_3.png.meta rename to Assets/arts/textures/ui/common/common_board_132.png.meta index 3a34e80bf..42413e0a0 100644 --- a/Assets/arts/textures/ui/daily_challenge/daily_bg_3.png.meta +++ b/Assets/arts/textures/ui/common/common_board_132.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: dc8a3702ac6dee74b9ecb91d0dc7f1f2 +guid: 2b61c72119833dc47ad00f1de32145c3 TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -128,5 +128,5 @@ TextureImporter: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: - assetBundleName: arts/textures/ui/daily_challenge.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/textures/ui/daily_challenge/daily_bg_1.png b/Assets/arts/textures/ui/daily_challenge/daily_bg_1.png deleted file mode 100644 index 0b8e9d5d5..000000000 Binary files a/Assets/arts/textures/ui/daily_challenge/daily_bg_1.png and /dev/null differ diff --git a/Assets/arts/textures/ui/daily_challenge/daily_bg_1.png.meta b/Assets/arts/textures/ui/daily_challenge/daily_bg_1.png.meta deleted file mode 100644 index 665ef8400..000000000 --- a/Assets/arts/textures/ui/daily_challenge/daily_bg_1.png.meta +++ /dev/null @@ -1,132 +0,0 @@ -fileFormatVersion: 2 -guid: 65f16667047638445b0a1726b5d82d81 -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 11 - mipmaps: - mipMapMode: 0 - enableMipMap: 0 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 1 - aniso: 1 - mipBias: 0 - wrapU: 1 - wrapV: 1 - wrapW: 1 - nPOTScale: 0 - lightmap: 0 - compressionQuality: 50 - spriteMode: 1 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 1 - spriteTessellationDetail: -1 - textureType: 8 - textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - platformSettings: - - serializedVersion: 3 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Android - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: 47 - textureCompression: 0 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 1 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: iPhone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: 50 - textureCompression: 0 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 1 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: 12 - textureCompression: 0 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 1 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: 5e97eb03825dee720800000000000000 - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: arts/textures/ui/daily_challenge.ab - assetBundleVariant: diff --git a/Assets/arts/textures/ui/daily_challenge/daily_bg_2.png.meta b/Assets/arts/textures/ui/daily_challenge/daily_bg_2.png.meta deleted file mode 100644 index 5cf4bc0a7..000000000 --- a/Assets/arts/textures/ui/daily_challenge/daily_bg_2.png.meta +++ /dev/null @@ -1,132 +0,0 @@ -fileFormatVersion: 2 -guid: f913666b4ff2e6d47880874f3b8924fa -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 11 - mipmaps: - mipMapMode: 0 - enableMipMap: 0 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 1 - aniso: 1 - mipBias: 0 - wrapU: 1 - wrapV: 1 - wrapW: 1 - nPOTScale: 0 - lightmap: 0 - compressionQuality: 50 - spriteMode: 1 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 1 - spriteTessellationDetail: -1 - textureType: 8 - textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - platformSettings: - - serializedVersion: 3 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Android - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: 47 - textureCompression: 0 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 1 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: iPhone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: 50 - textureCompression: 0 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 1 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: 12 - textureCompression: 0 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 1 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: 5e97eb03825dee720800000000000000 - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: arts/textures/ui/daily_challenge.ab - assetBundleVariant: diff --git a/Assets/arts/textures/ui/dungeon_armor/dungeon_armor_bg_10.png b/Assets/arts/textures/ui/dungeon_armor/dungeon_armor_bg_10.png deleted file mode 100644 index 9ec384b7b..000000000 Binary files a/Assets/arts/textures/ui/dungeon_armor/dungeon_armor_bg_10.png and /dev/null differ diff --git a/Assets/prefabs/ui/daily_challenge/daily_challenge_task_ui.prefab b/Assets/prefabs/ui/daily_challenge/daily_challenge_task_ui.prefab index e9fdea836..f0feb5e8c 100644 --- a/Assets/prefabs/ui/daily_challenge/daily_challenge_task_ui.prefab +++ b/Assets/prefabs/ui/daily_challenge/daily_challenge_task_ui.prefab @@ -408,7 +408,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: f913666b4ff2e6d47880874f3b8924fa, type: 3} + m_Sprite: {fileID: 21300000, guid: 2b61c72119833dc47ad00f1de32145c3, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -794,7 +794,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: f913666b4ff2e6d47880874f3b8924fa, type: 3} + m_Sprite: {fileID: 21300000, guid: 2b61c72119833dc47ad00f1de32145c3, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -869,7 +869,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: f913666b4ff2e6d47880874f3b8924fa, type: 3} + m_Sprite: {fileID: 21300000, guid: 2b61c72119833dc47ad00f1de32145c3, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1303,7 +1303,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: dc8a3702ac6dee74b9ecb91d0dc7f1f2, type: 3} + m_Sprite: {fileID: 21300000, guid: fdc5ec978c307224dbb7465f4698a226, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1378,7 +1378,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: dc8a3702ac6dee74b9ecb91d0dc7f1f2, type: 3} + m_Sprite: {fileID: 21300000, guid: fdc5ec978c307224dbb7465f4698a226, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1727,7 +1727,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: dc8a3702ac6dee74b9ecb91d0dc7f1f2, type: 3} + m_Sprite: {fileID: 21300000, guid: fdc5ec978c307224dbb7465f4698a226, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 diff --git a/Assets/prefabs/ui/dungeon_armor/dungeon_armor_task_ui.prefab b/Assets/prefabs/ui/dungeon_armor/dungeon_armor_task_ui.prefab index 93e2ac9d8..516f2ca1b 100644 --- a/Assets/prefabs/ui/dungeon_armor/dungeon_armor_task_ui.prefab +++ b/Assets/prefabs/ui/dungeon_armor/dungeon_armor_task_ui.prefab @@ -483,7 +483,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 132d84bd9510b644189b993123381e5c, type: 3} + m_Sprite: {fileID: 21300000, guid: 4e52f863d256e2b45aa84ecbf844ee89, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -874,7 +874,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 132d84bd9510b644189b993123381e5c, type: 3} + m_Sprite: {fileID: 21300000, guid: 4e52f863d256e2b45aa84ecbf844ee89, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1024,7 +1024,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 132d84bd9510b644189b993123381e5c, type: 3} + m_Sprite: {fileID: 21300000, guid: 4e52f863d256e2b45aa84ecbf844ee89, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1533,7 +1533,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 731ff0e15dcd7694b8f8d74f0a9b5075, type: 3} + m_Sprite: {fileID: 21300000, guid: fdc5ec978c307224dbb7465f4698a226, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1608,7 +1608,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 731ff0e15dcd7694b8f8d74f0a9b5075, type: 3} + m_Sprite: {fileID: 21300000, guid: fdc5ec978c307224dbb7465f4698a226, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1962,7 +1962,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 731ff0e15dcd7694b8f8d74f0a9b5075, type: 3} + m_Sprite: {fileID: 21300000, guid: fdc5ec978c307224dbb7465f4698a226, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 diff --git a/Assets/prefabs/ui/dungeon_rune/dungeon_rune_task_ui.prefab b/Assets/prefabs/ui/dungeon_rune/dungeon_rune_task_ui.prefab index 203c14518..2f496bc02 100644 --- a/Assets/prefabs/ui/dungeon_rune/dungeon_rune_task_ui.prefab +++ b/Assets/prefabs/ui/dungeon_rune/dungeon_rune_task_ui.prefab @@ -35,7 +35,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} m_AnchoredPosition: {x: 157, y: 0} - m_SizeDelta: {x: 336, y: 50} + m_SizeDelta: {x: 280, y: 50} m_Pivot: {x: 0, y: 0.5} --- !u!222 &4234767351712115475 CanvasRenderer: @@ -244,7 +244,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} m_AnchoredPosition: {x: 157, y: 0} - m_SizeDelta: {x: 336, y: 50} + m_SizeDelta: {x: 280, y: 50} m_Pivot: {x: 0, y: 0.5} --- !u!222 &3749313840020239520 CanvasRenderer: @@ -375,11 +375,11 @@ RectTransform: m_Father: {fileID: 899065938505670710} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 90, y: -86} - m_SizeDelta: {x: 45, y: 35} - m_Pivot: {x: 0, y: 1} + m_AnchorMin: {x: 1, y: 0.5} + m_AnchorMax: {x: 1, y: 0.5} + m_AnchoredPosition: {x: -42, y: 0} + m_SizeDelta: {x: 56, y: 46} + m_Pivot: {x: 1, y: 0.5} --- !u!222 &6138462071154151278 CanvasRenderer: m_ObjectHideFlags: 0 @@ -916,11 +916,11 @@ RectTransform: m_Father: {fileID: 2641478515053821968} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 90, y: -86} - m_SizeDelta: {x: 45, y: 35} - m_Pivot: {x: 0, y: 1} + m_AnchorMin: {x: 1, y: 0.5} + m_AnchorMax: {x: 1, y: 0.5} + m_AnchoredPosition: {x: -42, y: 0} + m_SizeDelta: {x: 56, y: 46} + m_Pivot: {x: 1, y: 0.5} --- !u!222 &3604958411644613099 CanvasRenderer: m_ObjectHideFlags: 0 @@ -1219,7 +1219,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} m_AnchoredPosition: {x: 157, y: 0} - m_SizeDelta: {x: 336, y: 50} + m_SizeDelta: {x: 280, y: 50} m_Pivot: {x: 0, y: 0.5} --- !u!222 &2561301626400338100 CanvasRenderer: @@ -1350,11 +1350,11 @@ RectTransform: m_Father: {fileID: 1096127962611753283} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 90, y: -86} - m_SizeDelta: {x: 45, y: 35} - m_Pivot: {x: 0, y: 1} + m_AnchorMin: {x: 1, y: 0.5} + m_AnchorMax: {x: 1, y: 0.5} + m_AnchoredPosition: {x: -42, y: 0} + m_SizeDelta: {x: 56, y: 46} + m_Pivot: {x: 1, y: 0.5} --- !u!222 &9176958553879879294 CanvasRenderer: m_ObjectHideFlags: 0