From 0628bd37169f3b931a19503898dc1f2b22bb5586 Mon Sep 17 00:00:00 2001 From: lishuo Date: Thu, 6 Jan 2022 10:58:52 +0800 Subject: [PATCH 1/4] =?UTF-8?q?loading=E8=B0=83=E6=95=B4&=E9=AA=91?= =?UTF-8?q?=E8=A1=8C=E5=8A=A8=E7=94=BB&=E8=A7=92=E5=BA=A6=E6=89=8B?= =?UTF-8?q?=E5=8A=BF=E6=96=B9=E5=90=91=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PlayerBasicAnimator.controller | 34 +-- .../UI/Prefab/Ride/Mobile/LoadingPanel.prefab | 265 ++---------------- .../UI/Prefab/Ride/Mobile/ViewAll.prefab | 213 ++++++++++++++ .../UI/Prefab/Ride/Mobile/ViewAll.prefab.meta | 7 + Assets/Scripts/Scenes/MainController.cs | 26 +- .../Scenes/Ride/Scripts/AbstractPlayer.cs | 22 +- .../Scenes/Ride/Scripts/CyclingController.cs | 2 +- .../Scenes/Ride/Scripts/LoadingController.cs | 55 ++-- .../Scenes/Ride/Scripts/PlayerController.cs | 2 +- Assets/Scripts/UI/Prefab/MultiTips.cs | 4 +- 10 files changed, 331 insertions(+), 299 deletions(-) create mode 100644 Assets/Resources/UI/Prefab/Ride/Mobile/ViewAll.prefab create mode 100644 Assets/Resources/UI/Prefab/Ride/Mobile/ViewAll.prefab.meta diff --git a/Assets/Models/Cyclist animations HD/AnimationClips/PlayerBasicAnimator.controller b/Assets/Models/Cyclist animations HD/AnimationClips/PlayerBasicAnimator.controller index 794752f2..9925fe3e 100644 --- a/Assets/Models/Cyclist animations HD/AnimationClips/PlayerBasicAnimator.controller +++ b/Assets/Models/Cyclist animations HD/AnimationClips/PlayerBasicAnimator.controller @@ -137,7 +137,7 @@ AnimatorStateTransition: m_Conditions: - m_ConditionMode: 3 m_ConditionEvent: Speed - m_EventTreshold: 35 + m_EventTreshold: 30 m_DstStateMachine: {fileID: 0} m_DstState: {fileID: -7209952864988691809} m_Solo: 0 @@ -209,7 +209,7 @@ AnimatorState: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: Ride + m_Name: RideSlow m_Speed: 1 m_CycleOffset: 0 m_Transitions: @@ -226,7 +226,7 @@ AnimatorState: m_MirrorParameterActive: 0 m_CycleOffsetParameterActive: 0 m_TimeParameterActive: 0 - m_Motion: {fileID: 7400000, guid: 362224225d2a8a64cbe8f6c561493ecf, type: 3} + m_Motion: {fileID: 7400000, guid: 10ca29a5c795e8044b30e67789898d8e, type: 3} m_Tag: m_SpeedParameter: m_MirrorParameter: @@ -267,7 +267,7 @@ AnimatorStateTransition: m_Conditions: - m_ConditionMode: 4 m_ConditionEvent: Speed - m_EventTreshold: 35 + m_EventTreshold: 30 m_DstStateMachine: {fileID: 0} m_DstState: {fileID: -5166529910487830129} m_Solo: 0 @@ -289,7 +289,7 @@ AnimatorState: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: RideSlow + m_Name: onride m_Speed: 1 m_CycleOffset: 0 m_Transitions: @@ -306,7 +306,7 @@ AnimatorState: m_MirrorParameterActive: 0 m_CycleOffsetParameterActive: 0 m_TimeParameterActive: 0 - m_Motion: {fileID: 7400000, guid: a936df4d89100854e89b3cb482325c84, type: 3} + m_Motion: {fileID: 7400000, guid: 3fd4fbe1b2c792747bbef92590be71d5, type: 3} m_Tag: m_SpeedParameter: m_MirrorParameter: @@ -367,7 +367,7 @@ AnimatorState: m_PrefabAsset: {fileID: 0} m_Name: ReachDestination m_Speed: 1 - m_CycleOffset: 0 + m_CycleOffset: 0.2 m_Transitions: - {fileID: 3513795484857918862} m_StateMachineBehaviours: [] @@ -420,19 +420,19 @@ AnimatorStateTransition: m_Conditions: - m_ConditionMode: 3 m_ConditionEvent: Speed - m_EventTreshold: 1 + m_EventTreshold: 0 m_DstStateMachine: {fileID: 0} m_DstState: {fileID: -2278438292350793016} m_Solo: 0 m_Mute: 0 m_IsExit: 0 serializedVersion: 3 - m_TransitionDuration: 0.25 - m_TransitionOffset: 0 - m_ExitTime: 0.85 + m_TransitionDuration: 0.5 + m_TransitionOffset: 0.2 + m_ExitTime: 1 m_HasExitTime: 1 m_HasFixedDuration: 1 - m_InterruptionSource: 0 + m_InterruptionSource: 1 m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 --- !u!1101 &2718087226547410217 @@ -445,7 +445,7 @@ AnimatorStateTransition: m_Conditions: - m_ConditionMode: 4 m_ConditionEvent: Speed - m_EventTreshold: 20 + m_EventTreshold: 1 m_DstStateMachine: {fileID: 0} m_DstState: {fileID: -2278438292350793016} m_Solo: 0 @@ -531,7 +531,7 @@ AnimatorState: m_MirrorParameterActive: 0 m_CycleOffsetParameterActive: 0 m_TimeParameterActive: 0 - m_Motion: {fileID: 7400000, guid: de4dc61a8e4e8714fb27b4beaaab5e06, type: 2} + m_Motion: {fileID: 7400000, guid: 2e796be8d4938c942b5376bf6f92ebcf, type: 3} m_Tag: m_SpeedParameter: m_MirrorParameter: @@ -546,7 +546,7 @@ AnimatorState: m_PrefabAsset: {fileID: 0} m_Name: win m_Speed: 1 - m_CycleOffset: 0 + m_CycleOffset: 1 m_Transitions: [] m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} @@ -561,7 +561,7 @@ AnimatorState: m_Tag: m_SpeedParameter: m_MirrorParameter: - m_CycleOffsetParameter: + m_CycleOffsetParameter: Speed m_TimeParameter: --- !u!1101 &4950297653642550959 AnimatorStateTransition: @@ -598,7 +598,7 @@ AnimatorStateTransition: m_Conditions: - m_ConditionMode: 3 m_ConditionEvent: Speed - m_EventTreshold: 20 + m_EventTreshold: 1 m_DstStateMachine: {fileID: 0} m_DstState: {fileID: -5166529910487830129} m_Solo: 0 diff --git a/Assets/Resources/UI/Prefab/Ride/Mobile/LoadingPanel.prefab b/Assets/Resources/UI/Prefab/Ride/Mobile/LoadingPanel.prefab index 3d714c1c..537b55f5 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: -209, y: 29} + m_AnchoredPosition: {x: -231, y: 39} 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: -87, y: 29} + m_AnchoredPosition: {x: -107, y: 39} m_SizeDelta: {x: 114, y: 38} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &955060079127864291 @@ -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: 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} @@ -1011,7 +1011,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &2322716380738134732 RectTransform: m_ObjectHideFlags: 0 @@ -1030,7 +1030,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: 30, y: 21} + m_AnchoredPosition: {x: 60, y: 21} m_SizeDelta: {x: 518, y: 6} m_Pivot: {x: 0, y: 1} --- !u!114 &2322716380738134731 @@ -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: 47.99997, y: -6} + m_AnchoredPosition: {x: 77.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: 95.349976, y: -133} + m_AnchoredPosition: {x: 125.34998, 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: 133, y: -71.1} + m_AnchoredPosition: {x: 163, 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: 121.7, y: -133} + m_AnchoredPosition: {x: 151.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: 183.9, y: -133} + m_AnchoredPosition: {x: 213.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: 36, y: -133} + m_AnchoredPosition: {x: 66, 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: 254.4714, y: -38} + m_AnchoredPosition: {x: 284.4714, y: -38} m_SizeDelta: {x: 448.94287, y: 36} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3007624748799085431 @@ -1834,7 +1834,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: 390, y: -216} + m_AnchoredPosition: {x: 420, y: -216} m_SizeDelta: {x: 360, y: 0} m_Pivot: {x: 1, y: 1} --- !u!222 &3007624748807431536 @@ -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: 68, y: -114} + m_AnchoredPosition: {x: 98, 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: 157, y: -133} + m_AnchoredPosition: {x: 187, 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: 38, y: -114} + m_AnchoredPosition: {x: 68, 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: 62, y: -149.1} + m_AnchoredPosition: {x: 92, y: -149.1} m_SizeDelta: {x: 36, y: 14} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3007624749335273309 @@ -2620,7 +2620,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: 109.5, y: -187} + m_AnchoredPosition: {x: 139.5, y: -187} m_SizeDelta: {x: 107, y: 14} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3007624749485164348 @@ -2741,7 +2741,6 @@ RectTransform: - {fileID: 145307033915764318} - {fileID: 3007624748790425457} - {fileID: 8724855723572369069} - - {fileID: 1099737395000638351} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -2799,6 +2798,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 3622b843b296d2e46ba722beb139f040, type: 3} m_Name: m_EditorClassIdentifier: + newNav: {fileID: 0} --- !u!1 &3007624749611492914 GameObject: m_ObjectHideFlags: 0 @@ -2969,7 +2969,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: 39, y: -187} + m_AnchoredPosition: {x: 69, y: -187} m_SizeDelta: {x: 18, y: 18} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3007624749690485199 @@ -3115,7 +3115,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !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: 533, y: 29} + m_AnchoredPosition: {x: 563, y: 29} m_SizeDelta: {x: 30, y: 14} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3007624749774178325 @@ -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: 35.24997, y: -147.35} + m_AnchoredPosition: {x: 65.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: -15, y: 24} - m_SizeDelta: {x: 29.999939, y: 48} + m_AnchoredPosition: {x: -31.539978, y: 39} + m_SizeDelta: {x: 36.912033, y: 38} 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: 62.5, y: -133} + m_AnchoredPosition: {x: 92.5, y: -133} m_SizeDelta: {x: 37, y: 14} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3007624750243088003 @@ -4208,217 +4208,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: key: ---- !u!1 &5635372946248809289 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4131203580560256159} - - component: {fileID: 5921965671833874072} - - component: {fileID: 1126882534568575374} - - component: {fileID: 3122355159842659469} - m_Layer: 5 - m_Name: Text - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &4131203580560256159 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5635372946248809289} - 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: 1099737395000638351} - 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 &5921965671833874072 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5635372946248809289} - m_CullTransparentMesh: 0 ---- !u!114 &1126882534568575374 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5635372946248809289} - 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: 12 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 1 - m_MaxSize: 160 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: View All ---- !u!114 &3122355159842659469 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5635372946248809289} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: e47f6ee11b78f3247a0b474b6c36e2cd, type: 3} - m_Name: - m_EditorClassIdentifier: - key: ---- !u!1 &6046649886281115850 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1099737395000638351} - - component: {fileID: 319866780811438616} - - component: {fileID: 7099969197448708611} - - component: {fileID: 3313342171471266539} - m_Layer: 5 - m_Name: ViewAll - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!224 &1099737395000638351 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6046649886281115850} - 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: 4131203580560256159} - m_Father: {fileID: 3007624749581944593} - m_RootOrder: 34 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 1, y: 0} - m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: -125, y: 80} - m_SizeDelta: {x: 110, y: 22} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &319866780811438616 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6046649886281115850} - m_CullTransparentMesh: 0 ---- !u!114 &7099969197448708611 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6046649886281115850} - 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 &3313342171471266539 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6046649886281115850} - 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: 7099969197448708611} - m_OnClick: - m_PersistentCalls: - m_Calls: [] --- !u!1 &8110328268474125505 GameObject: m_ObjectHideFlags: 0 @@ -4583,7 +4372,7 @@ PrefabInstance: - target: {fileID: 5170894839205404110, guid: 3bf4a1387517769468dd74f58f7dc777, type: 3} propertyPath: m_AnchoredPosition.x - value: 250.75 + value: 280.75 objectReference: {fileID: 0} - target: {fileID: 5170894839205404110, guid: 3bf4a1387517769468dd74f58f7dc777, type: 3} diff --git a/Assets/Resources/UI/Prefab/Ride/Mobile/ViewAll.prefab b/Assets/Resources/UI/Prefab/Ride/Mobile/ViewAll.prefab new file mode 100644 index 00000000..ac2834fb --- /dev/null +++ b/Assets/Resources/UI/Prefab/Ride/Mobile/ViewAll.prefab @@ -0,0 +1,213 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &1066168578621652784 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8767361402868410598} + - component: {fileID: 1355613300160441057} + - component: {fileID: 5718563051022697975} + - component: {fileID: 7758508104377637108} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8767361402868410598 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1066168578621652784} + 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: 5745496016708534262} + 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 &1355613300160441057 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1066168578621652784} + m_CullTransparentMesh: 0 +--- !u!114 &5718563051022697975 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1066168578621652784} + 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: 12 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 1 + m_MaxSize: 160 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: View All +--- !u!114 &7758508104377637108 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1066168578621652784} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e47f6ee11b78f3247a0b474b6c36e2cd, type: 3} + m_Name: + m_EditorClassIdentifier: + key: +--- !u!1 &1375026645095525555 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5745496016708534262} + - component: {fileID: 4940293065859018337} + - component: {fileID: 2483523143424657018} + - component: {fileID: 7855487609214158482} + m_Layer: 5 + m_Name: ViewAll + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5745496016708534262 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1375026645095525555} + 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: 8767361402868410598} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 0} + m_AnchorMax: {x: 1, y: 0} + m_AnchoredPosition: {x: -155, y: 80} + m_SizeDelta: {x: 190, y: 22} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4940293065859018337 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1375026645095525555} + m_CullTransparentMesh: 0 +--- !u!114 &2483523143424657018 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1375026645095525555} + 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 &7855487609214158482 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1375026645095525555} + 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: 2483523143424657018} + m_OnClick: + m_PersistentCalls: + m_Calls: [] diff --git a/Assets/Resources/UI/Prefab/Ride/Mobile/ViewAll.prefab.meta b/Assets/Resources/UI/Prefab/Ride/Mobile/ViewAll.prefab.meta new file mode 100644 index 00000000..2feac557 --- /dev/null +++ b/Assets/Resources/UI/Prefab/Ride/Mobile/ViewAll.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 52a1a07816f5a244f923134f58360eda +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Scenes/MainController.cs b/Assets/Scripts/Scenes/MainController.cs index abc6cd9f..2b2582f4 100644 --- a/Assets/Scripts/Scenes/MainController.cs +++ b/Assets/Scripts/Scenes/MainController.cs @@ -406,10 +406,15 @@ public class MainController : BaseScene var lang = App.GetLocalLanguage(); foreach (var item in list) { + if (item.Point != null && item.Point.Length > 0 && item.Point[0] == -1d) + { + var message = lang == "zh" ? $"{item.Name}进入了 运动地球" : "entered PowerFun"; + EventQueueSystem.QueueEventOnce(new LinkedMessageEvent(item.RouteId, message, item.HeadImage, item.Name, item.RouteName), $"{item.Id}{item.LastActiveTime}{item.Point}"); + } if (item.RouteId > 0) { var message = ""; - if (item.TotalTicks == 0) + if (item.TotalTicks == 0 && item.PreDistance == 0) { message = lang=="zh"?$"发起了对{item.RouteName}的挑战！" : $"started riding {item.RouteName}!"; } @@ -422,11 +427,6 @@ public class MainController : BaseScene EventQueueSystem.QueueEventOnce(new LinkedMessageEvent(item.RouteId, message, item.HeadImage, item.Name,item.RouteName), $"{item.RouteId}{item.Name}"); } } - if (item.Point!=null && item.Point.Length>0 && item.Point[0] == -1d) - { - var message = lang == "zh" ? $"{item.Name}进入了 运动地球" : "entered PowerFun"; - EventQueueSystem.QueueEventOnce(new LinkedMessageEvent(item.RouteId, message, item.HeadImage, item.Name, item.RouteName), $"{item.Id}{item.LastActiveTime}{item.Point}"); - } //距离50 if (item.EndDistance >= 50) { @@ -439,12 +439,12 @@ public class MainController : BaseScene var message = lang == "zh" ? $"骑行里程突破{"100KM"}！" : $"riding distance reaches {"100KM"}!"; EventQueueSystem.QueueEventOnce(new LinkedMessageEvent(item.RouteId, message, item.HeadImage, item.Name, item.RouteName), $"{item.RouteId}{item.Name}100KM"); } - //速度35 - if (item.Speed >= 35) - { - var message = lang == "zh" ? $"骑行速度突破{Math.Round(item.Speed, 2)}KM/H！" : $"riding speed reaches {Math.Round(item.Speed, 2)}KM/H!"; - EventQueueSystem.QueueEventOnce(new LinkedMessageEvent(item.RouteId, message, item.HeadImage, item.Name, item.RouteName), $"{item.RouteId}{item.Name}35KM/H"); - } + ////速度35 + //if (item.Speed >= 35) + //{ + // var message = lang == "zh" ? $"骑行速度突破{Math.Round(item.Speed, 2)}KM/H！" : $"riding speed reaches {Math.Round(item.Speed, 2)}KM/H!"; + // EventQueueSystem.QueueEventOnce(new LinkedMessageEvent(item.RouteId, message, item.HeadImage, item.Name, item.RouteName), $"{item.RouteId}{item.Name}35KM/H"); + //} //速度50 if (item.Speed >= 50) { @@ -452,7 +452,7 @@ public class MainController : BaseScene EventQueueSystem.QueueEventOnce(new LinkedMessageEvent(item.RouteId, message, item.HeadImage, item.Name, item.RouteName), $"{item.RouteId}{item.Name}50KM/H"); } //功体比 - if (item.WeightKg >= 3) + if (item.WeightKg >= 4) { var message = lang == "zh" ? $"骑行功体比突破{Math.Round(item.WeightKg, 2)}w/kg！" : $" riding PWR reaches {Math.Round(item.WeightKg, 2)}w/kg!"; EventQueueSystem.QueueEventOnce(new LinkedMessageEvent(item.RouteId, message, item.HeadImage, item.Name, item.RouteName), $"{item.RouteId}{item.Name}3WeightKg"); diff --git a/Assets/Scripts/Scenes/Ride/Scripts/AbstractPlayer.cs b/Assets/Scripts/Scenes/Ride/Scripts/AbstractPlayer.cs index 5f5e69ba..ced6a663 100644 --- a/Assets/Scripts/Scenes/Ride/Scripts/AbstractPlayer.cs +++ b/Assets/Scripts/Scenes/Ride/Scripts/AbstractPlayer.cs @@ -151,19 +151,23 @@ namespace Assets.Scenes.Ride.Scripts { characterAnimator.SetFloat("Speed", (float)speed); characterAnimator.SetFloat("Slope", (float)currentSlope); - if (currentSlope > 5) - { - characterAnimator.speed = 0.2f; - } - else + if (currentSlope > 6) { characterAnimator.speed = 0.45f; } - - if (totalDistance >= mapData.TotalDistance) - { - characterAnimator.SetBool("ReachEnd", true);//到达终点 + else + { + characterAnimator.speed = 0.65f; } + if (speed > 40) + { + characterAnimator.speed = 0.75f; + } + + //if (totalDistance >= mapData.TotalDistance) + //{ + // characterAnimator.SetBool("ReachEnd", true);//到达终点 + //} } Compute();//接受蓝牙设备数据计算 //开始骑行 diff --git a/Assets/Scripts/Scenes/Ride/Scripts/CyclingController.cs b/Assets/Scripts/Scenes/Ride/Scripts/CyclingController.cs index a1062047..bb17456b 100644 --- a/Assets/Scripts/Scenes/Ride/Scripts/CyclingController.cs +++ b/Assets/Scripts/Scenes/Ride/Scripts/CyclingController.cs @@ -274,7 +274,7 @@ public class CyclingController : DeviceServiceMonoBase { RotateLock = false; DOTween.Kill(target); - target.transform.Rotate(new Vector3(0, 1, 0), r.deltaRotation); + target.transform.Rotate(new Vector3(0, -1, 0), r.deltaRotation); } }; diff --git a/Assets/Scripts/Scenes/Ride/Scripts/LoadingController.cs b/Assets/Scripts/Scenes/Ride/Scripts/LoadingController.cs index d48db8bd..7e78afce 100644 --- a/Assets/Scripts/Scenes/Ride/Scripts/LoadingController.cs +++ b/Assets/Scripts/Scenes/Ride/Scripts/LoadingController.cs @@ -141,15 +141,15 @@ namespace Assets.Scenes.Ride.Scripts var list = mapApi.GetRouteRanking(route.Id, "1", 0, 10000, ""); if (list.result) { - if (list.data.list.Count > RankingPageSize) - { - var ViewAll = panel.transform.Find("ViewAll").gameObject; - ViewAll.SetActive(true); - UIManager.AddEvent(ViewAll, UnityEngine.EventSystems.EventTriggerType.PointerClick, b => - { - Application.OpenURL($"{App.CurrentUser.WebHost}Routes/{cyclingController.mapRoute.Id}?Token={App.CurrentUser.cookie}"); - }); - } + //if (list.data.list.Count > RankingPageSize) + //{ + // var ViewAll = panel.transform.Find("ViewAll").gameObject; + // ViewAll.SetActive(true); + // UIManager.AddEvent(ViewAll, UnityEngine.EventSystems.EventTriggerType.PointerClick, b => + // { + // Application.OpenURL($"{App.CurrentUser.WebHost}Routes/{cyclingController.mapRoute.Id}?Token={App.CurrentUser.cookie}"); + // }); + //} CreateRankingList(list.data.list); AddProcess(10); } @@ -162,6 +162,7 @@ namespace Assets.Scenes.Ride.Scripts #if UNITY_IOS || UNITY_ANDROID var prefab = Resources.Load("UI/Prefab/Ride/Mobile/RankingItem"); var myprefab = Resources.Load("UI/Prefab/Ride/Mobile/MySelfRankingItem"); + var viewAllbtn = Resources.Load("UI/Prefab/Ride/Mobile/ViewAll"); #else var prefab = Resources.Load("UI/Prefab/Ride/RankingItem"); var myprefab = Resources.Load("UI/Prefab/Ride/MySelfRankingItem"); @@ -186,17 +187,35 @@ namespace Assets.Scenes.Ride.Scripts } //如果有自己的记录显示自己的排名 var myself = list.Where(c => c.MySelf).FirstOrDefault(); - if (myself != null) + GameObject myselfObj = (GameObject)Instantiate(myprefab, parent); + var myselfItemScript = myselfObj.GetComponent(); + if (myself == null) { - GameObject newObj = (GameObject)Instantiate(myprefab, parent); - var selectPlayerItemScript = newObj.GetComponent(); - selectPlayerItemScript.SetRanking(myself.RowNumber.ToString()); - selectPlayerItemScript.SetName(myself.NickName); - selectPlayerItemScript.SetTimer(myself.IsDNF ? "DNF" : myself.TotalTime); - selectPlayerItemScript.SetHead(myself.WxHeadImg); + myselfItemScript.SetRanking("??"); + myselfItemScript.SetName(App.CurrentUser.Nickname); + myselfItemScript.SetTimer("??:??:??"); + myselfItemScript.SetHead(App.CurrentUser.WxHeadImg); + var texture = cyclingController.GetCountryImageByCode(App.CurrentUser.Country); + myselfItemScript.SetCountry(texture); + } + else + { + myselfItemScript.SetRanking(myself.RowNumber.ToString()); + myselfItemScript.SetName(myself.NickName); + myselfItemScript.SetTimer(myself.IsDNF ? "DNF" : myself.TotalTime); + myselfItemScript.SetHead(myself.WxHeadImg); var texture = cyclingController.GetCountryImageByCode(myself.CountryCode); - selectPlayerItemScript.SetCountry(texture); + myselfItemScript.SetCountry(texture); } - } + //显示查询全部按钮 + if (list.Count > 0) + { + GameObject ViewAll = (GameObject)Instantiate(viewAllbtn, parent); + UIManager.AddEvent(ViewAll, UnityEngine.EventSystems.EventTriggerType.PointerClick, b => + { + Application.OpenURL($"{App.CurrentUser.WebHost}Routes/{cyclingController.mapRoute.Id}?Token={App.CurrentUser.cookie}"); + }); + } + } } } diff --git a/Assets/Scripts/Scenes/Ride/Scripts/PlayerController.cs b/Assets/Scripts/Scenes/Ride/Scripts/PlayerController.cs index 718b9f92..8671bca6 100644 --- a/Assets/Scripts/Scenes/Ride/Scripts/PlayerController.cs +++ b/Assets/Scripts/Scenes/Ride/Scripts/PlayerController.cs @@ -61,7 +61,7 @@ namespace Assets.Scenes.Ride.Scripts weight = App.CurrentUser.Weight; bicycleWeight = App.CurrentUser.BicycleWeight; #if UNITY_EDITOR - power = 1443; + power = 330; #endif mainController.TrackResistance(currentSlope * App.RideSetting.Sensitivity / 100); } diff --git a/Assets/Scripts/UI/Prefab/MultiTips.cs b/Assets/Scripts/UI/Prefab/MultiTips.cs index 0f0ec6d1..150455af 100644 --- a/Assets/Scripts/UI/Prefab/MultiTips.cs +++ b/Assets/Scripts/UI/Prefab/MultiTips.cs @@ -49,7 +49,7 @@ public class MultiTips:PFUIText } } } - float time = 5f; + float time = 10f; // Update is called once per frame void Update() { @@ -57,7 +57,7 @@ public class MultiTips:PFUIText while (time<0) { SetText(); - time += 5f; + time += 10f; } } } From 43dc844998081b5934162c022780379caed313c5 Mon Sep 17 00:00:00 2001 From: lishuo Date: Thu, 6 Jan 2022 18:01:48 +0800 Subject: [PATCH 2/4] =?UTF-8?q?loading=E9=A1=B5=E9=9D=A2Tips=E8=B0=83?= =?UTF-8?q?=E6=95=B4&=E9=AA=91=E8=A1=8C=E5=8D=A1=E9=A1=BF=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E8=A7=A3=E5=86=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../UI/Prefab/Ride/Mobile/LoadingPanel.prefab | 10 ++++----- Assets/Scripts/Apis/MapApi.cs | 4 ++-- .../Scenes/Ride/Scripts/PlayerController.cs | 6 ++++-- Assets/Scripts/UI/Prefab/MultiTips.cs | 21 +++++++------------ 4 files changed, 18 insertions(+), 23 deletions(-) diff --git a/Assets/Resources/UI/Prefab/Ride/Mobile/LoadingPanel.prefab b/Assets/Resources/UI/Prefab/Ride/Mobile/LoadingPanel.prefab index 537b55f5..90f06fbe 100644 --- a/Assets/Resources/UI/Prefab/Ride/Mobile/LoadingPanel.prefab +++ b/Assets/Resources/UI/Prefab/Ride/Mobile/LoadingPanel.prefab @@ -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: 60, y: 21} - m_SizeDelta: {x: 518, y: 6} + m_AnchoredPosition: {x: 60, y: 31} + m_SizeDelta: {x: 480, y: 6} m_Pivot: {x: 0, y: 1} --- !u!114 &2322716380738134731 MonoBehaviour: @@ -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: 563, y: 29} + m_AnchoredPosition: {x: 525.8, y: 39} m_SizeDelta: {x: 30, y: 14} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3007624749774178325 @@ -3482,7 +3482,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 @@ -4377,7 +4377,7 @@ PrefabInstance: - target: {fileID: 5170894839205404110, guid: 3bf4a1387517769468dd74f58f7dc777, type: 3} propertyPath: m_AnchoredPosition.y - value: 29 + value: 39 objectReference: {fileID: 0} - target: {fileID: 5170894839205404110, guid: 3bf4a1387517769468dd74f58f7dc777, type: 3} diff --git a/Assets/Scripts/Apis/MapApi.cs b/Assets/Scripts/Apis/MapApi.cs index dfcbfbab..deeadfb1 100644 --- a/Assets/Scripts/Apis/MapApi.cs +++ b/Assets/Scripts/Apis/MapApi.cs @@ -16,9 +16,9 @@ namespace Assets.Scripts.Apis { return Get($"Map/GetMapToken?name={name}"); } - public string GetTipsList() + public JsonResult> GetTipsList() { - return Get($"Map/GetTipList"); + return Get>>($"Map/GetTipList"); } /// diff --git a/Assets/Scripts/Scenes/Ride/Scripts/PlayerController.cs b/Assets/Scripts/Scenes/Ride/Scripts/PlayerController.cs index 8671bca6..89d50346 100644 --- a/Assets/Scripts/Scenes/Ride/Scripts/PlayerController.cs +++ b/Assets/Scripts/Scenes/Ride/Scripts/PlayerController.cs @@ -117,8 +117,10 @@ namespace Assets.Scenes.Ride.Scripts //实时计算MaxAp //mainController.ComputeMaxAP(Power, ticks); //实时保存骑行记录 - - mainController.SaveRealTime(); + if (ticks / 60 == 0) + { + mainController.SaveRealTime(); + } } } protected override void BeforeRun() diff --git a/Assets/Scripts/UI/Prefab/MultiTips.cs b/Assets/Scripts/UI/Prefab/MultiTips.cs index 150455af..81385c15 100644 --- a/Assets/Scripts/UI/Prefab/MultiTips.cs +++ b/Assets/Scripts/UI/Prefab/MultiTips.cs @@ -11,17 +11,17 @@ public class MultiTips:PFUIText private Button button; private string[] tips { get; set; } private int currentIndex = 0; - + private System.Random random; new void Awake() { base.Awake(); text = GetComponent(); - var tiplist = ConfigHelper.mapApi.GetTipsList(); - if (!string.IsNullOrEmpty(tiplist)) + var result = ConfigHelper.mapApi.GetTipsList(); + if (result.result) { - tips = tiplist.Split('#'); + tips = result.data.ToArray(); } - var random = new System.Random(); + random = new System.Random(); currentIndex = random.Next(0, tips.Length); SetText(); } @@ -32,21 +32,14 @@ public class MultiTips:PFUIText } public void SetText() { - if(text == null) + if(text == null || tips.Length == 0) { return; } + currentIndex = random.Next(0, tips.Length); if (currentIndex <= tips.Length) { text.text = tips[currentIndex]; - if (currentIndex + 1 < tips.Length) - { - currentIndex++; - } - else - { - currentIndex = 0; - } } } float time = 10f; From 16a89b07b87e0d4da1e69c444269df45e7187042 Mon Sep 17 00:00:00 2001 From: lishuo Date: Fri, 7 Jan 2022 10:34:16 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E6=8E=A8=E8=8D=90api&=E9=AA=91=E8=A1=8C?= =?UTF-8?q?=E7=BB=93=E6=9E=9C=E6=97=A5=E6=9C=9F=E6=A0=BC=E5=BC=8F=E5=B7=B2?= =?UTF-8?q?=E7=BB=8F=E8=B7=B3=E8=BD=AC=E5=88=B0=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../UI/Prefab/Ride/Mobile/Panel.prefab | 749 +++++++++--------- Assets/Scripts/Apis/MapApi.cs | 5 + Assets/Scripts/Apis/Models/Recommand.cs | 31 + Assets/Scripts/Apis/Models/Recommand.cs.meta | 11 + Assets/Scripts/Scenes/MainController.cs | 3 + .../Scenes/Ride/Scripts/ResultPanelScript.cs | 6 +- 6 files changed, 431 insertions(+), 374 deletions(-) create mode 100644 Assets/Scripts/Apis/Models/Recommand.cs create mode 100644 Assets/Scripts/Apis/Models/Recommand.cs.meta diff --git a/Assets/Resources/UI/Prefab/Ride/Mobile/Panel.prefab b/Assets/Resources/UI/Prefab/Ride/Mobile/Panel.prefab index ac0ad385..d2c123f5 100644 --- a/Assets/Resources/UI/Prefab/Ride/Mobile/Panel.prefab +++ b/Assets/Resources/UI/Prefab/Ride/Mobile/Panel.prefab @@ -445,6 +445,84 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &703314396951402635 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6850040402389225878} + - component: {fileID: 7908457400811491753} + - component: {fileID: 3366695172525028428} + - component: {fileID: 8047643184094911571} + m_Layer: 5 + m_Name: Lines + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6850040402389225878 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 703314396951402635} + 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: 2178830657381817007} + 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: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &7908457400811491753 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 703314396951402635} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 55b5a59897c650342a9b23ff348a9992, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!222 &3366695172525028428 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 703314396951402635} + m_CullTransparentMesh: 0 +--- !u!114 &8047643184094911571 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 703314396951402635} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2032ee9ddbfbfb74da66a209b05d468d, 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: [] + Thickness: 2 --- !u!1 &765892904830817887 GameObject: m_ObjectHideFlags: 0 @@ -13015,6 +13093,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 3622b843b296d2e46ba722beb139f040, type: 3} m_Name: m_EditorClassIdentifier: + newNav: {fileID: 0} --- !u!114 &765892906030958108 MonoBehaviour: m_ObjectHideFlags: 0 @@ -21602,56 +21681,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: key: ---- !u!1 &1559945935907334517 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2297812452528493334} - - component: {fileID: 8374831777359013714} - m_Layer: 0 - m_Name: New Game Object - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &2297812452528493334 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1559945935907334517} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.96, y: 0.96, z: 1} - m_Children: - - {fileID: 3305202635437103895} - - {fileID: 90177269808771703} - m_Father: {fileID: 2877296740073624297} - 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: 0, y: 0} - m_SizeDelta: {x: 500, y: 50} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &8374831777359013714 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1559945935907334517} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 55b5a59897c650342a9b23ff348a9992, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &1571182371018132363 GameObject: m_ObjectHideFlags: 0 @@ -21876,6 +21905,69 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: radius: 19 +--- !u!1 &1907299570312336333 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 20512784799995034} + - component: {fileID: 4165689939624135330} + - component: {fileID: 2358369774724592409} + m_Layer: 5 + m_Name: textController + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &20512784799995034 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1907299570312336333} + 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: 3569197964953822211} + m_RootOrder: 1 + 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: -250, y: -25} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &4165689939624135330 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1907299570312336333} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 55b5a59897c650342a9b23ff348a9992, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &2358369774724592409 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1907299570312336333} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f8c8bf670921e114bbea10f451c86392, type: 3} + m_Name: + m_EditorClassIdentifier: + Camera: {fileID: 0} + PlaneDistance: 20 --- !u!1 &2052024789909891574 GameObject: m_ObjectHideFlags: 0 @@ -22380,6 +22472,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 144345f9d1132d348acb7e21bc1cd3d1, type: 3} m_Name: m_EditorClassIdentifier: + newNav: {fileID: 0} zhImage: {fileID: 21300000, guid: 5fa948a6fdc055341b4b277982afe5c9, type: 3} --- !u!1 &2385217535555903746 GameObject: @@ -23820,6 +23913,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 144345f9d1132d348acb7e21bc1cd3d1, type: 3} m_Name: m_EditorClassIdentifier: + newNav: {fileID: 0} zhImage: {fileID: 21300000, guid: 5de091020db8f394ea4c14e87223ee96, type: 3} --- !u!1 &2385217537198970645 GameObject: @@ -25222,6 +25316,84 @@ MonoBehaviour: m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: BPM +--- !u!1 &2628607429391852519 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1158404367385947863} + - component: {fileID: 703572892555790485} + - component: {fileID: 7290317972492065205} + - component: {fileID: 8025806213623331875} + m_Layer: 5 + m_Name: Lines + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1158404367385947863 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2628607429391852519} + 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: 2178830657381817007} + 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: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &703572892555790485 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2628607429391852519} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 55b5a59897c650342a9b23ff348a9992, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!222 &7290317972492065205 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2628607429391852519} + m_CullTransparentMesh: 0 +--- !u!114 &8025806213623331875 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2628607429391852519} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2032ee9ddbfbfb74da66a209b05d468d, 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: [] + Thickness: 4 --- !u!1 &2844054572527012973 GameObject: m_ObjectHideFlags: 0 @@ -25326,7 +25498,7 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 2297812452528493334} + - {fileID: 3569197964953822211} - {fileID: 5572785103298013575} m_Father: {fileID: 765892906030958096} m_RootOrder: 3 @@ -26175,6 +26347,56 @@ MonoBehaviour: m_EditorClassIdentifier: m_HorizontalFit: 2 m_VerticalFit: 0 +--- !u!1 &3461630384355818746 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3569197964953822211} + - component: {fileID: 7171441312815722118} + m_Layer: 0 + m_Name: New Game Object + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3569197964953822211 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3461630384355818746} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.96, y: 0.96, z: 1} + m_Children: + - {fileID: 2178830657381817007} + - {fileID: 20512784799995034} + m_Father: {fileID: 2877296740073624297} + 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: 0, y: 0} + m_SizeDelta: {x: 500, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &7171441312815722118 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3461630384355818746} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 55b5a59897c650342a9b23ff348a9992, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &3465700279815372351 GameObject: m_ObjectHideFlags: 0 @@ -26812,109 +27034,6 @@ MonoBehaviour: m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: 35.6KM ---- !u!1 &3676758697390975835 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 3305202635437103895} - - component: {fileID: 228295913976326433} - - component: {fileID: 5096137812554892532} - - component: {fileID: 5781091474691819862} - - component: {fileID: 2147767076046861167} - m_Layer: 5 - m_Name: RectMask(Clone) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &3305202635437103895 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3676758697390975835} - 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: 1813571833499916216} - - {fileID: 5053953882265359692} - m_Father: {fileID: 2297812452528493334} - 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: 50} - m_SizeDelta: {x: 500, y: 50} - m_Pivot: {x: 0, y: 1} ---- !u!114 &228295913976326433 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3676758697390975835} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3} - m_Name: - m_EditorClassIdentifier: - m_ShowMaskGraphic: 0 ---- !u!222 &5096137812554892532 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3676758697390975835} - m_CullTransparentMesh: 0 ---- !u!114 &5781091474691819862 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3676758697390975835} - 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: 10917, 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 &2147767076046861167 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3676758697390975835} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 55b5a59897c650342a9b23ff348a9992, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &3828612076740334578 GameObject: m_ObjectHideFlags: 0 @@ -27493,84 +27612,6 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!1 &4049799187376486798 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1813571833499916216} - - component: {fileID: 7550395192229183794} - - component: {fileID: 3712789421079915729} - - component: {fileID: 147236222342360370} - m_Layer: 5 - m_Name: Lines - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1813571833499916216 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4049799187376486798} - 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: 3305202635437103895} - 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: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &7550395192229183794 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4049799187376486798} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 55b5a59897c650342a9b23ff348a9992, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!222 &3712789421079915729 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4049799187376486798} - m_CullTransparentMesh: 0 ---- !u!114 &147236222342360370 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4049799187376486798} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 2032ee9ddbfbfb74da66a209b05d468d, 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: [] - Thickness: 4 --- !u!1 &4191222591262853397 GameObject: m_ObjectHideFlags: 0 @@ -27793,6 +27834,109 @@ MonoBehaviour: m_EditorClassIdentifier: m_HorizontalFit: 2 m_VerticalFit: 0 +--- !u!1 &4197148510895129005 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2178830657381817007} + - component: {fileID: 2172037707153563913} + - component: {fileID: 2123170211964066092} + - component: {fileID: 3627317674779623774} + - component: {fileID: 5894777307183780310} + m_Layer: 5 + m_Name: RectMask(Clone) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2178830657381817007 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4197148510895129005} + 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: 1158404367385947863} + - {fileID: 6850040402389225878} + m_Father: {fileID: 3569197964953822211} + 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: 50} + m_SizeDelta: {x: 500, y: 50} + m_Pivot: {x: 0, y: 1} +--- !u!114 &2172037707153563913 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4197148510895129005} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3} + m_Name: + m_EditorClassIdentifier: + m_ShowMaskGraphic: 0 +--- !u!222 &2123170211964066092 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4197148510895129005} + m_CullTransparentMesh: 0 +--- !u!114 &3627317674779623774 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4197148510895129005} + 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: 10917, 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 &5894777307183780310 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4197148510895129005} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 55b5a59897c650342a9b23ff348a9992, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &4317763269701405737 GameObject: m_ObjectHideFlags: 0 @@ -30072,69 +30216,6 @@ MonoBehaviour: m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: 0 ---- !u!1 &6873613086803359259 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 90177269808771703} - - component: {fileID: 410424472596964193} - - component: {fileID: 2592663200621733107} - m_Layer: 5 - m_Name: textController - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &90177269808771703 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6873613086803359259} - 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: 2297812452528493334} - m_RootOrder: 1 - 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: -250, y: -25} - m_SizeDelta: {x: 100, y: 100} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &410424472596964193 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6873613086803359259} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 55b5a59897c650342a9b23ff348a9992, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!114 &2592663200621733107 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6873613086803359259} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f8c8bf670921e114bbea10f451c86392, type: 3} - m_Name: - m_EditorClassIdentifier: - Camera: {fileID: 0} - PlaneDistance: 20 --- !u!1 &6885174058740936923 GameObject: m_ObjectHideFlags: 0 @@ -31812,84 +31893,6 @@ MonoBehaviour: m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: ---- !u!1 &7646336114412120793 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 5053953882265359692} - - component: {fileID: 7227630688503237923} - - component: {fileID: 1697818999144882858} - - component: {fileID: 7577946695605831117} - m_Layer: 5 - m_Name: Lines - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &5053953882265359692 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7646336114412120793} - 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: 3305202635437103895} - 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: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &7227630688503237923 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7646336114412120793} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 55b5a59897c650342a9b23ff348a9992, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!222 &1697818999144882858 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7646336114412120793} - m_CullTransparentMesh: 0 ---- !u!114 &7577946695605831117 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7646336114412120793} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 2032ee9ddbfbfb74da66a209b05d468d, 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: [] - Thickness: 2 --- !u!1 &7664492388540968627 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/Apis/MapApi.cs b/Assets/Scripts/Apis/MapApi.cs index deeadfb1..1ce7ba12 100644 --- a/Assets/Scripts/Apis/MapApi.cs +++ b/Assets/Scripts/Apis/MapApi.cs @@ -216,6 +216,11 @@ namespace Assets.Scripts.Apis var result = await GetAsync>>($"MapRouteArea/GetRecommendAreaList"); return result; } + public async Task>> GetRecommendList(int pageIndex=0, int pageSize=10000) + { + var result = await GetAsync>>($"Recommand/GetList?pageIndex={pageIndex}&pageSize={pageSize}"); + return result; + } public async Task>> GetMemberMapRouteAreaList(int pageIndex, int pageSize) { var result = await GetAsync>>($"MapRouteArea/GetMemberMapRouteAreaList?pageIndex={pageIndex}&pageSize={pageSize}"); diff --git a/Assets/Scripts/Apis/Models/Recommand.cs b/Assets/Scripts/Apis/Models/Recommand.cs new file mode 100644 index 00000000..d44354dd --- /dev/null +++ b/Assets/Scripts/Apis/Models/Recommand.cs @@ -0,0 +1,31 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Assets.Scripts.Apis.Models +{ + public class Recommand + { + public int Id { get; set; } + public int RouteId { get; set; } + public int AreaId { get; set; } + /// + /// Type:0线路 1集合 2活动 + /// + public int Type { get; set; } + /// + /// 标题 + /// + public string Title { get; set; } + /// + /// banner + /// + public string CoverImage { get; set; } + /// + /// 活动链接 + /// + public string Url { get; set; } + } +} diff --git a/Assets/Scripts/Apis/Models/Recommand.cs.meta b/Assets/Scripts/Apis/Models/Recommand.cs.meta new file mode 100644 index 00000000..f116c97d --- /dev/null +++ b/Assets/Scripts/Apis/Models/Recommand.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 027803d92c272e6449a187b23727986c +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Scenes/MainController.cs b/Assets/Scripts/Scenes/MainController.cs index 4386bc63..e19b42be 100644 --- a/Assets/Scripts/Scenes/MainController.cs +++ b/Assets/Scripts/Scenes/MainController.cs @@ -342,6 +342,9 @@ public class MainController : BaseScene if (App.MainSceneParam["Name"] == "UserInfoPanel") { UIManager.ShowUserInfoPanel(); + #if UNITY_ANDROID || UNITY_IOS + UIManager.ShowResultListPanel(); + #endif } if (App.MainSceneParam["Name"] == "RaceHomePanel") diff --git a/Assets/Scripts/Scenes/Ride/Scripts/ResultPanelScript.cs b/Assets/Scripts/Scenes/Ride/Scripts/ResultPanelScript.cs index 0d5cd8dc..3d7a54da 100644 --- a/Assets/Scripts/Scenes/Ride/Scripts/ResultPanelScript.cs +++ b/Assets/Scripts/Scenes/Ride/Scripts/ResultPanelScript.cs @@ -133,8 +133,12 @@ namespace Assets.Scenes.Ride.Scripts public void SetDataSource(RecorderDataModel record) { var route = record.CurrentRoute.RouteInstance; +#if UNITY_ANDROID || UNITY_IOS //绑定路书信息 - date.text = record.StartTime.ToShortDateString(); + date.text = record.StartTime.ToString("yyyy-MM-dd"); +#else + date.text = record.StartTime.ToShortDateString("yyyy-MM-dd"); +#endif time.text = record.StartTime.ToShortTimeString(); level.text = route.Hard; mapName.text = route.Name; From 300c61a883bcd826c934a0603b6337bca0cf78ad Mon Sep 17 00:00:00 2001 From: lishuo Date: Fri, 7 Jan 2022 11:03:49 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E6=8E=A8=E8=8D=90banner=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E8=B5=9B=E4=BA=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/Scripts/Apis/Models/Recommand.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/Assets/Scripts/Apis/Models/Recommand.cs b/Assets/Scripts/Apis/Models/Recommand.cs index d44354dd..ba9695b7 100644 --- a/Assets/Scripts/Apis/Models/Recommand.cs +++ b/Assets/Scripts/Apis/Models/Recommand.cs @@ -11,6 +11,7 @@ namespace Assets.Scripts.Apis.Models public int Id { get; set; } public int RouteId { get; set; } public int AreaId { get; set; } + public int CompetitionId { get; set; } /// /// Type:0线路 1集合 2活动 ///