Merge commit '72e9f78c364db3173ec1d5e0a37092d42de32a34'

MacBuilder

2018-08-23 9f1102900faf6adf5994cf6e870ce0716a06a09c

 System/Skill/SkillPassWin.cs

@@ -35,6 +35,7 @@
        [SerializeField] ScrollerController scrollerController;

        [SerializeField] RectTransform m_ContainerGetWay;

        [SerializeField] ClickScreenOtherSpace clickOtherSpace;

        [SerializeField, Header("特效时长")] float m_EffectDuration = 1f;

        private List<SkillConfig> skillListPass = new List<SkillConfig>();

        private int presentSltEquipIndex = -1;

        Coroutine cacheCoroutine = null;

@@ -193,7 +194,8 @@


        IEnumerator Co_UnlockEffectComplete()

        {

            yield return WaitingForSecondConst.WaitMS800;

            var duration = m_EffectDuration > 0f ? m_EffectDuration : 1.0f;

            yield return WaitingForSecondConst.GetWaitForSeconds(duration);

            SysNotifyMgr.Instance.ShowTip("PassNewHole");

            UpdateEquipPassSkill();

        }