From 1c4c5c5cb829334303bff98837a69a9653dca714 Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期一, 20 八月 2018 17:09:49 +0800
Subject: [PATCH] Merge branch 'master' into DogzDungeon

---
 System/Treasure/FunctionUnlockFlyObject.cs |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/System/Treasure/FunctionUnlockFlyObject.cs b/System/Treasure/FunctionUnlockFlyObject.cs
index fd4ed4b..f8ee0ec 100644
--- a/System/Treasure/FunctionUnlockFlyObject.cs
+++ b/System/Treasure/FunctionUnlockFlyObject.cs
@@ -64,6 +64,10 @@
                     m_FunctionIcon.SetSprite(skillConfig.IconName);
                     originalScale = 1f;
                     break;
+                case FunctionUnlockType.TreasureFunc:
+                    UI3DTreasureExhibition.Instance.BeginShowTreasure(m_Id, m_TreasureIcon);
+                    originalScale = 9f;
+                    break;
             }
 
             this.transform.localScale = Vector3.one * originalScale;
@@ -189,6 +193,7 @@
                     {
                         case FunctionUnlockType.Treasure:
                         case FunctionUnlockType.TreasureSkill:
+                        case FunctionUnlockType.TreasureFunc:
                             UI3DTreasureExhibition.Instance.StopShow();
                             break;
                         case FunctionUnlockType.Normal:

--
Gitblit v1.8.0