6680 子 【2.0】【开发】五行专精激活方式变更 / 【2.0】【前端】五行专精激活方式变更

client_linchunjie

2019-05-08 4163c11313f51845ad7a1f4190b79740483aebd7

6680 子 【2.0】【开发】五行专精激活方式变更 / 【2.0】【前端】五行专精激活方式变更

 System/Skill/ExpertSkillCyclicScroll.cs

@@ -12,7 +12,7 @@
        public bool IsPlaying

        {

            get { return m_IsPlaying; }

            private set

            set

            {

                m_IsPlaying = value;

                this.enabled = !m_IsPlaying;


 System/Skill/ExpertSkillSelectWin.cs

@@ -28,6 +28,8 @@
        [SerializeField] Button m_Close1;

        [SerializeField] Button m_Close2;



        [SerializeField] float m_Speed = 10f;



        public static int selectSkillId = 0;



        bool m_OpenDetail = false;

@@ -75,6 +77,8 @@
        {

            m_PositionTween.SetStartState();

            m_AlphaTween.SetStartState();



            m_CyclicScroll.IsPlaying = false;



            m_OpenDetail = false;



@@ -177,30 +181,33 @@


                m_CyclicScroll.Dispose();

                m_CyclicScroll.Init(datas);

                StartCoroutine(Co_Arrange(animationStep));

                StartCoroutine(Co_Arrange(animationStep, datas.Count > 2 ? 440 : 302));

            }

        }



        IEnumerator Co_Arrange(bool animationStep)

        IEnumerator Co_Arrange(bool animationStep, float height)

        {

            yield return null;

            if (animationStep)

            {

                var start = m_LayoutElement.preferredHeight;

                var intValue = (int)start;

                if (start > 302)

                if (start > height)

                {

                    while (start > 302)

                    while (start > height)

                    {

                        start -= Time.deltaTime * 10;

                        start = Mathf.Max(302, start);

                        start -= Time.deltaTime * m_Speed;

                        start = Mathf.Max(height, start);

                        m_LayoutElement.preferredHeight = start;

                        if (intValue != (int)start)

                        {

                            intValue = (int)start;

                            m_CyclicScroll.ReArrange();

                        }

                        yield return null;

                    }

                    yield return null;

                    m_CyclicScroll.ReArrange();

                    yield break;

                }

            }

@@ -268,7 +275,7 @@
                    {

                        m_CyclicScroll.DisplayAnimation(()=> 

                        {

                            DisplayDetail();

                            DisplayDetail(true);

                        });

                    }

                }


 System/Skill/TreasureSkillModel.cs

@@ -407,6 +407,10 @@
            }

            var level = 0;

            TryGetExpertActiveLevel(skillId, out level);

            if (expert.maxLevel <= level)

            {

                return false;

            }

            var skillConfig = SkillConfig.Get(skillId + level);

            var requireProperty = skillConfig.RequireProperty();

            var requireValue = skillConfig.RequirePropertyValue();