From dd1d26e9c86627d3b260cf5de05f22b8ccb09cc5 Mon Sep 17 00:00:00 2001 From: lishuo Date: Thu, 13 Jan 2022 13:43:09 +0800 Subject: [PATCH 1/2] =?UTF-8?q?pc=E8=B5=9B=E4=BA=8Bloading=E9=9A=90?= =?UTF-8?q?=E8=97=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/Resources/UI/Prefab/Match/CompetitonPanel.prefab | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Assets/Resources/UI/Prefab/Match/CompetitonPanel.prefab b/Assets/Resources/UI/Prefab/Match/CompetitonPanel.prefab index 0d45d6c4..53dca7fd 100644 --- a/Assets/Resources/UI/Prefab/Match/CompetitonPanel.prefab +++ b/Assets/Resources/UI/Prefab/Match/CompetitonPanel.prefab @@ -3435,6 +3435,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 3622b843b296d2e46ba722beb139f040, type: 3} m_Name: m_EditorClassIdentifier: + newNav: {fileID: 0} --- !u!114 &8647795171597459386 MonoBehaviour: m_ObjectHideFlags: 0 @@ -3447,6 +3448,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 3622b843b296d2e46ba722beb139f040, type: 3} m_Name: m_EditorClassIdentifier: + newNav: {fileID: 0} --- !u!1 &6558498177537283755 GameObject: m_ObjectHideFlags: 0 @@ -5224,7 +5226,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &6558498178561756610 RectTransform: m_ObjectHideFlags: 0 From 79ad622026e1015983ddf4c8a5802963467d576a Mon Sep 17 00:00:00 2001 From: lishuo Date: Thu, 13 Jan 2022 14:50:23 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E8=B5=9B=E4=BA=8Bloading=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E6=9D=A1=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../UI/Prefab/Match/CompetitonPanel.prefab | 97 ++++++++++++++++++- .../Match/Mobile/CompetitonPanel.prefab | 2 +- .../UI/Prefab/Ride/LoadingPanel.prefab | 16 +-- .../Resources/UI/Prefab/Ride/Multips.prefab | 94 ++++++++++++++++++ .../UI/Prefab/Ride/Multips.prefab.meta | 7 ++ .../CompetitionLoadingController.cs | 15 +-- 6 files changed, 214 insertions(+), 17 deletions(-) create mode 100644 Assets/Resources/UI/Prefab/Ride/Multips.prefab create mode 100644 Assets/Resources/UI/Prefab/Ride/Multips.prefab.meta diff --git a/Assets/Resources/UI/Prefab/Match/CompetitonPanel.prefab b/Assets/Resources/UI/Prefab/Match/CompetitonPanel.prefab index 53dca7fd..fa2cffbc 100644 --- a/Assets/Resources/UI/Prefab/Match/CompetitonPanel.prefab +++ b/Assets/Resources/UI/Prefab/Match/CompetitonPanel.prefab @@ -2388,6 +2388,98 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: key: +--- !u!1 &5481704648413949200 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8755589691839213968} + - component: {fileID: 5817553843603491900} + - component: {fileID: 158511944490989202} + - component: {fileID: 6432496535212216019} + m_Layer: 5 + m_Name: Multips + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8755589691839213968 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5481704648413949200} + 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: 6558498177448486125} + m_RootOrder: 45 + 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: -156.5, y: -329.21} + m_SizeDelta: {x: 1162.9983, y: 69.57846} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5817553843603491900 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5481704648413949200} + m_CullTransparentMesh: 0 +--- !u!114 &158511944490989202 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5481704648413949200} + 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: 14 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 1 + m_MaxSize: 40 + m_Alignment: 7 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: +--- !u!114 &6432496535212216019 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5481704648413949200} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 81e6186d0c08df64ba2687b894591e90, type: 3} + m_Name: + m_EditorClassIdentifier: + key: --- !u!1 &5674121455785206675 GameObject: m_ObjectHideFlags: 0 @@ -3378,6 +3470,7 @@ RectTransform: - {fileID: 6742262383745753795} - {fileID: 224593554342519100} - {fileID: 6085898456189044154} + - {fileID: 8755589691839213968} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -5758,7 +5851,7 @@ RectTransform: m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 5, y: 0} m_SizeDelta: {x: 10, y: 0} m_Pivot: {x: 0.5, y: 0.5} @@ -6113,7 +6206,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &6558498179115500272 RectTransform: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/UI/Prefab/Match/Mobile/CompetitonPanel.prefab b/Assets/Resources/UI/Prefab/Match/Mobile/CompetitonPanel.prefab index cedb4ab1..8381f4c9 100644 --- a/Assets/Resources/UI/Prefab/Match/Mobile/CompetitonPanel.prefab +++ b/Assets/Resources/UI/Prefab/Match/Mobile/CompetitonPanel.prefab @@ -3849,7 +3849,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: 100.5, y: -313} + m_AnchoredPosition: {x: 100.5, y: -298} m_SizeDelta: {x: 101, y: 14} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6558498177906922494 diff --git a/Assets/Resources/UI/Prefab/Ride/LoadingPanel.prefab b/Assets/Resources/UI/Prefab/Ride/LoadingPanel.prefab index cfed4b44..ce206ba2 100644 --- a/Assets/Resources/UI/Prefab/Ride/LoadingPanel.prefab +++ b/Assets/Resources/UI/Prefab/Ride/LoadingPanel.prefab @@ -1332,9 +1332,9 @@ RectTransform: m_Father: {fileID: 1936946042244182541} 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: 10, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 10, y: -14} m_SizeDelta: {x: 0, y: 28} m_Pivot: {x: 0, y: 0.5} --- !u!222 &9218960045514105109 @@ -4313,7 +4313,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: 10, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 28} m_Pivot: {x: 0, y: 0.5} --- !u!222 &4547966394363676322 @@ -4420,7 +4420,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: 10, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 28} m_Pivot: {x: 0, y: 0.5} --- !u!222 &1116450085117521016 @@ -4670,7 +4670,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: 10, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 28} m_Pivot: {x: 0, y: 0.5} --- !u!222 &4886094110349649579 @@ -4777,7 +4777,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: 20, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 16} m_Pivot: {x: 0.5, y: 1} --- !u!222 &8640525812794733518 @@ -4884,7 +4884,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: 20, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 16} m_Pivot: {x: 0.5, y: 1} --- !u!222 &8640525813296669078 diff --git a/Assets/Resources/UI/Prefab/Ride/Multips.prefab b/Assets/Resources/UI/Prefab/Ride/Multips.prefab new file mode 100644 index 00000000..49a7e2d7 --- /dev/null +++ b/Assets/Resources/UI/Prefab/Ride/Multips.prefab @@ -0,0 +1,94 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &6048373303729076889 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7377129575015114265} + - component: {fileID: 5719241987414678453} + - component: {fileID: 2148757891008602395} + - component: {fileID: 5090791236708161882} + m_Layer: 5 + m_Name: Multips + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7377129575015114265 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6048373303729076889} + 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: 0} + m_RootOrder: 0 + 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: -156.5, y: -329.21} + m_SizeDelta: {x: 1162.9983, y: 69.57846} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5719241987414678453 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6048373303729076889} + m_CullTransparentMesh: 0 +--- !u!114 &2148757891008602395 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6048373303729076889} + 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: 14 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 1 + m_MaxSize: 40 + m_Alignment: 7 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: +--- !u!114 &5090791236708161882 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6048373303729076889} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 81e6186d0c08df64ba2687b894591e90, type: 3} + m_Name: + m_EditorClassIdentifier: + key: diff --git a/Assets/Resources/UI/Prefab/Ride/Multips.prefab.meta b/Assets/Resources/UI/Prefab/Ride/Multips.prefab.meta new file mode 100644 index 00000000..dfc17794 --- /dev/null +++ b/Assets/Resources/UI/Prefab/Ride/Multips.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 57997cb9bf8c5b24fb9c385c2cede63f +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Scenes/Ride/Competiton/CompetitionLoadingController.cs b/Assets/Scripts/Scenes/Ride/Competiton/CompetitionLoadingController.cs index fee8606d..c43ba6c4 100644 --- a/Assets/Scripts/Scenes/Ride/Competiton/CompetitionLoadingController.cs +++ b/Assets/Scripts/Scenes/Ride/Competiton/CompetitionLoadingController.cs @@ -215,13 +215,16 @@ namespace Assets.Scenes.Ride.Scripts elevaction.text = Math.Round(route.TotalClimb.GetValueOrDefault(0), 2).ToString() + "M"; //平均破度 slope.text = Math.Round(route.AverageGrade, 2).ToString() + "%"; -#if UNITY_IOS || UNITY_ANDROID + //比赛开始时间 - StartTime.text = competition.StartTime.ToLocalTime().ToString("yyyy/MM/dd HH:mm:ss");//+" TO "+ competition.EndTime.ToLocalTime().ToString(); -#else - //比赛开始时间 - StartTime.text = competition.StartTime.ToLocalTime().ToString();//+" TO "+ competition.EndTime.ToLocalTime().ToString(); -#endif + if (App.GetLocalLanguage().Equals("zh")) + { + StartTime.text = competition.StartTime.ToLocalTime().ToString("yyyy-MM-dd HH:mm:ss");//+" TO "+ competition.EndTime.ToLocalTime().ToString(); + } + else + { + StartTime.text = competition.StartTime.ToLocalTime().ToString();//+" TO "+ competition.EndTime.ToLocalTime().ToString(); + } //比赛结束时间 // EndTime.text = competition.EndTime.ToLocalTime().ToString(); //比赛状态