From 9f89e3be35da42eb9ccb44e6589d62f320aa444c Mon Sep 17 00:00:00 2001
From: client_Hale <339726288@qq.com>
Date: 星期四, 11 四月 2019 21:31:06 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/Launch/LaunchBackGroundWin.cs | 60 +++++++-----------------------------------------------------
1 files changed, 7 insertions(+), 53 deletions(-)
diff --git a/System/Launch/LaunchBackGroundWin.cs b/System/Launch/LaunchBackGroundWin.cs
index bafb2b3..a47f080 100644
--- a/System/Launch/LaunchBackGroundWin.cs
+++ b/System/Launch/LaunchBackGroundWin.cs
@@ -17,16 +17,11 @@
{
[SerializeField] RectTransform m_StaticBackGround;
[SerializeField] Image m_BackGroundImage;
- [SerializeField] RectTransform m_DynamicBackGround;
- [SerializeField] SkeletonGraphic m_SkeletonGraphic;
+ [SerializeField] UIAlphaTween m_AlphaTween;
- GameObject loginEffect;
-
- bool useStaticBackGround = false;
#region Built-in
protected override void BindController()
{
- loginEffect = this.transform.Find("Pivot/Effect_DengLu").gameObject;
}
protected override void AddListeners()
@@ -36,41 +31,18 @@
protected override void OnPreOpen()
{
var sprite = BuiltInLoader.LoadSprite("LoginBackGround");
- useStaticBackGround = sprite != null;
-
- if (useStaticBackGround)
- {
- m_BackGroundImage.overrideSprite = sprite;
- m_StaticBackGround.gameObject.SetActive(true);
- m_DynamicBackGround.gameObject.SetActive(false);
- }
- else
- {
- m_StaticBackGround.gameObject.SetActive(false);
- m_DynamicBackGround.gameObject.SetActive(true);
- }
-
- if (loginEffect != null)
- {
- loginEffect.gameObject.SetActive(false);
- }
+ m_BackGroundImage.overrideSprite = sprite;
+ m_StaticBackGround.gameObject.SetActive(true);
this.transform.SetAsFirstSibling();
}
protected override void OnAfterOpen()
{
- StageLoad.Instance.onStageLoadFinish += ShowLoginEffect;
- if (StageLoad.Instance.currentStage is LoginStage)
- {
- ShowLoginEffect();
- }
}
protected override void OnPreClose()
{
- StageLoad.Instance.onStageLoadFinish -= ShowLoginEffect;
- Resources.UnloadAsset(m_SkeletonGraphic.material);
}
protected override void OnAfterClose()
@@ -80,33 +52,15 @@
protected override void OnActived()
{
base.OnActived();
-
- if (!useStaticBackGround)
- {
- if (m_SkeletonGraphic != null)
- {
- m_SkeletonGraphic.AnimationState.SetEmptyAnimations(0);
- }
- }
}
- #endregion
- void ShowLoginEffect()
+ private void Start()
{
- if (!useStaticBackGround)
- {
- if (loginEffect != null)
- {
- loginEffect.gameObject.SetActive(true);
- }
-
- if (m_SkeletonGraphic != null)
- {
- m_SkeletonGraphic.AnimationState.SetAnimation(0, "animation2", true);
- }
- }
+ m_AlphaTween.Play();
}
+ #endregion
+
}
}
--
Gitblit v1.8.0