diff --git a/Assets/arts/atlas/icon/skill_buff.asset b/Assets/arts/atlas/icon/skill_buff.asset deleted file mode 100644 index 93055d5ba..000000000 --- a/Assets/arts/atlas/icon/skill_buff.asset +++ /dev/null @@ -1,73 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 3a48bfa163a714a6d8469f9c542e223f, type: 3} - m_Name: skill_buff - m_EditorClassIdentifier: - spriteList: - - {fileID: 21300000, guid: 4aabe9d6fae60f1418cbbe1ad5d16af6, type: 3} - - {fileID: 21300000, guid: 3a208e2d84e47d84ba78af17b403c598, type: 3} - - {fileID: 21300000, guid: 6c7f25c1e372deb4da82fc5a059a1c41, type: 3} - - {fileID: 21300000, guid: 530c7ff35048e0246b4c1a3b6ddadf33, type: 3} - - {fileID: 21300000, guid: 925ff6c43a912724098bf9f7ae117ec6, type: 3} - - {fileID: 21300000, guid: 366996b062c626849861de9ef712e818, type: 3} - - {fileID: 21300000, guid: ce80e9d2871b2564ebc7c3caa8227374, type: 3} - - {fileID: 21300000, guid: 2c36fe882f17ae24487b1304f55e3ca4, type: 3} - - {fileID: 21300000, guid: b69147a8e4db03b48903d950c17220cf, type: 3} - - {fileID: 21300000, guid: 7be70d35cb44d934287e05ba3a68b3b6, type: 3} - - {fileID: 21300000, guid: 6143b0b426becec4d9d79da27bea0e4a, type: 3} - - {fileID: 21300000, guid: eec6200f85ae2d141baf795c661b7b70, type: 3} - - {fileID: 21300000, guid: 1983c02e311e5814faeebbe5d2543fa6, type: 3} - - {fileID: 21300000, guid: 27c7d09e4b7d64445974e945fcc85ef6, type: 3} - - {fileID: 21300000, guid: 12d3c0f225f8d964c8d7b84d93dbec09, type: 3} - - {fileID: 21300000, guid: 56da4d1d607e5d44896371ad2ce01b6b, type: 3} - - {fileID: 21300000, guid: be093d34894495e46b13fcb33ec1c2b5, type: 3} - - {fileID: 21300000, guid: 274c285614a5ad1448ba8ce1d5d54c64, type: 3} - - {fileID: 21300000, guid: fe2ecd779704aa84185f84343490a61e, type: 3} - - {fileID: 21300000, guid: aa7bb0c736342b74c8ed3c2134e713c9, type: 3} - - {fileID: 21300000, guid: fa35f309dbb5fdf4888fda36aa77e219, type: 3} - - {fileID: 21300000, guid: eccc4caa47583b6489ff74607093b218, type: 3} - - {fileID: 21300000, guid: 71608458ddf105841a1c30bb15a9f865, type: 3} - - {fileID: 21300000, guid: fb0cd1f02297e1347a8fb5bd2029eb28, type: 3} - - {fileID: 21300000, guid: bef798640dff2b84282d49f7e5cf5cd7, type: 3} - - {fileID: 21300000, guid: be11b7af3c77dc546b0d48ca9998d6ff, type: 3} - - {fileID: 21300000, guid: 578c9fe5b45fea24ea45e60f52a360e3, type: 3} - - {fileID: 21300000, guid: f151ac3d48b6abe4ba02bce09f55ea72, type: 3} - - {fileID: 21300000, guid: b4d1ef8033bb66246b086fdf8222842a, type: 3} - - {fileID: 21300000, guid: 574f9bc20f8820c48803c09c844fd4b1, type: 3} - - {fileID: 21300000, guid: e03003707006d8c488873b2f7649ee5b, type: 3} - - {fileID: 21300000, guid: 3545237931fcdf44a81d0d5d710b7940, type: 3} - - {fileID: 21300000, guid: feebb0951f5245740b45f61953c499fc, type: 3} - - {fileID: 21300000, guid: cd83f3640fd29d44699f94651a7a6abe, type: 3} - - {fileID: 21300000, guid: 9d72572f5ee0375429f03dfb9874ef83, type: 3} - - {fileID: 21300000, guid: fabaa2c4d092bc34497130dd91ac972a, type: 3} - - {fileID: 21300000, guid: 5a4b121d6371c174e9c3eb26f672ae35, type: 3} - - {fileID: 21300000, guid: b9843b9275cab4a498eadadd06670054, type: 3} - - {fileID: 21300000, guid: ab24d5e243518ba479c7e306be4e1ebc, type: 3} - - {fileID: 21300000, guid: bd72b0fed3749cc43bcab10abdbce60c, type: 3} - - {fileID: 21300000, guid: 500aa7d09c93a5644836330d54e679af, type: 3} - - {fileID: 21300000, guid: 379ff7bf65a20384f963b50ec770b813, type: 3} - - {fileID: 21300000, guid: ad2cad7404a3be04e9ccf883de3ce02a, type: 3} - - {fileID: 21300000, guid: 7ba68be1ea786514d8ce2f2ad0f3b9aa, type: 3} - - {fileID: 21300000, guid: b71180d62cfe9e94495980f7c8164936, type: 3} - - {fileID: 21300000, guid: c1b145bb216a2a44ea2610caabd576f8, type: 3} - - {fileID: 21300000, guid: d5d37b0be59f5a0409aac0202e2cd4e6, type: 3} - - {fileID: 21300000, guid: a305e93594856a542831ed8d411b79ee, type: 3} - - {fileID: 21300000, guid: 6f316fd063bb43942aec8680fc598486, type: 3} - - {fileID: 21300000, guid: 985d0d2f3126e384faf371be9356322d, type: 3} - - {fileID: 21300000, guid: bc9cc600fab2c2e45b4b7600d517c053, type: 3} - - {fileID: 21300000, guid: ecd483b9b34b1bc4ab876b366d542926, type: 3} - - {fileID: 21300000, guid: 80061c9da2a2edb4c8092285767e61b0, type: 3} - - {fileID: 21300000, guid: d37bfaf391be3b34283934b13e77632e, type: 3} - - {fileID: 21300000, guid: 58b5441136017ef418dcb148b831feed, type: 3} - - {fileID: 21300000, guid: 0d8f3f351c407c043a31f3ce30e7d8ef, type: 3} - - {fileID: 21300000, guid: 688f3dc14b978ce418a6d77e807e22f3, type: 3} - spriteNameList: 310000001f060000200600002106000022060000230600002406000025060000260600002706000028060000320000003e0600003f0600004006000041060000420600004306000044060000450600004606000047060000330000005d0600005e0600005f06000060060000610600006206000063060000640600006506000066060000340000007c0600007d0600007e0600007f060000800600008106000082060000830600008406000085060000350000009b0600009c0600009d0600009e0600009f06000036000000370000003800000039000000e00dcedbe10dcedbe20dcedb diff --git a/Assets/arts/atlas/ui/hero.asset b/Assets/arts/atlas/ui/hero.asset index 2fe8897ff..d561b4489 100644 --- a/Assets/arts/atlas/ui/hero.asset +++ b/Assets/arts/atlas/ui/hero.asset @@ -13,10 +13,11 @@ MonoBehaviour: m_Name: hero m_EditorClassIdentifier: spriteList: + - {fileID: 21300000, guid: 1ccd54c8189c82c42a429b7dc78b0302, type: 3} - {fileID: 21300000, guid: c5b636b42c0365744914663e4752e5d5, type: 3} - {fileID: 21300000, guid: 2406b504a91c18b43af5f1e8479825e4, type: 3} - {fileID: 21300000, guid: cda2aa3241ac98f4ba89e3debd597c08, type: 3} - {fileID: 21300000, guid: da36a68e123533e4797476431612061c, type: 3} - {fileID: 21300000, guid: 4c3d0a48af89a864bb285ebc163b77b5, type: 3} - {fileID: 21300000, guid: 31673d61953a1bb40a63b2fa93367988, type: 3} - spriteNameList: af66bc96b066bc96b166bc96b266bc96b366bc96b466bc96 + spriteNameList: dceffc88af66bc96b066bc96b166bc96b266bc96b366bc96b466bc96 diff --git a/Assets/arts/atlas/ui/hero.spriteatlas b/Assets/arts/atlas/ui/hero.spriteatlas index 6d51bf7c8..055f6920f 100644 --- a/Assets/arts/atlas/ui/hero.spriteatlas +++ b/Assets/arts/atlas/ui/hero.spriteatlas @@ -66,6 +66,7 @@ SpriteAtlas: - {fileID: 21300000, guid: 2406b504a91c18b43af5f1e8479825e4, type: 3} - {fileID: 21300000, guid: c5b636b42c0365744914663e4752e5d5, type: 3} - {fileID: 21300000, guid: 4c3d0a48af89a864bb285ebc163b77b5, type: 3} + - {fileID: 21300000, guid: 1ccd54c8189c82c42a429b7dc78b0302, type: 3} - {fileID: 21300000, guid: da36a68e123533e4797476431612061c, type: 3} m_PackedSpriteNamesToIndex: - hero_dec_6 @@ -73,6 +74,7 @@ SpriteAtlas: - hero_dec_2 - hero_dec_1 - hero_dec_5 + - hero_bg_1 - hero_dec_4 m_RenderDataMap: {} m_Tag: hero diff --git a/Assets/arts/atlas/ui/login.asset b/Assets/arts/atlas/ui/login.asset new file mode 100644 index 000000000..99111732c --- /dev/null +++ b/Assets/arts/atlas/ui/login.asset @@ -0,0 +1,17 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3a48bfa163a714a6d8469f9c542e223f, type: 3} + m_Name: login + m_EditorClassIdentifier: + spriteList: + - {fileID: 21300000, guid: f5d8239cd8995a745bdc76064dae90c7, type: 3} + spriteNameList: 01dd9078 diff --git a/Assets/arts/atlas/icon/skill_buff.asset.meta b/Assets/arts/atlas/ui/login.asset.meta similarity index 79% rename from Assets/arts/atlas/icon/skill_buff.asset.meta rename to Assets/arts/atlas/ui/login.asset.meta index 721725c7e..bc9617bd0 100644 --- a/Assets/arts/atlas/icon/skill_buff.asset.meta +++ b/Assets/arts/atlas/ui/login.asset.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: f6e55aca899cb3f43bafa4661ffe0f20 +guid: 9c0bf12b65cdba34487b535e1c618b91 NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/Assets/arts/atlas/ui/login.spriteatlas b/Assets/arts/atlas/ui/login.spriteatlas new file mode 100644 index 000000000..d8db6f7be --- /dev/null +++ b/Assets/arts/atlas/ui/login.spriteatlas @@ -0,0 +1,69 @@ +%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: login + 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: + - {fileID: 102900000, guid: 71998bfa508817541afabd1449d80180, type: 3} + bindAsDefault: 1 + isAtlasV2: 0 + cachedData: {fileID: 0} + m_MasterAtlas: {fileID: 0} + m_PackedSprites: + - {fileID: 21300000, guid: f5d8239cd8995a745bdc76064dae90c7, type: 3} + m_PackedSpriteNamesToIndex: + - login_cn + m_RenderDataMap: {} + m_Tag: login + m_IsVariant: 0 diff --git a/Assets/arts/atlas/ui/login.spriteatlas.meta b/Assets/arts/atlas/ui/login.spriteatlas.meta new file mode 100644 index 000000000..6ac201877 --- /dev/null +++ b/Assets/arts/atlas/ui/login.spriteatlas.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: be61d5fc1a1e8c548aff843b957f4680 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 4343727234628468602 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/arts/textures/background/battle/chessboard_2.png b/Assets/arts/textures/background/battle/chessboard_2.png index acebfdb1a..6dd254db2 100644 Binary files a/Assets/arts/textures/background/battle/chessboard_2.png and b/Assets/arts/textures/background/battle/chessboard_2.png differ diff --git a/Assets/arts/textures/background/battle/chessboard_2.png.meta b/Assets/arts/textures/background/battle/chessboard_2.png.meta index 49323a00d..94904688c 100644 --- a/Assets/arts/textures/background/battle/chessboard_2.png.meta +++ b/Assets/arts/textures/background/battle/chessboard_2.png.meta @@ -50,7 +50,7 @@ TextureImporter: spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 - alphaIsTransparency: 0 + alphaIsTransparency: 1 spriteTessellationDetail: -1 textureType: 0 textureShape: 1 @@ -99,6 +99,18 @@ TextureImporter: overridden: 1 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + 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: [] diff --git a/Assets/arts/textures/background/hero/hero_bg_1.png b/Assets/arts/textures/background/hero/hero_bg_1.png index 0f41e6231..ff97a3637 100644 Binary files a/Assets/arts/textures/background/hero/hero_bg_1.png and b/Assets/arts/textures/background/hero/hero_bg_1.png differ diff --git a/Assets/arts/textures/background/main/main_city_bg_1.png b/Assets/arts/textures/background/main/main_city_bg_1.png index a14b9c8c5..89e68827f 100644 Binary files a/Assets/arts/textures/background/main/main_city_bg_1.png and b/Assets/arts/textures/background/main/main_city_bg_1.png differ diff --git a/Assets/arts/textures/icon/hero/frame_2.png.meta b/Assets/arts/textures/icon/hero/frame_2.png.meta index a7c6ce1d5..e9c4140b9 100644 --- a/Assets/arts/textures/icon/hero/frame_2.png.meta +++ b/Assets/arts/textures/icon/hero/frame_2.png.meta @@ -47,7 +47,7 @@ TextureImporter: alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteBorder: {x: 62, y: 32, z: 62, w: 159} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 alphaIsTransparency: 1 diff --git a/Assets/arts/textures/ui/common/common_bg_1.png b/Assets/arts/textures/ui/common/common_bg_1.png index 2a45bac61..f5834d63e 100644 Binary files a/Assets/arts/textures/ui/common/common_bg_1.png and b/Assets/arts/textures/ui/common/common_bg_1.png differ diff --git a/Assets/arts/textures/ui/common/common_bg_2.png b/Assets/arts/textures/ui/common/common_bg_2.png index bb5adbff0..029ebd0e1 100644 Binary files a/Assets/arts/textures/ui/common/common_bg_2.png and b/Assets/arts/textures/ui/common/common_bg_2.png differ diff --git a/Assets/arts/textures/ui/hero/hero_bg_1.png b/Assets/arts/textures/ui/hero/hero_bg_1.png new file mode 100644 index 000000000..e158ddd72 Binary files /dev/null and b/Assets/arts/textures/ui/hero/hero_bg_1.png differ diff --git a/Assets/arts/textures/ui/hero/hero_bg_1.png.meta b/Assets/arts/textures/ui/hero/hero_bg_1.png.meta new file mode 100644 index 000000000..ad780b4ea --- /dev/null +++ b/Assets/arts/textures/ui/hero/hero_bg_1.png.meta @@ -0,0 +1,132 @@ +fileFormatVersion: 2 +guid: 1ccd54c8189c82c42a429b7dc78b0302 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 47 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 50 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 12 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/arts/textures/ui/login.meta b/Assets/arts/textures/ui/login.meta new file mode 100644 index 000000000..82c42da4d --- /dev/null +++ b/Assets/arts/textures/ui/login.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 71998bfa508817541afabd1449d80180 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/arts/textures/ui/login/login_cn.png b/Assets/arts/textures/ui/login/login_cn.png new file mode 100644 index 000000000..9b65ac9e8 Binary files /dev/null and b/Assets/arts/textures/ui/login/login_cn.png differ diff --git a/Assets/arts/textures/ui/login/login_cn.png.meta b/Assets/arts/textures/ui/login/login_cn.png.meta new file mode 100644 index 000000000..829f97de9 --- /dev/null +++ b/Assets/arts/textures/ui/login/login_cn.png.meta @@ -0,0 +1,132 @@ +fileFormatVersion: 2 +guid: f5d8239cd8995a745bdc76064dae90c7 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 47 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 50 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 12 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/prefabs/ui/battle/battle_pause_ui.prefab b/Assets/prefabs/ui/battle/battle_pause_ui.prefab index 8786333c1..2622593a4 100644 --- a/Assets/prefabs/ui/battle/battle_pause_ui.prefab +++ b/Assets/prefabs/ui/battle/battle_pause_ui.prefab @@ -235,7 +235,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: 0} + m_AnchoredPosition: {x: 0, y: 4} m_SizeDelta: {x: 36, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7758938756533484639 @@ -558,7 +558,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2} - m_Color: {r: 0, g: 0, b: 0, a: 0.74509805} + m_Color: {r: 0, g: 0, b: 0, a: 0.972549} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -750,7 +750,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: 0} + m_AnchoredPosition: {x: 0, y: 4} m_SizeDelta: {x: 48, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1752165177841096906 diff --git a/Assets/prefabs/ui/battle/battle_skill_select_ui.prefab b/Assets/prefabs/ui/battle/battle_skill_select_ui.prefab index d7a7d2278..d4041c691 100644 --- a/Assets/prefabs/ui/battle/battle_skill_select_ui.prefab +++ b/Assets/prefabs/ui/battle/battle_skill_select_ui.prefab @@ -1,5 +1,77 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &80214517956864511 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8791040051132454713} + - component: {fileID: 2005231829015718701} + - component: {fileID: 1608137087619731269} + m_Layer: 0 + m_Name: bg_1 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8791040051132454713 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 80214517956864511} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 4165930251451731960} + m_RootOrder: 1 + 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: 83} + m_SizeDelta: {x: 702, y: 702} + m_Pivot: {x: 0.5, y: 0} +--- !u!222 &2005231829015718701 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 80214517956864511} + m_CullTransparentMesh: 1 +--- !u!114 &1608137087619731269 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 80214517956864511} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, 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_Texture: {fileID: 2800000, guid: 067078ea215b4454dad4f5ff865004e5, type: 3} + m_UVRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 --- !u!1 &256286296675480759 GameObject: m_ObjectHideFlags: 0 @@ -981,7 +1053,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 4165930251451731960} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} @@ -1206,7 +1278,7 @@ RectTransform: - {fileID: 8019660072196121656} - {fileID: 4537208357357831650} m_Father: {fileID: 4165930251451731960} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} @@ -1256,6 +1328,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 7870804908802134986} + - {fileID: 8791040051132454713} - {fileID: 4201750005051344089} - {fileID: 9154371687382474293} m_Father: {fileID: 0} @@ -1688,16 +1761,16 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 1dcff29ab43a9e1428c119da472871a8, type: 3} ---- !u!224 &8099719434941304125 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 9110043562113854995, guid: 1dcff29ab43a9e1428c119da472871a8, type: 3} - m_PrefabInstance: {fileID: 1011792260408304430} - m_PrefabAsset: {fileID: 0} --- !u!1 &8486507067540819150 stripped GameObject: m_CorrespondingSourceObject: {fileID: 8920710045876662240, guid: 1dcff29ab43a9e1428c119da472871a8, type: 3} m_PrefabInstance: {fileID: 1011792260408304430} m_PrefabAsset: {fileID: 0} +--- !u!224 &8099719434941304125 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 9110043562113854995, guid: 1dcff29ab43a9e1428c119da472871a8, type: 3} + m_PrefabInstance: {fileID: 1011792260408304430} + m_PrefabAsset: {fileID: 0} --- !u!1001 &3455879069538119638 PrefabInstance: m_ObjectHideFlags: 0 @@ -1902,13 +1975,13 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 1dcff29ab43a9e1428c119da472871a8, type: 3} ---- !u!1 &1766169501049604215 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 8920710045876662240, guid: 1dcff29ab43a9e1428c119da472871a8, type: 3} - m_PrefabInstance: {fileID: 7155669263675320215} - m_PrefabAsset: {fileID: 0} --- !u!224 &2099639577004018052 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 9110043562113854995, guid: 1dcff29ab43a9e1428c119da472871a8, type: 3} m_PrefabInstance: {fileID: 7155669263675320215} m_PrefabAsset: {fileID: 0} +--- !u!1 &1766169501049604215 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 8920710045876662240, guid: 1dcff29ab43a9e1428c119da472871a8, type: 3} + m_PrefabInstance: {fileID: 7155669263675320215} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/prefabs/ui/common/currency_cell.prefab b/Assets/prefabs/ui/common/currency_cell.prefab index 892a6ef64..2b68618ef 100644 --- a/Assets/prefabs/ui/common/currency_cell.prefab +++ b/Assets/prefabs/ui/common/currency_cell.prefab @@ -166,10 +166,10 @@ RectTransform: m_Father: {fileID: 2561740748560008671} m_RootOrder: 2 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: 22, y: 0} - m_SizeDelta: {x: 80, y: 22} + m_AnchorMin: {x: 1, y: 0.5} + m_AnchorMax: {x: 1, y: 0.5} + m_AnchoredPosition: {x: -94, y: 0} + m_SizeDelta: {x: 84, y: 22} m_Pivot: {x: 0, y: 0.5} --- !u!222 &293606954239979409 CanvasRenderer: @@ -202,7 +202,7 @@ MonoBehaviour: m_text: m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: b0c1339d1d91a8846affd442449dbf31, type: 2} - m_sharedMaterial: {fileID: 2100000, guid: 156e0fd603636ea43841d960f99b6967, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: 2e0b5790ea0ce0a4eb6bf1b8b43a6bda, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -520,7 +520,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: 130, y: 40} + m_SizeDelta: {x: 130, y: 36} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1738945440303635954 CanvasRenderer: @@ -550,7 +550,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 4c8f9db6b4c3d474ebacc7496c8a9693, type: 3} + m_Sprite: {fileID: 21300000, guid: 89783d5ddc9ab034687ff93732ebdfe0, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 diff --git a/Assets/prefabs/ui/common/large_hero_cell.prefab b/Assets/prefabs/ui/common/large_hero_cell.prefab index cb4d1bb82..0c8b03ce1 100644 --- a/Assets/prefabs/ui/common/large_hero_cell.prefab +++ b/Assets/prefabs/ui/common/large_hero_cell.prefab @@ -34,7 +34,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 0, y: -139} + m_AnchoredPosition: {x: 0, y: -140} m_SizeDelta: {x: 89, y: 31} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &947635007800789414 @@ -170,7 +170,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 0, y: -155} + m_AnchoredPosition: {x: 0, y: -158} m_SizeDelta: {x: 106, y: 52} m_Pivot: {x: 0.5, y: 1} --- !u!222 &6352508113697031377 @@ -260,7 +260,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 0, y: -214} + m_AnchoredPosition: {x: 0, y: -217} m_SizeDelta: {x: 106, y: 52} m_Pivot: {x: 0.5, y: 1} --- !u!222 &7641779105496464157 @@ -670,7 +670,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_Sprite: {fileID: 21300000, guid: 5f59eb2671e1f8047bb5c912ab31a4e9, type: 3} - m_Type: 0 + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 diff --git a/Assets/prefabs/ui/hero/hero_detail_ui.prefab b/Assets/prefabs/ui/hero/hero_detail_ui.prefab index 1a7fdebe8..362e6c14b 100644 --- a/Assets/prefabs/ui/hero/hero_detail_ui.prefab +++ b/Assets/prefabs/ui/hero/hero_detail_ui.prefab @@ -34,7 +34,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 5.0899963, y: 0} + m_AnchoredPosition: {x: 5, y: 2} m_SizeDelta: {x: 32, y: 32} m_Pivot: {x: 0.5, y: 1} --- !u!222 &1172209989558395431 @@ -184,7 +184,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 228, y: -96} + m_AnchoredPosition: {x: 228, y: -92} m_SizeDelta: {x: 200, y: 36} m_Pivot: {x: 0, y: 1} --- !u!222 &5276734544451298542 @@ -576,14 +576,14 @@ MonoBehaviour: m_Calls: [] m_text: m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 9d1aadd9ebaf54ce2b217ab8427fa0db, type: 2} - m_sharedMaterial: {fileID: 2100000, guid: d9526b8cb4bc030488db413ef429c6f9, type: 2} + m_fontAsset: {fileID: 11400000, guid: b0c1339d1d91a8846affd442449dbf31, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: 2e0b5790ea0ce0a4eb6bf1b8b43a6bda, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4294957231 + rgba: 4294967295 m_fontColor: {r: 1, g: 1, b: 1, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 @@ -601,8 +601,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 24 - m_fontSizeBase: 24 + m_fontSize: 26 + m_fontSizeBase: 26 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -2071,7 +2071,7 @@ RectTransform: 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: 316, y: 260} + m_AnchoredPosition: {x: 326, y: 260} m_SizeDelta: {x: 56, y: 56} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1456058682979890450 @@ -2221,7 +2221,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 344, y: -148} + m_AnchoredPosition: {x: 354, y: -148} m_SizeDelta: {x: 138, y: 36} m_Pivot: {x: 0, y: 1} --- !u!222 &1341048401942300793 @@ -2715,8 +2715,8 @@ MonoBehaviour: m_Calls: [] m_text: m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 9d1aadd9ebaf54ce2b217ab8427fa0db, type: 2} - m_sharedMaterial: {fileID: 2100000, guid: d9526b8cb4bc030488db413ef429c6f9, type: 2} + m_fontAsset: {fileID: 11400000, guid: b0c1339d1d91a8846affd442449dbf31, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: 2e0b5790ea0ce0a4eb6bf1b8b43a6bda, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -2740,8 +2740,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 24 - m_fontSizeBase: 24 + m_fontSize: 26 + m_fontSizeBase: 26 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -3104,7 +3104,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2} - m_Color: {r: 0, g: 0, b: 0, a: 0.74509805} + m_Color: {r: 0, g: 0, b: 0, a: 0.972549} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -3679,7 +3679,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: a70289eca986ce142b027934f6cdd63c, type: 3} + m_Sprite: {fileID: 21300000, guid: 1ccd54c8189c82c42a429b7dc78b0302, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -4076,7 +4076,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 316, y: -144} + m_AnchoredPosition: {x: 326, y: -144} m_SizeDelta: {x: 170, y: 44} m_Pivot: {x: 0, y: 1} --- !u!222 &4619978621486377381 @@ -4579,7 +4579,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 829c31a0f5439a94caee22785f2edfdc, type: 3} + m_Sprite: {fileID: 21300000, guid: 1ccd54c8189c82c42a429b7dc78b0302, type: 3} m_Type: 3 m_PreserveAspect: 0 m_FillCenter: 1 diff --git a/Assets/prefabs/ui/hero/hero_ui.prefab b/Assets/prefabs/ui/hero/hero_ui.prefab index c217a0303..2195ea5b2 100644 --- a/Assets/prefabs/ui/hero/hero_ui.prefab +++ b/Assets/prefabs/ui/hero/hero_ui.prefab @@ -118,14 +118,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_Children: [] + m_Children: + - {fileID: 3176947851259523035} m_Father: {fileID: 8461932745927490369} 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: 0, y: 0} - m_SizeDelta: {x: 720, y: 460} + m_SizeDelta: {x: 1280, y: 534} m_Pivot: {x: 0.5, y: 1} --- !u!222 &7754779906364680016 CanvasRenderer: @@ -401,10 +402,10 @@ RectTransform: 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: -51.73352} - m_SizeDelta: {x: 720, y: 749.81} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 0, y: -1670.8} + m_SizeDelta: {x: 720, y: 2972} m_Pivot: {x: 0.5, y: 0.6} --- !u!114 &7141566688789457768 MonoBehaviour: @@ -672,8 +673,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 410} - m_SizeDelta: {x: 0, y: -820} + m_AnchoredPosition: {x: 0, y: 372} + m_SizeDelta: {x: 0, y: -896} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &4646135893159883983 GameObject: @@ -923,6 +924,216 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 670, y: 220} m_Pivot: {x: 0.5, y: 0} +--- !u!1 &4992365693003851834 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1873121481150386299} + - component: {fileID: 2288057476840783197} + - component: {fileID: 6955801923664015388} + m_Layer: 0 + m_Name: title_tx + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1873121481150386299 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4992365693003851834} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 3176947851259523035} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 6} + m_SizeDelta: {x: 200, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2288057476840783197 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4992365693003851834} + m_CullTransparentMesh: 1 +--- !u!114 &6955801923664015388 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4992365693003851834} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, 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_text: + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 9d1aadd9ebaf54ce2b217ab8427fa0db, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: d9526b8cb4bc030488db413ef429c6f9, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 36 + m_fontSizeBase: 36 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 0 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &5184948843245033786 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3176947851259523035} + - component: {fileID: 8235367312161999114} + - component: {fileID: 2198591828565077730} + m_Layer: 0 + m_Name: title_bg_img + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3176947851259523035 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5184948843245033786} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 1873121481150386299} + m_Father: {fileID: 5874475964210216752} + 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: -142} + m_SizeDelta: {x: 372, y: 74} + m_Pivot: {x: 0.5, y: 1} +--- !u!222 &8235367312161999114 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5184948843245033786} + m_CullTransparentMesh: 1 +--- !u!114 &2198591828565077730 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5184948843245033786} + 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: 3df1f1c0900d28e48958abf63b77fd5e, type: 3} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!1 &5688313113364308912 GameObject: m_ObjectHideFlags: 0 @@ -1370,7 +1581,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: 720, y: 749.81} + m_SizeDelta: {x: 720, y: 1954} m_Pivot: {x: 0.5, y: 1} --- !u!222 &3231478445068643713 CanvasRenderer: @@ -1688,7 +1899,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: 720, y: 749.81} + m_SizeDelta: {x: 720, y: 1954} m_Pivot: {x: 0.5, y: 1} --- !u!114 &822048272817942488 MonoBehaviour: @@ -1867,7 +2078,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: 471a678dc340f4f43b842474749cf0df, type: 3} propertyPath: m_AnchoredPosition.x - value: 90 + value: 84 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: 471a678dc340f4f43b842474749cf0df, type: 3} propertyPath: m_AnchoredPosition.y @@ -1982,7 +2193,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: cfa61de4a14c0a74db02811a55d1a8c7, type: 3} propertyPath: m_AnchoredPosition.x - value: -89.7 + value: -84 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: cfa61de4a14c0a74db02811a55d1a8c7, type: 3} propertyPath: m_AnchoredPosition.y @@ -2010,16 +2221,16 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: cfa61de4a14c0a74db02811a55d1a8c7, type: 3} ---- !u!224 &3870527576532518979 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 2568998946116628564, guid: cfa61de4a14c0a74db02811a55d1a8c7, type: 3} - m_PrefabInstance: {fileID: 1589782474373822487} - m_PrefabAsset: {fileID: 0} --- !u!1 &5416161667677924765 stripped GameObject: m_CorrespondingSourceObject: {fileID: 6717709196054680970, guid: cfa61de4a14c0a74db02811a55d1a8c7, type: 3} m_PrefabInstance: {fileID: 1589782474373822487} m_PrefabAsset: {fileID: 0} +--- !u!224 &3870527576532518979 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 2568998946116628564, guid: cfa61de4a14c0a74db02811a55d1a8c7, type: 3} + m_PrefabInstance: {fileID: 1589782474373822487} + m_PrefabAsset: {fileID: 0} --- !u!1001 &5266586851126525874 PrefabInstance: m_ObjectHideFlags: 0 @@ -2093,7 +2304,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: 471a678dc340f4f43b842474749cf0df, type: 3} propertyPath: m_AnchoredPosition.x - value: 267 + value: 255 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: 471a678dc340f4f43b842474749cf0df, type: 3} propertyPath: m_AnchoredPosition.y @@ -2125,16 +2336,16 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 471a678dc340f4f43b842474749cf0df, type: 3} ---- !u!1 &1453734956354595384 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 6717709196054680970, guid: 471a678dc340f4f43b842474749cf0df, type: 3} - m_PrefabInstance: {fileID: 5266586851126525874} - m_PrefabAsset: {fileID: 0} --- !u!224 &7687721771386130406 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 2568998946116628564, guid: 471a678dc340f4f43b842474749cf0df, type: 3} m_PrefabInstance: {fileID: 5266586851126525874} m_PrefabAsset: {fileID: 0} +--- !u!1 &1453734956354595384 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 6717709196054680970, guid: 471a678dc340f4f43b842474749cf0df, type: 3} + m_PrefabInstance: {fileID: 5266586851126525874} + m_PrefabAsset: {fileID: 0} --- !u!1001 &5905259576731938946 PrefabInstance: m_ObjectHideFlags: 0 @@ -2208,7 +2419,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: 471a678dc340f4f43b842474749cf0df, type: 3} propertyPath: m_AnchoredPosition.x - value: -267 + value: -255 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: 471a678dc340f4f43b842474749cf0df, type: 3} propertyPath: m_AnchoredPosition.y @@ -2323,7 +2534,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: 471a678dc340f4f43b842474749cf0df, type: 3} propertyPath: m_AnchoredPosition.x - value: -90 + value: -84 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: 471a678dc340f4f43b842474749cf0df, type: 3} propertyPath: m_AnchoredPosition.y diff --git a/Assets/prefabs/ui/login/login_ui.prefab b/Assets/prefabs/ui/login/login_ui.prefab index 4cefddd93..657d06a1c 100644 --- a/Assets/prefabs/ui/login/login_ui.prefab +++ b/Assets/prefabs/ui/login/login_ui.prefab @@ -339,7 +339,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.8601685} m_AnchorMax: {x: 0.5, y: 0.8601685} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 475, y: 296} + m_SizeDelta: {x: 346, y: 215} m_Pivot: {x: 0.5, y: 1} --- !u!222 &6606998168073101089 CanvasRenderer: @@ -369,7 +369,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: a70289eca986ce142b027934f6cdd63c, type: 3} + m_Sprite: {fileID: 21300000, guid: f5d8239cd8995a745bdc76064dae90c7, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -734,7 +734,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Texture: {fileID: 2800000, guid: 79681c1d9e2b29b49ba6bccbfed112b0, type: 3} + m_Texture: {fileID: 2800000, guid: 6fdb003cb9ba1e14bb77b744b5bb6c7c, type: 3} m_UVRect: serializedVersion: 2 x: 0 diff --git a/Assets/prefabs/ui/login/test_login_ui.prefab b/Assets/prefabs/ui/login/test_login_ui.prefab index 241237664..4e6020867 100644 --- a/Assets/prefabs/ui/login/test_login_ui.prefab +++ b/Assets/prefabs/ui/login/test_login_ui.prefab @@ -914,7 +914,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.8601685} m_AnchorMax: {x: 0.5, y: 0.8601685} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 475, y: 296} + m_SizeDelta: {x: 346, y: 215} m_Pivot: {x: 0.5, y: 1} --- !u!222 &4806986020387975939 CanvasRenderer: @@ -944,7 +944,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 1c6e013354e99e841b7b7f5be294a6e7, type: 3} + m_Sprite: {fileID: 21300000, guid: f5d8239cd8995a745bdc76064dae90c7, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1961,7 +1961,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Texture: {fileID: 2800000, guid: 79681c1d9e2b29b49ba6bccbfed112b0, type: 3} + m_Texture: {fileID: 2800000, guid: 6fdb003cb9ba1e14bb77b744b5bb6c7c, type: 3} m_UVRect: serializedVersion: 2 x: 0 diff --git a/Assets/prefabs/ui/main_city/main_comp.prefab b/Assets/prefabs/ui/main_city/main_comp.prefab index 0fcd8c667..a32600efb 100644 --- a/Assets/prefabs/ui/main_city/main_comp.prefab +++ b/Assets/prefabs/ui/main_city/main_comp.prefab @@ -35,7 +35,7 @@ RectTransform: 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: 111, y: 9} + m_AnchoredPosition: {x: 111, y: 5} m_SizeDelta: {x: 59, y: 54} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8823234576226998950 @@ -156,8 +156,8 @@ MonoBehaviour: m_Calls: [] m_text: m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 9d1aadd9ebaf54ce2b217ab8427fa0db, type: 2} - m_sharedMaterial: {fileID: 2100000, guid: d9526b8cb4bc030488db413ef429c6f9, type: 2} + m_fontAsset: {fileID: 11400000, guid: b0c1339d1d91a8846affd442449dbf31, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: 2e0b5790ea0ce0a4eb6bf1b8b43a6bda, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -446,8 +446,8 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 1977720900498427582} - - {fileID: 4218541309236846194} - {fileID: 8820620950456562659} + - {fileID: 4218541309236846194} m_Father: {fileID: 4165930251451731960} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -686,7 +686,7 @@ RectTransform: 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: 9} + m_AnchoredPosition: {x: 0, y: 5} m_SizeDelta: {x: 59, y: 54} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &406414493140495346 @@ -920,7 +920,7 @@ RectTransform: 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: 9} + m_AnchoredPosition: {x: 0, y: 5} m_SizeDelta: {x: 59, y: 54} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2653534978357253894 @@ -1037,7 +1037,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2} - m_Color: {r: 1, g: 1, b: 1, a: 0.9411765} + m_Color: {r: 1, g: 1, b: 1, a: 0.54901963} m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -1119,7 +1119,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: fea4f86213a880344bcffd2308591e61, type: 3} + m_Sprite: {fileID: 21300000, guid: 3c09c3571cc8aff4fbaee4765d7f856f, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1156,15 +1156,15 @@ RectTransform: m_GameObject: {fileID: 4728771971397557095} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 2, y: 2, z: 2} + m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 4165930251451731960} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 91, y: 269} - m_SizeDelta: {x: 56, y: 49} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 60, y: -50} + m_SizeDelta: {x: 34, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4405840621380361901 CanvasRenderer: @@ -1194,7 +1194,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: df3282ede5d4e6740b33cbb893059cb3, type: 3} + m_Sprite: {fileID: 21300000, guid: 306205473d3cf1f4a9d821c3e2971092, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1309,7 +1309,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 6695163000850577717} - m_RootOrder: 1 + 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} @@ -1346,8 +1346,8 @@ MonoBehaviour: m_Calls: [] m_text: m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 9d1aadd9ebaf54ce2b217ab8427fa0db, type: 2} - m_sharedMaterial: {fileID: 2100000, guid: d9526b8cb4bc030488db413ef429c6f9, type: 2} + m_fontAsset: {fileID: 11400000, guid: b0c1339d1d91a8846affd442449dbf31, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: 2e0b5790ea0ce0a4eb6bf1b8b43a6bda, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -1371,8 +1371,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 24 - m_fontSizeBase: 24 + m_fontSize: 30 + m_fontSizeBase: 30 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -1569,8 +1569,8 @@ MonoBehaviour: m_Calls: [] m_text: m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 9d1aadd9ebaf54ce2b217ab8427fa0db, type: 2} - m_sharedMaterial: {fileID: 2100000, guid: d9526b8cb4bc030488db413ef429c6f9, type: 2} + m_fontAsset: {fileID: 11400000, guid: b0c1339d1d91a8846affd442449dbf31, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: 2e0b5790ea0ce0a4eb6bf1b8b43a6bda, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -1670,8 +1670,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: 0, y: -18} - m_SizeDelta: {x: 220, y: 28} + m_AnchoredPosition: {x: 0, y: -12} + m_SizeDelta: {x: 220, y: 40} m_Pivot: {x: 0.5, y: 1} --- !u!222 &1371516663622780528 CanvasRenderer: @@ -1971,8 +1971,8 @@ MonoBehaviour: m_Calls: [] m_text: m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 9d1aadd9ebaf54ce2b217ab8427fa0db, type: 2} - m_sharedMaterial: {fileID: 2100000, guid: d9526b8cb4bc030488db413ef429c6f9, type: 2} + m_fontAsset: {fileID: 11400000, guid: b0c1339d1d91a8846affd442449dbf31, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: 2e0b5790ea0ce0a4eb6bf1b8b43a6bda, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -2352,7 +2352,7 @@ RectTransform: m_Children: - {fileID: 5332717838022981336} m_Father: {fileID: 6695163000850577717} - m_RootOrder: 2 + 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} @@ -2380,7 +2380,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 0.78431374} m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -2482,7 +2482,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: 471a678dc340f4f43b842474749cf0df, type: 3} propertyPath: m_AnchoredPosition.x - value: -131 + value: -129 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: 471a678dc340f4f43b842474749cf0df, type: 3} propertyPath: m_AnchoredPosition.y @@ -2601,7 +2601,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: 471a678dc340f4f43b842474749cf0df, type: 3} propertyPath: m_AnchoredPosition.x - value: -262 + value: -258 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: 471a678dc340f4f43b842474749cf0df, type: 3} propertyPath: m_AnchoredPosition.y @@ -2720,7 +2720,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: 471a678dc340f4f43b842474749cf0df, type: 3} propertyPath: m_AnchoredPosition.x - value: 262 + value: 258 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: 471a678dc340f4f43b842474749cf0df, type: 3} propertyPath: m_AnchoredPosition.y @@ -2839,7 +2839,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: 471a678dc340f4f43b842474749cf0df, type: 3} propertyPath: m_AnchoredPosition.x - value: 131 + value: 129 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: 471a678dc340f4f43b842474749cf0df, type: 3} propertyPath: m_AnchoredPosition.y diff --git a/Assets/prefabs/ui/main_city/main_ui.prefab b/Assets/prefabs/ui/main_city/main_ui.prefab index 9a2ff143a..229d9c108 100644 --- a/Assets/prefabs/ui/main_city/main_ui.prefab +++ b/Assets/prefabs/ui/main_city/main_ui.prefab @@ -1315,7 +1315,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} m_AnchoredPosition: {x: -178, y: 64} - m_SizeDelta: {x: 360, y: 128} + m_SizeDelta: {x: 374, y: 128} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2829657353007137055 CanvasRenderer: @@ -1815,6 +1815,38 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 6070711818386086778, guid: 144e4de3dac3a244db52e2450fdc9d6c, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6070711818386086778, guid: 144e4de3dac3a244db52e2450fdc9d6c, type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6070711818386086778, guid: 144e4de3dac3a244db52e2450fdc9d6c, type: 3} + propertyPath: m_SizeDelta.x + value: 34 + objectReference: {fileID: 0} + - target: {fileID: 6070711818386086778, guid: 144e4de3dac3a244db52e2450fdc9d6c, type: 3} + propertyPath: m_SizeDelta.y + value: 30 + objectReference: {fileID: 0} + - target: {fileID: 6070711818386086778, guid: 144e4de3dac3a244db52e2450fdc9d6c, type: 3} + propertyPath: m_LocalScale.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6070711818386086778, guid: 144e4de3dac3a244db52e2450fdc9d6c, type: 3} + propertyPath: m_LocalScale.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6070711818386086778, guid: 144e4de3dac3a244db52e2450fdc9d6c, type: 3} + propertyPath: m_LocalScale.z + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6070711818386086778, guid: 144e4de3dac3a244db52e2450fdc9d6c, type: 3} + propertyPath: m_AnchoredPosition.y + value: -50 + objectReference: {fileID: 0} - target: {fileID: 8889665677046596496, guid: 144e4de3dac3a244db52e2450fdc9d6c, type: 3} propertyPath: m_Name value: main_comp diff --git a/Assets/prefabs/ui/tips/help_tips.prefab b/Assets/prefabs/ui/tips/help_tips.prefab index d72523961..4075a74a3 100644 --- a/Assets/prefabs/ui/tips/help_tips.prefab +++ b/Assets/prefabs/ui/tips/help_tips.prefab @@ -32,10 +32,10 @@ RectTransform: m_Father: {fileID: 4992656467854107315} 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: 14} - m_SizeDelta: {x: 0, y: 68} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 505} + m_SizeDelta: {x: 720, y: 68} m_Pivot: {x: 0.5, y: 1} --- !u!222 &721466059904126763 CanvasRenderer: @@ -65,7 +65,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 3df1f1c0900d28e48958abf63b77fd5e, type: 3} + m_Sprite: {fileID: 21300000, guid: 1f0e6d68246796849961cb0680d4f226, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -307,7 +307,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: 0} + m_AnchoredPosition: {x: -284, y: -64} m_SizeDelta: {x: 92, y: 98} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3394721044435980120 @@ -842,7 +842,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2} - m_Color: {r: 0, g: 0, b: 0, a: 0.9411765} + m_Color: {r: 0, g: 0, b: 0, a: 0.972549} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 diff --git a/Assets/prefabs/ui/tips/item_tips.prefab b/Assets/prefabs/ui/tips/item_tips.prefab index d66d29c73..29c138803 100644 --- a/Assets/prefabs/ui/tips/item_tips.prefab +++ b/Assets/prefabs/ui/tips/item_tips.prefab @@ -383,14 +383,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: 4278190080 + m_fontColor: {r: 0, g: 0, b: 0, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: