Merge remote-tracking branch 'origin/master' into leonard

client_Wu Xijin

2018-10-29 d82561629d51d3863002a3f1bbb32ef6b1b429bb

 System/Treasure/TreasureComponent.cs

@@ -720,7 +720,7 @@
            Treasure _treasure;

            if (category == TreasureCategory.Human &&

                model.TryGetTreasure(treasureId, out _treasure) && _treasure.IsHighestStage

                && !model.GetTreasureFinishAnim(treasureId))

                && !model.GetTreasureFinishAnim(treasureId) && model.GetTreasureUnlockShow(TreasureCategory.Human) != treasureId)

            {

                highestSfx = SFXPlayUtility.Instance.Play(5197, root);

                if (highestSfx != null)

@@ -728,7 +728,7 @@
                    var animator = highestSfx.GetComponentInChildren<Animator>(true);

                    if (animator != null)

                    {

                        animator.Play(HUMAN_HIGHEST_STAGE_1, 0, 0);

                        animator.Play(HUMAN_HIGHEST_STAGE_1, 0, UI3DTreasureSelectStage.sync_normalizedTime);

                    }

                    highestSfx.duration = 0;

                    LayerUtility.SetLayer(highestSfx.gameObject, LayerUtility.UILayer, true);