From dbabaae032b2dc710222bd1c35e44bd0c7b5f9f5 Mon Sep 17 00:00:00 2001 From: lishuo Date: Mon, 10 Jan 2022 18:26:30 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=93=E6=9E=9C=E9=A1=B5&loading=E9=A1=B5?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../UI/Prefab/Ride/LoadingPanel.prefab | 19 +- .../Resources/UI/Prefab/Ride/ViewAll.prefab | 199 ++++++++++++++++++ .../UI/Prefab/Ride/ViewAll.prefab.meta | 7 + .../Scenes/Ride/Scripts/ResultPanelScript.cs | 10 +- 4 files changed, 220 insertions(+), 15 deletions(-) create mode 100644 Assets/Resources/UI/Prefab/Ride/ViewAll.prefab create mode 100644 Assets/Resources/UI/Prefab/Ride/ViewAll.prefab.meta diff --git a/Assets/Resources/UI/Prefab/Ride/LoadingPanel.prefab b/Assets/Resources/UI/Prefab/Ride/LoadingPanel.prefab index 9e63867f..9048a951 100644 --- a/Assets/Resources/UI/Prefab/Ride/LoadingPanel.prefab +++ b/Assets/Resources/UI/Prefab/Ride/LoadingPanel.prefab @@ -1334,7 +1334,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: 0, y: 0} + m_AnchoredPosition: {x: 10, y: 0} m_SizeDelta: {x: 0, y: 28} m_Pivot: {x: 0, y: 0.5} --- !u!222 &9218960045514105109 @@ -3109,6 +3109,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 3622b843b296d2e46ba722beb139f040, type: 3} m_Name: m_EditorClassIdentifier: + newNav: {fileID: 0} --- !u!1 &3007624749611492914 GameObject: m_ObjectHideFlags: 0 @@ -3777,7 +3778,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &3007624750140628948 RectTransform: m_ObjectHideFlags: 0 @@ -3834,10 +3835,10 @@ MonoBehaviour: m_Alignment: 0 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 0 + m_HorizontalOverflow: 1 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: Top 10 + m_Text: RANKING --- !u!1 &3007624750146435811 GameObject: m_ObjectHideFlags: 0 @@ -4298,7 +4299,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: 0, y: 0} + m_AnchoredPosition: {x: 10, y: 0} m_SizeDelta: {x: 0, y: 28} m_Pivot: {x: 0, y: 0.5} --- !u!222 &4547966394363676322 @@ -4405,7 +4406,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: 0, y: 0} + m_AnchoredPosition: {x: 10, y: 0} m_SizeDelta: {x: 0, y: 28} m_Pivot: {x: 0, y: 0.5} --- !u!222 &1116450085117521016 @@ -4655,7 +4656,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: 0, y: 0} + m_AnchoredPosition: {x: 10, y: 0} m_SizeDelta: {x: 0, y: 28} m_Pivot: {x: 0, y: 0.5} --- !u!222 &4886094110349649579 @@ -4762,7 +4763,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: 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 @@ -4869,7 +4870,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: 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 diff --git a/Assets/Resources/UI/Prefab/Ride/ViewAll.prefab b/Assets/Resources/UI/Prefab/Ride/ViewAll.prefab new file mode 100644 index 00000000..b7183816 --- /dev/null +++ b/Assets/Resources/UI/Prefab/Ride/ViewAll.prefab @@ -0,0 +1,199 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &3035877542464038358 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 587363923431513569} + - component: {fileID: 407207391305654799} + - component: {fileID: 4657217142766218751} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &587363923431513569 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3035877542464038358} + 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: 3773302385381427876} + 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 &407207391305654799 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3035877542464038358} + m_CullTransparentMesh: 0 +--- !u!114 &4657217142766218751 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3035877542464038358} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.9764706, g: 0.1882353, b: 0.5254902, a: 1} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 12800000, guid: 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: ViewAll +--- !u!1 &5766380139266401392 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3773302385381427876} + - component: {fileID: 952584370771594700} + - component: {fileID: 625708832601230730} + - component: {fileID: 727325490816276674} + m_Layer: 5 + m_Name: ViewAll + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3773302385381427876 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5766380139266401392} + 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: 587363923431513569} + 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: 590, y: -153} + m_SizeDelta: {x: 110, y: 22} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &952584370771594700 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5766380139266401392} + m_CullTransparentMesh: 0 +--- !u!114 &625708832601230730 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5766380139266401392} + 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: 0} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + 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 &727325490816276674 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5766380139266401392} + 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: 625708832601230730} + m_OnClick: + m_PersistentCalls: + m_Calls: [] diff --git a/Assets/Resources/UI/Prefab/Ride/ViewAll.prefab.meta b/Assets/Resources/UI/Prefab/Ride/ViewAll.prefab.meta new file mode 100644 index 00000000..66ed6b98 --- /dev/null +++ b/Assets/Resources/UI/Prefab/Ride/ViewAll.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 42e6439e5ca77244a9fd5d65bdc1e5da +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Scenes/Ride/Scripts/ResultPanelScript.cs b/Assets/Scripts/Scenes/Ride/Scripts/ResultPanelScript.cs index 0a215282..634ea5c8 100644 --- a/Assets/Scripts/Scenes/Ride/Scripts/ResultPanelScript.cs +++ b/Assets/Scripts/Scenes/Ride/Scripts/ResultPanelScript.cs @@ -123,6 +123,8 @@ namespace Assets.Scenes.Ride.Scripts { App.MainSceneParam.Add("Name", "UserInfoPanel"); } + + Application.OpenURL($"{App.CurrentUser.WebHost}Mine/Detail/{cyclingController.RankingId}?Token={App.CurrentUser.cookie}"); SceneManager.LoadScene("MainScene"); } @@ -133,12 +135,8 @@ namespace Assets.Scenes.Ride.Scripts public void SetDataSource(RecorderDataModel record) { var route = record.CurrentRoute.RouteInstance; -#if UNITY_ANDROID || UNITY_IOS - //绑定路书信息 - date.text = record.StartTime.ToString("yyyy-MM-dd"); -#else - date.text = record.StartTime.ToShortDateString(); -#endif + var dataformt = App.GetLocalLanguage().Equals("zh") ? "yyyy-MM-dd" : "dd-MM-yyyy"; + date.text = record.StartTime.ToString(dataformt); time.text = record.StartTime.ToShortTimeString(); level.text = route.Hard; mapName.text = route.Name;