5439 子 【优化】【1.3】【1.3.100】坐骑、灵宠界面修改：支持1-5个技能 / 【前端】【1.3】【1.3.100】坐骑、灵宠界面修改：支...

client_Zxw

2018-12-13 28808bd44254c38499da4e1e47be222aa0451acc

5439 子 【优化】【1.3】【1.3.100】坐骑、灵宠界面修改：支持1-5个技能 / 【前端】【1.3】【1.3.100】坐骑、灵宠界面修改：支持1-5个技能

 System/Mount/MountPanelAssignment.cs

@@ -58,6 +58,13 @@
        GameObject Skillimage2;

        [SerializeField]

        GameObject Skillimage3;

        [SerializeField]

        GameObject Skillimage4;

        [SerializeField]

        GameObject Skillimage5;

        [SerializeField] Transform m_Obj1;

        [SerializeField] Transform m_Obj2;

        [SerializeField] Transform m_AttributeInformationObj;

        private float timePlay = 0;//坐骑动作播放时间

        List<GameObject> Skillimage = new List<GameObject>();



@@ -77,10 +84,7 @@
        private int pitchOnHorseID = 0;

        private void Start()

        {

            Skillimage.Clear();

            Skillimage.Add(Skillimage1);

            Skillimage.Add(Skillimage2);

            Skillimage.Add(Skillimage3);

            
            m_NotUnlockButton.AddListener(OnClickNotUnlockButton);

        }

        private void OnEnable()

@@ -175,6 +179,7 @@
        }

        public void PanelAssignment(int mountID)

        {

            SetSkillimage();

            pitchOnHorseID = mountID;

            MountAttribute(mountID);

            PanelClassify(mountID);

@@ -432,6 +437,7 @@
                    MountSkills.Add(mountModel.GetMountSkillAndItem[key]);

                }

            }

            SetPos(MountSkills.Count);//控制位置

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

            {

                Skillimage[i].SetActive(false);

@@ -595,6 +601,30 @@
            }

            return fightNum;

        }



        private void SetSkillimage()

        {

            if (Skillimage.Count <= 0)

            {

                Skillimage.Clear();

                Skillimage.Add(Skillimage1);

                Skillimage.Add(Skillimage2);

                Skillimage.Add(Skillimage3);

                Skillimage.Add(Skillimage4);

                Skillimage.Add(Skillimage5);

            }

        }

        private void SetPos(int count)

        {

            if (count > 4)

            {

                m_AttributeInformationObj.localPosition = m_Obj2.localPosition;

            }

            else

            {

                m_AttributeInformationObj.localPosition = m_Obj1.localPosition;

            }      
        }

    }



}


 System/Pet/PetAttributeMethods.cs

@@ -72,7 +72,13 @@
        GameObject Skillimage2;

        [SerializeField]

        GameObject Skillimage3;



        [SerializeField]

        GameObject Skillimage4;

        [SerializeField]

        GameObject Skillimage5;

        [SerializeField] Transform m_Obj1;

        [SerializeField] Transform m_Obj2;

        [SerializeField] Transform m_PropertyPanel;

        [SerializeField] UIEffect m_UIeffect2;//经验条特效

        private int typePetID = 0;

        private float timePlay = 0;//灵宠动作播放时间

@@ -88,10 +94,7 @@
        private void OnEnable()

        {

            timePlay = 0;

            Skillimage.Clear();

            Skillimage.Add(Skillimage1);

            Skillimage.Add(Skillimage2);

            Skillimage.Add(Skillimage3);

           
            isAutoTrain = false;

            breakLockBtn.AddListener(ClickBreakBtn);

            petAutoTrainBtn.AddListener(ClickPetAutoTrainBtn);

@@ -172,6 +175,7 @@
            {

                Skillimage[i].SetActive(false);

            }

            SetPos(curPetSkillIds.Length);

            for (int i = 0; i < curPetSkillIds.Length; i++)

            {

                if (i < Skillimage.Count)

@@ -603,6 +607,7 @@


        public void ModelShow(int PetID)

        {

            SetSkillimage();

            petmodel.curPetId = PetID;

            isAutoTrain = false;

            petInfoConfig = Config.Instance.Get<PetInfoConfig>(PetID);

@@ -716,6 +721,28 @@
            FragmentUnlockTip.SetActive(false);

            FullAttTip.SetActive(true);

        }

        private void SetSkillimage()

        {

            if (Skillimage.Count <= 0)

            {

                Skillimage.Add(Skillimage1);

                Skillimage.Add(Skillimage2);

                Skillimage.Add(Skillimage3);

                Skillimage.Add(Skillimage4);

                Skillimage.Add(Skillimage5);

            }        
        }

        private void SetPos(int count)

        {

            if (count > 4)

            {

                m_PropertyPanel.localPosition = m_Obj2.localPosition;

            }

            else

            {

                m_PropertyPanel.localPosition = m_Obj1.localPosition;

            }

        }

    }

}