Merge remote-tracking branch 'origin/dev_lishuo' into dev_cyp

This commit is contained in:
Caiyanpeng committed 2022-01-13 18:58:01 +08:00
commit fed54ad85b
7 files changed
+21 -19

No files matched your search

+3 -3
View File
@@ -157,7 +157,7 @@ namespace Assets.Scripts.UI.Control
se.SetDelay(1);
se.AppendCallback(() =>
{
DOTween.CompleteAll(true);
DOTween.Complete(tooltips);
tooltips.SetActive(true);
tooltips.GetComponent<CanvasGroup>().alpha = 0f;
tooltips.GetComponent<CanvasGroup>().DOFade(1, 0.5f);
@@ -201,7 +201,7 @@ namespace Assets.Scripts.UI.Control
if (!string.IsNullOrWhiteSpace(Tooltips) && showTooltip)
{
#endif
DOTween.CompleteAll(true);
DOTween.Complete(tooltips);
group.DOFade(0, 1f).onComplete += () => {
tooltips.SetActive(false);
};
@@ -234,7 +234,7 @@ namespace Assets.Scripts.UI.Control
UIManager.AddEvent(this.gameObject, EventTriggerType.PointerDown, new UnityEngine.Events.UnityAction<BaseEventData>(e =>
{
if (!this.isActiveAndEnabled) return;
DOTween.CompleteAll(true);
DOTween.Complete(tooltips);
tooltips.SetActive(false);
//else
//{