Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

client_linchunjie

2018-12-13 693dd6230f1ea7532d73d9ab643ce3be13eef95f

Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

 System/Mount/MountPanelAssignment.cs

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

        [SerializeField]

        GameObject Skillimage3;

        [SerializeField]

        GameObject Skillimage4;

        [SerializeField]

        GameObject Skillimage5;

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

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



@@ -77,10 +81,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 +176,7 @@
        }

        public void PanelAssignment(int mountID)

        {

            SetSkillimage();

            pitchOnHorseID = mountID;

            MountAttribute(mountID);

            PanelClassify(mountID);

@@ -595,6 +597,19 @@
            }

            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);

            }

        }       
    }



}


 System/Pet/PetAttributeMethods.cs

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

        [SerializeField]

        GameObject Skillimage3;



        [SerializeField]

        GameObject Skillimage4;

        [SerializeField]

        GameObject Skillimage5;

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

        private int typePetID = 0;

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

@@ -88,10 +91,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);

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


        public void ModelShow(int PetID)

        {

            SetSkillimage();

            petmodel.curPetId = PetID;

            isAutoTrain = false;

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

@@ -716,6 +717,17 @@
            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);

            }        
        }

    }

}