diff --git a/Assets/Resources/Images/Mobile.meta b/Assets/Resources/Images/Mobile.meta new file mode 100644 index 00000000..51ec7828 --- /dev/null +++ b/Assets/Resources/Images/Mobile.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 74b9b7f532dfaa94a80e4b10f753d713 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Images/Mobile/map_筛选.png b/Assets/Resources/Images/Mobile/map_筛选.png new file mode 100644 index 00000000..abfc2819 Binary files /dev/null and b/Assets/Resources/Images/Mobile/map_筛选.png differ diff --git a/Assets/Resources/Images/Mobile/map_筛选.png.meta b/Assets/Resources/Images/Mobile/map_筛选.png.meta new file mode 100644 index 00000000..3fd58c57 --- /dev/null +++ b/Assets/Resources/Images/Mobile/map_筛选.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: 593b2dfe1fa703548b788b3a8bda3db5 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + 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 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: -1 + wrapV: -1 + wrapW: -1 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + 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: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 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 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Images/Mobile/登录 - 快捷.png b/Assets/Resources/Images/Mobile/登录 - 快捷.png new file mode 100644 index 00000000..15b7784e Binary files /dev/null and b/Assets/Resources/Images/Mobile/登录 - 快捷.png differ diff --git a/Assets/Resources/Images/Mobile/登录 - 快捷.png.meta b/Assets/Resources/Images/Mobile/登录 - 快捷.png.meta new file mode 100644 index 00000000..466c7516 --- /dev/null +++ b/Assets/Resources/Images/Mobile/登录 - 快捷.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: 182e7bd5a7cc2064bb330a23810f63bb +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + 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 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: -1 + wrapV: -1 + wrapW: -1 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + 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: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 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 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Images/Mobile/登录 - 账号.png b/Assets/Resources/Images/Mobile/登录 - 账号.png new file mode 100644 index 00000000..8947011b Binary files /dev/null and b/Assets/Resources/Images/Mobile/登录 - 账号.png differ diff --git a/Assets/Resources/Images/Mobile/登录 - 账号.png.meta b/Assets/Resources/Images/Mobile/登录 - 账号.png.meta new file mode 100644 index 00000000..f0cb7cd2 --- /dev/null +++ b/Assets/Resources/Images/Mobile/登录 - 账号.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: 66df7a92554cb4a44bba87ee9bbcbd0a +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + 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 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: -1 + wrapV: -1 + wrapW: -1 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + 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: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 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 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Images/Mobile/筛选2.png b/Assets/Resources/Images/Mobile/筛选2.png new file mode 100644 index 00000000..490b0a58 Binary files /dev/null and b/Assets/Resources/Images/Mobile/筛选2.png differ diff --git a/Assets/Resources/Images/Mobile/筛选2.png.meta b/Assets/Resources/Images/Mobile/筛选2.png.meta new file mode 100644 index 00000000..0a573a05 --- /dev/null +++ b/Assets/Resources/Images/Mobile/筛选2.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: 9f2294edf2a55124481f1bd9ac1a6434 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + 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 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: -1 + wrapV: -1 + wrapW: -1 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + 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: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 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 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Images/Mobile/记录 - 再一次.png b/Assets/Resources/Images/Mobile/记录 - 再一次.png new file mode 100644 index 00000000..bc03aac3 Binary files /dev/null and b/Assets/Resources/Images/Mobile/记录 - 再一次.png differ diff --git a/Assets/Resources/Images/Mobile/记录 - 再一次.png.meta b/Assets/Resources/Images/Mobile/记录 - 再一次.png.meta new file mode 100644 index 00000000..c70be6ba --- /dev/null +++ b/Assets/Resources/Images/Mobile/记录 - 再一次.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: 04bfb99c1584b9e43b8bc651596d4f1a +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + 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 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: -1 + wrapV: -1 + wrapW: -1 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + 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: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 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 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Images/Mobile/记录 - 删除.png b/Assets/Resources/Images/Mobile/记录 - 删除.png new file mode 100644 index 00000000..c0563443 Binary files /dev/null and b/Assets/Resources/Images/Mobile/记录 - 删除.png differ diff --git a/Assets/Resources/Images/Mobile/记录 - 删除.png.meta b/Assets/Resources/Images/Mobile/记录 - 删除.png.meta new file mode 100644 index 00000000..8ec566d5 --- /dev/null +++ b/Assets/Resources/Images/Mobile/记录 - 删除.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: ad507f0048fa74641a8c0ecc2771813f +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + 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 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: -1 + wrapV: -1 + wrapW: -1 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + 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: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 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 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Images/Mobile/记录 - 继续.png b/Assets/Resources/Images/Mobile/记录 - 继续.png new file mode 100644 index 00000000..f516d984 Binary files /dev/null and b/Assets/Resources/Images/Mobile/记录 - 继续.png differ diff --git a/Assets/Resources/Images/Mobile/记录 - 继续.png.meta b/Assets/Resources/Images/Mobile/记录 - 继续.png.meta new file mode 100644 index 00000000..83d90337 --- /dev/null +++ b/Assets/Resources/Images/Mobile/记录 - 继续.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: d009c5f234f87ea4cb80d23fa1c2b4ce +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + 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 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: -1 + wrapV: -1 + wrapW: -1 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + 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: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 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 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/UI/Prefab/Panel/Mobile/HomePanel.prefab b/Assets/Resources/UI/Prefab/Panel/Mobile/HomePanel.prefab index 4405e567..130f0a55 100644 --- a/Assets/Resources/UI/Prefab/Panel/Mobile/HomePanel.prefab +++ b/Assets/Resources/UI/Prefab/Panel/Mobile/HomePanel.prefab @@ -230,10 +230,10 @@ RectTransform: m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} + 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: 0, y: 0} + m_SizeDelta: {x: 844, y: 390} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &787256587561520313 MonoBehaviour: diff --git a/Assets/Resources/UI/Prefab/Panel/Mobile/MapListPanel.prefab b/Assets/Resources/UI/Prefab/Panel/Mobile/MapListPanel.prefab index aacc9232..275d5507 100644 --- a/Assets/Resources/UI/Prefab/Panel/Mobile/MapListPanel.prefab +++ b/Assets/Resources/UI/Prefab/Panel/Mobile/MapListPanel.prefab @@ -153,7 +153,7 @@ RectTransform: m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0, y: 1} + m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &465239219729653175 CanvasRenderer: m_ObjectHideFlags: 0 @@ -4428,7 +4428,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &1879042590406371758 RectTransform: m_ObjectHideFlags: 0 @@ -4606,7 +4606,7 @@ PrefabInstance: - target: {fileID: 545917028276686471, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 40 objectReference: {fileID: 0} - target: {fileID: 545917028276686471, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3} @@ -4742,12 +4742,12 @@ PrefabInstance: - target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3} @@ -4757,7 +4757,7 @@ PrefabInstance: - target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -9 objectReference: {fileID: 0} - target: {fileID: 8688565590564084001, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3} diff --git a/Assets/Resources/UI/Prefab/Panel/Mobile/ResultListPanel.prefab b/Assets/Resources/UI/Prefab/Panel/Mobile/ResultListPanel.prefab index 9619b1ff..1f70860a 100644 --- a/Assets/Resources/UI/Prefab/Panel/Mobile/ResultListPanel.prefab +++ b/Assets/Resources/UI/Prefab/Panel/Mobile/ResultListPanel.prefab @@ -622,10 +622,10 @@ RectTransform: m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} + 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: 0, y: 0} + m_SizeDelta: {x: 844, y: 390} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3070817481054122627 CanvasRenderer: diff --git a/Assets/Resources/UI/Prefab/Panel/Mobile/UserInfoPanel.prefab b/Assets/Resources/UI/Prefab/Panel/Mobile/UserInfoPanel.prefab index 36e48a79..b53c9fdc 100644 --- a/Assets/Resources/UI/Prefab/Panel/Mobile/UserInfoPanel.prefab +++ b/Assets/Resources/UI/Prefab/Panel/Mobile/UserInfoPanel.prefab @@ -2157,10 +2157,10 @@ RectTransform: m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} + 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: 0, y: 0} + m_SizeDelta: {x: 844, y: 390} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &4238835579819764237 MonoBehaviour: diff --git a/Assets/Scenes/MainScene.unity b/Assets/Scenes/MainScene.unity index 17ce1121..28dc0e5b 100644 --- a/Assets/Scenes/MainScene.unity +++ b/Assets/Scenes/MainScene.unity @@ -706,6 +706,7 @@ GameObject: - component: {fileID: 730655536} - component: {fileID: 730655538} - component: {fileID: 730655539} + - component: {fileID: 730655537} m_Layer: 5 m_Name: Panel m_TagString: Untagged @@ -732,6 +733,31 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 1600, y: 900} m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &730655537 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 730655535} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 4 + m_Spacing: 0 + m_ChildForceExpandWidth: 1 + m_ChildForceExpandHeight: 1 + m_ChildControlWidth: 0 + m_ChildControlHeight: 0 + m_ChildScaleWidth: 0 + m_ChildScaleHeight: 0 --- !u!222 &730655538 CanvasRenderer: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/Scenes/MainController.cs b/Assets/Scripts/Scenes/MainController.cs index 5bc3ccbb..d2b2276c 100644 --- a/Assets/Scripts/Scenes/MainController.cs +++ b/Assets/Scripts/Scenes/MainController.cs @@ -24,7 +24,12 @@ public class MainController : BaseScene Loom.Initialize(); #if UNITY_ANDROID || UNITY_IOS transform.GetComponent().referenceResolution = new Vector2(844, 390); - transform.Find("Panel").GetComponent().sizeDelta = new Vector2(844, 390); + //transform.Find("Panel").GetComponent().sizeDelta = new Vector2(844, 390); + var rectTransform = transform.Find("Panel").GetComponent(); + rectTransform.anchorMin = Vector2.zero; + rectTransform.anchorMax = Vector2.one; + rectTransform.offsetMin = Vector2.zero; + rectTransform.offsetMax = Vector2.zero; //transform.Find("ModalPanel").GetComponent().sizeDelta = new Vector2(844, 390); #endif App.MainDeviceAdapter.StartScan(); diff --git a/Assets/Scripts/UI/Prefab/Login/QuickLoginScroll.cs b/Assets/Scripts/UI/Prefab/Login/QuickLoginScroll.cs index 09a65157..65795090 100644 --- a/Assets/Scripts/UI/Prefab/Login/QuickLoginScroll.cs +++ b/Assets/Scripts/UI/Prefab/Login/QuickLoginScroll.cs @@ -14,9 +14,27 @@ public class QuickLoginScroll : MonoBehaviour private float contentSize; private int count; [SerializeField] Button L, R; + float startPos, endPos; void Start() { scroll = gameObject.GetComponent(); + UIManager.AddEvent(scroll.gameObject, UnityEngine.EventSystems.EventTriggerType.BeginDrag, b => + { + startPos = scroll.horizontalNormalizedPosition; + Debug.Log(startPos); + }); + UIManager.AddEvent(scroll.gameObject, UnityEngine.EventSystems.EventTriggerType.EndDrag, b => + { + endPos = scroll.horizontalNormalizedPosition; + if (startPos > endPos) + { + goLeft(); + } + else if (startPos < endPos) + { + goRight(); + } + }); //scroll.onValueChanged.AddListener((a) => //{ // Debug.Log(a); @@ -28,6 +46,7 @@ public class QuickLoginScroll : MonoBehaviour { UIManager.AddEvent(L.gameObject, UnityEngine.EventSystems.EventTriggerType.PointerClick,(b)=> { + startPos = scroll.horizontalNormalizedPosition; goLeft(); }); //L.onClick.AddListener(goLeft); @@ -36,6 +55,7 @@ public class QuickLoginScroll : MonoBehaviour { UIManager.AddEvent(R.gameObject, UnityEngine.EventSystems.EventTriggerType.PointerClick, (b) => { + startPos = scroll.horizontalNormalizedPosition; goRight(); }); //R.onClick.AddListener(goRight); @@ -67,6 +87,7 @@ public class QuickLoginScroll : MonoBehaviour if (content.childCount - 3 > 0) { contentSize = 1f / (content.childCount - 3); + Debug.Log(contentSize); } else { @@ -82,32 +103,39 @@ public class QuickLoginScroll : MonoBehaviour scroll.horizontalNormalizedPosition = contentSize/2+i*contentSize; #else scroll.horizontalNormalizedPosition = i * contentSize; - Debug.Log(scroll.horizontalNormalizedPosition); #endif SetColor(); } void goLeft() { - Debug.Log($"{scroll.horizontalNormalizedPosition},{contentSize}"); - if (scroll.horizontalNormalizedPosition+0.0001 <= contentSize) return; + if (scroll.horizontalNormalizedPosition <= 0 + 0.0001) return; goMove(-1); } void goRight() { - Debug.Log(scroll.horizontalNormalizedPosition); if (scroll.horizontalNormalizedPosition+0.0001 >= 1) return; goMove(); } void goMove(int i = 1) { doAni(); + //#if !(UNITY_ANDROID || UNITY_IOS) + // if (!start) startPosition = scroll.horizontalNormalizedPosition; + //#else + // int ind = GetIndex(startPos); + // if (!start) startPosition = ind*contentSize; + //#endif if (!start) startPosition = scroll.horizontalNormalizedPosition; start = true; - scrollValue = i*contentSize / 10; +#if !(UNITY_ANDROID || UNITY_IOS) + scrollValue = i * contentSize / 10; +#else + scrollValue = ((GetIndex(startPos) + i) * contentSize - startPos) / 10; +#endif } private bool start = false; private float scrollValue = 0, totalScrollValue = 0, startPosition = 0; - int GetIndex() + int GetIndex(float? startPos = null) { #if !(UNITY_ANDROID || UNITY_IOS) return (int)System.Math.Round( @@ -118,9 +146,8 @@ public class QuickLoginScroll : MonoBehaviour { return 1; } - return (int)System.Math.Round( - (scroll.horizontalNormalizedPosition+ contentSize) / contentSize, - 0); + return (int)System.Math.Round + ((startPos ?? scroll.horizontalNormalizedPosition + contentSize) / contentSize, 0); #endif } void SetColor() @@ -156,7 +183,11 @@ public class QuickLoginScroll : MonoBehaviour { scrollValue = 0; start = false; +#if !(UNITY_ANDROID || UNITY_IOS) scroll.horizontalNormalizedPosition = startPosition + (totalScrollValue<0?-1:1)*contentSize; +#else + scroll.horizontalNormalizedPosition = (GetIndex(startPos) + (totalScrollValue < 0 ? -1 : 1)) * contentSize; +#endif //Debug.Log(); SetColor(); totalScrollValue = 0; diff --git a/Assets/Scripts/UI/Prefab/Login/QuickLoginUser.cs b/Assets/Scripts/UI/Prefab/Login/QuickLoginUser.cs index b4893bf9..36427a38 100644 --- a/Assets/Scripts/UI/Prefab/Login/QuickLoginUser.cs +++ b/Assets/Scripts/UI/Prefab/Login/QuickLoginUser.cs @@ -23,10 +23,14 @@ public class QuickLoginUser : MonoBehaviour { if (user == null) return; this.top = top; +#if !(UNITY_ANDROID || UNITY_IOS) UIManager.AddEvent(gameObject, UnityEngine.EventSystems.EventTriggerType.PointerClick, (b) => { goMain(); }); +#else + gameObject.GetComponent