Merge branch 'master' into DogzDungeon

client_Wu Xijin

2018-08-20 1c4c5c5cb829334303bff98837a69a9653dca714

 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: