diff --git a/.gitignore b/.gitignore index 8c93d3a5..a778f40b 100644 --- a/.gitignore +++ b/.gitignore @@ -73,4 +73,4 @@ Assets/Packages Assets/Packages.meta Assets/Shader2D-master Assets/ZFBrowser -Assets/Resources/UI/Font +Assets/Resources/UI/Font/*.ttf diff --git a/Assets/Mapbox/Unity/Map/AbstractMap.cs b/Assets/Mapbox/Unity/Map/AbstractMap.cs index 7a6a27e4..a1cf4d1f 100644 --- a/Assets/Mapbox/Unity/Map/AbstractMap.cs +++ b/Assets/Mapbox/Unity/Map/AbstractMap.cs @@ -215,9 +215,19 @@ namespace Mapbox.Unity.Map } } + /// + /// ËïÌÎÐ޸ģ¬Ôö¼Ó×î´óËõ·ÅÅÐ¶Ï + /// + /// public void SetZoom(float zoom) { - Options.locationOptions.zoom = zoom; + if (MaxZoom.HasValue) + { + Options.locationOptions.zoom = Mathf.Max(MaxZoom.Value, zoom); + } + else { + Options.locationOptions.zoom = zoom; + } } /// @@ -1220,6 +1230,19 @@ namespace Mapbox.Unity.Map _options.scalingOptions.HasChanged = true; } + private float? _MaxZoom; + public float? MaxZoom + { + get + { + return _MaxZoom; + } + set + { + _MaxZoom = value; + } + } + #endregion #region Events diff --git a/Assets/Resources/Images/ANT+_2.png b/Assets/Resources/Images/ANT+_2.png new file mode 100644 index 00000000..4db255e3 Binary files /dev/null and b/Assets/Resources/Images/ANT+_2.png differ diff --git a/Assets/Resources/Images/ANT+_2.png.meta b/Assets/Resources/Images/ANT+_2.png.meta new file mode 100644 index 00000000..63279ea3 --- /dev/null +++ b/Assets/Resources/Images/ANT+_2.png.meta @@ -0,0 +1,104 @@ +fileFormatVersion: 2 +guid: 949827eb2b969cf428344bdc38c42fb2 +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/Ride.meta b/Assets/Resources/Images/Ride.meta index 3306b0fb..822ba870 100644 --- a/Assets/Resources/Images/Ride.meta +++ b/Assets/Resources/Images/Ride.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: c424b00c77060e24db3aa7985281b01e +guid: e776371cfc6ebb14e85a103db9c67744 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Resources/Images/man.png b/Assets/Resources/Images/man.png new file mode 100644 index 00000000..88ac209d Binary files /dev/null and b/Assets/Resources/Images/man.png differ diff --git a/Assets/Resources/Images/man.png.meta b/Assets/Resources/Images/man.png.meta new file mode 100644 index 00000000..518b8993 --- /dev/null +++ b/Assets/Resources/Images/man.png.meta @@ -0,0 +1,104 @@ +fileFormatVersion: 2 +guid: 2a3c5c12765c1da43901afbec2c179f2 +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/Control/PFUIText.prefab b/Assets/Resources/UI/Control/PFUIText.prefab index 01c1253e..ad52a9ae 100644 --- a/Assets/Resources/UI/Control/PFUIText.prefab +++ b/Assets/Resources/UI/Control/PFUIText.prefab @@ -13,7 +13,7 @@ GameObject: - component: {fileID: 2018962972499165246} - component: {fileID: 2018962972499165247} m_Layer: 5 - m_Name: PfText + m_Name: PFUIText m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 diff --git a/Assets/Resources/UI/Font.meta b/Assets/Resources/UI/Font.meta index b572848c..ab90dd6a 100644 --- a/Assets/Resources/UI/Font.meta +++ b/Assets/Resources/UI/Font.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 367a7d51917d3cc4199ac3c7a3fe8ecb +guid: 2769b318daa55d848a184702774e2628 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Resources/UI/Font/GenSenMaruGothicTW-Bold.ttf.meta b/Assets/Resources/UI/Font/GenSenMaruGothicTW-Bold.ttf.meta new file mode 100644 index 00000000..0a32ec71 --- /dev/null +++ b/Assets/Resources/UI/Font/GenSenMaruGothicTW-Bold.ttf.meta @@ -0,0 +1,25 @@ +fileFormatVersion: 2 +guid: 1db9e217733971041be26b076fda6083 +TrueTypeFontImporter: + externalObjects: {} + serializedVersion: 4 + fontSize: 16 + forceTextureCase: -2 + characterSpacing: 0 + characterPadding: 1 + includeFontData: 1 + fontName: GenSenMaruGothic TW TTF + fontNames: + - GenSenMaruGothic TW TTF + fallbackFontReferences: + - {fileID: 12800000, guid: 8180b991008992c45b6bf1a979c7baca, type: 3} + - {fileID: 12800000, guid: 9428f2aab98e9c34d923a9174035a197, type: 3} + - {fileID: 12800000, guid: dc2b8edfb87f74143913c268624f8711, type: 3} + customCharacters: + fontRenderingMode: 0 + ascentCalculationMode: 1 + useLegacyBoundsCalculation: 0 + shouldRoundAdvanceValue: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/UI/Font/GenSenMaruGothicTW-Heavy.ttf.meta b/Assets/Resources/UI/Font/GenSenMaruGothicTW-Heavy.ttf.meta new file mode 100644 index 00000000..ad412d47 --- /dev/null +++ b/Assets/Resources/UI/Font/GenSenMaruGothicTW-Heavy.ttf.meta @@ -0,0 +1,24 @@ +fileFormatVersion: 2 +guid: 9428f2aab98e9c34d923a9174035a197 +TrueTypeFontImporter: + externalObjects: {} + serializedVersion: 4 + fontSize: 16 + forceTextureCase: -2 + characterSpacing: 0 + characterPadding: 1 + includeFontData: 1 + fontName: GenSenMaruGothic TW TTF + fontNames: + - GenSenMaruGothic TW TTF + fallbackFontReferences: + - {fileID: 12800000, guid: 4394d1802932d4741b987ebf2c16b64b, type: 3} + - {fileID: 12800000, guid: 8180b991008992c45b6bf1a979c7baca, type: 3} + customCharacters: + fontRenderingMode: 0 + ascentCalculationMode: 1 + useLegacyBoundsCalculation: 0 + shouldRoundAdvanceValue: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/UI/Font/GenSenMaruGothicTW-Medium.ttf.meta b/Assets/Resources/UI/Font/GenSenMaruGothicTW-Medium.ttf.meta new file mode 100644 index 00000000..8faa0a3f --- /dev/null +++ b/Assets/Resources/UI/Font/GenSenMaruGothicTW-Medium.ttf.meta @@ -0,0 +1,25 @@ +fileFormatVersion: 2 +guid: dc2b8edfb87f74143913c268624f8711 +TrueTypeFontImporter: + externalObjects: {} + serializedVersion: 4 + fontSize: 16 + forceTextureCase: -2 + characterSpacing: 0 + characterPadding: 1 + includeFontData: 1 + fontName: GenSenMaruGothic TW TTF + fontNames: + - GenSenMaruGothic TW TTF + fallbackFontReferences: + - {fileID: 12800000, guid: 4394d1802932d4741b987ebf2c16b64b, type: 3} + - {fileID: 12800000, guid: 8180b991008992c45b6bf1a979c7baca, type: 3} + - {fileID: 12800000, guid: 9428f2aab98e9c34d923a9174035a197, type: 3} + customCharacters: + fontRenderingMode: 0 + ascentCalculationMode: 1 + useLegacyBoundsCalculation: 0 + shouldRoundAdvanceValue: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/UI/Font/GenSenMaruGothicTW-Regular.ttf.meta b/Assets/Resources/UI/Font/GenSenMaruGothicTW-Regular.ttf.meta new file mode 100644 index 00000000..a6bfc45a --- /dev/null +++ b/Assets/Resources/UI/Font/GenSenMaruGothicTW-Regular.ttf.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 8180b991008992c45b6bf1a979c7baca +TrueTypeFontImporter: + externalObjects: {} + serializedVersion: 4 + fontSize: 16 + forceTextureCase: -2 + characterSpacing: 0 + characterPadding: 1 + includeFontData: 1 + fontName: GenSenMaruGothic TW TTF + fontNames: + - GenSenMaruGothic TW TTF + fallbackFontReferences: + - {fileID: 12800000, guid: 4394d1802932d4741b987ebf2c16b64b, type: 3} + customCharacters: + fontRenderingMode: 0 + ascentCalculationMode: 1 + useLegacyBoundsCalculation: 0 + shouldRoundAdvanceValue: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/UI/Prefab/BigMap/Item.prefab b/Assets/Resources/UI/Prefab/BigMap/Item.prefab index 7ec4d7f8..11383004 100644 --- a/Assets/Resources/UI/Prefab/BigMap/Item.prefab +++ b/Assets/Resources/UI/Prefab/BigMap/Item.prefab @@ -1,5 +1,104 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &628269285932116249 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3375573268376707168} + - component: {fileID: 7696400418172266878} + - component: {fileID: 4897197053936486456} + - component: {fileID: 5064155270663215810} + m_Layer: 0 + m_Name: Hot + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3375573268376707168 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 628269285932116249} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 8514581898389219816} + m_Father: {fileID: 1644731075966996399} + m_RootOrder: 5 + 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_SizeDelta: {x: 46, y: 17} + m_Pivot: {x: 0, y: 1} +--- !u!222 &7696400418172266878 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 628269285932116249} + m_CullTransparentMesh: 0 +--- !u!114 &4897197053936486456 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 628269285932116249} + 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: 0} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!114 &5064155270663215810 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 628269285932116249} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7245fe6cb36dc7b4e921e9ae44200f43, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Direction: 0 + m_Color1: {r: 1, g: 0.45490196, b: 0.52156866, a: 1} + m_Color2: {r: 0.9764706, g: 0.1882353, b: 0.5254902, a: 1} + m_Color3: {r: 1, g: 1, b: 1, a: 1} + m_Color4: {r: 1, g: 1, b: 1, a: 1} + m_Rotation: 0 + m_Offset1: 0 + m_Offset2: 0 + m_GradientStyle: 0 + m_ColorSpace: -1 + m_IgnoreAspectRatio: 1 --- !u!1 &1006707989137105944 GameObject: m_ObjectHideFlags: 0 @@ -12,7 +111,7 @@ GameObject: - component: {fileID: 5310671687985071753} - component: {fileID: 7900034461715759898} m_Layer: 5 - m_Name: Image + m_Name: DistanceIcon m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -58,13 +157,13 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0.36078432, g: 0.36078432, b: 0.43137255, a: 1} m_RaycastTarget: 1 m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 6a8817fc534bb6c4b9a0de57f35882fa, type: 3} + m_Sprite: {fileID: 21300000, guid: 8adf51874688e8b48a396a83ccc7ad9d, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -105,11 +204,12 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 1644731077207170621} + - {fileID: 8586563145068443211} - {fileID: 7789815627924313506} - {fileID: 592474734359368031} - {fileID: 7546774928026946670} - {fileID: 2525110298282261934} + - {fileID: 3375573268376707168} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -190,84 +290,6 @@ MonoBehaviour: m_GradientStyle: 0 m_ColorSpace: -1 m_IgnoreAspectRatio: 1 ---- !u!1 &1644731077207170620 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1644731077207170621} - - component: {fileID: 1644731077207170611} - - component: {fileID: 1644731077207170610} - m_Layer: 5 - m_Name: name - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1644731077207170621 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1644731077207170620} - 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: 1644731075966996399} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 12, y: -10} - m_SizeDelta: {x: -24, y: 34} - m_Pivot: {x: 0, y: 1} ---- !u!222 &1644731077207170611 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1644731077207170620} - m_CullTransparentMesh: 0 ---- !u!114 &1644731077207170610 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1644731077207170620} - 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: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 12 - m_FontStyle: 1 - m_BestFit: 0 - m_MinSize: 1 - m_MaxSize: 40 - m_Alignment: 0 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: Name --- !u!1 &2605937531982105974 GameObject: m_ObjectHideFlags: 0 @@ -333,7 +355,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 25a07681c3624944d93fef973de82719, type: 3} m_FontSize: 12 m_FontStyle: 0 m_BestFit: 0 @@ -411,7 +433,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 25a07681c3624944d93fef973de82719, type: 3} m_FontSize: 12 m_FontStyle: 0 m_BestFit: 0 @@ -436,7 +458,7 @@ GameObject: - component: {fileID: 8071121334430382672} - component: {fileID: 4161665701330225276} m_Layer: 5 - m_Name: Image (1) + m_Name: BikeIcon m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -482,7 +504,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0.9764706, g: 0.1882353, b: 0.5254902, a: 1} m_RaycastTarget: 1 m_Maskable: 1 m_OnCullStateChanged: @@ -498,3 +520,325 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1001 &7650792506464872912 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 3375573268376707168} + m_Modifications: + - target: {fileID: 2018962972499165240, guid: d1deda2310a3a7241a8e0d559585b30d, + type: 3} + propertyPath: m_Pivot.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2018962972499165240, guid: d1deda2310a3a7241a8e0d559585b30d, + type: 3} + propertyPath: m_Pivot.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2018962972499165240, guid: d1deda2310a3a7241a8e0d559585b30d, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2018962972499165240, guid: d1deda2310a3a7241a8e0d559585b30d, + type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2018962972499165240, guid: d1deda2310a3a7241a8e0d559585b30d, + type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2018962972499165240, guid: d1deda2310a3a7241a8e0d559585b30d, + type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2018962972499165240, guid: d1deda2310a3a7241a8e0d559585b30d, + type: 3} + propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2018962972499165240, guid: d1deda2310a3a7241a8e0d559585b30d, + type: 3} + propertyPath: m_SizeDelta.x + value: 46 + objectReference: {fileID: 0} + - target: {fileID: 2018962972499165240, guid: d1deda2310a3a7241a8e0d559585b30d, + type: 3} + propertyPath: m_SizeDelta.y + value: 16 + objectReference: {fileID: 0} + - target: {fileID: 2018962972499165240, guid: d1deda2310a3a7241a8e0d559585b30d, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2018962972499165240, guid: d1deda2310a3a7241a8e0d559585b30d, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2018962972499165240, guid: d1deda2310a3a7241a8e0d559585b30d, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2018962972499165240, guid: d1deda2310a3a7241a8e0d559585b30d, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2018962972499165240, guid: d1deda2310a3a7241a8e0d559585b30d, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2018962972499165240, guid: d1deda2310a3a7241a8e0d559585b30d, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2018962972499165240, guid: d1deda2310a3a7241a8e0d559585b30d, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2018962972499165240, guid: d1deda2310a3a7241a8e0d559585b30d, + type: 3} + propertyPath: m_AnchoredPosition.x + value: -23 + objectReference: {fileID: 0} + - target: {fileID: 2018962972499165240, guid: d1deda2310a3a7241a8e0d559585b30d, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 8 + objectReference: {fileID: 0} + - target: {fileID: 2018962972499165240, guid: d1deda2310a3a7241a8e0d559585b30d, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2018962972499165240, guid: d1deda2310a3a7241a8e0d559585b30d, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2018962972499165240, guid: d1deda2310a3a7241a8e0d559585b30d, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2018962972499165241, guid: d1deda2310a3a7241a8e0d559585b30d, + type: 3} + propertyPath: m_Name + value: PFUIText + objectReference: {fileID: 0} + - target: {fileID: 2018962972499165246, guid: d1deda2310a3a7241a8e0d559585b30d, + type: 3} + propertyPath: m_Text + value: HOT + objectReference: {fileID: 0} + - target: {fileID: 2018962972499165246, guid: d1deda2310a3a7241a8e0d559585b30d, + type: 3} + propertyPath: m_Color.b + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2018962972499165246, guid: d1deda2310a3a7241a8e0d559585b30d, + type: 3} + propertyPath: m_Color.g + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2018962972499165246, guid: d1deda2310a3a7241a8e0d559585b30d, + type: 3} + propertyPath: m_Color.r + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2018962972499165246, guid: d1deda2310a3a7241a8e0d559585b30d, + type: 3} + propertyPath: m_FontData.m_Font + value: + objectReference: {fileID: 12800000, guid: 25a07681c3624944d93fef973de82719, + type: 3} + - target: {fileID: 2018962972499165246, guid: d1deda2310a3a7241a8e0d559585b30d, + type: 3} + propertyPath: m_FontData.m_MinSize + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2018962972499165246, guid: d1deda2310a3a7241a8e0d559585b30d, + type: 3} + propertyPath: m_FontData.m_FontSize + value: 12 + objectReference: {fileID: 0} + - target: {fileID: 2018962972499165246, guid: d1deda2310a3a7241a8e0d559585b30d, + type: 3} + propertyPath: m_FontData.m_Alignment + value: 4 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: d1deda2310a3a7241a8e0d559585b30d, type: 3} +--- !u!224 &8514581898389219816 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 2018962972499165240, guid: d1deda2310a3a7241a8e0d559585b30d, + type: 3} + m_PrefabInstance: {fileID: 7650792506464872912} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &7722923011652269683 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1644731075966996399} + m_Modifications: + - target: {fileID: 2018962972499165240, guid: d1deda2310a3a7241a8e0d559585b30d, + type: 3} + propertyPath: m_Pivot.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2018962972499165240, guid: d1deda2310a3a7241a8e0d559585b30d, + type: 3} + propertyPath: m_Pivot.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2018962972499165240, guid: d1deda2310a3a7241a8e0d559585b30d, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2018962972499165240, guid: d1deda2310a3a7241a8e0d559585b30d, + type: 3} + propertyPath: m_AnchorMax.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2018962972499165240, guid: d1deda2310a3a7241a8e0d559585b30d, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2018962972499165240, guid: d1deda2310a3a7241a8e0d559585b30d, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2018962972499165240, guid: d1deda2310a3a7241a8e0d559585b30d, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2018962972499165240, guid: d1deda2310a3a7241a8e0d559585b30d, + type: 3} + propertyPath: m_SizeDelta.x + value: -24 + objectReference: {fileID: 0} + - target: {fileID: 2018962972499165240, guid: d1deda2310a3a7241a8e0d559585b30d, + type: 3} + propertyPath: m_SizeDelta.y + value: 34 + objectReference: {fileID: 0} + - target: {fileID: 2018962972499165240, guid: d1deda2310a3a7241a8e0d559585b30d, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2018962972499165240, guid: d1deda2310a3a7241a8e0d559585b30d, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2018962972499165240, guid: d1deda2310a3a7241a8e0d559585b30d, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2018962972499165240, guid: d1deda2310a3a7241a8e0d559585b30d, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2018962972499165240, guid: d1deda2310a3a7241a8e0d559585b30d, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2018962972499165240, guid: d1deda2310a3a7241a8e0d559585b30d, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2018962972499165240, guid: d1deda2310a3a7241a8e0d559585b30d, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2018962972499165240, guid: d1deda2310a3a7241a8e0d559585b30d, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 12 + objectReference: {fileID: 0} + - target: {fileID: 2018962972499165240, guid: d1deda2310a3a7241a8e0d559585b30d, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -10 + objectReference: {fileID: 0} + - target: {fileID: 2018962972499165240, guid: d1deda2310a3a7241a8e0d559585b30d, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2018962972499165240, guid: d1deda2310a3a7241a8e0d559585b30d, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2018962972499165240, guid: d1deda2310a3a7241a8e0d559585b30d, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2018962972499165241, guid: d1deda2310a3a7241a8e0d559585b30d, + type: 3} + propertyPath: m_Name + value: name + objectReference: {fileID: 0} + - target: {fileID: 2018962972499165246, guid: d1deda2310a3a7241a8e0d559585b30d, + type: 3} + propertyPath: m_Text + value: Name + objectReference: {fileID: 0} + - target: {fileID: 2018962972499165246, guid: d1deda2310a3a7241a8e0d559585b30d, + type: 3} + propertyPath: m_Color.b + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2018962972499165246, guid: d1deda2310a3a7241a8e0d559585b30d, + type: 3} + propertyPath: m_Color.g + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2018962972499165246, guid: d1deda2310a3a7241a8e0d559585b30d, + type: 3} + propertyPath: m_Color.r + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2018962972499165246, guid: d1deda2310a3a7241a8e0d559585b30d, + type: 3} + propertyPath: m_FontData.m_Font + value: + objectReference: {fileID: 12800000, guid: 25a07681c3624944d93fef973de82719, + type: 3} + - target: {fileID: 2018962972499165246, guid: d1deda2310a3a7241a8e0d559585b30d, + type: 3} + propertyPath: m_FontData.m_FontStyle + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: d1deda2310a3a7241a8e0d559585b30d, type: 3} +--- !u!224 &8586563145068443211 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 2018962972499165240, guid: d1deda2310a3a7241a8e0d559585b30d, + type: 3} + m_PrefabInstance: {fileID: 7722923011652269683} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/Resources/UI/Prefab/BigMap/Tips.prefab b/Assets/Resources/UI/Prefab/BigMap/Tips.prefab index fc675d11..8926c5a9 100644 --- a/Assets/Resources/UI/Prefab/BigMap/Tips.prefab +++ b/Assets/Resources/UI/Prefab/BigMap/Tips.prefab @@ -213,14 +213,14 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 25a07681c3624944d93fef973de82719, type: 3} m_FontSize: 14 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 10 m_MaxSize: 40 - m_Alignment: 3 - m_AlignByGeometry: 0 + m_Alignment: 6 + m_AlignByGeometry: 1 m_RichText: 1 m_HorizontalOverflow: 0 m_VerticalOverflow: 0 @@ -291,7 +291,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 25a07681c3624944d93fef973de82719, type: 3} m_FontSize: 14 m_FontStyle: 0 m_BestFit: 0 @@ -304,6 +304,77 @@ MonoBehaviour: m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: 0% +--- !u!1 &3911929221497280277 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5529212295301498890} + - component: {fileID: 7218183401790191712} + - component: {fileID: 7121275946044093878} + m_Layer: 5 + m_Name: AltitudeGraph + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5529212295301498890 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3911929221497280277} + 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: 6863560505873109966} + m_RootOrder: 15 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 20, y: -198} + m_SizeDelta: {x: 323, y: 34} + m_Pivot: {x: 0, y: 1} +--- !u!222 &7218183401790191712 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3911929221497280277} + m_CullTransparentMesh: 0 +--- !u!114 &7121275946044093878 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3911929221497280277} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, 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_Texture: {fileID: 0} + m_UVRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 --- !u!1 &4286186333184849785 GameObject: m_ObjectHideFlags: 0 @@ -369,7 +440,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 25a07681c3624944d93fef973de82719, type: 3} m_FontSize: 14 m_FontStyle: 0 m_BestFit: 0 @@ -546,7 +617,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 25a07681c3624944d93fef973de82719, type: 3} m_FontSize: 14 m_FontStyle: 0 m_BestFit: 0 @@ -698,7 +769,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 25a07681c3624944d93fef973de82719, type: 3} m_FontSize: 12 m_FontStyle: 0 m_BestFit: 0 @@ -827,6 +898,7 @@ RectTransform: - {fileID: 8243496190560064870} - {fileID: 2722580046731890951} - {fileID: 8991763474801765394} + - {fileID: 5529212295301498890} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -949,7 +1021,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 25a07681c3624944d93fef973de82719, type: 3} m_FontSize: 18 m_FontStyle: 0 m_BestFit: 0 @@ -1311,7 +1383,7 @@ PrefabInstance: - target: {fileID: 3150550772916003707, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3} propertyPath: m_FontData.m_FontStyle - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8688565590564084001, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3} @@ -1451,7 +1523,7 @@ PrefabInstance: - target: {fileID: 3150550772916003707, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3} propertyPath: m_FontData.m_FontStyle - value: 1 + value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3} diff --git a/Assets/Resources/UI/Prefab/Device/ConnectDeviceModal.prefab b/Assets/Resources/UI/Prefab/Device/ConnectDeviceModal.prefab index 6f60a4ac..f8a803ca 100644 --- a/Assets/Resources/UI/Prefab/Device/ConnectDeviceModal.prefab +++ b/Assets/Resources/UI/Prefab/Device/ConnectDeviceModal.prefab @@ -232,7 +232,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 25a07681c3624944d93fef973de82719, type: 3} m_FontSize: 14 m_FontStyle: 0 m_BestFit: 0 @@ -384,9 +384,9 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: bd658c45bc0743949ae710339d462afd, type: 3} m_FontSize: 20 - m_FontStyle: 1 + m_FontStyle: 0 m_BestFit: 0 m_MinSize: 0 m_MaxSize: 40 diff --git a/Assets/Resources/UI/Prefab/Device/DeviceItem.prefab b/Assets/Resources/UI/Prefab/Device/DeviceItem.prefab index ca88348a..57f01259 100644 --- a/Assets/Resources/UI/Prefab/Device/DeviceItem.prefab +++ b/Assets/Resources/UI/Prefab/Device/DeviceItem.prefab @@ -217,9 +217,9 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: bb4c2b248704c75488b5f24a63a5f370, type: 3} m_FontSize: 16 - m_FontStyle: 1 + m_FontStyle: 0 m_BestFit: 0 m_MinSize: 1 m_MaxSize: 40 diff --git a/Assets/Resources/UI/Prefab/Device/DeviceView.prefab b/Assets/Resources/UI/Prefab/Device/DeviceView.prefab index 6306f1fa..a5a1f38b 100644 --- a/Assets/Resources/UI/Prefab/Device/DeviceView.prefab +++ b/Assets/Resources/UI/Prefab/Device/DeviceView.prefab @@ -240,7 +240,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 25a07681c3624944d93fef973de82719, type: 3} m_FontSize: 14 m_FontStyle: 0 m_BestFit: 0 @@ -435,9 +435,9 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: bd658c45bc0743949ae710339d462afd, type: 3} m_FontSize: 20 - m_FontStyle: 1 + m_FontStyle: 0 m_BestFit: 0 m_MinSize: 2 m_MaxSize: 40 @@ -513,9 +513,9 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: bd658c45bc0743949ae710339d462afd, type: 3} m_FontSize: 12 - m_FontStyle: 1 + m_FontStyle: 0 m_BestFit: 0 m_MinSize: 1 m_MaxSize: 40 @@ -692,9 +692,9 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: bd658c45bc0743949ae710339d462afd, type: 3} m_FontSize: 32 - m_FontStyle: 1 + m_FontStyle: 0 m_BestFit: 0 m_MinSize: 3 m_MaxSize: 48 @@ -770,7 +770,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 25a07681c3624944d93fef973de82719, type: 3} m_FontSize: 14 m_FontStyle: 0 m_BestFit: 0 @@ -795,6 +795,17 @@ PrefabInstance: propertyPath: m_Text value: CHANGE objectReference: {fileID: 0} + - target: {fileID: 128304049968949179, guid: f9b4f89e2e3738c459fe1a4f852d6774, + type: 3} + propertyPath: m_FontData.m_Font + value: + objectReference: {fileID: 12800000, guid: bd658c45bc0743949ae710339d462afd, + type: 3} + - target: {fileID: 128304049968949179, guid: f9b4f89e2e3738c459fe1a4f852d6774, + type: 3} + propertyPath: m_FontData.m_FontStyle + value: 0 + objectReference: {fileID: 0} - target: {fileID: 6055053651375121365, guid: f9b4f89e2e3738c459fe1a4f852d6774, type: 3} propertyPath: m_Color.b @@ -940,6 +951,17 @@ PrefabInstance: propertyPath: m_Text value: SEARCH objectReference: {fileID: 0} + - target: {fileID: 128304049968949179, guid: f9b4f89e2e3738c459fe1a4f852d6774, + type: 3} + propertyPath: m_FontData.m_Font + value: + objectReference: {fileID: 12800000, guid: 25a07681c3624944d93fef973de82719, + type: 3} + - target: {fileID: 128304049968949179, guid: f9b4f89e2e3738c459fe1a4f852d6774, + type: 3} + propertyPath: m_FontData.m_FontStyle + value: 0 + objectReference: {fileID: 0} - target: {fileID: 6238379916544863262, guid: f9b4f89e2e3738c459fe1a4f852d6774, type: 3} propertyPath: m_Name @@ -1070,6 +1092,17 @@ PrefabInstance: propertyPath: m_Text value: PAIR objectReference: {fileID: 0} + - target: {fileID: 128304049968949179, guid: f9b4f89e2e3738c459fe1a4f852d6774, + type: 3} + propertyPath: m_FontData.m_Font + value: + objectReference: {fileID: 12800000, guid: bd658c45bc0743949ae710339d462afd, + type: 3} + - target: {fileID: 128304049968949179, guid: f9b4f89e2e3738c459fe1a4f852d6774, + type: 3} + propertyPath: m_FontData.m_FontStyle + value: 0 + objectReference: {fileID: 0} - target: {fileID: 6055053651375121365, guid: f9b4f89e2e3738c459fe1a4f852d6774, type: 3} propertyPath: m_Color.b diff --git a/Assets/Resources/UI/Prefab/Home/UserInfo.prefab b/Assets/Resources/UI/Prefab/Home/UserInfo.prefab index caf4fca1..005b4e82 100644 --- a/Assets/Resources/UI/Prefab/Home/UserInfo.prefab +++ b/Assets/Resources/UI/Prefab/Home/UserInfo.prefab @@ -153,7 +153,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: bd658c45bc0743949ae710339d462afd, type: 3} m_FontSize: 24 m_FontStyle: 0 m_BestFit: 0 @@ -305,7 +305,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 452cd41c1fcf96e4c8d8341a2f0ada65, type: 3} m_FontSize: 10 m_FontStyle: 0 m_BestFit: 0 @@ -383,7 +383,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 25a07681c3624944d93fef973de82719, type: 3} m_FontSize: 14 m_FontStyle: 0 m_BestFit: 0 @@ -609,7 +609,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: bd658c45bc0743949ae710339d462afd, type: 3} m_FontSize: 24 m_FontStyle: 0 m_BestFit: 0 @@ -687,7 +687,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 452cd41c1fcf96e4c8d8341a2f0ada65, type: 3} m_FontSize: 10 m_FontStyle: 0 m_BestFit: 0 @@ -812,7 +812,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 452cd41c1fcf96e4c8d8341a2f0ada65, type: 3} m_FontSize: 10 m_FontStyle: 0 m_BestFit: 0 @@ -866,6 +866,8 @@ RectTransform: - {fileID: 4566599627557342350} - {fileID: 4566599628192613341} - {fileID: 4566599629016508004} + - {fileID: 7275502706204060242} + - {fileID: 3459981280928128198} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1043,7 +1045,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 25a07681c3624944d93fef973de82719, type: 3} m_FontSize: 14 m_FontStyle: 0 m_BestFit: 0 @@ -1195,7 +1197,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: bd658c45bc0743949ae710339d462afd, type: 3} m_FontSize: 24 m_FontStyle: 0 m_BestFit: 0 @@ -1273,7 +1275,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: bd658c45bc0743949ae710339d462afd, type: 3} m_FontSize: 24 m_FontStyle: 0 m_BestFit: 0 @@ -1398,7 +1400,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 25a07681c3624944d93fef973de82719, type: 3} m_FontSize: 14 m_FontStyle: 0 m_BestFit: 0 @@ -1598,7 +1600,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 25a07681c3624944d93fef973de82719, type: 3} m_FontSize: 14 m_FontStyle: 0 m_BestFit: 0 @@ -1750,9 +1752,9 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: bd658c45bc0743949ae710339d462afd, type: 3} m_FontSize: 32 - m_FontStyle: 0 + m_FontStyle: 1 m_BestFit: 0 m_MinSize: 3 m_MaxSize: 40 @@ -1762,7 +1764,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: 8462KCAL + m_Text: 0000KCAL --- !u!1 &4566599627981592891 GameObject: m_ObjectHideFlags: 0 @@ -1902,9 +1904,9 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: bd658c45bc0743949ae710339d462afd, type: 3} m_FontSize: 32 - m_FontStyle: 0 + m_FontStyle: 1 m_BestFit: 0 m_MinSize: 3 m_MaxSize: 40 @@ -1914,7 +1916,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: 91274KM + m_Text: 0000KM --- !u!1 &4566599628192613340 GameObject: m_ObjectHideFlags: 0 @@ -2100,7 +2102,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 25a07681c3624944d93fef973de82719, type: 3} m_FontSize: 14 m_FontStyle: 0 m_BestFit: 0 @@ -2178,7 +2180,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 25a07681c3624944d93fef973de82719, type: 3} m_FontSize: 14 m_FontStyle: 0 m_BestFit: 0 @@ -2256,9 +2258,9 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: bd658c45bc0743949ae710339d462afd, type: 3} m_FontSize: 32 - m_FontStyle: 0 + m_FontStyle: 1 m_BestFit: 0 m_MinSize: 3 m_MaxSize: 40 @@ -2268,7 +2270,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: 242M + m_Text: 000M --- !u!1 &4566599629016508011 GameObject: m_ObjectHideFlags: 0 @@ -2315,6 +2317,80 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4566599629016508011} m_CullTransparentMesh: 0 +--- !u!1 &6527932267091740730 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3459981280928128198} + - component: {fileID: 5707476663510439821} + - component: {fileID: 2764351249887253553} + m_Layer: 5 + m_Name: SexIcon + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3459981280928128198 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6527932267091740730} + 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: 2589794478191162465} + m_RootOrder: 14 + 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: -68, y: 303} + m_SizeDelta: {x: 24, y: 24} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5707476663510439821 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6527932267091740730} + m_CullTransparentMesh: 0 +--- !u!114 &2764351249887253553 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6527932267091740730} + 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: 2a3c5c12765c1da43901afbec2c179f2, 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!1001 &4515319442379514431 PrefabInstance: m_ObjectHideFlags: 0 @@ -2442,6 +2518,11 @@ PrefabInstance: propertyPath: m_Text value: More objectReference: {fileID: 0} + - target: {fileID: 3150550772916003707, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, + type: 3} + propertyPath: m_FontData.m_FontStyle + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3} --- !u!224 &1517891333614586015 stripped @@ -2450,3 +2531,159 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 4515319442379514431} m_PrefabAsset: {fileID: 0} +--- !u!1001 &8715321839789107818 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 2589794478191162465} + m_Modifications: + - target: {fileID: 2018962972499165240, guid: d1deda2310a3a7241a8e0d559585b30d, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2018962972499165240, guid: d1deda2310a3a7241a8e0d559585b30d, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2018962972499165240, guid: d1deda2310a3a7241a8e0d559585b30d, + type: 3} + propertyPath: m_RootOrder + value: 13 + objectReference: {fileID: 0} + - target: {fileID: 2018962972499165240, guid: d1deda2310a3a7241a8e0d559585b30d, + type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2018962972499165240, guid: d1deda2310a3a7241a8e0d559585b30d, + type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2018962972499165240, guid: d1deda2310a3a7241a8e0d559585b30d, + type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2018962972499165240, guid: d1deda2310a3a7241a8e0d559585b30d, + type: 3} + propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2018962972499165240, guid: d1deda2310a3a7241a8e0d559585b30d, + type: 3} + propertyPath: m_SizeDelta.x + value: 160 + objectReference: {fileID: 0} + - target: {fileID: 2018962972499165240, guid: d1deda2310a3a7241a8e0d559585b30d, + type: 3} + propertyPath: m_SizeDelta.y + value: 19 + objectReference: {fileID: 0} + - target: {fileID: 2018962972499165240, guid: d1deda2310a3a7241a8e0d559585b30d, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2018962972499165240, guid: d1deda2310a3a7241a8e0d559585b30d, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2018962972499165240, guid: d1deda2310a3a7241a8e0d559585b30d, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2018962972499165240, guid: d1deda2310a3a7241a8e0d559585b30d, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2018962972499165240, guid: d1deda2310a3a7241a8e0d559585b30d, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2018962972499165240, guid: d1deda2310a3a7241a8e0d559585b30d, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2018962972499165240, guid: d1deda2310a3a7241a8e0d559585b30d, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2018962972499165240, guid: d1deda2310a3a7241a8e0d559585b30d, + type: 3} + propertyPath: m_AnchoredPosition.x + value: -6.899994 + objectReference: {fileID: 0} + - target: {fileID: 2018962972499165240, guid: d1deda2310a3a7241a8e0d559585b30d, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 102.5 + objectReference: {fileID: 0} + - target: {fileID: 2018962972499165240, guid: d1deda2310a3a7241a8e0d559585b30d, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2018962972499165240, guid: d1deda2310a3a7241a8e0d559585b30d, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2018962972499165240, guid: d1deda2310a3a7241a8e0d559585b30d, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2018962972499165241, guid: d1deda2310a3a7241a8e0d559585b30d, + type: 3} + propertyPath: m_Name + value: IDText + objectReference: {fileID: 0} + - target: {fileID: 2018962972499165246, guid: d1deda2310a3a7241a8e0d559585b30d, + type: 3} + propertyPath: m_Text + value: ID:000 + objectReference: {fileID: 0} + - target: {fileID: 2018962972499165246, guid: d1deda2310a3a7241a8e0d559585b30d, + type: 3} + propertyPath: m_Color.b + value: 0.49019608 + objectReference: {fileID: 0} + - target: {fileID: 2018962972499165246, guid: d1deda2310a3a7241a8e0d559585b30d, + type: 3} + propertyPath: m_Color.g + value: 0.43137255 + objectReference: {fileID: 0} + - target: {fileID: 2018962972499165246, guid: d1deda2310a3a7241a8e0d559585b30d, + type: 3} + propertyPath: m_Color.r + value: 0.43137255 + objectReference: {fileID: 0} + - target: {fileID: 2018962972499165246, guid: d1deda2310a3a7241a8e0d559585b30d, + type: 3} + propertyPath: m_FontData.m_Font + value: + objectReference: {fileID: 12800000, guid: bb4c2b248704c75488b5f24a63a5f370, + type: 3} + - target: {fileID: 2018962972499165246, guid: d1deda2310a3a7241a8e0d559585b30d, + type: 3} + propertyPath: m_FontData.m_Alignment + value: 4 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: d1deda2310a3a7241a8e0d559585b30d, type: 3} +--- !u!224 &7275502706204060242 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 2018962972499165240, guid: d1deda2310a3a7241a8e0d559585b30d, + type: 3} + m_PrefabInstance: {fileID: 8715321839789107818} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/Resources/UI/Prefab/Panel/BigMapPanel.prefab b/Assets/Resources/UI/Prefab/Panel/BigMapPanel.prefab index efb57ba0..f247d31e 100644 --- a/Assets/Resources/UI/Prefab/Panel/BigMapPanel.prefab +++ b/Assets/Resources/UI/Prefab/Panel/BigMapPanel.prefab @@ -324,9 +324,9 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 25a07681c3624944d93fef973de82719, type: 3} m_FontSize: 14 - m_FontStyle: 2 + m_FontStyle: 0 m_BestFit: 0 m_MinSize: 10 m_MaxSize: 40 @@ -336,7 +336,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: Enter text... + m_Text: Search Road --- !u!1 &1438309948063184099 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/UI/Prefab/Panel/DevicePanel.prefab b/Assets/Resources/UI/Prefab/Panel/DevicePanel.prefab index 3e765d86..9db283b3 100644 --- a/Assets/Resources/UI/Prefab/Panel/DevicePanel.prefab +++ b/Assets/Resources/UI/Prefab/Panel/DevicePanel.prefab @@ -1,83 +1,5 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &1721424399715677124 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 8540350976322887840} - - component: {fileID: 5933915444681685300} - - component: {fileID: 212711484308567273} - m_Layer: 5 - m_Name: Text - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &8540350976322887840 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1721424399715677124} - 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: 6682760290205143075} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &5933915444681685300 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1721424399715677124} - m_CullTransparentMesh: 0 ---- !u!114 &212711484308567273 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1721424399715677124} - 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.19607843, g: 0.19607843, b: 0.19607843, a: 1} - m_RaycastTarget: 1 - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 14 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 10 - m_MaxSize: 40 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: Return --- !u!1 &2085210787015337199 GameObject: m_ObjectHideFlags: 0 @@ -673,7 +595,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 25a07681c3624944d93fef973de82719, type: 3} m_FontSize: 14 m_FontStyle: 0 m_BestFit: 0 @@ -751,9 +673,9 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: bd658c45bc0743949ae710339d462afd, type: 3} m_FontSize: 20 - m_FontStyle: 1 + m_FontStyle: 0 m_BestFit: 0 m_MinSize: 2 m_MaxSize: 40 @@ -867,8 +789,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 8540350976322887840} + m_Children: [] m_Father: {fileID: 4032660314221060952} m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1022,7 +943,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 25a07681c3624944d93fef973de82719, type: 3} m_FontSize: 14 m_FontStyle: 0 m_BestFit: 0 @@ -1047,6 +968,17 @@ PrefabInstance: propertyPath: m_Text value: PAIR objectReference: {fileID: 0} + - target: {fileID: 128304049968949179, guid: f9b4f89e2e3738c459fe1a4f852d6774, + type: 3} + propertyPath: m_FontData.m_Font + value: + objectReference: {fileID: 12800000, guid: bd658c45bc0743949ae710339d462afd, + type: 3} + - target: {fileID: 128304049968949179, guid: f9b4f89e2e3738c459fe1a4f852d6774, + type: 3} + propertyPath: m_FontData.m_FontStyle + value: 0 + objectReference: {fileID: 0} - target: {fileID: 6055053651375121365, guid: f9b4f89e2e3738c459fe1a4f852d6774, type: 3} propertyPath: m_Color.b @@ -1192,6 +1124,17 @@ PrefabInstance: propertyPath: m_Text value: CHANGE objectReference: {fileID: 0} + - target: {fileID: 128304049968949179, guid: f9b4f89e2e3738c459fe1a4f852d6774, + type: 3} + propertyPath: m_FontData.m_Font + value: + objectReference: {fileID: 12800000, guid: bd658c45bc0743949ae710339d462afd, + type: 3} + - target: {fileID: 128304049968949179, guid: f9b4f89e2e3738c459fe1a4f852d6774, + type: 3} + propertyPath: m_FontData.m_FontStyle + value: 0 + objectReference: {fileID: 0} - target: {fileID: 6055053651375121365, guid: f9b4f89e2e3738c459fe1a4f852d6774, type: 3} propertyPath: m_Color.b @@ -1722,6 +1665,17 @@ PrefabInstance: propertyPath: m_Text value: SEARCH objectReference: {fileID: 0} + - target: {fileID: 128304049968949179, guid: f9b4f89e2e3738c459fe1a4f852d6774, + type: 3} + propertyPath: m_FontData.m_Font + value: + objectReference: {fileID: 12800000, guid: bd658c45bc0743949ae710339d462afd, + type: 3} + - target: {fileID: 128304049968949179, guid: f9b4f89e2e3738c459fe1a4f852d6774, + type: 3} + propertyPath: m_FontData.m_FontStyle + value: 0 + objectReference: {fileID: 0} - target: {fileID: 6055053651375121365, guid: f9b4f89e2e3738c459fe1a4f852d6774, type: 3} propertyPath: m_Color.b diff --git a/Assets/Resources/UI/Prefab/Panel/HomePanel.prefab b/Assets/Resources/UI/Prefab/Panel/HomePanel.prefab index a74a173d..00084127 100644 --- a/Assets/Resources/UI/Prefab/Panel/HomePanel.prefab +++ b/Assets/Resources/UI/Prefab/Panel/HomePanel.prefab @@ -112,26 +112,6 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 1777885814862178517} m_Modifications: - - target: {fileID: 1517891333614586013, guid: 652cdefe0475dfd429e5a7e92bc3fa31, - type: 3} - propertyPath: mType - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 1517891333821268292, guid: 652cdefe0475dfd429e5a7e92bc3fa31, - type: 3} - propertyPath: m_FontData.m_FontStyle - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2589794477215490372, guid: 652cdefe0475dfd429e5a7e92bc3fa31, - type: 3} - propertyPath: m_Enabled - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2589794477215490372, guid: 652cdefe0475dfd429e5a7e92bc3fa31, - type: 3} - propertyPath: m_Softness - value: 1 - objectReference: {fileID: 0} - target: {fileID: 2589794478191162464, guid: 652cdefe0475dfd429e5a7e92bc3fa31, type: 3} propertyPath: m_Name @@ -257,6 +237,24 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 1777885814862178517} m_Modifications: + - target: {fileID: 3324359233536132662, guid: 0cf36a704cf17794aab167386641cf2a, + type: 3} + propertyPath: m_FontData.m_Font + value: + objectReference: {fileID: 12800000, guid: bd658c45bc0743949ae710339d462afd, + type: 3} + - target: {fileID: 3324359234025609929, guid: 0cf36a704cf17794aab167386641cf2a, + type: 3} + propertyPath: m_FontData.m_Font + value: + objectReference: {fileID: 12800000, guid: bd658c45bc0743949ae710339d462afd, + type: 3} + - target: {fileID: 3324359234272836253, guid: 0cf36a704cf17794aab167386641cf2a, + type: 3} + propertyPath: m_FontData.m_Font + value: + objectReference: {fileID: 12800000, guid: bd658c45bc0743949ae710339d462afd, + type: 3} - target: {fileID: 3324359234648502169, guid: 0cf36a704cf17794aab167386641cf2a, type: 3} propertyPath: m_Name diff --git a/Assets/Resources/UI/Prefab/Panel/UserInfoPanel.prefab b/Assets/Resources/UI/Prefab/Panel/UserInfoPanel.prefab index 6b3654e7..b04de9d2 100644 --- a/Assets/Resources/UI/Prefab/Panel/UserInfoPanel.prefab +++ b/Assets/Resources/UI/Prefab/Panel/UserInfoPanel.prefab @@ -26,18 +26,18 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1813940879} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 6411762837200755527} + m_Father: {fileID: 5404217439901075764} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 244.99997, y: -329} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 86, y: 159} m_SizeDelta: {x: 17, y: 20} - m_Pivot: {x: 0, y: 1} + m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1813940883 CanvasRenderer: m_ObjectHideFlags: 0 @@ -118,7 +118,7 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: [] ---- !u!1 &96122034131341442 +--- !u!1 &268610031460185737 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -126,9 +126,243 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1620601985458407757} - - component: {fileID: 5270554771606397863} - - component: {fileID: 1888228446010351628} + - component: {fileID: 2587780112287864597} + - component: {fileID: 8938951192191715209} + - component: {fileID: 4972349388098758502} + m_Layer: 5 + m_Name: Value + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2587780112287864597 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 268610031460185737} + 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: 5069127984184424283} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: -46} + m_SizeDelta: {x: 0, y: 44} + m_Pivot: {x: 0.5, y: 1} +--- !u!222 &8938951192191715209 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 268610031460185737} + m_CullTransparentMesh: 0 +--- !u!114 &4972349388098758502 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 268610031460185737} + 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: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 32 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 3 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: 8462 +--- !u!1 &432896224568997250 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3506068050711393049} + - component: {fileID: 8777918853947204333} + - component: {fileID: 4940555049957487700} + m_Layer: 5 + m_Name: Value + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3506068050711393049 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 432896224568997250} + 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: 4952231134547891946} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: -46} + m_SizeDelta: {x: 0, y: 44} + m_Pivot: {x: 0.5, y: 1} +--- !u!222 &8777918853947204333 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 432896224568997250} + m_CullTransparentMesh: 0 +--- !u!114 &4940555049957487700 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 432896224568997250} + 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: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 32 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 3 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: 8462 +--- !u!1 &1024343455100898518 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8557842270688238807} + - component: {fileID: 1956465605292344084} + - component: {fileID: 4652275898427740134} + m_Layer: 5 + m_Name: Value + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8557842270688238807 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1024343455100898518} + 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: 1146954909952044699} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: -46} + m_SizeDelta: {x: 0, y: 44} + m_Pivot: {x: 0.5, y: 1} +--- !u!222 &1956465605292344084 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1024343455100898518} + m_CullTransparentMesh: 0 +--- !u!114 &4652275898427740134 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1024343455100898518} + 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: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 32 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 3 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: 8462 +--- !u!1 &1796947255969931771 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1420261070150595080} + - component: {fileID: 476479703889436245} + - component: {fileID: 1780135168820726445} m_Layer: 5 m_Name: Title m_TagString: Untagged @@ -136,18 +370,18 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &1620601985458407757 +--- !u!224 &1420261070150595080 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 96122034131341442} + m_GameObject: {fileID: 1796947255969931771} 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: 1371666530237420721} + m_Father: {fileID: 2007136740013128215} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} @@ -155,21 +389,21 @@ RectTransform: m_AnchoredPosition: {x: 0, y: -27} m_SizeDelta: {x: 0, y: 19} m_Pivot: {x: 0, y: 1} ---- !u!222 &5270554771606397863 +--- !u!222 &476479703889436245 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 96122034131341442} + m_GameObject: {fileID: 1796947255969931771} m_CullTransparentMesh: 0 ---- !u!114 &1888228446010351628 +--- !u!114 &1780135168820726445 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 96122034131341442} + m_GameObject: {fileID: 1796947255969931771} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} @@ -183,7 +417,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: 1db9e217733971041be26b076fda6083, type: 3} + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} m_FontSize: 14 m_FontStyle: 0 m_BestFit: 0 @@ -196,280 +430,6 @@ MonoBehaviour: m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: Total Calories Burned ---- !u!1 &937009008728691796 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 6726649260655687799} - - component: {fileID: 8560144644552207464} - - component: {fileID: 5605252016536961262} - m_Layer: 5 - m_Name: Title - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &6726649260655687799 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 937009008728691796} - 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: 1146954909952044699} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: -27} - m_SizeDelta: {x: 0, y: 19} - m_Pivot: {x: 0, y: 1} ---- !u!222 &8560144644552207464 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 937009008728691796} - m_CullTransparentMesh: 0 ---- !u!114 &5605252016536961262 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 937009008728691796} - 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.43137255, g: 0.43137255, b: 0.49019608, a: 1} - m_RaycastTarget: 1 - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_FontData: - m_Font: {fileID: 12800000, guid: 1db9e217733971041be26b076fda6083, type: 3} - m_FontSize: 14 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 10 - m_MaxSize: 40 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: Total Kilometer ---- !u!1 &1276326559684319788 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 6613187375439004126} - - component: {fileID: 1942402989030642512} - - component: {fileID: 4920830219155017287} - - component: {fileID: 161507219333268307} - m_Layer: 5 - m_Name: Button - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &6613187375439004126 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1276326559684319788} - 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: 5404217439901075764} - 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: 70, y: -40} - m_SizeDelta: {x: 44, y: 44} - m_Pivot: {x: 0, y: 1} ---- !u!222 &1942402989030642512 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1276326559684319788} - m_CullTransparentMesh: 0 ---- !u!114 &4920830219155017287 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1276326559684319788} - 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: fdb6d865c6f1a0d45a6fa4e26e4784a8, 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 &161507219333268307 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1276326559684319788} - 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: 4920830219155017287} - m_OnClick: - m_PersistentCalls: - m_Calls: [] ---- !u!1 &1971321931770085244 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1010961551672138821} - - component: {fileID: 943173000717612923} - - component: {fileID: 7265681883517370404} - m_Layer: 5 - m_Name: Unit - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1010961551672138821 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1971321931770085244} - 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: 2007136740013128215} - m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: -90} - m_SizeDelta: {x: 0, y: 30} - m_Pivot: {x: 0.5, y: 1} ---- !u!222 &943173000717612923 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1971321931770085244} - m_CullTransparentMesh: 0 ---- !u!114 &7265681883517370404 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1971321931770085244} - 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: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_FontData: - m_Font: {fileID: 12800000, guid: 1db9e217733971041be26b076fda6083, type: 3} - m_FontSize: 14 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 10 - m_MaxSize: 40 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: M --- !u!1 &2058030436935648323 GameObject: m_ObjectHideFlags: 0 @@ -515,7 +475,7 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2058030436935648323} m_CullTransparentMesh: 0 ---- !u!1 &2231738225852673686 +--- !u!1 &2349137503739508049 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -523,50 +483,128 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 3250283736331742491} - - component: {fileID: 4222418656988232412} - - component: {fileID: 6598839100569944269} + - component: {fileID: 625122180615283205} + - component: {fileID: 4809165699545475522} + - component: {fileID: 3219966500409232226} m_Layer: 5 - m_Name: Value + m_Name: Title m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &3250283736331742491 +--- !u!224 &625122180615283205 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2231738225852673686} + m_GameObject: {fileID: 2349137503739508049} 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: 1371666530237420721} - m_RootOrder: 1 + m_Father: {fileID: 5069127984184424283} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: -46} - m_SizeDelta: {x: 0, y: 44} - m_Pivot: {x: 0.5, y: 1} ---- !u!222 &4222418656988232412 + m_AnchoredPosition: {x: 0, y: -27} + m_SizeDelta: {x: 0, y: 19} + m_Pivot: {x: 0, y: 1} +--- !u!222 &4809165699545475522 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2231738225852673686} + m_GameObject: {fileID: 2349137503739508049} m_CullTransparentMesh: 0 ---- !u!114 &6598839100569944269 +--- !u!114 &3219966500409232226 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2231738225852673686} + m_GameObject: {fileID: 2349137503739508049} + 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.43137255, g: 0.43137255, b: 0.49019608, a: 1} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 14 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: Total Calories Burned +--- !u!1 &2605510387284341992 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8047728208616113735} + - component: {fileID: 2500333751756571590} + - component: {fileID: 5788624504241676642} + m_Layer: 5 + m_Name: Unit + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8047728208616113735 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2605510387284341992} + 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: 5069127984184424283} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: -90} + m_SizeDelta: {x: 0, y: 30} + m_Pivot: {x: 0.5, y: 1} +--- !u!222 &2500333751756571590 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2605510387284341992} + m_CullTransparentMesh: 0 +--- !u!114 &5788624504241676642 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2605510387284341992} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} @@ -580,11 +618,11 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: 9428f2aab98e9c34d923a9174035a197, type: 3} - m_FontSize: 32 + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 14 m_FontStyle: 0 m_BestFit: 0 - m_MinSize: 3 + m_MinSize: 10 m_MaxSize: 40 m_Alignment: 4 m_AlignByGeometry: 0 @@ -592,7 +630,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: 8462 + m_Text: times --- !u!1 &3081183610668172624 GameObject: m_ObjectHideFlags: 0 @@ -622,7 +660,7 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 5069127984184424283} + m_Father: {fileID: 1371666530237420721} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} @@ -658,7 +696,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: 1db9e217733971041be26b076fda6083, type: 3} + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} m_FontSize: 14 m_FontStyle: 0 m_BestFit: 0 @@ -701,9 +739,9 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 6726649260655687799} - - {fileID: 827999855811362536} - - {fileID: 1978183363787085241} + - {fileID: 2371126046335605320} + - {fileID: 8557842270688238807} + - {fileID: 7407821082274166662} m_Father: {fileID: 5404217439945121858} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -792,9 +830,9 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 6633876791617008} - - {fileID: 752753760748171058} - - {fileID: 10729051742163264} + - {fileID: 625122180615283205} + - {fileID: 2587780112287864597} + - {fileID: 8047728208616113735} m_Father: {fileID: 5404217439945121858} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -853,7 +891,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: radius: 30 ---- !u!1 &3659328615255561877 +--- !u!1 &4299872448735922151 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -861,9 +899,9 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1978183363787085241} - - component: {fileID: 3413291253128712301} - - component: {fileID: 8620053170939781314} + - component: {fileID: 1816650286567294569} + - component: {fileID: 6429764493787050882} + - component: {fileID: 597199805850691233} m_Layer: 5 m_Name: Unit m_TagString: Untagged @@ -871,18 +909,18 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &1978183363787085241 +--- !u!224 &1816650286567294569 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3659328615255561877} + m_GameObject: {fileID: 4299872448735922151} 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: 1146954909952044699} + m_Father: {fileID: 4952231134547891946} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} @@ -890,21 +928,21 @@ RectTransform: m_AnchoredPosition: {x: 0, y: -90} m_SizeDelta: {x: 0, y: 30} m_Pivot: {x: 0.5, y: 1} ---- !u!222 &3413291253128712301 +--- !u!222 &6429764493787050882 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3659328615255561877} + m_GameObject: {fileID: 4299872448735922151} m_CullTransparentMesh: 0 ---- !u!114 &8620053170939781314 +--- !u!114 &597199805850691233 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3659328615255561877} + m_GameObject: {fileID: 4299872448735922151} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} @@ -918,7 +956,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: 1db9e217733971041be26b076fda6083, type: 3} + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} m_FontSize: 14 m_FontStyle: 0 m_BestFit: 0 @@ -930,241 +968,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: KM ---- !u!1 &3908288212686547906 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 5148735776865229796} - - component: {fileID: 3647817985284347049} - - component: {fileID: 2950365441303027423} - m_Layer: 5 - m_Name: Title - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &5148735776865229796 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3908288212686547906} - 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: 4952231134547891946} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: -27} - m_SizeDelta: {x: 0, y: 19} - m_Pivot: {x: 0, y: 1} ---- !u!222 &3647817985284347049 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3908288212686547906} - m_CullTransparentMesh: 0 ---- !u!114 &2950365441303027423 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3908288212686547906} - 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.43137255, g: 0.43137255, b: 0.49019608, a: 1} - m_RaycastTarget: 1 - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_FontData: - m_Font: {fileID: 12800000, guid: 1db9e217733971041be26b076fda6083, type: 3} - m_FontSize: 14 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 10 - m_MaxSize: 40 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: Total riding time ---- !u!1 &4080633421470452234 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4403919992630810637} - - component: {fileID: 5522230592268777169} - - component: {fileID: 7132276463700219047} - m_Layer: 5 - m_Name: Value - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &4403919992630810637 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4080633421470452234} - 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: 2007136740013128215} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: -46} - m_SizeDelta: {x: 0, y: 44} - m_Pivot: {x: 0.5, y: 1} ---- !u!222 &5522230592268777169 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4080633421470452234} - m_CullTransparentMesh: 0 ---- !u!114 &7132276463700219047 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4080633421470452234} - 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: 1, g: 1, b: 1, 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: 32 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 3 - m_MaxSize: 40 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: 8462 ---- !u!1 &4385286733597419945 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 752753760748171058} - - component: {fileID: 4831009377643036358} - - component: {fileID: 9100155790705961087} - m_Layer: 5 - m_Name: Value - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &752753760748171058 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4385286733597419945} - 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: 5069127984184424283} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: -46} - m_SizeDelta: {x: 0, y: 44} - m_Pivot: {x: 0.5, y: 1} ---- !u!222 &4831009377643036358 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4385286733597419945} - m_CullTransparentMesh: 0 ---- !u!114 &9100155790705961087 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4385286733597419945} - 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: 1, g: 1, b: 1, 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: 32 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 3 - m_MaxSize: 40 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: 8462 + m_Text: times --- !u!1 &4455414704490449947 GameObject: m_ObjectHideFlags: 0 @@ -1195,9 +999,9 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 7929698356935282743} - - {fileID: 4403919992630810637} - - {fileID: 1010961551672138821} + - {fileID: 1420261070150595080} + - {fileID: 4657822252438665778} + - {fileID: 8338869236725907066} m_Father: {fileID: 5404217439945121858} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1286,9 +1090,9 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 1620601985458407757} - - {fileID: 3250283736331742491} - - {fileID: 9050031054309192575} + - {fileID: 7765258694892104562} + - {fileID: 5811163701789347620} + - {fileID: 10729051742163264} m_Father: {fileID: 5404217439945121858} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1347,7 +1151,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: radius: 30 ---- !u!1 &5049100858162210264 +--- !u!1 &4980813192286529589 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1355,50 +1159,50 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 7244106525112837206} - - component: {fileID: 2631555680151835069} - - component: {fileID: 8500433522411799710} + - component: {fileID: 4657822252438665778} + - component: {fileID: 3538934546248340718} + - component: {fileID: 2253166406533068440} m_Layer: 5 - m_Name: Unit + m_Name: Value m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &7244106525112837206 +--- !u!224 &4657822252438665778 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5049100858162210264} + m_GameObject: {fileID: 4980813192286529589} 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: 4952231134547891946} - m_RootOrder: 2 + m_Father: {fileID: 2007136740013128215} + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: -90} - m_SizeDelta: {x: 0, y: 30} + m_AnchoredPosition: {x: 0, y: -46} + m_SizeDelta: {x: 0, y: 44} m_Pivot: {x: 0.5, y: 1} ---- !u!222 &2631555680151835069 +--- !u!222 &3538934546248340718 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5049100858162210264} + m_GameObject: {fileID: 4980813192286529589} m_CullTransparentMesh: 0 ---- !u!114 &8500433522411799710 +--- !u!114 &2253166406533068440 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5049100858162210264} + m_GameObject: {fileID: 4980813192286529589} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} @@ -1412,11 +1216,11 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: 1db9e217733971041be26b076fda6083, type: 3} - m_FontSize: 14 + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 32 m_FontStyle: 0 m_BestFit: 0 - m_MinSize: 10 + m_MinSize: 3 m_MaxSize: 40 m_Alignment: 4 m_AlignByGeometry: 0 @@ -1424,7 +1228,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: hours + m_Text: 8462 --- !u!1 &5404217437987161135 GameObject: m_ObjectHideFlags: 0 @@ -1450,17 +1254,17 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5404217437987161135} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 6411762837200755527} + m_Father: {fileID: 5404217439901075764} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 35, y: -358} - m_SizeDelta: {x: 272, y: 34} + m_AnchoredPosition: {x: 111, y: -371} + m_SizeDelta: {x: 182, y: 34} m_Pivot: {x: 0, y: 1} --- !u!222 &5404217437987161132 CanvasRenderer: @@ -1490,13 +1294,13 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: 9428f2aab98e9c34d923a9174035a197, type: 3} + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} m_FontSize: 24 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 2 m_MaxSize: 40 - m_Alignment: 4 + m_Alignment: 0 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 @@ -1513,7 +1317,6 @@ GameObject: m_Component: - component: {fileID: 5404217438093112801} - component: {fileID: 4238835579819764237} - - component: {fileID: 1298315926268858870} m_Layer: 5 m_Name: UserInfoPanel m_TagString: Untagged @@ -1528,7 +1331,7 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5404217438093112802} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: @@ -1554,14 +1357,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d53c11af00252ab409587459f4a0f3f6, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!222 &1298315926268858870 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5404217438093112802} - m_CullTransparentMesh: 0 --- !u!1 &5404217438189736395 GameObject: m_ObjectHideFlags: 0 @@ -1587,18 +1382,18 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5404217438189736395} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 6411762837200755527} - m_RootOrder: 4 + m_Father: {fileID: 5404217439901075764} + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 90.99997, y: -469} + 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: 160, y: 34} - m_Pivot: {x: 0, y: 1} + m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5404217438189736392 CanvasRenderer: m_ObjectHideFlags: 0 @@ -1627,19 +1422,93 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: dc2b8edfb87f74143913c268624f8711, type: 3} + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} m_FontSize: 12 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 1 m_MaxSize: 40 - m_Alignment: 4 + m_Alignment: 0 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: "\u81EA2018\u5E7406\u670822\u65E5\u8D77\r\n\u60A8\u5DF2\u6210\u4E3A\u8FD0\u52A8\u5730\u7403\u4F1A\u54581003\u5929" +--- !u!1 &5404217438576865099 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5404217438576865098} + - component: {fileID: 5404217438576865096} + - component: {fileID: 5404217438576865097} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5404217438576865098 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5404217438576865099} + 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: 5404217439532697477} + 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: 20, y: 0} + m_SizeDelta: {x: 160, y: 115} + m_Pivot: {x: 0, y: 1} +--- !u!222 &5404217438576865096 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5404217438576865099} + m_CullTransparentMesh: 0 +--- !u!114 &5404217438576865097 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5404217438576865099} + 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: cec76994f6f79c44880e1c9584dd3cda, 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 &5404217439475192495 GameObject: m_ObjectHideFlags: 0 @@ -1665,17 +1534,17 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5404217439475192495} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 6411762837200755527} + m_Father: {fileID: 5404217439901075764} 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: 133.99997, y: -329} - m_SizeDelta: {x: 75, y: 19} + m_AnchoredPosition: {x: 164.5, y: -341} + m_SizeDelta: {x: 75, y: 30} m_Pivot: {x: 0, y: 1} --- !u!222 &5404217439475192492 CanvasRenderer: @@ -1705,7 +1574,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: dc2b8edfb87f74143913c268624f8711, type: 3} + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} m_FontSize: 14 m_FontStyle: 0 m_BestFit: 0 @@ -1728,7 +1597,6 @@ GameObject: m_Component: - component: {fileID: 5404217439532697477} - component: {fileID: 5404217439532697476} - - component: {fileID: 1298315925835965418} m_Layer: 5 m_Name: Logo m_TagString: Untagged @@ -1743,17 +1611,19 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5404217439532697478} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 6411762837200755527} + m_Children: + - {fileID: 5404217439596995148} + - {fileID: 5404217438576865098} + m_Father: {fileID: 5404217439901075764} 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: 60, y: -154} - m_SizeDelta: {x: 205, y: 191} + m_AnchoredPosition: {x: 100, y: -166} + m_SizeDelta: {x: 200, y: 150} m_Pivot: {x: 0, y: 1} --- !u!222 &5404217439532697476 CanvasRenderer: @@ -1763,13 +1633,58 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5404217439532697478} m_CullTransparentMesh: 0 ---- !u!114 &1298315925835965418 +--- !u!1 &5404217439596995149 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5404217439596995148} + - component: {fileID: 5404217439596995146} + - component: {fileID: 5404217439596995147} + m_Layer: 5 + m_Name: Image1 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5404217439596995148 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5404217439596995149} + m_LocalRotation: {x: 0, y: 0, z: 0.7071068, w: 0.7071068} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 5404217439532697477} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 90} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -50, y: 0} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5404217439596995146 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5404217439596995149} + m_CullTransparentMesh: 0 +--- !u!114 &5404217439596995147 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5404217439532697478} + m_GameObject: {fileID: 5404217439596995149} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} @@ -1782,7 +1697,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 798581ded0bd5a3478c1b31a12c1f53d, type: 3} + m_Sprite: {fileID: 21300000, guid: a2ecdda8d669c9f4b8d361a62d891df8, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1821,9 +1736,12 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 6613187375439004126} - - {fileID: 1487941755267510423} - - {fileID: 6411762837200755527} + - {fileID: 5404217439532697477} + - {fileID: 5404217439475192494} + - {fileID: 5404217437987161134} + - {fileID: 5404217438189736394} + - {fileID: 2772237898578650081} + - {fileID: 1813940880} m_Father: {fileID: 5404217438093112801} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1949,7 +1867,7 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!1 &6304095428302727023 +--- !u!1 &5441247902150363645 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1957,775 +1875,9 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 9050031054309192575} - - component: {fileID: 5088486313345884502} - - component: {fileID: 3582544789602486881} - m_Layer: 5 - m_Name: Unit - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &9050031054309192575 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6304095428302727023} - 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: 1371666530237420721} - m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: -90} - m_SizeDelta: {x: 0, y: 30} - m_Pivot: {x: 0.5, y: 1} ---- !u!222 &5088486313345884502 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6304095428302727023} - m_CullTransparentMesh: 0 ---- !u!114 &3582544789602486881 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6304095428302727023} - 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: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_FontData: - m_Font: {fileID: 12800000, guid: 1db9e217733971041be26b076fda6083, type: 3} - m_FontSize: 14 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 10 - m_MaxSize: 40 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: KCAL ---- !u!1 &6411762835807780575 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 6411762835807780572} - - component: {fileID: 6411762835807780573} - m_Layer: 5 - m_Name: MHR - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &6411762835807780572 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6411762835807780575} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 7462604566699977406} - - {fileID: 7462604567275235211} - - {fileID: 7462604567503793488} - m_Father: {fileID: 6411762837200755527} - m_RootOrder: 10 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 1, y: 1} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -60, y: -564} - m_SizeDelta: {x: 111, y: 65} - m_Pivot: {x: 1, y: 1} ---- !u!222 &6411762835807780573 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6411762835807780575} - m_CullTransparentMesh: 0 ---- !u!1 &6411762836526202482 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 6411762836526202483} - - component: {fileID: 6411762836526202481} - - component: {fileID: 2374546825948186795} - m_Layer: 5 - m_Name: Country - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &6411762836526202483 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6411762836526202482} - 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: 6411762836704884641} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 24, y: 24} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &6411762836526202481 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6411762836526202482} - m_CullTransparentMesh: 0 ---- !u!114 &2374546825948186795 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6411762836526202482} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, 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_Texture: {fileID: 0} - m_UVRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 1 - height: 1 ---- !u!1 &6411762836543330312 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 6411762836543330313} - - component: {fileID: 6411762836543330318} - m_Layer: 5 - m_Name: WD - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &6411762836543330313 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6411762836543330312} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 7462604568352200860} - - {fileID: 7462604567891391091} - - {fileID: 7462604568324739519} - m_Father: {fileID: 6411762837200755527} - m_RootOrder: 13 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 1, y: 1} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -171, y: -734} - m_SizeDelta: {x: 111, y: 65} - m_Pivot: {x: 1, y: 1} ---- !u!222 &6411762836543330318 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6411762836543330312} - m_CullTransparentMesh: 0 ---- !u!1 &6411762836704884640 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 6411762836704884641} - - component: {fileID: 6411762836704884647} - - component: {fileID: 6411762836704884644} - - component: {fileID: 6411762836704884645} - m_Layer: 5 - m_Name: Status - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &6411762836704884641 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6411762836704884640} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 6411762836526202483} - - {fileID: 6411762837365507617} - m_Father: {fileID: 6411762837200755527} - m_RootOrder: 7 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 1} - m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 0, y: -425} - m_SizeDelta: {x: 0, y: 24} - m_Pivot: {x: 0.5, y: 1} ---- !u!222 &6411762836704884647 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6411762836704884640} - m_CullTransparentMesh: 0 ---- !u!114 &6411762836704884644 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6411762836704884640} - 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: 0 - m_Spacing: 10 - m_ChildForceExpandWidth: 1 - m_ChildForceExpandHeight: 1 - m_ChildControlWidth: 0 - m_ChildControlHeight: 0 - m_ChildScaleWidth: 0 - m_ChildScaleHeight: 0 ---- !u!114 &6411762836704884645 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6411762836704884640} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} - m_Name: - m_EditorClassIdentifier: - m_HorizontalFit: 2 - m_VerticalFit: 0 ---- !u!1 &6411762836842488227 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 6411762836842488224} - - component: {fileID: 6411762836842488231} - - component: {fileID: 6411762836842488230} - - component: {fileID: 6411762836842488225} - m_Layer: 5 - m_Name: Avatar - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &6411762836842488224 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6411762836842488227} - 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: 6411762837200755527} - m_RootOrder: 6 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 101.00002, y: -181} - m_SizeDelta: {x: 140, y: 140} - m_Pivot: {x: 0, y: 1} ---- !u!222 &6411762836842488231 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6411762836842488227} - m_CullTransparentMesh: 0 ---- !u!114 &6411762836842488230 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6411762836842488227} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, 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_Texture: {fileID: 0} - m_UVRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 1 - height: 1 ---- !u!114 &6411762836842488225 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6411762836842488227} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: adb30198aa32dd140b5750692dd48104, type: 3} - m_Name: - m_EditorClassIdentifier: - radius: 70 ---- !u!1 &6411762837061016331 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 6411762837061016328} - - component: {fileID: 6411762837061016329} - m_Layer: 5 - m_Name: BW - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &6411762837061016328 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6411762837061016331} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 7462604566943736990} - - {fileID: 7462604567111632055} - - {fileID: 7462604568171448231} - m_Father: {fileID: 6411762837200755527} - m_RootOrder: 12 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 1, y: 1} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -60, y: -649} - m_SizeDelta: {x: 111, y: 65} - m_Pivot: {x: 1, y: 1} ---- !u!222 &6411762837061016329 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6411762837061016331} - m_CullTransparentMesh: 0 ---- !u!1 &6411762837200755526 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 6411762837200755527} - - component: {fileID: 6411762837200755524} - m_Layer: 5 - m_Name: P - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &6411762837200755527 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6411762837200755526} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 5404217439532697477} - - {fileID: 5404217439475192494} - - {fileID: 5404217437987161134} - - {fileID: 6411762837875029616} - - {fileID: 5404217438189736394} - - {fileID: 1813940880} - - {fileID: 6411762836842488224} - - {fileID: 6411762836704884641} - - {fileID: 7462604567576883730} - - {fileID: 6411762837552108817} - - {fileID: 6411762835807780572} - - {fileID: 6411762837444288610} - - {fileID: 6411762837061016328} - - {fileID: 6411762836543330313} - m_Father: {fileID: 5404217439901075764} - m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 20, y: 0} - m_SizeDelta: {x: -40, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &6411762837200755524 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6411762837200755526} - m_CullTransparentMesh: 0 ---- !u!1 &6411762837365507616 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 6411762837365507617} - - component: {fileID: 6411762837365507623} - - component: {fileID: 6411762837365507622} - m_Layer: 5 - m_Name: Wx - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &6411762837365507617 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6411762837365507616} - 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: 6411762836704884641} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 24, y: 24} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &6411762837365507623 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6411762837365507616} - m_CullTransparentMesh: 0 ---- !u!114 &6411762837365507622 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6411762837365507616} - 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: 47efb322b7994f243bd73eec064d44d5, 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 &6411762837444288621 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 6411762837444288610} - - component: {fileID: 6411762837444288611} - m_Layer: 5 - m_Name: Weight - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &6411762837444288610 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6411762837444288621} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 7462604567275421330} - - {fileID: 7462604567335874454} - - {fileID: 7462604566810469051} - m_Father: {fileID: 6411762837200755527} - m_RootOrder: 11 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 1, y: 1} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -171, y: -649} - m_SizeDelta: {x: 111, y: 65} - m_Pivot: {x: 1, y: 1} ---- !u!222 &6411762837444288611 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6411762837444288621} - m_CullTransparentMesh: 0 ---- !u!1 &6411762837552108816 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 6411762837552108817} - - component: {fileID: 6411762837552108823} - m_Layer: 5 - m_Name: Ftp - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &6411762837552108817 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6411762837552108816} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 7462604567862011931} - - {fileID: 7462604566789801359} - - {fileID: 7462604567977832408} - m_Father: {fileID: 6411762837200755527} - m_RootOrder: 9 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 1, y: 1} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -171, y: -564} - m_SizeDelta: {x: 111, y: 65} - m_Pivot: {x: 1, y: 1} ---- !u!222 &6411762837552108823 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6411762837552108816} - m_CullTransparentMesh: 0 ---- !u!1 &6411762837875029619 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 6411762837875029616} - - component: {fileID: 6411762837875029622} - - component: {fileID: 6411762837875029617} - m_Layer: 5 - m_Name: EmailText - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &6411762837875029616 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6411762837875029619} - 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: 6411762837200755527} - m_RootOrder: 3 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 35.000004, y: -392} - m_SizeDelta: {x: 272, y: 17} - m_Pivot: {x: 0, y: 1} ---- !u!222 &6411762837875029622 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6411762837875029619} - m_CullTransparentMesh: 0 ---- !u!114 &6411762837875029617 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6411762837875029619} - 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.43137258, g: 0.43137258, b: 0.4901961, a: 1} - m_RaycastTarget: 1 - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_FontData: - m_Font: {fileID: 12800000, guid: dc2b8edfb87f74143913c268624f8711, type: 3} - m_FontSize: 12 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 1 - m_MaxSize: 40 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: administrator@powerfun.com ---- !u!1 &7299841647229486020 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7929698356935282743} - - component: {fileID: 8872934090278927466} - - component: {fileID: 7280766774226282642} + - component: {fileID: 4237270043729181147} + - component: {fileID: 5701999604399322774} + - component: {fileID: 6147405742265646304} m_Layer: 5 m_Name: Title m_TagString: Untagged @@ -2733,18 +1885,18 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &7929698356935282743 +--- !u!224 &4237270043729181147 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7299841647229486020} + m_GameObject: {fileID: 5441247902150363645} 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: 2007136740013128215} + m_Father: {fileID: 4952231134547891946} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} @@ -2752,21 +1904,21 @@ RectTransform: m_AnchoredPosition: {x: 0, y: -27} m_SizeDelta: {x: 0, y: 19} m_Pivot: {x: 0, y: 1} ---- !u!222 &8872934090278927466 +--- !u!222 &5701999604399322774 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7299841647229486020} + m_GameObject: {fileID: 5441247902150363645} m_CullTransparentMesh: 0 ---- !u!114 &7280766774226282642 +--- !u!114 &6147405742265646304 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7299841647229486020} + m_GameObject: {fileID: 5441247902150363645} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} @@ -2780,1329 +1932,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: 1db9e217733971041be26b076fda6083, type: 3} - m_FontSize: 14 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 10 - m_MaxSize: 40 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: Total Climbed ---- !u!1 &7462604566699977407 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7462604566699977406} - - component: {fileID: 7462604566699977400} - - component: {fileID: 7462604566699977401} - m_Layer: 5 - m_Name: Text - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &7462604566699977406 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7462604566699977407} - 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: 6411762835807780572} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 19} - m_Pivot: {x: 0.5, y: 1} ---- !u!222 &7462604566699977400 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7462604566699977407} - m_CullTransparentMesh: 0 ---- !u!114 &7462604566699977401 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7462604566699977407} - 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.43137258, g: 0.43137258, b: 0.4901961, a: 1} - m_RaycastTarget: 1 - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_FontData: - m_Font: {fileID: 12800000, guid: 1db9e217733971041be26b076fda6083, type: 3} - m_FontSize: 14 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 10 - m_MaxSize: 40 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: Max heart rate ---- !u!1 &7462604566789801356 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7462604566789801359} - - component: {fileID: 7462604566789801353} - - component: {fileID: 7462604566789801358} - m_Layer: 5 - m_Name: Value - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &7462604566789801359 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7462604566789801356} - 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: 6411762837552108817} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: -19} - m_SizeDelta: {x: 0, y: 34} - m_Pivot: {x: 0.5, y: 1} ---- !u!222 &7462604566789801353 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7462604566789801356} - m_CullTransparentMesh: 0 ---- !u!114 &7462604566789801358 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7462604566789801356} - 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: 1, g: 1, b: 1, 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: 24 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 2 - m_MaxSize: 40 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: 85KG ---- !u!1 &7462604566810469048 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7462604566810469051} - - component: {fileID: 7462604566810468997} - - component: {fileID: 7462604566810469050} - m_Layer: 5 - m_Name: Time - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &7462604566810469051 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7462604566810469048} - 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: 6411762837444288610} - m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: -51} - m_SizeDelta: {x: 0, y: 14} - m_Pivot: {x: 0.5, y: 1} ---- !u!222 &7462604566810468997 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7462604566810469048} - m_CullTransparentMesh: 0 ---- !u!114 &7462604566810469050 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7462604566810469048} - 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.36078432, g: 0.36078432, b: 0.43137258, a: 1} - m_RaycastTarget: 1 - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_FontData: - m_Font: {fileID: 12800000, guid: 8180b991008992c45b6bf1a979c7baca, type: 3} - m_FontSize: 10 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 1 - m_MaxSize: 40 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: 2020.02.15 ---- !u!1 &7462604566943736991 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7462604566943736990} - - component: {fileID: 7462604566943736984} - - component: {fileID: 7462604566943736985} - m_Layer: 5 - m_Name: Text - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &7462604566943736990 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7462604566943736991} - 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: 6411762837061016328} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 19} - m_Pivot: {x: 0.5, y: 1} ---- !u!222 &7462604566943736984 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7462604566943736991} - m_CullTransparentMesh: 0 ---- !u!114 &7462604566943736985 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7462604566943736991} - 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.43137258, g: 0.43137258, b: 0.4901961, a: 1} - m_RaycastTarget: 1 - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_FontData: - m_Font: {fileID: 12800000, guid: 1db9e217733971041be26b076fda6083, type: 3} - m_FontSize: 14 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 10 - m_MaxSize: 40 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: Bike weight ---- !u!1 &7462604567111632052 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7462604567111632055} - - component: {fileID: 7462604567111632049} - - component: {fileID: 7462604567111632054} - m_Layer: 5 - m_Name: Value - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &7462604567111632055 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7462604567111632052} - 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: 6411762837061016328} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: -19} - m_SizeDelta: {x: 0, y: 34} - m_Pivot: {x: 0.5, y: 1} ---- !u!222 &7462604567111632049 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7462604567111632052} - m_CullTransparentMesh: 0 ---- !u!114 &7462604567111632054 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7462604567111632052} - 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: 1, g: 1, b: 1, 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: 24 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 2 - m_MaxSize: 40 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: 85KG ---- !u!1 &7462604567275235208 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7462604567275235211} - - component: {fileID: 7462604567275235221} - - component: {fileID: 7462604567275235210} - m_Layer: 5 - m_Name: Value - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &7462604567275235211 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7462604567275235208} - 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: 6411762835807780572} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: -19} - m_SizeDelta: {x: 0, y: 34} - m_Pivot: {x: 0.5, y: 1} ---- !u!222 &7462604567275235221 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7462604567275235208} - m_CullTransparentMesh: 0 ---- !u!114 &7462604567275235210 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7462604567275235208} - 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: 1, g: 1, b: 1, 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: 24 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 2 - m_MaxSize: 40 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: 85KG ---- !u!1 &7462604567275421331 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7462604567275421330} - - component: {fileID: 7462604567275421340} - - component: {fileID: 7462604567275421341} - m_Layer: 5 - m_Name: Text - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &7462604567275421330 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7462604567275421331} - 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: 6411762837444288610} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 19} - m_Pivot: {x: 0.5, y: 1} ---- !u!222 &7462604567275421340 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7462604567275421331} - m_CullTransparentMesh: 0 ---- !u!114 &7462604567275421341 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7462604567275421331} - 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.43137258, g: 0.43137258, b: 0.4901961, a: 1} - m_RaycastTarget: 1 - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_FontData: - m_Font: {fileID: 12800000, guid: 1db9e217733971041be26b076fda6083, type: 3} - m_FontSize: 14 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 10 - m_MaxSize: 40 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: Weight ---- !u!1 &7462604567335874455 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7462604567335874454} - - component: {fileID: 7462604567335874448} - - component: {fileID: 7462604567335874449} - m_Layer: 5 - m_Name: Value - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &7462604567335874454 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7462604567335874455} - 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: 6411762837444288610} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: -19} - m_SizeDelta: {x: 0, y: 34} - m_Pivot: {x: 0.5, y: 1} ---- !u!222 &7462604567335874448 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7462604567335874455} - m_CullTransparentMesh: 0 ---- !u!114 &7462604567335874449 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7462604567335874455} - 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: 1, g: 1, b: 1, 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: 24 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 2 - m_MaxSize: 40 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: 85KG ---- !u!1 &7462604567503793489 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7462604567503793488} - - component: {fileID: 7462604567503793490} - - component: {fileID: 7462604567503793491} - m_Layer: 5 - m_Name: Time - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &7462604567503793488 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7462604567503793489} - 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: 6411762835807780572} - m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: -51} - m_SizeDelta: {x: 0, y: 14} - m_Pivot: {x: 0.5, y: 1} ---- !u!222 &7462604567503793490 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7462604567503793489} - m_CullTransparentMesh: 0 ---- !u!114 &7462604567503793491 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7462604567503793489} - 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.36078432, g: 0.36078432, b: 0.43137258, a: 1} - m_RaycastTarget: 1 - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_FontData: - m_Font: {fileID: 12800000, guid: 8180b991008992c45b6bf1a979c7baca, type: 3} - m_FontSize: 10 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 1 - m_MaxSize: 40 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: 2020.02.15 ---- !u!1 &7462604567576883731 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7462604567576883730} - - component: {fileID: 7462604567576883740} - - component: {fileID: 7462604567576883741} - m_Layer: 5 - m_Name: Line - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &7462604567576883730 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7462604567576883731} - 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: 6411762837200755527} - m_RootOrder: 8 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 1} - m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 0, y: -533} - m_SizeDelta: {x: 222, y: 1} - m_Pivot: {x: 0.5, y: 1} ---- !u!222 &7462604567576883740 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7462604567576883731} - m_CullTransparentMesh: 0 ---- !u!114 &7462604567576883741 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7462604567576883731} - 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.2784314, g: 0.2784314, b: 0.34901962, a: 1} - m_RaycastTarget: 1 - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 0} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!1 &7462604567862011928 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7462604567862011931} - - component: {fileID: 7462604567862012133} - - component: {fileID: 7462604567862011930} - m_Layer: 5 - m_Name: Text - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &7462604567862011931 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7462604567862011928} - 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: 6411762837552108817} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 19} - m_Pivot: {x: 0.5, y: 1} ---- !u!222 &7462604567862012133 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7462604567862011928} - m_CullTransparentMesh: 0 ---- !u!114 &7462604567862011930 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7462604567862011928} - 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.43137258, g: 0.43137258, b: 0.4901961, a: 1} - m_RaycastTarget: 1 - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_FontData: - m_Font: {fileID: 12800000, guid: 1db9e217733971041be26b076fda6083, type: 3} - m_FontSize: 14 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 10 - m_MaxSize: 40 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: FTP ---- !u!1 &7462604567891391088 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7462604567891391091} - - component: {fileID: 7462604567891391101} - - component: {fileID: 7462604567891391090} - m_Layer: 5 - m_Name: Value - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &7462604567891391091 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7462604567891391088} - 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: 6411762836543330313} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: -19} - m_SizeDelta: {x: 0, y: 34} - m_Pivot: {x: 0.5, y: 1} ---- !u!222 &7462604567891391101 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7462604567891391088} - m_CullTransparentMesh: 0 ---- !u!114 &7462604567891391090 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7462604567891391088} - 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: 1, g: 1, b: 1, 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: 24 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 2 - m_MaxSize: 40 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: 85KG ---- !u!1 &7462604567977832409 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7462604567977832408} - - component: {fileID: 7462604567977832410} - - component: {fileID: 7462604567977832411} - m_Layer: 5 - m_Name: Time - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &7462604567977832408 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7462604567977832409} - 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: 6411762837552108817} - m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: -51} - m_SizeDelta: {x: 0, y: 14} - m_Pivot: {x: 0.5, y: 1} ---- !u!222 &7462604567977832410 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7462604567977832409} - m_CullTransparentMesh: 0 ---- !u!114 &7462604567977832411 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7462604567977832409} - 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.36078432, g: 0.36078432, b: 0.43137258, a: 1} - m_RaycastTarget: 1 - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_FontData: - m_Font: {fileID: 12800000, guid: 8180b991008992c45b6bf1a979c7baca, type: 3} - m_FontSize: 10 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 1 - m_MaxSize: 40 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: 2020.02.15 ---- !u!1 &7462604568171448228 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7462604568171448231} - - component: {fileID: 7462604568171448225} - - component: {fileID: 7462604568171448230} - m_Layer: 5 - m_Name: Time - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &7462604568171448231 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7462604568171448228} - 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: 6411762837061016328} - m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: -51} - m_SizeDelta: {x: 0, y: 14} - m_Pivot: {x: 0.5, y: 1} ---- !u!222 &7462604568171448225 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7462604568171448228} - m_CullTransparentMesh: 0 ---- !u!114 &7462604568171448230 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7462604568171448228} - 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.36078432, g: 0.36078432, b: 0.43137258, a: 1} - m_RaycastTarget: 1 - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_FontData: - m_Font: {fileID: 12800000, guid: 8180b991008992c45b6bf1a979c7baca, type: 3} - m_FontSize: 10 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 1 - m_MaxSize: 40 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: 2020.02.15 ---- !u!1 &7462604568324739516 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7462604568324739519} - - component: {fileID: 7462604568324739513} - - component: {fileID: 7462604568324739518} - m_Layer: 5 - m_Name: Time - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &7462604568324739519 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7462604568324739516} - 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: 6411762836543330313} - m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: -51} - m_SizeDelta: {x: 0, y: 14} - m_Pivot: {x: 0.5, y: 1} ---- !u!222 &7462604568324739513 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7462604568324739516} - m_CullTransparentMesh: 0 ---- !u!114 &7462604568324739518 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7462604568324739516} - 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.36078432, g: 0.36078432, b: 0.43137258, a: 1} - m_RaycastTarget: 1 - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_FontData: - m_Font: {fileID: 12800000, guid: 8180b991008992c45b6bf1a979c7baca, type: 3} - m_FontSize: 10 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 1 - m_MaxSize: 40 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: 2020.02.15 ---- !u!1 &7462604568352200861 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7462604568352200860} - - component: {fileID: 7462604568352200862} - - component: {fileID: 7462604568352200863} - m_Layer: 5 - m_Name: Text - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &7462604568352200860 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7462604568352200861} - 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: 6411762836543330313} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 19} - m_Pivot: {x: 0.5, y: 1} ---- !u!222 &7462604568352200862 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7462604568352200861} - m_CullTransparentMesh: 0 ---- !u!114 &7462604568352200863 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7462604568352200861} - 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.43137258, g: 0.43137258, b: 0.4901961, a: 1} - m_RaycastTarget: 1 - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_FontData: - m_Font: {fileID: 12800000, guid: 1db9e217733971041be26b076fda6083, type: 3} - m_FontSize: 14 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 10 - m_MaxSize: 40 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: Wheel Diameter ---- !u!1 &8167680332720985558 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 6633876791617008} - - component: {fileID: 8501614878764034749} - - component: {fileID: 8040516523966914763} - m_Layer: 5 - m_Name: Title - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &6633876791617008 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8167680332720985558} - 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: 5069127984184424283} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: -27} - m_SizeDelta: {x: 0, y: 19} - m_Pivot: {x: 0, y: 1} ---- !u!222 &8501614878764034749 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8167680332720985558} - m_CullTransparentMesh: 0 ---- !u!114 &8040516523966914763 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8167680332720985558} - 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.43137255, g: 0.43137255, b: 0.49019608, a: 1} - m_RaycastTarget: 1 - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_FontData: - m_Font: {fileID: 12800000, guid: 1db9e217733971041be26b076fda6083, type: 3} + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} m_FontSize: 14 m_FontStyle: 0 m_BestFit: 0 @@ -4115,7 +1945,7 @@ MonoBehaviour: m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: Total Calories Burned ---- !u!1 &8325193901124955881 +--- !u!1 &5725973655062508714 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -4123,50 +1953,50 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 827999855811362536} - - component: {fileID: 7392929634758451499} - - component: {fileID: 4408462221552758233} + - component: {fileID: 7407821082274166662} + - component: {fileID: 5971851171255251538} + - component: {fileID: 729198308104094461} m_Layer: 5 - m_Name: Value + m_Name: Unit m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &827999855811362536 +--- !u!224 &7407821082274166662 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8325193901124955881} + m_GameObject: {fileID: 5725973655062508714} 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: 1146954909952044699} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: -46} - m_SizeDelta: {x: 0, y: 44} + m_AnchoredPosition: {x: 0, y: -90} + m_SizeDelta: {x: 0, y: 30} m_Pivot: {x: 0.5, y: 1} ---- !u!222 &7392929634758451499 +--- !u!222 &5971851171255251538 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8325193901124955881} + m_GameObject: {fileID: 5725973655062508714} m_CullTransparentMesh: 0 ---- !u!114 &4408462221552758233 +--- !u!114 &729198308104094461 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8325193901124955881} + m_GameObject: {fileID: 5725973655062508714} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} @@ -4180,7 +2010,85 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: 9428f2aab98e9c34d923a9174035a197, type: 3} + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 14 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: times +--- !u!1 &7153562670071794857 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5811163701789347620} + - component: {fileID: 5127135054606620899} + - component: {fileID: 2751132558324015858} + m_Layer: 5 + m_Name: Value + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5811163701789347620 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7153562670071794857} + 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: 1371666530237420721} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: -46} + m_SizeDelta: {x: 0, y: 44} + m_Pivot: {x: 0.5, y: 1} +--- !u!222 &5127135054606620899 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7153562670071794857} + m_CullTransparentMesh: 0 +--- !u!114 &2751132558324015858 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7153562670071794857} + 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: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} m_FontSize: 32 m_FontStyle: 0 m_BestFit: 0 @@ -4193,7 +2101,7 @@ MonoBehaviour: m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: 8462 ---- !u!1 &8693013624586139547 +--- !u!1 &7414543009457610051 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -4201,51 +2109,129 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1487941755267510423} - - component: {fileID: 9204072334168913350} - - component: {fileID: 7528057451792558477} - - component: {fileID: 5923485944004977104} + - component: {fileID: 8338869236725907066} + - component: {fileID: 8117992966846879044} + - component: {fileID: 1831511918994481691} m_Layer: 5 - m_Name: SwitchAccountButton + m_Name: Unit m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &1487941755267510423 +--- !u!224 &8338869236725907066 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8693013624586139547} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_GameObject: {fileID: 7414543009457610051} + 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: 5404217439901075764} - m_RootOrder: 1 + m_Father: {fileID: 2007136740013128215} + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 124, y: -40} - m_SizeDelta: {x: 44, y: 44} - m_Pivot: {x: 0, y: 1} ---- !u!222 &9204072334168913350 + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: -90} + m_SizeDelta: {x: 0, y: 30} + m_Pivot: {x: 0.5, y: 1} +--- !u!222 &8117992966846879044 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8693013624586139547} + m_GameObject: {fileID: 7414543009457610051} m_CullTransparentMesh: 0 ---- !u!114 &7528057451792558477 +--- !u!114 &1831511918994481691 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8693013624586139547} + m_GameObject: {fileID: 7414543009457610051} + 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: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 14 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: times +--- !u!1 &7784570298126661651 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2772237898578650081} + - component: {fileID: 7443034517059678575} + - component: {fileID: 4176095023621352568} + - component: {fileID: 9188465543353557356} + m_Layer: 5 + m_Name: Button + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2772237898578650081 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7784570298126661651} + 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: 5404217439901075764} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 70, y: -40} + m_SizeDelta: {x: 44, y: 44} + m_Pivot: {x: 0, y: 1} +--- !u!222 &7443034517059678575 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7784570298126661651} + m_CullTransparentMesh: 0 +--- !u!114 &4176095023621352568 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7784570298126661651} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} @@ -4258,7 +2244,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 16d4d4e1a880b14419e1e59044ca21d0, type: 3} + m_Sprite: {fileID: 21300000, guid: fdb6d865c6f1a0d45a6fa4e26e4784a8, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -4268,13 +2254,13 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!114 &5923485944004977104 +--- !u!114 &9188465543353557356 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8693013624586139547} + m_GameObject: {fileID: 7784570298126661651} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} @@ -4307,10 +2293,88 @@ MonoBehaviour: m_SelectedTrigger: Selected m_DisabledTrigger: Disabled m_Interactable: 1 - m_TargetGraphic: {fileID: 7528057451792558477} + m_TargetGraphic: {fileID: 4176095023621352568} m_OnClick: m_PersistentCalls: m_Calls: [] +--- !u!1 &8124170428124591723 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2371126046335605320} + - component: {fileID: 825719472189541975} + - component: {fileID: 3492522053376828113} + m_Layer: 5 + m_Name: Title + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2371126046335605320 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8124170428124591723} + 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: 1146954909952044699} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: -27} + m_SizeDelta: {x: 0, y: 19} + m_Pivot: {x: 0, y: 1} +--- !u!222 &825719472189541975 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8124170428124591723} + m_CullTransparentMesh: 0 +--- !u!114 &3492522053376828113 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8124170428124591723} + 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.43137255, g: 0.43137255, b: 0.49019608, a: 1} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 14 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: Total Calories Burned --- !u!1 &8742705129243243295 GameObject: m_ObjectHideFlags: 0 @@ -4341,9 +2405,9 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 5148735776865229796} - - {fileID: 5554692196944023846} - - {fileID: 7244106525112837206} + - {fileID: 4237270043729181147} + - {fileID: 3506068050711393049} + - {fileID: 1816650286567294569} m_Father: {fileID: 5404217439945121858} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -4402,7 +2466,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: radius: 30 ---- !u!1 &8917058671189350333 +--- !u!1 &9001370968567362237 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -4410,68 +2474,68 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 5554692196944023846} - - component: {fileID: 319575252684112082} - - component: {fileID: 4120325177877616235} + - component: {fileID: 7765258694892104562} + - component: {fileID: 3790606935226761624} + - component: {fileID: 7460881882821427763} m_Layer: 5 - m_Name: Value + m_Name: Title m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &5554692196944023846 +--- !u!224 &7765258694892104562 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8917058671189350333} + m_GameObject: {fileID: 9001370968567362237} 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: 4952231134547891946} - m_RootOrder: 1 + m_Father: {fileID: 1371666530237420721} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: -46} - m_SizeDelta: {x: 0, y: 44} - m_Pivot: {x: 0.5, y: 1} ---- !u!222 &319575252684112082 + m_AnchoredPosition: {x: 0, y: -27} + m_SizeDelta: {x: 0, y: 19} + m_Pivot: {x: 0, y: 1} +--- !u!222 &3790606935226761624 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8917058671189350333} + m_GameObject: {fileID: 9001370968567362237} m_CullTransparentMesh: 0 ---- !u!114 &4120325177877616235 +--- !u!114 &7460881882821427763 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8917058671189350333} + m_GameObject: {fileID: 9001370968567362237} 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: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0.43137255, g: 0.43137255, b: 0.49019608, 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: 32 + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 14 m_FontStyle: 0 m_BestFit: 0 - m_MinSize: 3 + m_MinSize: 10 m_MaxSize: 40 m_Alignment: 4 m_AlignByGeometry: 0 @@ -4479,7 +2543,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: 8462 + m_Text: Total Calories Burned --- !u!1001 &4734340669132012360 PrefabInstance: m_ObjectHideFlags: 0 @@ -4637,23 +2701,11 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 8884056308248339243, guid: ed226fe096f17a0459f856db5fc494af, - type: 3} - propertyPath: m_FontData.m_Font - value: - objectReference: {fileID: 12800000, guid: 9428f2aab98e9c34d923a9174035a197, - type: 3} - target: {fileID: 8884056308736538996, guid: ed226fe096f17a0459f856db5fc494af, type: 3} propertyPath: m_SizeDelta.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 8884056309303262662, guid: ed226fe096f17a0459f856db5fc494af, - type: 3} - propertyPath: m_FontData.m_Font - value: - objectReference: {fileID: 12800000, guid: 9428f2aab98e9c34d923a9174035a197, - type: 3} - target: {fileID: 8884056309872452861, guid: ed226fe096f17a0459f856db5fc494af, type: 3} propertyPath: m_Material diff --git a/Assets/Scenes/MainScene.unity b/Assets/Scenes/MainScene.unity index 700f0406..3092f0bf 100644 --- a/Assets/Scenes/MainScene.unity +++ b/Assets/Scenes/MainScene.unity @@ -121,6 +121,84 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} +--- !u!1 &154299661 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 154299662} + - component: {fileID: 154299664} + - component: {fileID: 154299663} + m_Layer: 5 + m_Name: Version + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &154299662 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 154299661} + 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: 273807004} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + 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_Pivot: {x: 1, y: 0} +--- !u!114 &154299663 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 154299661} + 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.61960787, g: 0.61960787, b: 0.6784314, a: 1} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 12800000, guid: 25a07681c3624944d93fef973de82719, type: 3} + m_FontSize: 14 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 40 + m_Alignment: 5 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: Version:0.0.0 +--- !u!222 &154299664 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 154299661} + m_CullTransparentMesh: 0 --- !u!1 &273807000 GameObject: m_ObjectHideFlags: 0 @@ -215,6 +293,7 @@ RectTransform: m_Children: - {fileID: 730655536} - {fileID: 1985738406} + - {fileID: 154299662} m_Father: {fileID: 0} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -706,10 +785,10 @@ RectTransform: m_Father: {fileID: 273807004} m_RootOrder: 1 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: 1600, y: 900} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1985738407 MonoBehaviour: diff --git a/Assets/Scripts/Apis/MapInterruptRecordApi.cs b/Assets/Scripts/Apis/MapInterruptRecordApi.cs index 21cdbd86..95b1daba 100644 --- a/Assets/Scripts/Apis/MapInterruptRecordApi.cs +++ b/Assets/Scripts/Apis/MapInterruptRecordApi.cs @@ -41,7 +41,7 @@ namespace Assets.Scripts.Apis } catch (Exception e) { - Debug.Log(e.ToString()); + Debug.LogError(e.ToString()); return result; } diff --git a/Assets/Scripts/Apis/Models/NearRouteModel.cs b/Assets/Scripts/Apis/Models/NearRouteModel.cs index 1ce7b2c7..2fb44f47 100644 --- a/Assets/Scripts/Apis/Models/NearRouteModel.cs +++ b/Assets/Scripts/Apis/Models/NearRouteModel.cs @@ -33,5 +33,9 @@ namespace Assets.Scripts.Apis.Models public bool IsFavorite { get; set; } public bool Enable3D { get; set; } + /// + /// 海拔线 + /// + public string AltitudeGraph { get; set; } } } diff --git a/Assets/Scripts/Apis/Models/RouteResult.cs b/Assets/Scripts/Apis/Models/RouteResult.cs index 2d8d0e77..0418d51d 100644 --- a/Assets/Scripts/Apis/Models/RouteResult.cs +++ b/Assets/Scripts/Apis/Models/RouteResult.cs @@ -35,7 +35,7 @@ namespace Assets.Scripts.Apis.Models /// /// /// - public string RankingsId { get; set; } + public List RankingsId { get; set; } /// /// /// diff --git a/Assets/Scripts/App.cs b/Assets/Scripts/App.cs index 31f8a010..31375837 100644 --- a/Assets/Scripts/App.cs +++ b/Assets/Scripts/App.cs @@ -7,7 +7,7 @@ using UnityEngine; public static class App { - public static string Host = "http://192.168.0.101:5082/"; + public static string Host = "http://192.168.0.97:5082/"; public static string AppVersion = "1.0.0"; diff --git a/Assets/Scripts/Scenes/MainController.cs b/Assets/Scripts/Scenes/MainController.cs index 6ba10103..5e4e54af 100644 --- a/Assets/Scripts/Scenes/MainController.cs +++ b/Assets/Scripts/Scenes/MainController.cs @@ -2,13 +2,16 @@ using System.Collections; using System.Collections.Generic; using UnityEngine; +using UnityEngine.UI; public class MainController : MonoBehaviour { [SerializeField]GameObject root; + private Text Version; private void Awake() { - + Version = this.transform.Find("Version").GetComponent(); + Version.text = "Version:"+App.AppVersion; } // Start is called before the first frame update diff --git a/Assets/Scripts/UI/Control/PFUIInputField.cs b/Assets/Scripts/UI/Control/PFUIInputField.cs index e7ac137f..1cbb8897 100644 --- a/Assets/Scripts/UI/Control/PFUIInputField.cs +++ b/Assets/Scripts/UI/Control/PFUIInputField.cs @@ -90,7 +90,7 @@ namespace Assets.Scripts.UI.Control outline.enabled = false; } - UIManager.AddEvent(this.mInnerInputField.gameObject, EventTriggerType.PointerClick, new UnityAction(this.OnSelect)); + //UIManager.AddEvent(this.mInnerInputField.gameObject, EventTriggerType.PointerClick, new UnityAction(this.OnSelect)); UIManager.AddEvent(this.mInnerInputField.gameObject, EventTriggerType.Select, new UnityAction(this.OnSelect)); UIManager.AddEvent(this.mInnerInputField.gameObject, EventTriggerType.Deselect, new UnityAction(this.OnDeselect)); UIManager.AddEvent(this.mInnerInputField.gameObject, EventTriggerType.PointerEnter, new UnityAction((e) => diff --git a/Assets/Scripts/UI/Control/PFUIText.cs b/Assets/Scripts/UI/Control/PFUIText.cs index b78cafe8..e68c2121 100644 --- a/Assets/Scripts/UI/Control/PFUIText.cs +++ b/Assets/Scripts/UI/Control/PFUIText.cs @@ -4,10 +4,16 @@ using System.Linq; using System.Text; using System.Threading.Tasks; using UnityEngine; +using UnityEngine.UI; namespace Assets.Scripts.UI.Control { - public class PfText : PFUIComponentBase + [RequireComponent(typeof(Text))] + public class PFUIText : PFUIComponentBase { + protected void Awake() + { + + } } } diff --git a/Assets/Scripts/UI/Prefab/BigMap/Item.cs b/Assets/Scripts/UI/Prefab/BigMap/Item.cs index 17c0370a..775c5493 100644 --- a/Assets/Scripts/UI/Prefab/BigMap/Item.cs +++ b/Assets/Scripts/UI/Prefab/BigMap/Item.cs @@ -8,7 +8,7 @@ using UnityEngine; using UnityEngine.EventSystems; using UnityEngine.UI; -public class Item : MonoBehaviour, IPointerClickHandler +public class Item : PFUIPanel //, IPointerClickHandler { private Text text; @@ -49,7 +49,8 @@ public class Item : MonoBehaviour, IPointerClickHandler } } public Action onClick; - private void Awake() + private Transform hot; + protected override void Awake() { text = this.transform.Find("name").GetComponent(); km = this.transform.Find("km").GetComponent(); @@ -63,6 +64,11 @@ public class Item : MonoBehaviour, IPointerClickHandler var rect = ((RectTransform)transform).rect; material.SetVector(Shader.PropertyToID("_WidthHeightRadius"), new Vector4(rect.width, rect.height, rect.height * 0.5f, 0)); this.GetComponent().material = material; + + hot = this.transform.Find("Hot"); + SetRounded(hot, 17); + + UIManager.AddEvent(this.gameObject, EventTriggerType.PointerClick, OnPointerClick); } public void Selected(bool value) @@ -74,28 +80,42 @@ public class Item : MonoBehaviour, IPointerClickHandler this.GetComponent().color2 = Utils.HexToColor("F93086"); this.GetComponent().color = Color.white; - this.transform.Find("km").GetComponent().color = Color.white; - this.transform.Find("count").GetComponent().color = Color.white; + km.color = Color.white; + count.color = Color.white; + this.transform.Find("DistanceIcon").GetComponent().color = Color.white; + this.transform.Find("BikeIcon").GetComponent().color = Color.white; + + + hot.GetComponent().color1 = Color.white; + hot.GetComponent().color2 = Color.white; + hot.Find("PFUIText").GetComponent().color = Utils.HexToColor("F93086"); } else { this.GetComponent().enabled = false; this.GetComponent().color = Utils.HexToColor("353543"); - this.transform.Find("km").GetComponent().color = Utils.HexToColor("5C5C6E"); - this.transform.Find("count").GetComponent().color = Utils.HexToColor("F93086"); + km.color = Utils.HexToColor("5C5C6E"); + count.color = Utils.HexToColor("F93086"); + this.transform.Find("DistanceIcon").GetComponent().color = Utils.HexToColor("5C5C6E"); + this.transform.Find("BikeIcon").GetComponent().color = Utils.HexToColor("F93086"); + + hot.GetComponent().color1 = Utils.HexToColor("FF7485"); + hot.GetComponent().color2 = Utils.HexToColor("F93086"); + hot.Find("PFUIText").GetComponent().color = Color.white; + } } public void SetModel(NearRouteModel model) { this.Text = model.Name; - this.Distance = model.Distance + "KM"; + this.Distance = model.Distance.ToString("0.0") + "KM"; this.Count = model.TheHeat.ToString(); } // Start is called before the first frame update - void Start() + protected override void Start() { } @@ -106,7 +126,7 @@ public class Item : MonoBehaviour, IPointerClickHandler } - public void OnPointerClick(PointerEventData eventData) + public void OnPointerClick(BaseEventData eventData) { if(onClick != null) { diff --git a/Assets/Scripts/UI/Prefab/BigMap/Tips.cs b/Assets/Scripts/UI/Prefab/BigMap/Tips.cs index 06fbcfa1..b9f65bc2 100644 --- a/Assets/Scripts/UI/Prefab/BigMap/Tips.cs +++ b/Assets/Scripts/UI/Prefab/BigMap/Tips.cs @@ -9,6 +9,7 @@ using UnityEngine.SceneManagement; using UnityEngine.UI; using System; using System.Linq; +using Assets.Scripts; public class Tips : MonoBehaviour { @@ -30,6 +31,7 @@ public class Tips : MonoBehaviour private List countryList; private GameObject level; private GameObject m3DIcon; + private RawImage altitudeGraph; private void Awake() { var materialSource = Resources.Load("UI/Material/RoundedCornersTextureMaterial"); @@ -63,6 +65,8 @@ public class Tips : MonoBehaviour level.GetComponent().material = material1; m3DIcon = this.transform.Find("3DIcon").gameObject; + + altitudeGraph = this.transform.Find("AltitudeGraph").GetComponent(); } // Start is called before the first frame update @@ -81,7 +85,7 @@ public class Tips : MonoBehaviour { if (this.isActiveAndEnabled) { - if(_model.Id == model.Id) + if(_model != null && _model.Id == model.Id) { //this.gameObject.SetActive(false); return; @@ -94,10 +98,10 @@ public class Tips : MonoBehaviour Name.text = _model.Name; Count.text = _model.TheHeat.ToString(); - Distance.text = _model.Distance.ToString("#.0")+"KM"; - TotalClimb.text = _model.TotalClimb.ToString(); + Distance.text = _model.Distance.ToString("0.0")+"KM"; + TotalClimb.text = _model.TotalClimb.ToString("0") +"FT"; - averageGrade.text = _model.AverageGrade.ToString() + "%"; + averageGrade.text = _model.AverageGrade.ToString("0.0") + "%"; //var country = countryList.SingleOrDefault(r => r.abbreviation.Equals(_model.CountryCode, StringComparison.InvariantCultureIgnoreCase)); //if(country ) @@ -110,7 +114,12 @@ public class Tips : MonoBehaviour level.transform.Find("Text").GetComponent().text = _model.Hard; m3DIcon.SetActive(_model.Enable3D); - + + + //altitudeGraph + + Utils.DisplayImage(StartCoroutine, altitudeGraph, _model.AltitudeGraph); + //Utils.DisplayImage(StartCoroutine, altitudeGraph, "http://192.168.0.97:5082/Map/AltitudeGraph?id=1215"); } @@ -137,9 +146,11 @@ public class Tips : MonoBehaviour } this.transform.localPosition = localPosition; this.transform.localScale = new Vector2(2, 2); - this.SetModel(model); + //tips.Show(); this.gameObject.SetActive(true); + + this.SetModel(model); } public void Hide() { diff --git a/Assets/Scripts/UI/Prefab/Device/ConnectDeviceModal.cs b/Assets/Scripts/UI/Prefab/Device/ConnectDeviceModal.cs index 0f9957ba..f86fdc52 100644 --- a/Assets/Scripts/UI/Prefab/Device/ConnectDeviceModal.cs +++ b/Assets/Scripts/UI/Prefab/Device/ConnectDeviceModal.cs @@ -42,15 +42,14 @@ public class ConnectDeviceModal : PFUIPanel var panel = container.Find("Panel"); content = panel.Find("Scroll View").Find("Viewport").Find("Content").GetComponent(); - Material material = null; - if (material == null) - { - material = Instantiate(Resources.Load("UI/Material/RoundedCornersTextureMaterial")); - } - var rect = ((RectTransform)panel.transform).rect; - material.SetVector(Shader.PropertyToID("_WidthHeightRadius"), new Vector4(rect.width, rect.height, 20f, 0)); - panel.GetComponent().material = material; - + //Material material = null; + //if (material == null) + //{ + // material = Instantiate(Resources.Load("UI/Material/RoundedCornersTextureMaterial")); + //} + //var rect = ((RectTransform)panel.transform).rect; + //material.SetVector(Shader.PropertyToID("_WidthHeightRadius"), new Vector4(rect.width, rect.height, 20f, 0)); + base.SetRounded(panel.GetComponent().transform, 20f); UIManager.AddEvent(closeBtn.gameObject, EventTriggerType.PointerClick, new UnityEngine.Events.UnityAction(e => { diff --git a/Assets/Scripts/UI/Prefab/Panel/BigMapController.cs b/Assets/Scripts/UI/Prefab/Panel/BigMapController.cs index 19afa582..535fdbdb 100644 --- a/Assets/Scripts/UI/Prefab/Panel/BigMapController.cs +++ b/Assets/Scripts/UI/Prefab/Panel/BigMapController.cs @@ -39,6 +39,7 @@ public class BigMapController : PFUIPanel begin = Resources.Load("UI/Prefab/BigMap/Begin"); mapManager = this.transform.Find("Map").GetComponent(); + mapManager.MaxZoom = 4; mapManager.OnInitialized += MapManager_OnInitialized; mapManager.OnUpdated += MapManager_OnUpdated; @@ -57,7 +58,7 @@ public class BigMapController : PFUIPanel mapManager.Destroy(); UIManager.ShowMapListPanel(); //this.gameObject.SetActive(false); - DestroyImmediate(this.gameObject); + //DestroyImmediate(this.gameObject); }); var panel = canvas.transform.Find("Panel"); @@ -91,7 +92,7 @@ public class BigMapController : PFUIPanel UIManager.AddEvent(headImage.gameObject, EventTriggerType.PointerClick, (e) => { - UIManager.ShowEditUserPanel(); + UIManager.ShowUserInfoPanel(); }); } @@ -126,6 +127,8 @@ public class BigMapController : PFUIPanel } private void MapManager_OnUpdated() { + Debug.Log("update"); + foreach (var item in linesCache) { //if(item.Value.LineObject != null) diff --git a/Assets/Scripts/UI/Prefab/Panel/DeviceController.cs b/Assets/Scripts/UI/Prefab/Panel/DeviceController.cs index 8a2317aa..b951c1bb 100644 --- a/Assets/Scripts/UI/Prefab/Panel/DeviceController.cs +++ b/Assets/Scripts/UI/Prefab/Panel/DeviceController.cs @@ -40,14 +40,19 @@ public class DeviceController : PFUIPanel //UIManager.CloseModal(); this.Close(); })); + //UIManager.AddEvent(mReturnBtn.gameObject, EventTriggerType.PointerUp, (e) => + //{ + // Debug.Log("aaaaaaaaaaaaaa"); + //}); var bg = this.transform.Find("Status").Find("Bg"); antStatus = bg.Find("Ant+").GetComponent(); ant0 = Resources.Load("Images/ANT+_0"); - ant1 = Resources.Load("Images/ANT+_1"); + ant1 = Resources.Load("Images/ANT+_2"); - Debug.Log("device start"); + + base.SetRounded(bg, 64); } diff --git a/Assets/Scripts/UI/Prefab/Panel/HomeController.cs b/Assets/Scripts/UI/Prefab/Panel/HomeController.cs index 5da1a7c8..5857ecf7 100644 --- a/Assets/Scripts/UI/Prefab/Panel/HomeController.cs +++ b/Assets/Scripts/UI/Prefab/Panel/HomeController.cs @@ -100,9 +100,10 @@ public class HomeController : PFUIPanel userInfo.Find("GroupTop").Find("FtpContainer").Find("FtpValue").GetComponent().text = App.CurrentUser.FTP.ToString(); userInfo.Find("GroupTop").Find("WeightContainer").Find("WeightValue").GetComponent().text = App.CurrentUser.Weight.ToString(); userInfo.Find("GroupTop").Find("WKGContainer").Find("WKGValue").GetComponent().text = $"{App.CurrentUser.Weight}kg/{App.CurrentUser.BicycleWeight}kg"; - userInfo.Find("CaloriesContainer").Find("CaloriesValue").GetComponent().text = summary.Kcal; - userInfo.Find("KMContainer").Find("KMValue").GetComponent().text = summary.TotalDistance.ToString(); - userInfo.Find("ClimbContainer").Find("ClimbValue").GetComponent().text = summary.TotalClimb; + userInfo.Find("CaloriesContainer").Find("CaloriesValue").GetComponent().text = summary.Kcal +" KCAL"; + userInfo.Find("KMContainer").Find("KMValue").GetComponent().text = summary.TotalDistance.ToString("0") +" KM"; + userInfo.Find("ClimbContainer").Find("ClimbValue").GetComponent().text = summary.TotalClimb +" M"; + userInfo.Find("IDText").GetComponent().text = "ID:"+App.CurrentUser.Id; //var user = ConfigHelper.CurrentUser; //Ftp.text = summary.Ftp.ToString(); //Weight.text = user.Weight.ToString(); @@ -148,4 +149,9 @@ public class HomeController : PFUIPanel { } + + public override void Show() + { + base.Show(); + } } diff --git a/Assets/Scripts/UI/Prefab/Panel/MapListController.cs b/Assets/Scripts/UI/Prefab/Panel/MapListController.cs index e6dcb8e0..2ae59d22 100644 --- a/Assets/Scripts/UI/Prefab/Panel/MapListController.cs +++ b/Assets/Scripts/UI/Prefab/Panel/MapListController.cs @@ -205,7 +205,7 @@ public class MapListController : PFUIPanel UIManager.AddEvent(headImage.gameObject, EventTriggerType.PointerClick, (e) => { - UIManager.ShowEditUserPanel(); + UIManager.ShowUserInfoPanel(); }); } diff --git a/Assets/Scripts/UI/Prefab/ResultList/RouteItem.cs b/Assets/Scripts/UI/Prefab/ResultList/RouteItem.cs index aa632608..d1a3f132 100644 --- a/Assets/Scripts/UI/Prefab/ResultList/RouteItem.cs +++ b/Assets/Scripts/UI/Prefab/ResultList/RouteItem.cs @@ -5,6 +5,7 @@ using System.Collections; using System.Collections.Generic; using UnityEngine; using UnityEngine.EventSystems; +using UnityEngine.SceneManagement; using UnityEngine.UI; public class RouteItem : MonoBehaviour, IPointerExitHandler, IPointerEnterHandler @@ -23,8 +24,10 @@ public class RouteItem : MonoBehaviour, IPointerExitHandler, IPointerEnterHandle } string titleColor = "#5c5c6e"; + RouteResult data; public void Initial(RouteResult result) { + data = result; left = transform.Find("Left"); row1 = left.Find("Main").Find("Row1"); row2 = left.Find("Main").Find("Row2"); @@ -61,17 +64,23 @@ public class RouteItem : MonoBehaviour, IPointerExitHandler, IPointerEnterHandle private void Delete() { - throw new NotImplementedException(); + //throw new NotImplementedException(); + UIManager.ShowAlert("暂未实现"); } private void GoReRide() { - throw new NotImplementedException(); + //throw new NotImplementedException(); + //UIManager.ShowAlert("去骑行"); + + App.RouteIdParam = data.RouteId; + SceneManager.LoadScene("Ride"); } private void GoContinue() { - throw new NotImplementedException(); + //throw new NotImplementedException(); + UIManager.ShowAlert("暂未实现"); } public void OnPointerExit(PointerEventData eventData) diff --git a/Assets/Scripts/UIManager.cs b/Assets/Scripts/UIManager.cs index dff61270..b7970158 100644 --- a/Assets/Scripts/UIManager.cs +++ b/Assets/Scripts/UIManager.cs @@ -343,6 +343,7 @@ public class UIManager : MonoBehaviour //prePanel = bigMap.GetComponent(); } + static Texture2D cursor; public static void AddEvent(GameObject gameObject, EventTriggerType eventTriggerType, UnityAction call) { EventTrigger et = gameObject.GetComponent(); @@ -354,6 +355,27 @@ public class UIManager : MonoBehaviour pointerEvent.eventID = eventTriggerType; pointerEvent.callback.AddListener(call); et.triggers.Add(pointerEvent); + + if(eventTriggerType == EventTriggerType.PointerClick) + { + //设置光标 + if (cursor == null) + { + cursor = Resources.Load("Images/PointerButtonHover"); + } + UIManager.AddEvent(gameObject, EventTriggerType.PointerEnter, (e)=>{ + if (!gameObject.activeInHierarchy) return; + Cursor.SetCursor(cursor, Vector2.zero, CursorMode.Auto); + }); + UIManager.AddEvent(gameObject, EventTriggerType.PointerUp, (e) => { + if (!gameObject.activeInHierarchy) return; + Cursor.SetCursor(null, Vector2.zero, CursorMode.Auto); + }); + UIManager.AddEvent(gameObject, EventTriggerType.PointerExit, (e) => { + if (!gameObject.activeInHierarchy) return; + Cursor.SetCursor(null, Vector2.zero, CursorMode.Auto); + }); + } } public static void Close(MonoBehaviour obj) diff --git a/Assets/StreamingAssets.meta b/Assets/StreamingAssets.meta new file mode 100644 index 00000000..0cbd8580 --- /dev/null +++ b/Assets/StreamingAssets.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 9a0a7989900f2c34abeee17c663d08dc +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 5ea0ff38..6d6cea43 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -568,7 +568,7 @@ PlayerSettings: monoEnv: splashScreenBackgroundSourceLandscape: {fileID: 0} splashScreenBackgroundSourcePortrait: {fileID: 0} - blurSplashScreenBackground: 1 + blurSplashScreenBackground: 0 spritePackerPolicy: webGLMemorySize: 16 webGLExceptionSupport: 1