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

client_wuxijin

2018-08-09 37fc0096121c68a90fabf4e4af8a90078ee10faa

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

 Fight/Actor/AI/HeroAI_Auto.cs

@@ -358,11 +358,13 @@
            {

                _hero.Behaviour.DoCommonAttack();

                m_DecideSkill = null;

                m_UserClickSkillID = -1;

            }

            else

            {

                _hero.Behaviour.DoAttack(_skill);

                m_DecideSkill = null;

                m_UserClickSkillID = -1;

            }

        }



@@ -402,12 +404,7 @@
        //}

        m_PauseStartTime = Time.realtimeSinceStartup;

        m_State = 1;

        m_UserClickSkillID = -1;

        GA_Hero _hero = PlayerDatas.Instance.hero;

        if (_hero != null)

        {

            _hero.StopRush();

        }

        m_NeedMoveToPos = false;

    }




 System/Pet/PetAttributeMethods.cs

@@ -73,6 +73,7 @@
        [SerializeField]

        GameObject Skillimage3;



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

        private int typePetID = 0;

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

        PlayerPetDatas m_petModel;

@@ -327,7 +328,8 @@
        private void RefreshPetInfo()

        {

            if (petInfoConfig == null) return;



            SoundPlayer.Instance.PlayUIAudio(19);

            m_UIeffect2.Play();

            AllPetAttrCtrl();

            curPetSkillCtrl.m_Scorller.RefreshActiveCellViews();

            CreateAllPetSkill();