From d82561629d51d3863002a3f1bbb32ef6b1b429bb Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期一, 29 十月 2018 17:56:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into leonard
---
System/Message/BattleHintWin.cs | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/System/Message/BattleHintWin.cs b/System/Message/BattleHintWin.cs
index 4c05f33..9662667 100644
--- a/System/Message/BattleHintWin.cs
+++ b/System/Message/BattleHintWin.cs
@@ -88,21 +88,25 @@
m_ContainerKing.gameObject.SetActive(false);
m_ContainerEnemy.gameObject.SetActive(false);
m_ContainerAncientRemind.gameObject.SetActive(false);
+ m_ContainerBattleHint.gameObject.SetActive(true);
switch (ancientType)
{
case 1:
m_ContainerKing.gameObject.SetActive(true);
+ m_BattleHintTween.SetEndState();
+ OnBattleHintTweenComplete();
break;
case 2:
m_ContainerEnemy.gameObject.SetActive(true);
+ m_BattleHintTween.SetEndState();
+ OnBattleHintTweenComplete();
break;
case 3:
m_ContainerAncientRemind.gameObject.SetActive(true);
+ m_BattleHintTween.SetStartState();
+ m_BattleHintTween.Play(OnBattleHintTweenComplete);
break;
}
- m_ContainerBattleHint.gameObject.SetActive(true);
- m_BattleHintTween.SetStartState();
- m_BattleHintTween.Play(OnBattleHintTweenComplete);
}
}
--
Gitblit v1.8.0