From c49ec60e44c268494289b2435cca1e8e69f4e2b5 Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期四, 25 四月 2019 11:57:37 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/Treasure/HumanTreasureTaskCell.cs | 19 ++++++++++++++++---
1 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/System/Treasure/HumanTreasureTaskCell.cs b/System/Treasure/HumanTreasureTaskCell.cs
index d541dcf..4037a69 100644
--- a/System/Treasure/HumanTreasureTaskCell.cs
+++ b/System/Treasure/HumanTreasureTaskCell.cs
@@ -9,6 +9,7 @@
{
public class HumanTreasureTaskCell : CellView
{
+ [SerializeField] UIEffect m_EffectAppear;
[SerializeField] UIAlphaTween m_AlphaTween;
[SerializeField] Text m_ClueName;
[SerializeField] Transform m_ContainerCollected;
@@ -26,7 +27,12 @@
m_Goto.AddListener(Goto);
}
- public void Display(int clue, bool animationStep = false)
+ private void OnDisable()
+ {
+ StopAllCoroutines();
+ }
+
+ public void Display(int clue, bool animationStep, float displayTime)
{
var config = TreasureConfig.Get(model.selectedTreasure);
Dictionary<int, List<int>> clues;
@@ -79,17 +85,24 @@
m_ContainerCutline.gameObject.SetActive(lastClue != clue);
- if (!animationStep)
+ if (!animationStep || !gameObject.activeInHierarchy)
{
m_AlphaTween.SetEndState();
}
else
{
m_AlphaTween.SetStartState();
- m_AlphaTween.Play();
+ StartCoroutine(Co_Display(displayTime));
}
}
+ IEnumerator Co_Display(float time)
+ {
+ yield return WaitingForSecondConst.GetWaitForSeconds(time);
+ m_EffectAppear.Play();
+ m_AlphaTween.Play();
+ }
+
private void Goto()
{
WindowJumpMgr.Instance.ClearJumpData();
--
Gitblit v1.8.0