diff --git a/Assets/arts/textures/background/login/login_1.png b/Assets/arts/textures/background/login/login_1.png new file mode 100644 index 000000000..0d523bb8b Binary files /dev/null and b/Assets/arts/textures/background/login/login_1.png differ diff --git a/Assets/first/ui/login_bg.png.meta b/Assets/arts/textures/background/login/login_1.png.meta similarity index 97% rename from Assets/first/ui/login_bg.png.meta rename to Assets/arts/textures/background/login/login_1.png.meta index e79463254..6da388dae 100644 --- a/Assets/first/ui/login_bg.png.meta +++ b/Assets/arts/textures/background/login/login_1.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 2135ddd30429a5f438401422665919dc +guid: 836c22190ec2b455aaf6da01564b9749 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 @@ -101,6 +89,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: Standalone maxTextureSize: 2048 @@ -143,5 +143,5 @@ TextureImporter: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: - assetBundleName: first/first.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/textures/background/login/login_bg_1.png b/Assets/arts/textures/background/login/login_bg_1.png deleted file mode 100644 index 2a086da72..000000000 Binary files a/Assets/arts/textures/background/login/login_bg_1.png and /dev/null differ diff --git a/Assets/first/ui/common_bg_1.png b/Assets/first/ui/common_bg_1.png new file mode 100644 index 000000000..9ec176af0 Binary files /dev/null and b/Assets/first/ui/common_bg_1.png differ diff --git a/Assets/first/ui/common_title_4.png.meta b/Assets/first/ui/common_bg_1.png.meta similarity index 95% rename from Assets/first/ui/common_title_4.png.meta rename to Assets/first/ui/common_bg_1.png.meta index 0cca8933e..30dd435a3 100644 --- a/Assets/first/ui/common_title_4.png.meta +++ b/Assets/first/ui/common_bg_1.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 8343adc73d2a0ae4f8e50d61d4bcad27 +guid: f8a9242dd6a94430a9dcbb259a1f43c8 TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -48,7 +48,7 @@ TextureImporter: alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 - spriteBorder: {x: 92, y: 0, z: 92, w: 0} + spriteBorder: {x: 318, y: 45, z: 264, w: 88} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 alphaIsTransparency: 1 @@ -63,7 +63,7 @@ TextureImporter: textureFormatSet: 0 ignorePngGamma: 0 applyGammaDecoding: 0 - cookieLightType: 1 + cookieLightType: 0 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform @@ -132,7 +132,7 @@ TextureImporter: physicsShape: [] bones: [] spriteID: 5e97eb03825dee720800000000000000 - internalID: 0 + internalID: 1537655665 vertices: [] indices: edges: [] @@ -143,5 +143,5 @@ TextureImporter: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: - assetBundleName: first/first.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/first/ui/common_bg_3.png b/Assets/first/ui/common_bg_3.png new file mode 100644 index 000000000..0de30073c Binary files /dev/null and b/Assets/first/ui/common_bg_3.png differ diff --git a/Assets/first/ui/common_btn_red_2.png.meta b/Assets/first/ui/common_bg_3.png.meta similarity index 95% rename from Assets/first/ui/common_btn_red_2.png.meta rename to Assets/first/ui/common_bg_3.png.meta index f94650d22..490dec5bb 100644 --- a/Assets/first/ui/common_btn_red_2.png.meta +++ b/Assets/first/ui/common_bg_3.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: aa63070905d352f43aee9ca65e14bfb2 +guid: 44b0b70c88def43acaf4e01279f95bae TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -48,7 +48,7 @@ TextureImporter: alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 - spriteBorder: {x: 26, y: 32, z: 26, w: 24} + spriteBorder: {x: 18, y: 18, z: 18, w: 18} spriteGenerateFallbackPhysicsShape: 0 alphaUsage: 1 alphaIsTransparency: 1 @@ -63,7 +63,7 @@ TextureImporter: textureFormatSet: 0 ignorePngGamma: 0 applyGammaDecoding: 0 - cookieLightType: 1 + cookieLightType: 0 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform @@ -132,7 +132,7 @@ TextureImporter: physicsShape: [] bones: [] spriteID: 5e97eb03825dee720800000000000000 - internalID: 0 + internalID: 1537655665 vertices: [] indices: edges: [] @@ -143,5 +143,5 @@ TextureImporter: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: - assetBundleName: first/first.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/first/ui/common_board_111.png b/Assets/first/ui/common_board_111.png deleted file mode 100644 index d978a6812..000000000 Binary files a/Assets/first/ui/common_board_111.png and /dev/null differ diff --git a/Assets/first/ui/common_board_112.png b/Assets/first/ui/common_board_112.png deleted file mode 100644 index 67281c5c2..000000000 Binary files a/Assets/first/ui/common_board_112.png and /dev/null differ diff --git a/Assets/first/ui/common_board_4.png b/Assets/first/ui/common_board_4.png deleted file mode 100644 index b8419a23d..000000000 Binary files a/Assets/first/ui/common_board_4.png and /dev/null differ diff --git a/Assets/first/ui/common_board_4.png.meta b/Assets/first/ui/common_board_4.png.meta deleted file mode 100644 index dcea8ab23..000000000 --- a/Assets/first/ui/common_board_4.png.meta +++ /dev/null @@ -1,147 +0,0 @@ -fileFormatVersion: 2 -guid: a3fb767166419f04088ab41a4a5ff274 -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: 0 - 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: 40, y: 40, z: 40, w: 40} - spriteGenerateFallbackPhysicsShape: 0 - 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: Standalone - 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: iPhone - 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: -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: first/first.ab - assetBundleVariant: diff --git a/Assets/first/ui/common_btn_blue_3.png b/Assets/first/ui/common_btn_blue_3.png new file mode 100644 index 000000000..8dd89467a Binary files /dev/null and b/Assets/first/ui/common_btn_blue_3.png differ diff --git a/Assets/first/ui/common_board_112.png.meta b/Assets/first/ui/common_btn_blue_3.png.meta similarity index 97% rename from Assets/first/ui/common_board_112.png.meta rename to Assets/first/ui/common_btn_blue_3.png.meta index 4d6b2616f..d3a43eef4 100644 --- a/Assets/first/ui/common_board_112.png.meta +++ b/Assets/first/ui/common_btn_blue_3.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: ca7f2c56402ab784a9dafd0546c614f0 +guid: c9677f0d665bd4e268c069f805347c68 TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -63,7 +63,7 @@ TextureImporter: textureFormatSet: 0 ignorePngGamma: 0 applyGammaDecoding: 0 - cookieLightType: 1 + cookieLightType: 0 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform @@ -143,5 +143,5 @@ TextureImporter: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: - assetBundleName: first/first.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/first/ui/common_btn_green_2.png b/Assets/first/ui/common_btn_green_2.png deleted file mode 100644 index 340d938d0..000000000 Binary files a/Assets/first/ui/common_btn_green_2.png and /dev/null differ diff --git a/Assets/first/ui/common_btn_green_2.png.meta b/Assets/first/ui/common_btn_green_2.png.meta deleted file mode 100644 index 6d1ca2488..000000000 --- a/Assets/first/ui/common_btn_green_2.png.meta +++ /dev/null @@ -1,147 +0,0 @@ -fileFormatVersion: 2 -guid: 4a72a8c80da9c824fb4f0b0adb8e2bea -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: 0 - 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: 32, z: 26, w: 24} - spriteGenerateFallbackPhysicsShape: 0 - 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: Standalone - 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: iPhone - 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: -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: first/first.ab - assetBundleVariant: diff --git a/Assets/first/ui/common_btn_red_2.png b/Assets/first/ui/common_btn_red_2.png deleted file mode 100644 index e8511cf57..000000000 Binary files a/Assets/first/ui/common_btn_red_2.png and /dev/null differ diff --git a/Assets/first/ui/common_btn_yellow_3.png b/Assets/first/ui/common_btn_yellow_3.png new file mode 100644 index 000000000..e2a36f9b9 Binary files /dev/null and b/Assets/first/ui/common_btn_yellow_3.png differ diff --git a/Assets/first/ui/common_board_111.png.meta b/Assets/first/ui/common_btn_yellow_3.png.meta similarity index 97% rename from Assets/first/ui/common_board_111.png.meta rename to Assets/first/ui/common_btn_yellow_3.png.meta index 9c75695dd..5a757e739 100644 --- a/Assets/first/ui/common_board_111.png.meta +++ b/Assets/first/ui/common_btn_yellow_3.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 2da0fad63491aa84a944120a156fa579 +guid: 154589828e18e47b3b41aad522c6cf75 TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -63,7 +63,7 @@ TextureImporter: textureFormatSet: 0 ignorePngGamma: 0 applyGammaDecoding: 0 - cookieLightType: 1 + cookieLightType: 0 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform @@ -143,5 +143,5 @@ TextureImporter: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: - assetBundleName: first/first.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/first/ui/common_title_4.png b/Assets/first/ui/common_title_4.png deleted file mode 100644 index aeb2c63ed..000000000 Binary files a/Assets/first/ui/common_title_4.png and /dev/null differ diff --git a/Assets/first/ui/first.prefab b/Assets/first/ui/first.prefab index 9de537ea2..a71dd078b 100644 --- a/Assets/first/ui/first.prefab +++ b/Assets/first/ui/first.prefab @@ -29,13 +29,14 @@ 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: 7220032382195896184} 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.5} + m_AnchoredPosition: {x: 0, y: 1} m_SizeDelta: {x: 200, y: 60} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4484291921079162880 @@ -95,81 +96,6 @@ MonoBehaviour: m_EffectColor: {r: 0, g: 0, b: 0, a: 1} m_EffectDistance: {x: 1.5, y: -1} m_UseGraphicAlpha: 1 ---- !u!1 &780724304350154803 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4572803369166070718} - - component: {fileID: 1813936604392136997} - - component: {fileID: 3771790343271499251} - m_Layer: 5 - m_Name: title_img - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &4572803369166070718 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 780724304350154803} - 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: 9148346167279928157} - 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: 0, y: 25} - m_SizeDelta: {x: 648, y: 96} - m_Pivot: {x: 0.5, y: 1} ---- !u!222 &1813936604392136997 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 780724304350154803} - m_CullTransparentMesh: 1 ---- !u!114 &3771790343271499251 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 780724304350154803} - 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: 8343adc73d2a0ae4f8e50d61d4bcad27, 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 &2393651154059976186 GameObject: m_ObjectHideFlags: 0 @@ -198,6 +124,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: 9213377628658369777} m_RootOrder: 3 @@ -270,6 +197,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: 9213377628658369777} m_RootOrder: 11 @@ -343,15 +271,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: 4154090476444788940} m_Father: {fileID: 9148346167279928157} - m_RootOrder: 3 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 124, y: -120} - m_SizeDelta: {x: 208, y: 98} + m_AnchoredPosition: {x: 133, y: -152} + m_SizeDelta: {x: 218, y: 92} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7470947447568709749 CanvasRenderer: @@ -381,8 +310,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: aa63070905d352f43aee9ca65e14bfb2, type: 3} - m_Type: 1 + m_Sprite: {fileID: 21300000, guid: c9677f0d665bd4e268c069f805347c68, type: 3} + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -432,6 +361,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: 9213377628658369777} m_RootOrder: 4 @@ -505,13 +435,14 @@ 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: 7055499158932467233} 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.5} + m_AnchoredPosition: {x: 0, y: 1} m_SizeDelta: {x: 200, y: 60} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4834343751375123219 @@ -599,6 +530,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: 9213377628658369777} m_RootOrder: 5 @@ -671,10 +603,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: 8746548397368214977} - - {fileID: 1533195499523222536} - - {fileID: 4572803369166070718} + - {fileID: 5197290172621688055} - {fileID: 7055499158932467233} - {fileID: 7220032382195896184} - {fileID: 2654996993487592751} @@ -684,7 +615,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: 576, y: 426} + m_SizeDelta: {x: 628, y: 496} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &950151610585111869 CanvasRenderer: @@ -714,7 +645,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: a3fb767166419f04088ab41a4a5ff274, type: 3} + m_Sprite: {fileID: 21300000, guid: f8a9242dd6a94430a9dcbb259a1f43c8, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -752,6 +683,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: 9213377628658369777} m_RootOrder: 1 @@ -824,6 +756,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: 9213377628658369777} m_RootOrder: 10 @@ -897,15 +830,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: 8661394603919109390} m_Father: {fileID: 9148346167279928157} - m_RootOrder: 4 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -124, y: -120} - m_SizeDelta: {x: 208, y: 98} + m_AnchoredPosition: {x: -133, y: -152} + m_SizeDelta: {x: 218, y: 92} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &255261530843180814 CanvasRenderer: @@ -935,8 +869,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 4a72a8c80da9c824fb4f0b0adb8e2bea, type: 3} - m_Type: 1 + m_Sprite: {fileID: 21300000, guid: 154589828e18e47b3b41aad522c6cf75, type: 3} + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -986,6 +920,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: 9213377628658369777} m_RootOrder: 7 @@ -1058,6 +993,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: 9148346167279928157} m_Father: {fileID: 9213377628658369777} @@ -1097,6 +1033,82 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_Sprite: {fileID: 0} + 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 &7009708160980161400 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5197290172621688055} + - component: {fileID: 9205392968842745457} + - component: {fileID: 5653304315817522783} + m_Layer: 5 + m_Name: bg + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5197290172621688055 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7009708160980161400} + 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: 9148346167279928157} + 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: 37} + m_SizeDelta: {x: 576, y: 208} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &9205392968842745457 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7009708160980161400} + m_CullTransparentMesh: 1 +--- !u!114 &5653304315817522783 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7009708160980161400} + 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: 44b0b70c88def43acaf4e01279f95bae, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1135,6 +1147,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.34, y: 0.34, z: 0.34} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 9213377628658369777} m_RootOrder: 13 @@ -1229,6 +1242,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: 9213377628658369777} m_RootOrder: 6 @@ -1273,81 +1287,6 @@ MonoBehaviour: y: 0 width: 1 height: 1 ---- !u!1 &7951321131389539729 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 8746548397368214977} - - component: {fileID: 6385298505705733844} - - component: {fileID: 2020723869320263880} - m_Layer: 5 - m_Name: bg_2 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &8746548397368214977 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7951321131389539729} - 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: 9148346167279928157} - 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: 66} - m_SizeDelta: {x: 554, y: 203} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &6385298505705733844 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7951321131389539729} - m_CullTransparentMesh: 1 ---- !u!114 &2020723869320263880 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7951321131389539729} - 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: 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: ca7f2c56402ab784a9dafd0546c614f0, 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 &8082365339014405109 GameObject: m_ObjectHideFlags: 0 @@ -1376,6 +1315,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: 9213377628658369777} m_RootOrder: 8 @@ -1420,81 +1360,6 @@ MonoBehaviour: y: 0 width: 1 height: 1 ---- !u!1 &8467889978529436299 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1533195499523222536} - - component: {fileID: 7696135535213543334} - - component: {fileID: 7118714388694732344} - m_Layer: 5 - m_Name: line_img - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1533195499523222536 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8467889978529436299} - 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: 9148346167279928157} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: -35} - m_SizeDelta: {x: 554, y: 4} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &7696135535213543334 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8467889978529436299} - m_CullTransparentMesh: 1 ---- !u!114 &7118714388694732344 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8467889978529436299} - 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: 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: 2da0fad63491aa84a944120a156fa579, 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 &8627321879788207259 GameObject: m_ObjectHideFlags: 0 @@ -1523,13 +1388,14 @@ 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: 9148346167279928157} - m_RootOrder: 5 + 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: 44} + m_AnchoredPosition: {x: 0, y: 37} m_SizeDelta: {x: 544, y: 152} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4624194077182514041 @@ -1553,7 +1419,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0.18039216, g: 0.24705882, b: 0.26666668, a: 1} m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -1562,7 +1428,7 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 30 + m_FontSize: 26 m_FontStyle: 1 m_BestFit: 0 m_MinSize: 2 @@ -1602,6 +1468,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: 9213377628658369777} m_RootOrder: 2 @@ -1674,6 +1541,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: 9213377628658369777} m_RootOrder: 9 @@ -1744,6 +1612,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: 9213377630258928043} - {fileID: 2508354483137611326} @@ -1797,6 +1666,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.2, y: 0.2, z: 0.2} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 9213377628658369777} m_RootOrder: 14 @@ -1876,6 +1746,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: 9213377628658369777} m_RootOrder: 0 @@ -1913,7 +1784,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Texture: {fileID: 2800000, guid: 2135ddd30429a5f438401422665919dc, type: 3} + m_Texture: {fileID: 2800000, guid: 91540b30c95394d7e8d0c1f0967f5b1b, type: 3} m_UVRect: serializedVersion: 2 x: 0 @@ -1949,6 +1820,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.26, y: 0.26, z: 0.26} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 9213377628658369777} m_RootOrder: 12 diff --git a/Assets/first/ui/login_1.png b/Assets/first/ui/login_1.png new file mode 100644 index 000000000..0d523bb8b Binary files /dev/null and b/Assets/first/ui/login_1.png differ diff --git a/Assets/arts/textures/background/login/login_bg_1.png.meta b/Assets/first/ui/login_1.png.meta similarity index 92% rename from Assets/arts/textures/background/login/login_bg_1.png.meta rename to Assets/first/ui/login_1.png.meta index 7df66fb54..2ad630265 100644 --- a/Assets/arts/textures/background/login/login_bg_1.png.meta +++ b/Assets/first/ui/login_1.png.meta @@ -1,12 +1,12 @@ fileFormatVersion: 2 -guid: 79681c1d9e2b29b49ba6bccbfed112b0 +guid: 91540b30c95394d7e8d0c1f0967f5b1b TextureImporter: internalIDToNameTable: [] externalObjects: {} serializedVersion: 12 mipmaps: mipMapMode: 0 - enableMipMap: 0 + enableMipMap: 1 sRGBTexture: 1 linearTexture: 0 fadeOut: 0 @@ -63,7 +63,7 @@ TextureImporter: textureFormatSet: 0 ignorePngGamma: 0 applyGammaDecoding: 0 - cookieLightType: 1 + cookieLightType: 0 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform @@ -78,31 +78,31 @@ TextureImporter: androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 - buildTarget: Android + buildTarget: Standalone maxTextureSize: 2048 resizeAlgorithm: 0 - textureFormat: 45 - textureCompression: 0 + textureFormat: -1 + textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 - overridden: 1 + overridden: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 buildTarget: iPhone maxTextureSize: 2048 resizeAlgorithm: 0 - textureFormat: 50 - textureCompression: 0 + textureFormat: -1 + textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 - overridden: 1 + overridden: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 - buildTarget: Standalone + buildTarget: Android maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 @@ -143,5 +143,5 @@ TextureImporter: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: - assetBundleName: arts/textures/background/login/login_bg_1.png.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/first/ui/login_bg.png b/Assets/first/ui/login_bg.png deleted file mode 100644 index 2a086da72..000000000 Binary files a/Assets/first/ui/login_bg.png and /dev/null differ diff --git a/Assets/lua/app/ui/currency_bar/currency_bar.lua.bytes b/Assets/lua/app/ui/currency_bar/currency_bar.lua.bytes index 4a9367f71..2116917aa 100644 Binary files a/Assets/lua/app/ui/currency_bar/currency_bar.lua.bytes and b/Assets/lua/app/ui/currency_bar/currency_bar.lua.bytes differ diff --git a/Assets/lua/app/userdata/summon/summon_data.lua.bytes b/Assets/lua/app/userdata/summon/summon_data.lua.bytes index fde52363c..1650c47a5 100644 Binary files a/Assets/lua/app/userdata/summon/summon_data.lua.bytes and b/Assets/lua/app/userdata/summon/summon_data.lua.bytes differ diff --git a/Assets/prefabs/ui/common/currency_bar.prefab b/Assets/prefabs/ui/common/currency_bar.prefab index 2123c0f25..c865a4e52 100644 --- a/Assets/prefabs/ui/common/currency_bar.prefab +++ b/Assets/prefabs/ui/common/currency_bar.prefab @@ -254,7 +254,7 @@ RectTransform: 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: -36} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5557984228439236601 @@ -308,7 +308,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2561740748560008671, guid: ba36e22b1403347479bd2480cc482bac, type: 3} propertyPath: m_Pivot.y - value: 0.5 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2561740748560008671, guid: ba36e22b1403347479bd2480cc482bac, type: 3} propertyPath: m_RootOrder @@ -415,7 +415,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2561740748560008671, guid: ba36e22b1403347479bd2480cc482bac, type: 3} propertyPath: m_Pivot.y - value: 0.5 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2561740748560008671, guid: ba36e22b1403347479bd2480cc482bac, type: 3} propertyPath: m_RootOrder @@ -522,7 +522,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2561740748560008671, guid: ba36e22b1403347479bd2480cc482bac, type: 3} propertyPath: m_Pivot.y - value: 0.5 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2561740748560008671, guid: ba36e22b1403347479bd2480cc482bac, type: 3} propertyPath: m_RootOrder @@ -629,7 +629,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2561740748560008671, guid: ba36e22b1403347479bd2480cc482bac, type: 3} propertyPath: m_Pivot.y - value: 0.5 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2561740748560008671, guid: ba36e22b1403347479bd2480cc482bac, type: 3} propertyPath: m_RootOrder diff --git a/Assets/prefabs/ui/login/login_ui.prefab b/Assets/prefabs/ui/login/login_ui.prefab index 2a4ed0b2c..6f769c36c 100644 --- a/Assets/prefabs/ui/login/login_ui.prefab +++ b/Assets/prefabs/ui/login/login_ui.prefab @@ -691,7 +691,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &2196873022783477550 RectTransform: m_ObjectHideFlags: 0 @@ -740,7 +740,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Texture: {fileID: 2800000, guid: 79681c1d9e2b29b49ba6bccbfed112b0, type: 3} + m_Texture: {fileID: 2800000, guid: 836c22190ec2b455aaf6da01564b9749, type: 3} m_UVRect: serializedVersion: 2 x: 0 @@ -894,6 +894,10 @@ PrefabInstance: propertyPath: m_Name value: ui_spine_obj objectReference: {fileID: 0} + - target: {fileID: 1991971382385470840, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 2505651998029909099, guid: 4f7cf840d6e73e14781807788b817568, type: 3} propertyPath: referenceSize.x value: 0 diff --git a/Assets/prefabs/ui/main_city/main_ui.prefab b/Assets/prefabs/ui/main_city/main_ui.prefab index d1df8cc27..6b11c6e1c 100644 --- a/Assets/prefabs/ui/main_city/main_ui.prefab +++ b/Assets/prefabs/ui/main_city/main_ui.prefab @@ -3913,9 +3913,7 @@ MonoBehaviour: EffectList: - {fileID: 6842602564882140481} - {fileID: 4204302052191318406} - NotchScreenNodeList: - - gameObject: {fileID: 4843481663428897787} - adjustHeight: 0 + NotchScreenNodeList: [] --- !u!1 &8973501236370705617 GameObject: m_ObjectHideFlags: 0 @@ -4871,7 +4869,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5471507407041762851, guid: 3432548e889deee4f9bb96253a139feb, type: 3} propertyPath: m_SizeDelta.y - value: 80 + value: 64 objectReference: {fileID: 0} - target: {fileID: 5471507407041762851, guid: 3432548e889deee4f9bb96253a139feb, type: 3} propertyPath: m_LocalPosition.x @@ -4907,7 +4905,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5471507407041762851, guid: 3432548e889deee4f9bb96253a139feb, type: 3} propertyPath: m_AnchoredPosition.y - value: -86 + value: -82 objectReference: {fileID: 0} - target: {fileID: 5471507407041762851, guid: 3432548e889deee4f9bb96253a139feb, type: 3} propertyPath: m_LocalEulerAnglesHint.x