diff --git a/Assets/Resources/UI/Prefab/Panel/NewRouteDetailPanel.prefab b/Assets/Resources/UI/Prefab/Panel/NewRouteDetailPanel.prefab index a214a17a..5aa8c772 100644 --- a/Assets/Resources/UI/Prefab/Panel/NewRouteDetailPanel.prefab +++ b/Assets/Resources/UI/Prefab/Panel/NewRouteDetailPanel.prefab @@ -914,7 +914,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: ON ROAD + m_Text: RIDERS --- !u!114 &725103695351321084 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/UI/Prefab/Panel/NewRouteOverviewPanel.prefab b/Assets/Resources/UI/Prefab/Panel/NewRouteOverviewPanel.prefab index c0dc2d14..d2234414 100644 --- a/Assets/Resources/UI/Prefab/Panel/NewRouteOverviewPanel.prefab +++ b/Assets/Resources/UI/Prefab/Panel/NewRouteOverviewPanel.prefab @@ -263,6 +263,7 @@ GameObject: - component: {fileID: 3728196982063212412} - component: {fileID: 3728196982063212386} - component: {fileID: 3728196982063212413} + - component: {fileID: 7011952942006856952} m_Layer: 5 m_Name: AllRoutes m_TagString: Untagged @@ -328,6 +329,49 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!114 &7011952942006856952 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3728196982063212415} + 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: 3728196982063212413} + m_OnClick: + m_PersistentCalls: + m_Calls: [] --- !u!1 &3728196982087670777 GameObject: m_ObjectHideFlags: 0 @@ -719,6 +763,7 @@ GameObject: - component: {fileID: 3728196982461360755} - component: {fileID: 3728196982461360753} - component: {fileID: 3728196982461360752} + - component: {fileID: 3155658155276841648} m_Layer: 5 m_Name: MyUpload m_TagString: Untagged @@ -784,6 +829,49 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!114 &3155658155276841648 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3728196982461360754} + 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: 3728196982461360752} + m_OnClick: + m_PersistentCalls: + m_Calls: [] --- !u!1 &3728196982670996111 GameObject: m_ObjectHideFlags: 0 @@ -887,6 +975,7 @@ GameObject: - component: {fileID: 3728196982891290182} - component: {fileID: 3728196982891290180} - component: {fileID: 3728196982891290183} + - component: {fileID: 8002401230216742435} m_Layer: 5 m_Name: MyCollection m_TagString: Untagged @@ -952,6 +1041,49 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!114 &8002401230216742435 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3728196982891290177} + 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: 3728196982891290183} + m_OnClick: + m_PersistentCalls: + m_Calls: [] --- !u!1 &3728196982913226174 GameObject: m_ObjectHideFlags: 0 @@ -1444,6 +1576,7 @@ GameObject: - component: {fileID: 3728196983699769756} - component: {fileID: 3728196983699769730} - component: {fileID: 3728196983699769757} + - component: {fileID: 279663084834021489} m_Layer: 5 m_Name: RecentRoute m_TagString: Untagged @@ -1509,6 +1642,49 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!114 &279663084834021489 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3728196983699769759} + 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: 3728196983699769757} + m_OnClick: + m_PersistentCalls: + m_Calls: [] --- !u!1 &3728196983700296461 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/UI/language.json b/Assets/Resources/UI/language.json index a5559f87..b93d2ae5 100644 --- a/Assets/Resources/UI/language.json +++ b/Assets/Resources/UI/language.json @@ -311,7 +311,8 @@ "Distance King": "里程王", "Power King": "功率王", "Climbing King": "爬坡王", - "WAIT": "稍后" + "WAIT": "稍后", + "RIDERS": "骑行人数" }, "en": { "HOT ROUTES": "HOT ROUTES", @@ -617,6 +618,7 @@ "Distance King": "Distance King", "Power King": "Power King", "Climbing King": "Climbing King", - "WAIT": "WAIT" + "WAIT": "WAIT", + "RIDERS": "RIDERS" } } diff --git a/Assets/Scripts/UI/Control/PfUIButton.cs b/Assets/Scripts/UI/Control/PfUIButton.cs index 96eb81d0..c090e2c2 100644 --- a/Assets/Scripts/UI/Control/PfUIButton.cs +++ b/Assets/Scripts/UI/Control/PfUIButton.cs @@ -9,6 +9,7 @@ using UnityEngine.EventSystems; using UnityEngine.Events; using DG.Tweening; using System.Timers; +using System.Collections; namespace Assets.Scripts.UI.Control { @@ -31,7 +32,8 @@ namespace Assets.Scripts.UI.Control //private Texture2D cursor; private Outline outline; private Button mButton; - + private Sequence se = null; + protected void Awake() { @@ -120,7 +122,6 @@ namespace Assets.Scripts.UI.Control } } public bool showTooltip { get; set; } - private void BindEvent() { Timer timer = new Timer(); @@ -128,8 +129,9 @@ namespace Assets.Scripts.UI.Control var group = tooltips.GetComponent(); timer.Elapsed += (r, s) => { + Debug.Log(131); timer.Stop(); - group.DOFade(1, 0.5f); + }; //鼠标进入 @@ -144,9 +146,25 @@ namespace Assets.Scripts.UI.Control if (!string.IsNullOrWhiteSpace(Tooltips) && showTooltip) { #endif - tooltips.GetComponent().alpha = 0f; - tooltips.SetActive(true); - timer.Start(); + + //tooltips.SetActive(true); + //tooltips.GetComponent().DOFade(1, 0.5f); + + + //tooltips.GetComponent().DOFade(1, 0.5f); + //DOTween.CompleteAll(true); + se = DOTween.Sequence(); + se.SetDelay(1); + se.AppendCallback(() => + { + DOTween.CompleteAll(true); + tooltips.SetActive(true); + tooltips.GetComponent().alpha = 0f; + tooltips.GetComponent().DOFade(1, 0.5f); + }); + se.Play(); + //StartCoroutine(DelayShowTooltip()); + //timer.Start(); } switch (mType) { @@ -183,6 +201,7 @@ namespace Assets.Scripts.UI.Control if (!string.IsNullOrWhiteSpace(Tooltips) && showTooltip) { #endif + DOTween.CompleteAll(true); group.DOFade(0, 1f).onComplete += () => { tooltips.SetActive(false); }; @@ -215,6 +234,15 @@ namespace Assets.Scripts.UI.Control UIManager.AddEvent(this.gameObject, EventTriggerType.PointerDown, new UnityEngine.Events.UnityAction(e => { if (!this.isActiveAndEnabled) return; + DOTween.CompleteAll(true); + tooltips.SetActive(false); + //else + //{ + // DOTween.CompleteAll(true); + // tooltips.SetActive(true); + // tooltips.GetComponent().alpha = 0f; + // tooltips.GetComponent().DOFade(1, 0.5f); + //} switch (mType) { case Type.Normal: @@ -244,7 +272,7 @@ namespace Assets.Scripts.UI.Control { if (!this.isActiveAndEnabled) return; //Cursor.SetCursor(null, Vector2.zero, CursorMode.Auto); - + switch (mType) { case Type.Normal: @@ -275,7 +303,6 @@ namespace Assets.Scripts.UI.Control })); } - public void SetEnabled(bool value) { base.enabled = value; diff --git a/Assets/Scripts/UI/Prefab/MainNav.cs b/Assets/Scripts/UI/Prefab/MainNav.cs index 39ebe890..fb0040e7 100644 --- a/Assets/Scripts/UI/Prefab/MainNav.cs +++ b/Assets/Scripts/UI/Prefab/MainNav.cs @@ -41,7 +41,7 @@ public class MainNav : MonoBehaviour #if UNITY_ANDROID || UNITY_IOS UIManager.AddEvent(transform.Find("Delay").gameObject, EventTriggerType.PointerClick, b => { - delayTime = 3; + delayTime = 3; transform.Find("Delay/Tooltips").gameObject.SetActive(true); transform.Find("Delay/Tooltips").GetComponent().DOFade(1, 0.5f); }); @@ -57,7 +57,22 @@ public class MainNav : MonoBehaviour { UIManager.ShowPrePanel(); }); - + UIManager.AddEvent(transform.Find("Delay").gameObject, EventTriggerType.PointerClick, x => + { + var tooltips = transform.Find("Delay/Tooltips").gameObject; + if (tooltips.activeInHierarchy) + { + DOTween.CompleteAll(true); + tooltips.SetActive(false); + } + else + { + DOTween.CompleteAll(true); + tooltips.SetActive(true); + tooltips.GetComponent().alpha = 0f; + tooltips.GetComponent().DOFade(1, 0.5f); + } + }); UIManager.AddEvent(transform.Find("Setting").gameObject, EventTriggerType.PointerClick, x => { UIManager.ShowSettingModal(); @@ -94,6 +109,7 @@ public class MainNav : MonoBehaviour // Update is called once per frame void Update() { +#if UNITY_ANDROID || UNITY_IOS if (delayTime < 0) { Debug.Log("小时"); @@ -108,6 +124,7 @@ public class MainNav : MonoBehaviour Debug.Log(delayTime); delayTime -= Time.deltaTime; } +#endif } public void ShowExit()