From 7cc84329c52b6e39cd979eb33a126e059b9bf36c Mon Sep 17 00:00:00 2001
From: leonard Wu <364452445@qq.com>
Date: 星期五, 03 八月 2018 21:07:11 +0800
Subject: [PATCH] Merge branch 'master' into leonard
---
System/Treasure/UI3DTreasureSelectStage.cs | 13 +++++++++++++
1 files changed, 13 insertions(+), 0 deletions(-)
diff --git a/System/Treasure/UI3DTreasureSelectStage.cs b/System/Treasure/UI3DTreasureSelectStage.cs
index 5257c77..dff2131 100644
--- a/System/Treasure/UI3DTreasureSelectStage.cs
+++ b/System/Treasure/UI3DTreasureSelectStage.cs
@@ -320,6 +320,11 @@
{
HideAllTreasure();
CloseRenderCamera();
+ var movecomponent = m_CameraControl.GetComponent<SmoothMove>();
+ if (movecomponent != null)
+ {
+ DestroyImmediate(movecomponent);
+ }
m_CameraControl.localPosition = m_StartPosition;
IsCloser = false;
@@ -868,6 +873,10 @@
private void OnCloserComplete()
{
+ if (!IsOpen)
+ {
+ return;
+ }
CloserComplete = true;
OpenRenderCamera();
m_Treasures[currentCategory][presentSelectIndex].SetLayer(LayerUtility.DefaultLayer);
@@ -897,6 +906,10 @@
private void CameraBackComplete()
{
+ if (!IsOpen)
+ {
+ return;
+ }
IsCloser = false;
if (OnCameraBackComplete != null)
{
--
Gitblit v1.8.0