diff --git a/Assets/first/ui/common_board_111.png b/Assets/first/ui/common_board_111.png new file mode 100644 index 000000000..d978a6812 Binary files /dev/null and b/Assets/first/ui/common_board_111.png differ diff --git a/Assets/first/ui/common_board_111.png.meta b/Assets/first/ui/common_board_111.png.meta new file mode 100644 index 000000000..9bf232c7e --- /dev/null +++ b/Assets/first/ui/common_board_111.png.meta @@ -0,0 +1,132 @@ +fileFormatVersion: 2 +guid: 2da0fad63491aa84a944120a156fa579 +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: 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: 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: 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 + 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/first/ui/common_board_112.png b/Assets/first/ui/common_board_112.png new file mode 100644 index 000000000..67281c5c2 Binary files /dev/null and b/Assets/first/ui/common_board_112.png differ diff --git a/Assets/first/ui/common_board_112.png.meta b/Assets/first/ui/common_board_112.png.meta new file mode 100644 index 000000000..3eb775fc8 --- /dev/null +++ b/Assets/first/ui/common_board_112.png.meta @@ -0,0 +1,132 @@ +fileFormatVersion: 2 +guid: ca7f2c56402ab784a9dafd0546c614f0 +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: 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: 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: 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 + 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/first/ui/common_board_4.png b/Assets/first/ui/common_board_4.png index f9ac3e4a9..b8419a23d 100644 Binary files a/Assets/first/ui/common_board_4.png and b/Assets/first/ui/common_board_4.png differ diff --git a/Assets/first/ui/common_btn_green_2.png b/Assets/first/ui/common_btn_green_2.png index 93c88314e..340d938d0 100644 Binary files a/Assets/first/ui/common_btn_green_2.png and b/Assets/first/ui/common_btn_green_2.png differ diff --git a/Assets/first/ui/common_btn_red_2.png b/Assets/first/ui/common_btn_red_2.png index c1cdd4bfa..e8511cf57 100644 Binary files a/Assets/first/ui/common_btn_red_2.png and b/Assets/first/ui/common_btn_red_2.png differ diff --git a/Assets/first/ui/common_title_4.png b/Assets/first/ui/common_title_4.png index 4684d2f22..aeb2c63ed 100644 Binary files a/Assets/first/ui/common_title_4.png and b/Assets/first/ui/common_title_4.png differ diff --git a/Assets/first/ui/common_title_4.png.meta b/Assets/first/ui/common_title_4.png.meta index fa41e8d1c..f0c9343da 100644 --- a/Assets/first/ui/common_title_4.png.meta +++ b/Assets/first/ui/common_title_4.png.meta @@ -47,7 +47,7 @@ TextureImporter: alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 - spriteBorder: {x: 32, y: 0, z: 32, w: 0} + spriteBorder: {x: 92, y: 0, z: 92, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 alphaIsTransparency: 1 diff --git a/Assets/first/ui/first.prefab b/Assets/first/ui/first.prefab index 752b95980..ae25ff469 100644 --- a/Assets/first/ui/first.prefab +++ b/Assets/first/ui/first.prefab @@ -120,17 +120,17 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 780724304350154803} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + 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_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: 23} - m_SizeDelta: {x: 638, y: 100} + m_AnchoredPosition: {x: 0, y: 25} + m_SizeDelta: {x: 648, y: 96} m_Pivot: {x: 0.5, y: 1} --- !u!222 &1813936604392136997 CanvasRenderer: @@ -274,11 +274,11 @@ RectTransform: m_Children: - {fileID: 4154090476444788940} m_Father: {fileID: 9148346167279928157} - m_RootOrder: 2 + 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: -124, y: -95} + m_AnchoredPosition: {x: 124, y: -120} m_SizeDelta: {x: 208, y: 98} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7470947447568709749 @@ -529,6 +529,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 8746548397368214977} + - {fileID: 1533195499523222536} - {fileID: 4572803369166070718} - {fileID: 7055499158932467233} - {fileID: 7220032382195896184} @@ -683,11 +684,11 @@ RectTransform: m_Children: - {fileID: 8661394603919109390} m_Father: {fileID: 9148346167279928157} - m_RootOrder: 3 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 124, y: -95} + m_AnchoredPosition: {x: -124, y: -120} m_SizeDelta: {x: 208, y: 98} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &255261530843180814 @@ -908,7 +909,7 @@ GameObject: - component: {fileID: 6385298505705733844} - component: {fileID: 2020723869320263880} m_Layer: 5 - m_Name: image + m_Name: bg_2 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -930,8 +931,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 552, y: 402} + m_AnchoredPosition: {x: 0, y: 66} + m_SizeDelta: {x: 554, y: 203} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6385298505705733844 CanvasRenderer: @@ -961,8 +962,83 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: fae9e7155a31e9d47a2492dcb472b22f, type: 3} - m_Type: 1 + 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 &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 @@ -1001,7 +1077,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 9148346167279928157} - m_RootOrder: 4 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} diff --git a/Assets/first/ui/login_bg.png b/Assets/first/ui/login_bg.png index f15562c6e..a484efc7a 100644 Binary files a/Assets/first/ui/login_bg.png and b/Assets/first/ui/login_bg.png differ diff --git a/Assets/lua/app/common/i18n_manager.lua.bytes b/Assets/lua/app/common/i18n_manager.lua.bytes index e87f481be..2364c8669 100644 Binary files a/Assets/lua/app/common/i18n_manager.lua.bytes and b/Assets/lua/app/common/i18n_manager.lua.bytes differ diff --git a/Assets/lua/app/first/first.lua.bytes b/Assets/lua/app/first/first.lua.bytes index b5c9f873b..644ba9232 100644 Binary files a/Assets/lua/app/first/first.lua.bytes and b/Assets/lua/app/first/first.lua.bytes differ diff --git a/Assets/lua/app/ui/loading/loading_cloud_ui.lua.bytes b/Assets/lua/app/ui/loading/loading_cloud_ui.lua.bytes index 6c7fc102f..01c26fcc7 100644 Binary files a/Assets/lua/app/ui/loading/loading_cloud_ui.lua.bytes and b/Assets/lua/app/ui/loading/loading_cloud_ui.lua.bytes differ