From 68f95c4e3db1f79b3ef5705443d792e3f1cfd8ff Mon Sep 17 00:00:00 2001
From: client_Hale <339726288@qq.com>
Date: 星期六, 24 十一月 2018 16:28:03 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/Welcome/WelcomeWin.cs | 21 +++++++++++++++++----
1 files changed, 17 insertions(+), 4 deletions(-)
diff --git a/System/Welcome/WelcomeWin.cs b/System/Welcome/WelcomeWin.cs
index a131e05..9da9b33 100644
--- a/System/Welcome/WelcomeWin.cs
+++ b/System/Welcome/WelcomeWin.cs
@@ -14,8 +14,8 @@
public class WelcomeWin : Window
{
-
- [SerializeField] UIAlphaTween m_AlphaTween;
+ [SerializeField] UIAlphaTween m_FadeInTween;
+ [SerializeField] UIAlphaTween m_FadeOutTween;
[SerializeField] Button m_Close;
[SerializeField] float m_ForbidTime = 5f;
[SerializeField] float m_OutTime = 10f;
@@ -36,8 +36,10 @@
protected override void OnPreOpen()
{
+ m_Close.gameObject.SetActive(false);
+ superOutTime = m_OutTime + 5f;
ensured = false;
- m_AlphaTween.SetStartState();
+ m_FadeOutTween.SetStartState();
}
protected override void OnAfterOpen()
@@ -52,11 +54,22 @@
{
}
+ protected override void OnActived()
+ {
+ base.OnActived();
+ m_FadeInTween.Play();
+ }
+
protected override void LateUpdate()
{
base.LateUpdate();
timer += Time.deltaTime;
+ if (timer > m_ForbidTime && !m_Close.gameObject.activeInHierarchy)
+ {
+ m_Close.gameObject.SetActive(true);
+ }
+
if (timer > m_OutTime)
{
if (!ensured)
@@ -90,7 +103,7 @@
private void FadeOut()
{
- m_AlphaTween.Play(OnFadeOutComplete);
+ m_FadeOutTween.Play(OnFadeOutComplete);
}
private void OnFadeOutComplete()
--
Gitblit v1.8.0