0312 优化技能栏表现

hch

2019-10-01 af4f2091e55b1aae8e7937e1bf6765769ba2b4dc

0312 优化技能栏表现

 System/MainWin/SkillContainer.cs

@@ -84,6 +84,7 @@

        public void UnInit()
        {
            m_SkillTurnplate.UnInit();
            m_Switch.RemoveAllListeners();
            m_Attack.RemoveListener();
            m_BlinkSkill.RemoveAllListeners();

 System/MainWin/SkillTurnplate.cs

@@ -9,11 +9,14 @@
{

    public class SkillTurnplate : SkillButtonInterface

    {

        [SerializeField] Button m_SkillGroupSign;

        [SerializeField] GameObject m_UpImg;

        [SerializeField] GameObject m_DownImg;

        [SerializeField] GameObject m_SkillGroup2;

        [SerializeField] Button m_SkillSwitch;



        [Header("主界面第二批技能切换模块")]

        [SerializeField] Transform m_SkillGroup2;

        [SerializeField] Transform m_SG2Position1;

        [SerializeField] Transform m_SG2Position2;

        //Vector2 startPoint = Vector2.zero;

        //Vector2 endPoint = Vector2.zero;



@@ -41,13 +44,21 @@


        public void Init()

        {

            if (m_SkillGroupSign != null)

            {

                m_SkillGroupSign.AddListener(ShowSkillGroup);

                m_SkillGroupSign.gameObject.SetActive(IsSecondPanelAllow());

                SwitchGroup(groupIndex);

            }



            m_SkillSwitch.AddListener(ShowSkillGroup);

            SwitchGroup(groupIndex);





        }

        public void UnInit()

        {



            m_SkillSwitch.RemoveAllListeners();

        }



        public void ShowSkillGroup2Immedidately(bool show)

        {

            m_SkillGroup2.localPosition = show ? m_SG2Position1.localPosition : m_SG2Position2.localPosition;

        }



        public void ShowSkillGroup()

@@ -92,7 +103,7 @@
            {

                return;

            }



            m_SkillSwitch.gameObject.SetActive(IsSecondPanelAllow());

            StopAllCoroutines();

            groupIndex = _groupIndex;

            //m_SkillContainer.transform.localEulerAngles = groupIndex == 1 ? Vector3.zero : new Vector3(0, 0, 180);

@@ -100,10 +111,9 @@
            m_UpImg.SetActive(groupIndex == 1);

            m_DownImg.SetActive(groupIndex == 2);



            if (IsSecondPanelAllow())

            {

                m_SkillGroup2.SetActive(groupIndex == 2);

            }

            //m_SkillGroup2.SetActive(IsSecondPanelAllow()&&groupIndex == 2);

            ShowSkillGroup2Immedidately(IsSecondPanelAllow() && groupIndex == 2);



        }



        public bool Turn(GestureType _type = GestureType.Down)


 System/Skill/SkillAccordWin.cs

@@ -30,7 +30,6 @@
        [SerializeField] Image m_DragImg;

        [SerializeField] Image m_DragSkillImg;

        [SerializeField] List<RectTransform> m_QuickSkillRect = new List<RectTransform>();

        [SerializeField] SkillTurnplate m_SkillTurnplate;

        [SerializeField] Button m_AutoUseXp;

        [SerializeField] Image m_AutoXpCheck;

        [SerializeField] Button m_SkillMatch;

@@ -126,7 +125,7 @@
                    break;

                }

            }

            m_SkillTurnplate.Init();

            //m_SkillTurnplate.Init();

            UpdateSkillPage();

            //RefreshXpSkill();

            DisplayButtonState();

@@ -510,10 +509,10 @@
        {

            for (int i = 0; i < m_QuickSkillRect.Count; i++)

            {

                if (!InDisplay(i))

                {

                    continue;

                }

                //if (!InDisplay(i))

                //{

                //    continue;

                //}

                var des = RectTransformUtility.CalculateRelativeRectTransformBounds(this.transform, m_QuickSkillRect[i]);

                var src = RectTransformUtility.CalculateRelativeRectTransformBounds(this.transform, m_DragImg.rectTransform);

                var dis = Vector3.Distance(des.center, src.center);

@@ -536,18 +535,6 @@
            }

        }



        private bool InDisplay(int _index)

        {

            if (m_SkillTurnplate.GroupIndex == 1)

            {

                return _index < 3;

            }

            else if (m_SkillTurnplate.GroupIndex == 2)

            {

                return _index > 2;

            }

            return true;

        }



        private int m_AchieveSkillId = 0;

        void HandleAchievement()