Merge branch '法宝、法宝魂修改'

client_linchunjie

2018-08-18 f4f07847775c12b338d8bccedbbabc067dc1ae2c

 System/Treasure/TreasureAnimation.cs

@@ -278,6 +278,12 @@
            var _effect = EffectMgr.Instance.PlayUIEffect(SPIRALSFX, 2700, m_TreasureMeridians[_index].transform.parent, false);

            _effect.transform.localPosition = _config[_index].position;

            _duration = _effect.duration;



            if (_index == _config.stagePointNum - 1 && m_ProgressPosTween.gameObject.activeInHierarchy)

            {

                m_ProgressPosTween.Play(true);

            }



            while (_timer < _duration)

            {

                _timer += Time.deltaTime;

@@ -602,7 +608,12 @@
                    OnAchievementTweenComplete();

                }

            });

            m_ProgressPosTween.Play();

            Treasure treasure;

            model.TryGetTreasure(selectTreasureId, out treasure);

            if (!treasure.IsHighestStage)

            {

                m_ProgressPosTween.Play();

            }

            if (OnStepComplete != null)

            {

                OnStepComplete(TreasureShowStep.FirstUnLock);

@@ -612,7 +623,6 @@
                yield return null;

            }

            stepComplete = true;

            Treasure treasure;

            model.TryGetTreasure(selectTreasureId, out treasure);

            if (treasure.treasureStages[0].unlockType != TreasureStageUnlock.None)

            {

@@ -709,13 +719,15 @@
            {

                yield return null;

            }



            timer = 0;

            var _effect = EffectMgr.Instance.PlayUIEffect(CONVERGESFX, 2700, m_TreasureMeridians[_skillStageIndex].transform.parent, false);

            _effect.transform.localPosition = _config[_skillStageIndex].position;

            while (timer < 0.5f)

            if (_config.stagePointNum > 1)

            {

                yield return null;

                timer = 0;

                var _effect = EffectMgr.Instance.PlayUIEffect(CONVERGESFX, 2700, m_TreasureMeridians[_skillStageIndex].transform.parent, false);

                _effect.transform.localPosition = _config[_skillStageIndex].position;

                while (timer < 0.5f)

                {

                    yield return null;

                }

            }

            timer = 0;

            m_ContainerLevelUp.gameObject.SetActive(false);