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; } } }