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

client_Zxw

2018-08-30 51fab14cee367849d673ccf9a0809c68cac843fc

 Fight/Actor/AI/HeroAI_Auto.cs

@@ -258,7 +258,6 @@
                    }

                }





                break;

        }



@@ -267,7 +266,7 @@
        {

            return;

        }

        


        if (m_DecideSkill != null)

        {

            _skill = m_DecideSkill;

@@ -280,8 +279,7 @@


        bool _forceMove = _skill.skillInfo.soFile != null && _skill.skillInfo.soFile.forceMove;



        if (!_forceMove && !IsSkillNeedMove(_skill.skillInfo.config.Tag,

                            (E_SkillType)_skill.skillInfo.config.SkillType))

        if (!_forceMove && !IsSkillNeedMove(_skill.skillInfo.config.Tag, (E_SkillType)_skill.skillInfo.config.SkillType))

        {

            _hero.Behaviour.DoAttack(_skill);

            m_DecideSkill = null;

@@ -361,14 +359,26 @@
            if (_hero.Behaviour.IsComAtk(_skill.id))

            {

                _hero.Behaviour.DoCommonAttack();

                m_DecideSkill = null;

                m_UserClickSkillID = -1;

                if (m_DecideSkill != null && m_DecideSkill.id == _skill.id)

                {

                    m_DecideSkill = null;

                }

                if (_skill.id == m_UserClickSkillID)

                {

                    m_UserClickSkillID = -1;

                }

            }

            else

            {

                _hero.Behaviour.DoAttack(_skill);

                m_DecideSkill = null;

                m_UserClickSkillID = -1;

                if (m_DecideSkill != null && m_DecideSkill.id == _skill.id)

                {

                    m_DecideSkill = null;

                }

                if (_skill.id == m_UserClickSkillID)

                {

                    m_UserClickSkillID = -1;

                }

            }

        }