From 85448a839d432aab4220e6b23e55a0270e007b6f Mon Sep 17 00:00:00 2001
From: Client_PangDeRong <593317293@qq.com>
Date: 星期四, 23 八月 2018 18:03:38 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/Tip/MarqueeWin.cs | 41 +++++++++++++++++++++++++++++++++--------
1 files changed, 33 insertions(+), 8 deletions(-)
diff --git a/System/Tip/MarqueeWin.cs b/System/Tip/MarqueeWin.cs
index 925b797..3affd01 100644
--- a/System/Tip/MarqueeWin.cs
+++ b/System/Tip/MarqueeWin.cs
@@ -14,13 +14,11 @@
public class MarqueeWin : Window
{
- [SerializeField]
- RichText marqueeText;
- [SerializeField]
- RectTransform marqueeBg;
- [SerializeField]
- TweenCurve tweenCurve;
-
+ [SerializeField] RectTransform m_ContainerMarquee;
+ [SerializeField] RichText marqueeText;
+ [SerializeField] RectTransform marqueeBg;
+ [SerializeField] TweenCurve tweenCurve;
+ [SerializeField] UIEffect m_Effect;
#region 鍙傛暟
Vector3 fromPos;
Vector3 toPos;
@@ -32,6 +30,8 @@
[SerializeField]
float speed = 5.0f;
+
+ Coroutine cacheCoroutine = null;
#region Built-in
protected override void BindController()
@@ -49,19 +49,37 @@
m_Time = 0;
ServerTipDetails.OnTweening = false;
presentCnt = 0;
+ m_ContainerMarquee.gameObject.SetActive(false);
+ if (cacheCoroutine != null)
+ {
+ StopCoroutine(cacheCoroutine);
+ cacheCoroutine = null;
+ }
+ }
+
+ protected override void OnActived()
+ {
+ base.OnActived();
+ m_Effect.Play();
+ cacheCoroutine = StartCoroutine(Co_StartTween());
}
protected override void OnAfterOpen()
{
- BeginMarquee();
+ //BeginMarquee();
}
protected override void OnPreClose()
{
ServerTipDetails.OnTweening = false;
presentCnt = 0;
+ if (cacheCoroutine != null)
+ {
+ StopCoroutine(cacheCoroutine);
+ cacheCoroutine = null;
+ }
}
protected override void OnAfterClose()
@@ -69,6 +87,13 @@
}
+ IEnumerator Co_StartTween()
+ {
+ yield return WaitingForSecondConst.WaitMS500;
+ m_ContainerMarquee.gameObject.SetActive(true);
+ BeginMarquee();
+ }
+
protected override void LateUpdate()
{
base.LateUpdate();
--
Gitblit v1.8.0