From 2e7aa5faabcbe00757c74379f67b3231b1b3370f Mon Sep 17 00:00:00 2001
From: client_Hale <339726288@qq.com>
Date: 星期二, 09 十月 2018 16:01:59 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/MainInterfacePanel/UpgradeWin.cs | 41 +++++++++++++++++------------------------
1 files changed, 17 insertions(+), 24 deletions(-)
diff --git a/System/MainInterfacePanel/UpgradeWin.cs b/System/MainInterfacePanel/UpgradeWin.cs
index ad91ce6..3bca967 100644
--- a/System/MainInterfacePanel/UpgradeWin.cs
+++ b/System/MainInterfacePanel/UpgradeWin.cs
@@ -9,15 +9,14 @@
using UnityEngine;
using UnityEngine.UI;
-namespace Snxxz.UI {
+namespace Snxxz.UI
+{
public class UpgradeWin : Window
- {
- [SerializeField] UIAlphaTween m_UIAlphaTween;
- [SerializeField] ScaleTween m_ScaleTween;
- [SerializeField] UIAlphaTween m_UIAlphaTween1;
- [SerializeField] GameObject m_Guang;
+ {
+ [SerializeField] ScaleTween m_ScaleTween;
[SerializeField] Text m_TextLV;
+ [SerializeField] UIEffect m_UIEffect;
#region Built-in
protected override void BindController()
{
@@ -28,31 +27,34 @@
}
protected override void OnPreOpen()
- {
- // m_Guang.SetActive(false);
- m_TextLV.text = PlayerDatas.Instance.baseData.LV.ToString();
- m_UIAlphaTween1.SetEndState();
-
-
+ {
+ m_TextLV.text = PlayerDatas.Instance.baseData.LV.ToString();
}
protected override void OnActived()
{
- m_UIAlphaTween.Play(ShowOverAlpha);
+ m_UIEffect.Play();
+ m_UIEffect.OnComplete = () => { CloseImmediately(); };
m_ScaleTween.Play();
}
protected override void OnAfterOpen()
{
-
WindowCenter.Instance.windowBeforeCloseEvent += windowBeforeClose;
PlayerDatas.Instance.PlayerDataRefreshInfoEvent += Updatefighting;//鏁版嵁鐨勫埛鏂�(h0418)
}
protected override void OnPreClose()
{
+ if (m_UIEffect.IsPlaying)
+ {
+ m_UIEffect.Stop();
+ }
WindowCenter.Instance.windowBeforeCloseEvent -= windowBeforeClose;
PlayerDatas.Instance.PlayerDataRefreshInfoEvent -= Updatefighting;//鏁版嵁鐨勫埛鏂�(h0418)
}
-
+ protected override void OnAfterClose()
+ {
+ }
+ #endregion
private void windowBeforeClose(Window _window)
{
if (_window is MainInterfaceWin)
@@ -69,15 +71,6 @@
}
}
- protected override void OnAfterClose()
- {
- }
- #endregion
- private void ShowOverAlpha()
- {
- m_UIAlphaTween.Play(true);
- m_UIAlphaTween1.Play(true);
- }
}
}
--
Gitblit v1.8.0