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 00000000..cf01b924 Binary files /dev/null and b/Assets/Resources/Images/Ride/bg_myrank_APP.png differ 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)