From b8a3a30629aeeb34b70686fa246fed0e2a718a88 Mon Sep 17 00:00:00 2001 From: lishuo Date: Wed, 29 Dec 2021 14:40:58 +0800 Subject: [PATCH] =?UTF-8?q?=E9=AA=91=E8=A1=8Cloading&=E8=B5=9B=E4=BA=8B?= =?UTF-8?q?=E8=AE=A1=E6=97=B6=E6=9D=BF=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Resources/Images/Ride/bg_myrank_APP.png | Bin 0 -> 16849 bytes .../Images/Ride/bg_myrank_APP.png.meta | 128 ++++++++++++++++++ .../Match/Mobile/CompetitonPanel.prefab | 5 + .../Prefab/Match/Mobile/CountDownPanel.prefab | 18 +-- .../UI/Prefab/Ride/Mobile/LoadingPanel.prefab | 104 +++++++------- .../Ride/Mobile/MySelfRankingItem.prefab | 28 +--- .../UI/Prefab/Ride/MySelfRankingItem.prefab | 6 +- Assets/Resources/UI/language.json | 8 +- Assets/Scripts/Apis/MapApi.cs | 9 ++ Assets/Scripts/Scenes/MainController.cs | 16 +-- .../Ride/Competiton/CountDownFactory.cs | 16 +-- .../Scenes/Ride/Model/RecorderDataModel.cs | 1 + .../Scenes/Ride/Network/MapUDPService.cs | 9 ++ .../Scenes/Ride/Scripts/CyclingController.cs | 13 +- .../Scenes/Ride/Scripts/LoadingController.cs | 2 +- 15 files changed, 248 insertions(+), 115 deletions(-) create mode 100644 Assets/Resources/Images/Ride/bg_myrank_APP.png create mode 100644 Assets/Resources/Images/Ride/bg_myrank_APP.png.meta diff --git a/Assets/Resources/Images/Ride/bg_myrank_APP.png b/Assets/Resources/Images/Ride/bg_myrank_APP.png new file mode 100644 index 0000000000000000000000000000000000000000..cf01b9243b8e357e21b82d2e2cefbd8fa98f95fd GIT binary patch literal 16849 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 literal 0 HcmV?d00001 diff --git a/Assets/Resources/Images/Ride/bg_myrank_APP.png.meta b/Assets/Resources/Images/Ride/bg_myrank_APP.png.meta new file mode 100644 index 00000000..7a1a348d --- /dev/null +++ b/Assets/Resources/Images/Ride/bg_myrank_APP.png.meta @@ -0,0 +1,128 @@ +fileFormatVersion: 2 +guid: 453f1e196e8d31b4fabf0f06d169539b +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 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/UI/Prefab/Match/Mobile/CompetitonPanel.prefab b/Assets/Resources/UI/Prefab/Match/Mobile/CompetitonPanel.prefab index 0b06203c..e3cdacb3 100644 --- a/Assets/Resources/UI/Prefab/Match/Mobile/CompetitonPanel.prefab +++ b/Assets/Resources/UI/Prefab/Match/Mobile/CompetitonPanel.prefab @@ -7609,6 +7609,11 @@ PrefabInstance: propertyPath: m_Name value: MultiTips objectReference: {fileID: 0} + - target: {fileID: 6582060407730122472, guid: 3bf4a1387517769468dd74f58f7dc777, + type: 3} + propertyPath: m_FontData.m_Alignment + value: 6 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 3bf4a1387517769468dd74f58f7dc777, type: 3} --- !u!224 &978563753921066300 stripped diff --git a/Assets/Resources/UI/Prefab/Match/Mobile/CountDownPanel.prefab b/Assets/Resources/UI/Prefab/Match/Mobile/CountDownPanel.prefab index af8c722e..d7f5e68d 100644 --- a/Assets/Resources/UI/Prefab/Match/Mobile/CountDownPanel.prefab +++ b/Assets/Resources/UI/Prefab/Match/Mobile/CountDownPanel.prefab @@ -34,8 +34,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: -44.5, y: 16} - m_SizeDelta: {x: 67, y: 14} + m_AnchoredPosition: {x: -42.11, y: 16} + m_SizeDelta: {x: 60.219727, y: 14} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &120332816951723430 CanvasRenderer: @@ -58,7 +58,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.36078432, g: 0.36078432, b: 0.43137255, a: 1} + m_Color: {r: 0.9764706, g: 0.1882353, b: 0.5254902, a: 1} m_RaycastTarget: 1 m_Maskable: 1 m_OnCullStateChanged: @@ -71,7 +71,7 @@ MonoBehaviour: m_BestFit: 0 m_MinSize: 1 m_MaxSize: 40 - m_Alignment: 4 + m_Alignment: 5 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 @@ -114,7 +114,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 40.89, y: 16} - m_SizeDelta: {x: 57.787933, y: 14} + m_SizeDelta: {x: 57.780273, y: 14} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4634055342823246341 CanvasRenderer: @@ -137,7 +137,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.36078432, g: 0.36078432, b: 0.43137255, a: 1} + m_Color: {r: 0.9764706, g: 0.1882353, b: 0.5254902, a: 1} m_RaycastTarget: 1 m_Maskable: 1 m_OnCullStateChanged: @@ -156,7 +156,7 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: Riding Time + m_Text: Get Ready --- !u!114 &3318970160431747262 MonoBehaviour: m_ObjectHideFlags: 0 @@ -248,7 +248,7 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: Get Ready + m_Text: Competition Time --- !u!114 &4976400502972404802 MonoBehaviour: m_ObjectHideFlags: 0 @@ -425,7 +425,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.9764706, g: 0.1882353, b: 0.5254902, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_Maskable: 1 m_OnCullStateChanged: diff --git a/Assets/Resources/UI/Prefab/Ride/Mobile/LoadingPanel.prefab b/Assets/Resources/UI/Prefab/Ride/Mobile/LoadingPanel.prefab index 122124c3..6bba736e 100644 --- a/Assets/Resources/UI/Prefab/Ride/Mobile/LoadingPanel.prefab +++ b/Assets/Resources/UI/Prefab/Ride/Mobile/LoadingPanel.prefab @@ -38,7 +38,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: -244, y: 39} + m_AnchoredPosition: {x: -209, y: 29} m_SizeDelta: {x: 114, y: 38} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &955060079027007931 @@ -173,7 +173,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: -122, y: 39} + m_AnchoredPosition: {x: -87, y: 29} m_SizeDelta: {x: 114, y: 38} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &955060079127864291 @@ -493,7 +493,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} m_AnchoredPosition: {x: 0, y: -50} - m_SizeDelta: {x: 40, y: 34} + m_SizeDelta: {x: 0, y: 34} m_Pivot: {x: 0.5, y: 1} --- !u!222 &1135116821091102494 CanvasRenderer: @@ -622,7 +622,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} m_AnchoredPosition: {x: 0, y: -50} - m_SizeDelta: {x: 40, y: 34} + m_SizeDelta: {x: 0, y: 34} m_Pivot: {x: 0.5, y: 1} --- !u!222 &1135116820989721926 CanvasRenderer: @@ -746,7 +746,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 118.7, y: -214} + m_AnchoredPosition: {x: 98.099976, y: -114} m_SizeDelta: {x: 16, y: 16} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4505805532644863986 @@ -941,7 +941,7 @@ RectTransform: m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 5, y: 0} m_SizeDelta: {x: 10, y: 0} m_Pivot: {x: 0.5, y: 0.5} @@ -1011,7 +1011,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &2322716380738134732 RectTransform: m_ObjectHideFlags: 0 @@ -1030,8 +1030,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 49.9, y: 38.9} - m_SizeDelta: {x: 468, y: 6} + m_AnchoredPosition: {x: 30, y: 21} + m_SizeDelta: {x: 518, y: 6} m_Pivot: {x: 0, y: 1} --- !u!114 &2322716380738134731 MonoBehaviour: @@ -1117,7 +1117,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 68.75, y: -5} + m_AnchoredPosition: {x: 47.99997, y: -6} m_SizeDelta: {x: 36, y: 14} m_Pivot: {x: 0.5, y: 1} --- !u!222 &5327673503896133289 @@ -1195,7 +1195,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 117, y: -233} + m_AnchoredPosition: {x: 95.349976, y: -133} m_SizeDelta: {x: 10.5, y: 10.5} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3007624748289717560 @@ -1270,7 +1270,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 153, y: -72} + m_AnchoredPosition: {x: 133, y: -71.1} m_SizeDelta: {x: 206, y: 22} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3007624748412546459 @@ -1353,7 +1353,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 143, y: -233} + m_AnchoredPosition: {x: 121.7, y: -133} m_SizeDelta: {x: 36, y: 14} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3007624748526063404 @@ -1431,7 +1431,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 203, y: -233} + m_AnchoredPosition: {x: 183.9, y: -133} m_SizeDelta: {x: 36, y: 14} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3007624748546083608 @@ -1607,7 +1607,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 56, y: -233} + m_AnchoredPosition: {x: 36, y: -133} m_SizeDelta: {x: 10.5, y: 10.5} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3007624748693613234 @@ -1755,7 +1755,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 274.47, y: -38} + m_AnchoredPosition: {x: 254.4714, y: -38} m_SizeDelta: {x: 448.94287, y: 36} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3007624748799085431 @@ -1834,8 +1834,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 410, y: -102} - m_SizeDelta: {x: 360, y: 12} + m_AnchoredPosition: {x: 390, y: -216} + m_SizeDelta: {x: 360, y: 0} m_Pivot: {x: 1, y: 1} --- !u!222 &3007624748807431536 CanvasRenderer: @@ -2141,7 +2141,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 88, y: -214} + m_AnchoredPosition: {x: 68, y: -114} m_SizeDelta: {x: 36, y: 16} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3007624749170224128 @@ -2228,7 +2228,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 177, y: -233} + m_AnchoredPosition: {x: 157, y: -133} m_SizeDelta: {x: 10.5, y: 10.5} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3007624749186584481 @@ -2378,7 +2378,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 58, y: -214} + m_AnchoredPosition: {x: 38, y: -114} m_SizeDelta: {x: 16, y: 16} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3007624749321123288 @@ -2449,7 +2449,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 82.5, y: -251} + m_AnchoredPosition: {x: 62, y: -149.1} m_SizeDelta: {x: 36, y: 14} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3007624749335273309 @@ -2618,10 +2618,10 @@ RectTransform: m_Father: {fileID: 3007624749581944593} m_RootOrder: 24 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 153.5, y: 73.5} - m_SizeDelta: {x: 107, y: 19} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 109.5, y: -187} + m_SizeDelta: {x: 107, y: 14} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3007624749485164348 CanvasRenderer: @@ -2967,10 +2967,10 @@ RectTransform: m_Father: {fileID: 3007624749581944593} m_RootOrder: 21 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 72, y: 73} - m_SizeDelta: {x: 44, y: 44} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 39, y: -187} + m_SizeDelta: {x: 18, y: 18} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3007624749690485199 CanvasRenderer: @@ -3018,7 +3018,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: adb30198aa32dd140b5750692dd48104, type: 3} m_Name: m_EditorClassIdentifier: - radius: 22 + radius: 9 --- !u!1 &3007624749716399587 GameObject: m_ObjectHideFlags: 0 @@ -3115,7 +3115,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &3007624749774178323 RectTransform: m_ObjectHideFlags: 0 @@ -3132,7 +3132,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 502.90002, y: 45.899994} + m_AnchoredPosition: {x: 533, y: 29} m_SizeDelta: {x: 30, y: 14} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3007624749774178325 @@ -3207,7 +3207,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &3007624749816964129 RectTransform: m_ObjectHideFlags: 0 @@ -3292,7 +3292,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &3007624749866736679 RectTransform: m_ObjectHideFlags: 0 @@ -3590,7 +3590,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 56, y: -252} + m_AnchoredPosition: {x: 35.24997, y: -147.35} m_SizeDelta: {x: 10.5, y: 10.5} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3007624750146435812 @@ -3666,8 +3666,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: -37, y: 27} - m_SizeDelta: {x: 34, y: 42} + m_AnchoredPosition: {x: -15, y: 24} + m_SizeDelta: {x: 29.999939, y: 48} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3007624750161478546 CanvasRenderer: @@ -3769,7 +3769,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 82.5, y: -233} + m_AnchoredPosition: {x: 62.5, y: -133} m_SizeDelta: {x: 37, y: 14} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3007624750243088003 @@ -4028,9 +4028,9 @@ RectTransform: m_Father: {fileID: 3327674565846436473} 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: 20, y: -9} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 20, y: 0} m_SizeDelta: {x: 0, y: 16} m_Pivot: {x: 0.5, y: 1} --- !u!222 &8640525812794733518 @@ -4135,9 +4135,9 @@ RectTransform: m_Father: {fileID: 3327674566083090465} 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: 20, y: -9} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 20, y: 0} m_SizeDelta: {x: 0, y: 16} m_Pivot: {x: 0.5, y: 1} --- !u!222 &8640525813296669078 @@ -4569,12 +4569,12 @@ PrefabInstance: - target: {fileID: 5170894839205404110, guid: 3bf4a1387517769468dd74f58f7dc777, type: 3} propertyPath: m_AnchoredPosition.x - value: 269.9 + value: 250.75 objectReference: {fileID: 0} - target: {fileID: 5170894839205404110, guid: 3bf4a1387517769468dd74f58f7dc777, type: 3} propertyPath: m_AnchoredPosition.y - value: 45.899994 + value: 29 objectReference: {fileID: 0} - target: {fileID: 5170894839205404110, guid: 3bf4a1387517769468dd74f58f7dc777, type: 3} @@ -4596,6 +4596,16 @@ PrefabInstance: propertyPath: m_Name value: MultiTips objectReference: {fileID: 0} + - target: {fileID: 6582060407730122472, guid: 3bf4a1387517769468dd74f58f7dc777, + type: 3} + propertyPath: m_Text + value: + objectReference: {fileID: 0} + - target: {fileID: 6582060407730122472, guid: 3bf4a1387517769468dd74f58f7dc777, + type: 3} + propertyPath: m_FontData.m_Alignment + value: 6 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 3bf4a1387517769468dd74f58f7dc777, type: 3} --- !u!224 &8724855723572369069 stripped diff --git a/Assets/Resources/UI/Prefab/Ride/Mobile/MySelfRankingItem.prefab b/Assets/Resources/UI/Prefab/Ride/Mobile/MySelfRankingItem.prefab index 4f6f996d..39738bf9 100644 --- a/Assets/Resources/UI/Prefab/Ride/Mobile/MySelfRankingItem.prefab +++ b/Assets/Resources/UI/Prefab/Ride/Mobile/MySelfRankingItem.prefab @@ -97,7 +97,6 @@ GameObject: - component: {fileID: 3944575076599925979} - component: {fileID: 3944575076599925980} - component: {fileID: 7470444284165639829} - - component: {fileID: 553273351145986002} m_Layer: 5 m_Name: MySelfRankingItem m_TagString: Untagged @@ -157,8 +156,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 0} - m_Type: 1 + m_Sprite: {fileID: 21300000, guid: 453f1e196e8d31b4fabf0f06d169539b, type: 3} + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -179,29 +178,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: f48cdbeff59981140b430d66a9c53fc6, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!114 &553273351145986002 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3944575076599925982} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 7245fe6cb36dc7b4e921e9ae44200f43, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Direction: 2 - m_Color1: {r: 0.9764706, g: 0.1882353, b: 0.5254902, a: 0} - m_Color2: {r: 0.9764706, g: 0.1882353, b: 0.5254902, a: 0.49803922} - m_Color3: {r: 0.9764706, g: 0.1882353, b: 0.5254902, a: 1} - m_Color4: {r: 1, g: 1, b: 1, a: 1} - m_Rotation: 180 - m_Offset1: 0 - m_Offset2: 0 - m_GradientStyle: 1 - m_ColorSpace: -1 - m_IgnoreAspectRatio: 1 --- !u!1 &3944575076895843122 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/UI/Prefab/Ride/MySelfRankingItem.prefab b/Assets/Resources/UI/Prefab/Ride/MySelfRankingItem.prefab index 990121c2..09dccdb3 100644 --- a/Assets/Resources/UI/Prefab/Ride/MySelfRankingItem.prefab +++ b/Assets/Resources/UI/Prefab/Ride/MySelfRankingItem.prefab @@ -150,14 +150,14 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 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: 10907, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 + m_Sprite: {fileID: 21300000, guid: 453f1e196e8d31b4fabf0f06d169539b, type: 3} + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 diff --git a/Assets/Resources/UI/language.json b/Assets/Resources/UI/language.json index 4baff121..b5d43f04 100644 --- a/Assets/Resources/UI/language.json +++ b/Assets/Resources/UI/language.json @@ -288,7 +288,9 @@ "All Route": "全部线路", "Reconnect": "重新连接", "Did you want to reconnect the trip that was interrupted abnormally?": "你有异常中断的骑行,是否重新连接开始骑行?", - "LIST MODE": "线路模式" + "LIST MODE": "线路模式", + "Get The First Place. Time Limit": "第一名已产生，倒计时:", + "Competition Time": "比赛时间" }, "en": { "HOT ROUTES": "HOT ROUTES", @@ -570,6 +572,8 @@ "All Route": "All Route", "Reconnect": "Reconnect", "Did you want to reconnect the trip that was interrupted abnormally?": "Did you want to reconnect the trip that was interrupted abnormally?", - "LIST MODE": "LIST MODE" + "LIST MODE": "LIST MODE", + "Get The First Place. Time Limit": "Get The First Place. Time Limit", + "Competition Time": "Competition Time" } } \ No newline at end of file diff --git a/Assets/Scripts/Apis/MapApi.cs b/Assets/Scripts/Apis/MapApi.cs index 94667a8d..c307c2f9 100644 --- a/Assets/Scripts/Apis/MapApi.cs +++ b/Assets/Scripts/Apis/MapApi.cs @@ -99,6 +99,15 @@ namespace Assets.Scripts.Apis return null; } + public JsonResult> GetMapRouteInfo(IEnumerable ids) + { + var result = Newtonsoft.Json.JsonConvert.DeserializeObject>>(Post("Map/GetMapRouteInfo", ids)); + if (result.result) + { + return result; + } + return null; + } public async Task>> GetNearRouteAsync(float lat, float lng, float zoom, string bounds) { diff --git a/Assets/Scripts/Scenes/MainController.cs b/Assets/Scripts/Scenes/MainController.cs index 8b754416..b10feba0 100644 --- a/Assets/Scripts/Scenes/MainController.cs +++ b/Assets/Scripts/Scenes/MainController.cs @@ -317,19 +317,6 @@ public class MainController : BaseScene { if (item.RouteId > 0) { - if (!App.RouteNameDict.ContainsKey(item.RouteId)) - { - var result = ConfigHelper.mapApi.GetById(item.RouteId); - if (result.result) - { - item.RouteName = result.data.Name; - App.RouteNameDict.Add(item.RouteId, item.RouteName); - } - } - else - { - item.RouteName = App.RouteNameDict[item.RouteId]; - } var message = ""; if (item.TotalTicks == 0) { @@ -425,7 +412,8 @@ public class MainController : BaseScene var tempRecordData = Newtonsoft.Json.JsonConvert.DeserializeObject(content); App.tempRecordData = tempRecordData; - UIManager.ShowConfirm(App.GetLocalString("Reconnect"), App.GetLocalString("Did you want to reconnect the trip that was interrupted abnormally?"), () => { SceneManager.LoadScene("Ride"); },2,()=> { + UIManager.ShowConfirm(App.GetLocalString("Reconnect"), App.GetLocalString("Did you want to reconnect the trip that was interrupted abnormally?"), () => { App.RouteIdParam = App.tempRecordData.RouteId; App.CompetionId = App.tempRecordData.CompetitionId; + SceneManager.LoadScene("Ride"); },2,()=> { Helper.DelectDir(PFConstants.MapWorkoutRecordTempFolder); App.tempRecordData = null; }); diff --git a/Assets/Scripts/Scenes/Ride/Competiton/CountDownFactory.cs b/Assets/Scripts/Scenes/Ride/Competiton/CountDownFactory.cs index 98d2f987..133f895a 100644 --- a/Assets/Scripts/Scenes/Ride/Competiton/CountDownFactory.cs +++ b/Assets/Scripts/Scenes/Ride/Competiton/CountDownFactory.cs @@ -41,8 +41,8 @@ namespace Assets.Scenes.Ride.Scripts if (count >= 0 && !competitionModel.recorderData.Saved) { ShowCountDown(count, App.GetLocalString("Get Ready!"));//显示倒计时面板信息 - Timer.gameObject.SetActive(false); - TimerTitle.gameObject.SetActive(false); + //Timer.gameObject.SetActive(false); + //TimerTitle.gameObject.SetActive(false); } else { @@ -56,7 +56,7 @@ namespace Assets.Scenes.Ride.Scripts //显示倒计时面板信息 ShowCountDown(s.Item1, App.GetLocalString("Time Limit")); #else - ShowCountDown(s.Item1, "Get The First Place. Time Limit"); + ShowCountDown(s.Item1, App.GetLocalString("Get The First Place. Time Limit")); #endif } else if (s.Item1 >= 0) @@ -66,19 +66,19 @@ namespace Assets.Scenes.Ride.Scripts ShowCountDown(s.Item1, App.GetLocalString("Remaining Time")); } //显示当前选手骑行时间 - Timer.gameObject.SetActive(true); - TimerTitle.gameObject.SetActive(true); - Timer.text = Helper.FormatTicks(s.Item2);// Helper.FormatTicks(cyclingController.currentPlayer.TotalTicks); + //CountTimer.gameObject.SetActive(true); + //TimerTitle.gameObject.SetActive(true); + CountTimer.text = Helper.FormatTicks(s.Item2);// Helper.FormatTicks(cyclingController.currentPlayer.TotalTicks); } } } private void ShowCountDown(int count, string text) { - Title.text = text; + TimerTitle.text = text; if (count >= 0) { - CountTimer.text = Helper.FormatTicks(count); + Timer.text = Helper.FormatTicks(count); } } } diff --git a/Assets/Scripts/Scenes/Ride/Model/RecorderDataModel.cs b/Assets/Scripts/Scenes/Ride/Model/RecorderDataModel.cs index d88ccb08..0590cb66 100644 --- a/Assets/Scripts/Scenes/Ride/Model/RecorderDataModel.cs +++ b/Assets/Scripts/Scenes/Ride/Model/RecorderDataModel.cs @@ -267,6 +267,7 @@ namespace Assets.Scenes.Ride.Scripts.Model public class TempRecordData { + public int CompetitionId { get; set; } public int RouteId { get; set; } public RouteResultParam selectParam { get; set; } public double CurrentRouteStartDistance { get; set; } diff --git a/Assets/Scripts/Scenes/Ride/Network/MapUDPService.cs b/Assets/Scripts/Scenes/Ride/Network/MapUDPService.cs index 2eb9319a..10b275b7 100644 --- a/Assets/Scripts/Scenes/Ride/Network/MapUDPService.cs +++ b/Assets/Scripts/Scenes/Ride/Network/MapUDPService.cs @@ -428,6 +428,7 @@ namespace Assets.Scenes.Ride.Scripts var msgs = RemoveExceptionData(mes); //LastActiveTime = DateTime.Now; var ids = msgs.Where(m => onlineUsers.All(u => u.Id != m.MemberId)).Select(m => m.MemberId); + var routeIds = msgs.Where(m => onlineUsers.All(u => u.Id != m.MemberId)).Select(m => m.RouteId); if (ids.Any()) { List notCachedIds = new List(); @@ -447,6 +448,8 @@ namespace Assets.Scenes.Ride.Scripts if (notCachedIds.Count > 0) { var rangeUser = ConfigHelper.mapApi.GetOnlineUserInfo(ids).data; + var rangeRoute = ConfigHelper.mapApi.GetMapRouteInfo(routeIds).data; + App.RouteList.AddRange(rangeRoute); onlineUsers.AddRange(rangeUser); App.userList.AddRange(rangeUser); } @@ -454,10 +457,16 @@ namespace Assets.Scenes.Ride.Scripts foreach (var user in onlineUsers) { var item = msgs.FirstOrDefault(u => u.MemberId == user.Id); + var route = App.RouteList.Where(c => c.Id == item.RouteId).FirstOrDefault(); + if (route != null) + { + user.RouteName = route.NickName; + } if (item != null) { user.LastActiveTime = DateTime.Now; user.RouteId = item.RouteId; + user.Point = item.Point; user.IsCompleted = item.IsCompleted; //user.exit = item.exit; diff --git a/Assets/Scripts/Scenes/Ride/Scripts/CyclingController.cs b/Assets/Scripts/Scenes/Ride/Scripts/CyclingController.cs index 526ec552..3878e20e 100644 --- a/Assets/Scripts/Scenes/Ride/Scripts/CyclingController.cs +++ b/Assets/Scripts/Scenes/Ride/Scripts/CyclingController.cs @@ -92,8 +92,8 @@ public class CyclingController : DeviceServiceMonoBase if (App.tempRecordData != null) { selectParamModel = App.tempRecordData.selectParam; - competitionId = selectParamModel.CompetitionId ?? 0; - routeId = selectParamModel.RouteId ?? 0; + competitionId = App.tempRecordData.CompetitionId; + routeId = App.tempRecordData.RouteId; } Resources.UnloadUnusedAssets(); } @@ -560,8 +560,10 @@ public class CyclingController : DeviceServiceMonoBase //初始比赛 private IEnumerator InitRace() { - yield return new WaitForSeconds(1); + yield return null;//new WaitForSeconds(1); + UnityEngine.Debug.Log($"TEST:{routeId}"); mapRoute = mapApi.GetById(routeId).data; + var mapCompetitionApi = new MapCompetitionApi(); competition = mapCompetitionApi.GetById(competitionId).data; loadingController.Init();//初始化loading页面 @@ -602,7 +604,7 @@ public class CyclingController : DeviceServiceMonoBase EndDistance = 0, RankingsId = new List(), OnlineUserId = 0, - RouteId = App.RouteIdParam + RouteId = routeId }; } @@ -1146,7 +1148,8 @@ public BaseUIManager singleUIManager; RecorderDataModel recorderData = cyclingController.recorderData; tempRecordData.RiderDatas = recorderData.RiderDatas; tempRecordData.selectParam = recorderData.selectParam; - tempRecordData.RouteId = mapRoute.Id; + tempRecordData.RouteId = recorderData.Competitionid; + tempRecordData.CompetitionId = mapRoute.Id; tempRecordData.StartTime = startTime; tempRecordData.ManufacturerId = recorderData.ManufacturerId; tempRecordData.ManufacturerName = recorderData.ManufacturerName; diff --git a/Assets/Scripts/Scenes/Ride/Scripts/LoadingController.cs b/Assets/Scripts/Scenes/Ride/Scripts/LoadingController.cs index 602679bf..aef4567b 100644 --- a/Assets/Scripts/Scenes/Ride/Scripts/LoadingController.cs +++ b/Assets/Scripts/Scenes/Ride/Scripts/LoadingController.cs @@ -137,7 +137,7 @@ namespace Assets.Scenes.Ride.Scripts DrawMapRouteAsync(route.Id); AddProcess(10); //查询排行榜 - var list = mapApi.GetRouteRanking(App.RouteIdParam, "1", 0, 99999, ""); + var list = mapApi.GetRouteRanking(route.Id, "1", 0, 10, ""); if (list.result) { if (list.data.list.Count > 10)