Merge branch 'master' into leonard

client_Wu Xijin

2018-10-26 82931aabaaa3e479bc04e11630a77cd9c9dd5fe3

 System/Treasure/TreasureComponent.cs

@@ -12,6 +12,8 @@
        const string HUMAN_LOCKSFX_STATE_2 = "Effcet_FaBao_FengYin_02";

        const string DEMON_LOCKSFX_STATE_1 = "Effcet_FaBao_FengYin2_01";

        const string DEMON_LOCKSFX_STATE_2 = "Effcet_FaBao_FengYin2_02";

        const string HUMAN_HIGHEST_STAGE_1 = "Effect_FaBao_QuanJueXing";

        const string HUMAN_HIGHEST_STAGE_2 = "Effect_FaBao_QuanJueXing_2";

        const int HUMAN_BACKLIGHT_EFFECT = 5115;

        const int DEMON_BACKLIGHT_EFFECT = 5116;

        const int FAIRY_BACKLIGHT_EFFECT = 5117;

@@ -715,20 +717,25 @@
        public void RequestHighestEffect()

        {

            RecycleHighestEffect();

            //Treasure _treasure;

            //if (category == TreasureCategory.Human &&

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

            //    && !model.GetTreasureFinishAnim(treasureId))

            //{

            //    highestSfx = SFXPlayUtility.Instance.Play(5198, root);

            //    if (highestSfx != null)

            //    {

            //        highestSfx.duration = 0;

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

            //        highestSfx.transform.localPosition = Vector3.zero;

            //        highestSfx.transform.LookAt(UI3DTreasureSelectStage.Instance.center);

            //    }

            //}

            Treasure _treasure;

            if (category == TreasureCategory.Human &&

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

                && !model.GetTreasureFinishAnim(treasureId))

            {

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

                if (highestSfx != null)

                {

                    var animator = highestSfx.GetComponentInChildren<Animator>(true);

                    if (animator != null)

                    {

                        animator.Play(HUMAN_HIGHEST_STAGE_1, 0, 0);

                    }

                    highestSfx.duration = 0;

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

                    highestSfx.transform.localPosition = Vector3.zero;

                    highestSfx.transform.LookAt(UI3DTreasureSelectStage.Instance.center);

                }

            }

        }



        public void RecycleHighestEffect()

@@ -839,6 +846,11 @@
            var _effect = SFXPlayUtility.Instance.Play(5197, root);

            if (_effect != null)

            {

                var animator = _effect.GetComponentInChildren<Animator>(true);

                if (animator != null)

                {

                    animator.Play(HUMAN_HIGHEST_STAGE_2, 0, 0);

                }

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

                _effect.transform.LookAt(UI3DTreasureSelectStage.Instance.center);

                _effect.transform.localPosition = Vector3.zero;