Merge remote-tracking branch 'origin/master' into LuaOrgan

client_Lhy

2019-07-04 8ebdcb8980b7a630beb6a1ff82381baa0ab2ddb5

 System/Skill/SkillCell.cs

@@ -13,15 +13,19 @@
        [SerializeField] SkillData skill;
        [SerializeField] RedpointBehaviour m_Redpoint;

        public SkillData skillData {
            get {
        public SkillData skillData

        {
            get

            {
                return skill;
            }
        }

        SkillModel m_Model;
        SkillModel model {
            get {
        SkillModel model

        {
            get

            {
                return m_Model ?? (m_Model = ModelCenter.Instance.GetModel<SkillModel>());
            }
        }
@@ -37,13 +41,16 @@
        public void OnPointerDown(PointerEventData eventData)
        {
            skill.m_SkillBtn.OnPointerClick(eventData);
            if (model.skillDraging) {
            if (model.skillDraging)

            {
                return;
            }
            if (PlayerDatas.Instance.skill.GetSKillById(skill.skillId) == null) {
            if (PlayerDatas.Instance.skill.GetSKillById(skill.skillId) == null)

            {
                return;
            }
            if (model.GetXpSkillID() == skill.skillId) {
            if (model.IsXpSkill(skill.skillId))

            {
                return;
            }
            onPress = true;
@@ -66,10 +73,12 @@
        public void Refresh(int skillId)
        {
            skill.SetSkillData(skillId);
            if (model.presentSltSkillID == skillId) {
            if (model.presentSltSkillID == skillId)

            {
                skill.m_SelectImg.gameObject.SetActive(true);
            }
            else {
            else

            {
                skill.m_SelectImg.gameObject.SetActive(false);
            }

@@ -96,9 +105,11 @@

        private void LateUpdate()
        {
            if (onPress && !model.skillDraging) {
            if (onPress && !model.skillDraging)

            {
                m_Time += Time.deltaTime;
                if (m_Time > model.onDragDelay) {
                if (m_Time > model.onDragDelay)

                {
                    model.skillDragId = skill.skillId;
                    model.skillDraging = true;
                    m_Time = 0;