diff --git a/Assets/Resources/Images/ANT+_1.png b/Assets/Resources/Images/ANT+_1.png deleted file mode 100644 index ecd0ea81..00000000 Binary files a/Assets/Resources/Images/ANT+_1.png and /dev/null differ diff --git a/Assets/Resources/Images/ANT+_2.png b/Assets/Resources/Images/ANT+_2.png index 4db255e3..e76538a3 100644 Binary files a/Assets/Resources/Images/ANT+_2.png and b/Assets/Resources/Images/ANT+_2.png differ diff --git a/Assets/Resources/Images/Config_1.png b/Assets/Resources/Images/Config_1.png new file mode 100644 index 00000000..f2ef6f05 Binary files /dev/null and b/Assets/Resources/Images/Config_1.png differ diff --git a/Assets/Resources/Images/ANT+_1.png.meta b/Assets/Resources/Images/Config_1.png.meta similarity index 98% rename from Assets/Resources/Images/ANT+_1.png.meta rename to Assets/Resources/Images/Config_1.png.meta index 2c028a92..6fe43e3d 100644 --- a/Assets/Resources/Images/ANT+_1.png.meta +++ b/Assets/Resources/Images/Config_1.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: b05a06daa805be243afe339207cb338c +guid: 28c1cc7667df5eb4e8bf360991cc784c TextureImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/Assets/Resources/Images/Device Connect_BG.png b/Assets/Resources/Images/Device Connect_BG.png new file mode 100644 index 00000000..980648b2 Binary files /dev/null and b/Assets/Resources/Images/Device Connect_BG.png differ diff --git a/Assets/Resources/Images/Device Connect_BG.png.meta b/Assets/Resources/Images/Device Connect_BG.png.meta new file mode 100644 index 00000000..57dbe90c --- /dev/null +++ b/Assets/Resources/Images/Device Connect_BG.png.meta @@ -0,0 +1,104 @@ +fileFormatVersion: 2 +guid: 0aa699974f67fc14391df9d204504c86 +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 + 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: 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 + 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 + - 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: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Images/Smart Trainer Connect _BG.png b/Assets/Resources/Images/Smart Trainer Connect _BG.png new file mode 100644 index 00000000..7a7572d2 Binary files /dev/null and b/Assets/Resources/Images/Smart Trainer Connect _BG.png differ diff --git a/Assets/Resources/Images/Smart Trainer Connect _BG.png.meta b/Assets/Resources/Images/Smart Trainer Connect _BG.png.meta new file mode 100644 index 00000000..66ed15e2 --- /dev/null +++ b/Assets/Resources/Images/Smart Trainer Connect _BG.png.meta @@ -0,0 +1,104 @@ +fileFormatVersion: 2 +guid: bb78a6427b2dd2e468f35d12d18c3945 +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 + 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: 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 + 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 + - 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: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Images/Smart Trainer Connectd _BG.png b/Assets/Resources/Images/Smart Trainer Connectd _BG.png new file mode 100644 index 00000000..9f02187d Binary files /dev/null and b/Assets/Resources/Images/Smart Trainer Connectd _BG.png differ diff --git a/Assets/Resources/Images/Smart Trainer Connectd _BG.png.meta b/Assets/Resources/Images/Smart Trainer Connectd _BG.png.meta new file mode 100644 index 00000000..357d1b5a --- /dev/null +++ b/Assets/Resources/Images/Smart Trainer Connectd _BG.png.meta @@ -0,0 +1,104 @@ +fileFormatVersion: 2 +guid: f801cf1a87a735b49890bdb5ab4022d6 +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 + 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: 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 + 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 + - 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: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Images/close_1.png b/Assets/Resources/Images/close_1.png new file mode 100644 index 00000000..ab3a2ad2 Binary files /dev/null and b/Assets/Resources/Images/close_1.png differ diff --git a/Assets/Resources/Images/close_1.png.meta b/Assets/Resources/Images/close_1.png.meta new file mode 100644 index 00000000..d7d7a7c0 --- /dev/null +++ b/Assets/Resources/Images/close_1.png.meta @@ -0,0 +1,104 @@ +fileFormatVersion: 2 +guid: 5cbb2a1813e35d143a8939fc60814d38 +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 + 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: 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 + 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 + - 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: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Images/icon-circulo-carga.png b/Assets/Resources/Images/icon-circulo-carga.png new file mode 100644 index 00000000..13ea6c63 Binary files /dev/null and b/Assets/Resources/Images/icon-circulo-carga.png differ diff --git a/Assets/Resources/Images/icon-circulo-carga.png.meta b/Assets/Resources/Images/icon-circulo-carga.png.meta new file mode 100644 index 00000000..e7866b8e --- /dev/null +++ b/Assets/Resources/Images/icon-circulo-carga.png.meta @@ -0,0 +1,104 @@ +fileFormatVersion: 2 +guid: 407dc13d102a8d842bbaa773773df936 +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 + 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: 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 + 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 + - 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: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Images/icon-circulo-completo.png b/Assets/Resources/Images/icon-circulo-completo.png new file mode 100644 index 00000000..4c860c3a Binary files /dev/null and b/Assets/Resources/Images/icon-circulo-completo.png differ diff --git a/Assets/Resources/Images/icon-circulo-completo.png.meta b/Assets/Resources/Images/icon-circulo-completo.png.meta new file mode 100644 index 00000000..11fe9288 --- /dev/null +++ b/Assets/Resources/Images/icon-circulo-completo.png.meta @@ -0,0 +1,104 @@ +fileFormatVersion: 2 +guid: cd3deb5c5274df94bbb4496fffd50e7c +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 + 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: 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 + 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 + - 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: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Images/search.png b/Assets/Resources/Images/search.png new file mode 100644 index 00000000..a08d45cf Binary files /dev/null and b/Assets/Resources/Images/search.png differ diff --git a/Assets/Resources/Images/search.png.meta b/Assets/Resources/Images/search.png.meta new file mode 100644 index 00000000..f4490f4c --- /dev/null +++ b/Assets/Resources/Images/search.png.meta @@ -0,0 +1,104 @@ +fileFormatVersion: 2 +guid: f731243fde8f17842b1b54e8fe2a16d6 +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 + 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: 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 + 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 + - 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: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Images/woman.png b/Assets/Resources/Images/woman.png new file mode 100644 index 00000000..3b584246 Binary files /dev/null and b/Assets/Resources/Images/woman.png differ diff --git a/Assets/Resources/Images/woman.png.meta b/Assets/Resources/Images/woman.png.meta new file mode 100644 index 00000000..5f19866f --- /dev/null +++ b/Assets/Resources/Images/woman.png.meta @@ -0,0 +1,104 @@ +fileFormatVersion: 2 +guid: e070f035bee8324459f88aef1c594662 +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 + 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: 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 + 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 + - 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: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Mapbox/User.meta b/Assets/Resources/Sound.meta similarity index 77% rename from Assets/Mapbox/User.meta rename to Assets/Resources/Sound.meta index 4b9b954f..1bdeea03 100644 --- a/Assets/Mapbox/User.meta +++ b/Assets/Resources/Sound.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 102e792eaf910f74e9acb0b9a6182219 +guid: 95a41acefc4f5e04a9a456f8ce06938e folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Resources/UI/Prefab/BigMap/Item.prefab b/Assets/Resources/UI/Prefab/BigMap/Item.prefab index b6e1e450..131846db 100644 --- a/Assets/Resources/UI/Prefab/BigMap/Item.prefab +++ b/Assets/Resources/UI/Prefab/BigMap/Item.prefab @@ -36,7 +36,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: 182, y: -50} + m_AnchoredPosition: {x: 182, y: -33} m_SizeDelta: {x: 46, y: 17} m_Pivot: {x: 0, y: 1} --- !u!222 &7696400418172266878 @@ -133,7 +133,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: 12, y: -53} + m_AnchoredPosition: {x: 12, y: -36} m_SizeDelta: {x: 12, y: 12} m_Pivot: {x: 0, y: 1} --- !u!222 &5310671687985071753 @@ -216,7 +216,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: 240, y: 77} + m_SizeDelta: {x: 240, y: 60} m_Pivot: {x: 0, y: 1} --- !u!222 &1644731075966996397 CanvasRenderer: @@ -324,7 +324,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: 28, y: -50} + m_AnchoredPosition: {x: 28, y: -33} m_SizeDelta: {x: 60, y: 17} m_Pivot: {x: 0, y: 1} --- !u!222 &7879955616901665858 @@ -402,7 +402,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: 108, y: -50} + m_AnchoredPosition: {x: 108, y: -33} m_SizeDelta: {x: 60, y: 17} m_Pivot: {x: 0, y: 1} --- !u!222 &1893774285036630824 @@ -480,7 +480,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: 92, y: -53} + m_AnchoredPosition: {x: 92, y: -36} m_SizeDelta: {x: 12, y: 12} m_Pivot: {x: 0, y: 1} --- !u!222 &8071121334430382672 @@ -736,7 +736,7 @@ PrefabInstance: - target: {fileID: 2018962972499165240, guid: d1deda2310a3a7241a8e0d559585b30d, type: 3} propertyPath: m_SizeDelta.y - value: 34 + value: 17 objectReference: {fileID: 0} - target: {fileID: 2018962972499165240, guid: d1deda2310a3a7241a8e0d559585b30d, type: 3} diff --git a/Assets/Resources/UI/Prefab/Device/ConnectDeviceModal.prefab b/Assets/Resources/UI/Prefab/Device/ConnectDeviceModal.prefab index 1819100d..7b852fa0 100644 --- a/Assets/Resources/UI/Prefab/Device/ConnectDeviceModal.prefab +++ b/Assets/Resources/UI/Prefab/Device/ConnectDeviceModal.prefab @@ -866,7 +866,7 @@ MonoBehaviour: m_Spacing: 2 m_ChildForceExpandWidth: 1 m_ChildForceExpandHeight: 1 - m_ChildControlWidth: 0 + m_ChildControlWidth: 1 m_ChildControlHeight: 0 m_ChildScaleWidth: 0 m_ChildScaleHeight: 0 @@ -1104,6 +1104,7 @@ RectTransform: - {fileID: 5111540946519637648} - {fileID: 373244018917157862} - {fileID: 4486570865570418447} + - {fileID: 9148816495943991969} m_Father: {fileID: 2357493399953259503} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1174,6 +1175,80 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &8699258261893011431 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 9148816495943991969} + - component: {fileID: 6682538152067005844} + - component: {fileID: 7512890813467725056} + m_Layer: 5 + m_Name: SearchIcon + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &9148816495943991969 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8699258261893011431} + 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: 8260988677505792498} + m_RootOrder: 6 + 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: 290.3, y: 150.2} + m_SizeDelta: {x: 30, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6682538152067005844 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8699258261893011431} + m_CullTransparentMesh: 0 +--- !u!114 &7512890813467725056 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8699258261893011431} + 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: 0.25490198, g: 0.25882354, b: 0.31764707, a: 1} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: f731243fde8f17842b1b54e8fe2a16d6, 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 &8816592783367478648 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/UI/Prefab/Device/DeviceItem.prefab b/Assets/Resources/UI/Prefab/Device/DeviceItem.prefab index ce51a2f6..7c0e2ff9 100644 --- a/Assets/Resources/UI/Prefab/Device/DeviceItem.prefab +++ b/Assets/Resources/UI/Prefab/Device/DeviceItem.prefab @@ -32,10 +32,10 @@ RectTransform: m_Father: {fileID: 189965521107699628} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 29, y: -44} - m_SizeDelta: {x: 612, y: 1} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 1, y: 0.5} + m_AnchoredPosition: {x: 29, y: -17} + m_SizeDelta: {x: -58, y: 1} m_Pivot: {x: 0, y: 1} --- !u!222 &3359272933999016855 CanvasRenderer: @@ -104,14 +104,15 @@ RectTransform: m_Children: - {fileID: 4347642619387382541} - {fileID: 5333104648953487716} + - {fileID: 4582282901144642708} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.5} - m_AnchorMax: {x: 1, y: 0.5} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 54} - m_Pivot: {x: 0.5, y: 0.5} + m_Pivot: {x: 0, y: 1} --- !u!114 &4265028498138876579 MonoBehaviour: m_ObjectHideFlags: 0 @@ -230,3 +231,81 @@ MonoBehaviour: m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: New Text +--- !u!1 &8513862428541677370 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4582282901144642708} + - component: {fileID: 828510373746272033} + - component: {fileID: 1484798634535886974} + m_Layer: 5 + m_Name: Type + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4582282901144642708 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8513862428541677370} + 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: 189965521107699628} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 0.5} + m_AnchorMax: {x: 1, y: 0.5} + m_AnchoredPosition: {x: -43.46, y: 15} + m_SizeDelta: {x: 65.85498, y: 30} + m_Pivot: {x: 1, y: 1} +--- !u!222 &828510373746272033 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8513862428541677370} + m_CullTransparentMesh: 0 +--- !u!114 &1484798634535886974 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8513862428541677370} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.9764706, g: 0.1882353, b: 0.5254902, a: 1} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 12800000, guid: 9428f2aab98e9c34d923a9174035a197, type: 3} + m_FontSize: 16 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 1 + m_MaxSize: 40 + m_Alignment: 3 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: ANT+ diff --git a/Assets/Resources/UI/Prefab/Device/DeviceView.prefab b/Assets/Resources/UI/Prefab/Device/DeviceView.prefab index cf312ad1..4e982eb8 100644 --- a/Assets/Resources/UI/Prefab/Device/DeviceView.prefab +++ b/Assets/Resources/UI/Prefab/Device/DeviceView.prefab @@ -538,6 +538,7 @@ GameObject: - component: {fileID: 6865488968694474991} - component: {fileID: 9174514640126681443} - component: {fileID: 7187524458426321200} + - component: {fileID: 8263193341907766823} m_Layer: 5 m_Name: ConnectionPanel m_TagString: Untagged @@ -627,6 +628,18 @@ MonoBehaviour: m_GradientStyle: 0 m_ColorSpace: -1 m_IgnoreAspectRatio: 1 +--- !u!225 &8263193341907766823 +CanvasGroup: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8089520134167711217} + m_Enabled: 1 + m_Alpha: 1 + m_Interactable: 1 + m_BlocksRaycasts: 1 + m_IgnoreParentGroups: 0 --- !u!1 &8191608159360083798 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/UI/Prefab/MainNav.prefab b/Assets/Resources/UI/Prefab/MainNav.prefab index 50e2049f..2efe86ad 100644 --- a/Assets/Resources/UI/Prefab/MainNav.prefab +++ b/Assets/Resources/UI/Prefab/MainNav.prefab @@ -540,7 +540,7 @@ PrefabInstance: - target: {fileID: 8688565590564084001, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3} propertyPath: Tooltips - value: "\u963F\u65AF\u987F\u53D1" + value: Device objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3} @@ -707,7 +707,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: aa45bff1f87f0e24381d66bf33aba1b8, + objectReference: {fileID: 21300000, guid: 28c1cc7667df5eb4e8bf360991cc784c, type: 3} - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3} diff --git a/Assets/Resources/UI/Prefab/MapList/MapItem.prefab b/Assets/Resources/UI/Prefab/MapList/MapItem.prefab index 599dcbf7..05237423 100644 --- a/Assets/Resources/UI/Prefab/MapList/MapItem.prefab +++ b/Assets/Resources/UI/Prefab/MapList/MapItem.prefab @@ -314,7 +314,6 @@ GameObject: - component: {fileID: 281043391106631963} - component: {fileID: 281043391106631957} - component: {fileID: 5399473526635801971} - - component: {fileID: 2103284423} m_Layer: 5 m_Name: MapItem m_TagString: Untagged @@ -347,10 +346,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: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_SizeDelta: {x: 280, y: 287} m_Pivot: {x: 0, y: 1} --- !u!222 &5262667172184159176 CanvasRenderer: @@ -444,22 +443,6 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: [] ---- !u!114 &2103284423 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5262667172184159175} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 97bc2ebab6563400c95b036136d26ea6, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Inverse: 0 - m_MaskInteraction: 1 - m_UseStencil: 1 - m_RaycastFilter: 0 --- !u!1 &5307116753058887248 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/UI/Prefab/Panel/BigMapPanel.prefab b/Assets/Resources/UI/Prefab/Panel/BigMapPanel.prefab index 8289135a..805d4b42 100644 --- a/Assets/Resources/UI/Prefab/Panel/BigMapPanel.prefab +++ b/Assets/Resources/UI/Prefab/Panel/BigMapPanel.prefab @@ -789,7 +789,8 @@ Transform: 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: 1728001826856130898} m_Father: {fileID: 3945718112839240075} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} @@ -920,9 +921,9 @@ MonoBehaviour: entityPerCoroutine: 20 vectorSubLayers: [] locationPrefabList: [] - _tileProvider: {fileID: 0} + _tileProvider: {fileID: 5955187681502729797} _previewOptions: - isPreviewEnabled: 0 + isPreviewEnabled: 1 --- !u!114 &3945718112544175234 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1254,6 +1255,53 @@ MonoBehaviour: m_EditorClassIdentifier: m_HorizontalFit: 0 m_VerticalFit: 2 +--- !u!1 &5990552412584580859 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1728001826856130898} + - component: {fileID: 5955187681502729797} + m_Layer: 0 + m_Name: TileProvider + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1728001826856130898 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5990552412584580859} + 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: 3945718112544175236} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &5955187681502729797 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5990552412584580859} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 756a01a914208439d8d2fc8dcd68b229, type: 3} + m_Name: + m_EditorClassIdentifier: + _cbtpOptions: + camera: {fileID: 0} + visibleBuffer: 0 + disposeBuffer: 0 --- !u!1 &6307228320602552118 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/UI/Prefab/Panel/DevicePanel.prefab b/Assets/Resources/UI/Prefab/Panel/DevicePanel.prefab index b59042b2..632d34cd 100644 --- a/Assets/Resources/UI/Prefab/Panel/DevicePanel.prefab +++ b/Assets/Resources/UI/Prefab/Panel/DevicePanel.prefab @@ -100,7 +100,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: b78d80c303a893343a9f1fbad91b258f, type: 3} + m_Sprite: {fileID: 21300000, guid: 0aa699974f67fc14391df9d204504c86, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -140,13 +140,14 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 540031521672414432} + - {fileID: 4177612200037049886} m_Father: {fileID: 2716191576886074694} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 100, y: 64} + m_SizeDelta: {x: 64, y: 64} m_Pivot: {x: 0, y: 1} --- !u!222 &6268486626046139400 CanvasRenderer: @@ -249,14 +250,14 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.13725491, g: 0.13725491, b: 0.1764706, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 0} m_RaycastTarget: 1 m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] m_Sprite: {fileID: 0} - m_Type: 1 + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -361,6 +362,8 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 7880067589867523193} + - component: {fileID: 2300362318542359912} + - component: {fileID: 7674521249602453297} m_Layer: 5 m_Name: UnconnectionPanel m_TagString: Untagged @@ -390,6 +393,43 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2300362318542359912 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3922022349098588048} + m_CullTransparentMesh: 0 +--- !u!114 &7674521249602453297 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3922022349098588048} + 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_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: bb78a6427b2dd2e468f35d12d18c3945, 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 &4032660314221060955 GameObject: m_ObjectHideFlags: 0 @@ -428,7 +468,7 @@ RectTransform: - {fileID: 3144935909727982048} - {fileID: 6693457840500217632} - {fileID: 4318784480111848189} - - {fileID: 6682760290205143075} + - {fileID: 3886093058250731124} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -508,6 +548,8 @@ GameObject: m_Component: - component: {fileID: 4987533108072491894} - component: {fileID: 1827267358013476362} + - component: {fileID: 8976174000101069486} + - component: {fileID: 6858275271041851238} m_Layer: 5 m_Name: ConnectionPanel m_TagString: Untagged @@ -543,6 +585,47 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5023905775086954472} m_CullTransparentMesh: 0 +--- !u!114 &8976174000101069486 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5023905775086954472} + 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_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: f801cf1a87a735b49890bdb5ab4022d6, 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!225 &6858275271041851238 +CanvasGroup: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5023905775086954472} + m_Enabled: 1 + m_Alpha: 1 + m_Interactable: 1 + m_BlocksRaycasts: 1 + m_IgnoreParentGroups: 0 --- !u!1 &5941259351214417460 GameObject: m_ObjectHideFlags: 0 @@ -699,6 +782,80 @@ MonoBehaviour: m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: Smart Trainer +--- !u!1 &6502171739230510504 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4177612200037049886} + - component: {fileID: 4637196965224215020} + - component: {fileID: 6835048507788123828} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4177612200037049886 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6502171739230510504} + m_LocalRotation: {x: 0.08715578, y: 0, z: 0, w: 0.9961947} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 6430829710355291381} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 10, 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: 44, y: 44} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4637196965224215020 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6502171739230510504} + m_CullTransparentMesh: 0 +--- !u!114 &6835048507788123828 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6502171739230510504} + 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_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 407dc13d102a8d842bbaa773773df936, 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 &7066476020851680862 GameObject: m_ObjectHideFlags: 0 @@ -773,124 +930,6 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!1 &7751583847402098136 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 6682760290205143075} - - component: {fileID: 3666476432683473770} - - component: {fileID: 8072193673390519755} - - component: {fileID: 1279988025458105546} - m_Layer: 5 - m_Name: CloseBtn - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &6682760290205143075 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7751583847402098136} - 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: 4032660314221060952} - m_RootOrder: 7 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 1506, y: -30} - m_SizeDelta: {x: 64, y: 64} - m_Pivot: {x: 0, y: 1} ---- !u!222 &3666476432683473770 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7751583847402098136} - m_CullTransparentMesh: 0 ---- !u!114 &8072193673390519755 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7751583847402098136} - 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_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 13eb11ec68556324fb34d28dec570c27, 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!114 &1279988025458105546 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7751583847402098136} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Navigation: - m_Mode: 3 - m_SelectOnUp: {fileID: 0} - m_SelectOnDown: {fileID: 0} - m_SelectOnLeft: {fileID: 0} - m_SelectOnRight: {fileID: 0} - m_Transition: 1 - m_Colors: - m_NormalColor: {r: 1, g: 1, b: 1, a: 1} - m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} - m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} - m_ColorMultiplier: 1 - m_FadeDuration: 0.1 - m_SpriteState: - m_HighlightedSprite: {fileID: 0} - m_PressedSprite: {fileID: 0} - m_SelectedSprite: {fileID: 0} - m_DisabledSprite: {fileID: 0} - m_AnimationTriggers: - m_NormalTrigger: Normal - m_HighlightedTrigger: Highlighted - m_PressedTrigger: Pressed - m_SelectedTrigger: Selected - m_DisabledTrigger: Disabled - m_Interactable: 1 - m_TargetGraphic: {fileID: 8072193673390519755} - m_OnClick: - m_PersistentCalls: - m_Calls: [] --- !u!1 &7967353091167980053 GameObject: m_ObjectHideFlags: 0 @@ -1151,17 +1190,17 @@ PrefabInstance: - target: {fileID: 6055053651375121365, guid: f9b4f89e2e3738c459fe1a4f852d6774, type: 3} propertyPath: m_Color.b - value: 0.5254902 + value: 0.44313726 objectReference: {fileID: 0} - target: {fileID: 6055053651375121365, guid: f9b4f89e2e3738c459fe1a4f852d6774, type: 3} propertyPath: m_Color.g - value: 0.1882353 + value: 0.105882354 objectReference: {fileID: 0} - target: {fileID: 6055053651375121365, guid: f9b4f89e2e3738c459fe1a4f852d6774, type: 3} propertyPath: m_Color.r - value: 0.9764706 + value: 0.89411765 objectReference: {fileID: 0} - target: {fileID: 6238379916544863262, guid: f9b4f89e2e3738c459fe1a4f852d6774, type: 3} @@ -1536,6 +1575,177 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 2068211973115863772} m_PrefabAsset: {fileID: 0} +--- !u!1001 &2186264729535284436 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 4032660314221060952} + m_Modifications: + - target: {fileID: 2665063159965378333, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_Type + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2665063159965378333, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 5cbb2a1813e35d143a8939fc60814d38, + type: 3} + - target: {fileID: 2665063159965378333, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_Color.b + value: 0.7372549 + objectReference: {fileID: 0} + - target: {fileID: 2665063159965378333, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_Color.g + value: 0.6862745 + objectReference: {fileID: 0} + - target: {fileID: 2665063159965378333, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_Color.r + value: 0.6862745 + objectReference: {fileID: 0} + - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_Pivot.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_Pivot.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_RootOrder + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_SizeDelta.x + value: 64 + objectReference: {fileID: 0} + - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_SizeDelta.y + value: 64 + objectReference: {fileID: 0} + - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 1506 + objectReference: {fileID: 0} + - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -30 + objectReference: {fileID: 0} + - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3150550772099312289, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_Name + value: CloseBtn + objectReference: {fileID: 0} + - target: {fileID: 3150550772099312291, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_Colors.m_HighlightedColor.b + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3150550772099312291, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_Colors.m_HighlightedColor.g + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3150550772099312291, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_Colors.m_HighlightedColor.r + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8688565590564084001, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: mType + value: 3 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3} +--- !u!224 &3886093058250731124 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + m_PrefabInstance: {fileID: 2186264729535284436} + m_PrefabAsset: {fileID: 0} --- !u!1001 &7779191180664939548 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/UI/Prefab/Panel/HomePanel.prefab b/Assets/Resources/UI/Prefab/Panel/HomePanel.prefab index df2b2d2a..223b704a 100644 --- a/Assets/Resources/UI/Prefab/Panel/HomePanel.prefab +++ b/Assets/Resources/UI/Prefab/Panel/HomePanel.prefab @@ -192,6 +192,12 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 4566599627632401657, guid: 652cdefe0475dfd429e5a7e92bc3fa31, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 447fc332cc850f9488caf68a854c7c24, + type: 3} - target: {fileID: 8600990077643662720, guid: 652cdefe0475dfd429e5a7e92bc3fa31, type: 3} propertyPath: m_SizeDelta.x diff --git a/Assets/Resources/UI/Prefab/Panel/MapListPanel.prefab b/Assets/Resources/UI/Prefab/Panel/MapListPanel.prefab index dc554dfd..c6e6942d 100644 --- a/Assets/Resources/UI/Prefab/Panel/MapListPanel.prefab +++ b/Assets/Resources/UI/Prefab/Panel/MapListPanel.prefab @@ -4031,6 +4031,7 @@ GameObject: - component: {fileID: 5692760043962084493} - component: {fileID: 6644751111942277666} - component: {fileID: 1909824527552891219} + - component: {fileID: 7699048177492648660} m_Layer: 5 m_Name: GoList m_TagString: Untagged @@ -4094,6 +4095,49 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!114 &7699048177492648660 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8296637580613539111} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 1909824527552891219} + m_OnClick: + m_PersistentCalls: + m_Calls: [] --- !u!1 &8539777692955277418 GameObject: m_ObjectHideFlags: 0 @@ -4420,21 +4464,27 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 5ee52e0b78bd38244a2b473e2236800c, type: 3} ---- !u!224 &6111654188722717914 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 6258245508770672658, guid: 5ee52e0b78bd38244a2b473e2236800c, +--- !u!1 &4236066551055479381 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 4089475371085219485, guid: 5ee52e0b78bd38244a2b473e2236800c, type: 3} m_PrefabInstance: {fileID: 146705893016024264} m_PrefabAsset: {fileID: 0} ---- !u!1 &1109064923048164317 stripped +--- !u!1 &2009426565801043604 stripped GameObject: - m_CorrespondingSourceObject: {fileID: 967434514102783765, guid: 5ee52e0b78bd38244a2b473e2236800c, + m_CorrespondingSourceObject: {fileID: 1867831574853112412, guid: 5ee52e0b78bd38244a2b473e2236800c, type: 3} m_PrefabInstance: {fileID: 146705893016024264} m_PrefabAsset: {fileID: 0} ---- !u!1 &2049799399839608 stripped +--- !u!1 &1377157623896305697 stripped GameObject: - m_CorrespondingSourceObject: {fileID: 148192672769352624, guid: 5ee52e0b78bd38244a2b473e2236800c, + m_CorrespondingSourceObject: {fileID: 1231050277644289257, guid: 5ee52e0b78bd38244a2b473e2236800c, + type: 3} + m_PrefabInstance: {fileID: 146705893016024264} + m_PrefabAsset: {fileID: 0} +--- !u!1 &859051997198845018 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 712346121867735186, guid: 5ee52e0b78bd38244a2b473e2236800c, type: 3} m_PrefabInstance: {fileID: 146705893016024264} m_PrefabAsset: {fileID: 0} @@ -4450,27 +4500,21 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 146705893016024264} m_PrefabAsset: {fileID: 0} ---- !u!1 &1377157623896305697 stripped +--- !u!1 &1109064923048164317 stripped GameObject: - m_CorrespondingSourceObject: {fileID: 1231050277644289257, guid: 5ee52e0b78bd38244a2b473e2236800c, + m_CorrespondingSourceObject: {fileID: 967434514102783765, guid: 5ee52e0b78bd38244a2b473e2236800c, type: 3} m_PrefabInstance: {fileID: 146705893016024264} m_PrefabAsset: {fileID: 0} ---- !u!1 &2009426565801043604 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 1867831574853112412, guid: 5ee52e0b78bd38244a2b473e2236800c, +--- !u!224 &6111654188722717914 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 6258245508770672658, guid: 5ee52e0b78bd38244a2b473e2236800c, type: 3} m_PrefabInstance: {fileID: 146705893016024264} m_PrefabAsset: {fileID: 0} ---- !u!1 &4236066551055479381 stripped +--- !u!1 &2049799399839608 stripped GameObject: - m_CorrespondingSourceObject: {fileID: 4089475371085219485, guid: 5ee52e0b78bd38244a2b473e2236800c, - type: 3} - m_PrefabInstance: {fileID: 146705893016024264} - m_PrefabAsset: {fileID: 0} ---- !u!1 &859051997198845018 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 712346121867735186, guid: 5ee52e0b78bd38244a2b473e2236800c, + m_CorrespondingSourceObject: {fileID: 148192672769352624, guid: 5ee52e0b78bd38244a2b473e2236800c, type: 3} m_PrefabInstance: {fileID: 146705893016024264} m_PrefabAsset: {fileID: 0} @@ -4767,48 +4811,48 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 2277129673863769977} m_PrefabAsset: {fileID: 0} ---- !u!1 &1048332570473065360 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 1231050277644289257, guid: 5ee52e0b78bd38244a2b473e2236800c, - type: 3} - m_PrefabInstance: {fileID: 2277129673863769977} - m_PrefabAsset: {fileID: 0} --- !u!1 &1365991255437877356 stripped GameObject: m_CorrespondingSourceObject: {fileID: 967434514102783765, guid: 5ee52e0b78bd38244a2b473e2236800c, type: 3} m_PrefabInstance: {fileID: 2277129673863769977} m_PrefabAsset: {fileID: 0} ---- !u!1 &2132314977860390089 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 148192672769352624, guid: 5ee52e0b78bd38244a2b473e2236800c, - type: 3} - m_PrefabInstance: {fileID: 2277129673863769977} - m_PrefabAsset: {fileID: 0} ---- !u!1 &2835369396092332516 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 4089475371085219485, guid: 5ee52e0b78bd38244a2b473e2236800c, - type: 3} - m_PrefabInstance: {fileID: 2277129673863769977} - m_PrefabAsset: {fileID: 0} --- !u!1 &8658814530548131613 stripped GameObject: m_CorrespondingSourceObject: {fileID: 7472514873862735972, guid: 5ee52e0b78bd38244a2b473e2236800c, type: 3} m_PrefabInstance: {fileID: 2277129673863769977} m_PrefabAsset: {fileID: 0} +--- !u!1 &1048332570473065360 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1231050277644289257, guid: 5ee52e0b78bd38244a2b473e2236800c, + type: 3} + m_PrefabInstance: {fileID: 2277129673863769977} + m_PrefabAsset: {fileID: 0} --- !u!1 &464472969339895077 stripped GameObject: m_CorrespondingSourceObject: {fileID: 1867831574853112412, guid: 5ee52e0b78bd38244a2b473e2236800c, type: 3} m_PrefabInstance: {fileID: 2277129673863769977} m_PrefabAsset: {fileID: 0} +--- !u!1 &2835369396092332516 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 4089475371085219485, guid: 5ee52e0b78bd38244a2b473e2236800c, + type: 3} + m_PrefabInstance: {fileID: 2277129673863769977} + m_PrefabAsset: {fileID: 0} --- !u!1 &9001619333872210974 stripped GameObject: m_CorrespondingSourceObject: {fileID: 7166863393051868007, guid: 5ee52e0b78bd38244a2b473e2236800c, type: 3} m_PrefabInstance: {fileID: 2277129673863769977} m_PrefabAsset: {fileID: 0} +--- !u!1 &2132314977860390089 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 148192672769352624, guid: 5ee52e0b78bd38244a2b473e2236800c, + type: 3} + m_PrefabInstance: {fileID: 2277129673863769977} + m_PrefabAsset: {fileID: 0} --- !u!1001 &2881229966191197026 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/MainScene.unity b/Assets/Scenes/MainScene.unity index 6cef8fe3..51a8759e 100644 --- a/Assets/Scenes/MainScene.unity +++ b/Assets/Scenes/MainScene.unity @@ -156,7 +156,7 @@ RectTransform: m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 0} m_AnchoredPosition: {x: -20, y: 20} - m_SizeDelta: {x: 160, y: 19} + m_SizeDelta: {x: 70, y: 19} m_Pivot: {x: 1, y: 0} --- !u!114 &154299663 MonoBehaviour: @@ -190,7 +190,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: Version:0.0.0 + m_Text: V0.0.0 --- !u!222 &154299664 CanvasRenderer: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/Apis/Models/SummaryResultModel.cs b/Assets/Scripts/Apis/Models/SummaryResultModel.cs index 51b9e61d..e8f45669 100644 --- a/Assets/Scripts/Apis/Models/SummaryResultModel.cs +++ b/Assets/Scripts/Apis/Models/SummaryResultModel.cs @@ -46,5 +46,7 @@ namespace Assets.Scripts.Apis.Models public double CompleteRoute { get; set; } public string Tips { get; set; } + + } } diff --git a/Assets/Scripts/Apis/Models/UserResultModel.cs b/Assets/Scripts/Apis/Models/UserResultModel.cs index 15c4ca7c..980cafaf 100644 --- a/Assets/Scripts/Apis/Models/UserResultModel.cs +++ b/Assets/Scripts/Apis/Models/UserResultModel.cs @@ -63,5 +63,11 @@ namespace Assets.Scripts.Apis.Models public string Unionid { get; set; } public int Height { get; set; } + + public DateTime LastUpdateFtpTime { get; set; } + + public DateTime LastUpdateWeightTime { get; set; } + + public DateTime LastUpdateBicycleWeightTime { get; set; } } } diff --git a/Assets/Scripts/Apis/UserApi.cs b/Assets/Scripts/Apis/UserApi.cs index a0617d80..bc433dc5 100644 --- a/Assets/Scripts/Apis/UserApi.cs +++ b/Assets/Scripts/Apis/UserApi.cs @@ -67,6 +67,9 @@ namespace Assets.Scripts.Apis user.ConnectedToStrava = ret.data.ConnectedToStrava; } user.Birthday = ret.data.Birthday; + user.LastUpdateFtpTime = ret.data.LastUpdateFtpTime; + user.LastUpdateWeightTime = ret.data.LastUpdateWeightTime; + user.LastUpdateBicycleWeightTime = ret.data.LastUpdateBicycleWeightTime; //todo: check local database, insert new user //PubCommData.CurrentUser = user; diff --git a/Assets/Scripts/Devices/Ant/AntConnector.cs b/Assets/Scripts/Devices/Ant/AntConnector.cs index befb3fa1..70bd7c93 100644 --- a/Assets/Scripts/Devices/Ant/AntConnector.cs +++ b/Assets/Scripts/Devices/Ant/AntConnector.cs @@ -152,7 +152,7 @@ namespace Assets.Scripts.Devices.Ant private void antDevice_serialError(ANT_Device sender, ANT_Device.serialErrorCode error, bool isCritical) { //throw new NotImplementedException(); - Log("出错了"); + Log("出错了"+ error.ToString()); if (error != ANT_Device.serialErrorCode.DeviceConnectionLost) return; diff --git a/Assets/Scripts/Scenes/MainController.cs b/Assets/Scripts/Scenes/MainController.cs index 1dfe7828..b60a7202 100644 --- a/Assets/Scripts/Scenes/MainController.cs +++ b/Assets/Scripts/Scenes/MainController.cs @@ -1,6 +1,9 @@ -using Mapbox.Examples; +using Assets.Scripts; +using Assets.Scripts.Devices.Ant; +using Mapbox.Examples; using System.Collections; using System.Collections.Generic; +using System.Threading.Tasks; using UnityEngine; using UnityEngine.UI; @@ -11,17 +14,23 @@ public class MainController : MonoBehaviour private void Awake() { Version = this.transform.Find("GameObject").Find("Version").GetComponent(); - Version.text = "Version:"+App.AppVersion; + Version.text = "V"+App.AppVersion; + AntConnector.Instance(); } // Start is called before the first frame update - void Start() + async void Start() { UIManager.Instance.Root = root; UIManager.Instance.MainPanel = this.transform.Find("Panel").GetComponent(); UIManager.Instance.ModalsPanel = this.transform.Find("ModalPanel").GetComponent(); + if (App.CurrentUser == null) + { + await Login(); + } + //MainMenu.transform.Find("Home").GetComponent