少年修仙传客户端代码仓库
client_linchunjie
2018-08-31 bf3ef9808b4f183e1c515961edca1f6ccc2fe829
Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
3个文件已修改
44 ■■■■■ 已修改文件
Fight/Actor/HeroBehaviour.cs 27 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Fight/Stage/Dungeon/MapTransfer.cs 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Fight/Stage/StageManager.cs 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Fight/Actor/HeroBehaviour.cs
@@ -121,13 +121,36 @@
            _skill.CSkillPrepareEnd = false;
        }
        GActorFight _fightTarget = m_Hero.LockTarget as GActorFight;
        if (_fightTarget != null && _fightTarget.CanAtked())
        {
            m_Hero.SelectTarget = _fightTarget;
        }
        else
        {
            _fightTarget = m_Hero.SelectTarget as GActorFight;
            if (_fightTarget != null && _fightTarget.CanAtked())
            {
                m_Hero.LockTarget = m_Hero.SelectTarget;
            }
            else
            {
                float _range = m_Hero.JobSetup.SearchEnemyDist * Constants.F_DELTA;
                m_Hero.LockTarget = m_Hero.SelectTarget = GAMgr.Instance.FindAtkTarget(m_Hero.Pos, _range, 360);
                _fightTarget = m_Hero.SelectTarget as GActorFight;
            }
        }
        if (m_Hero.aiHandler.currentType == E_HeroAIType.None)
        {
            byte _type = (byte)E_HeroAIType.KillUntilDie;
            KillUntilDieData _data = m_Hero.aiHandler.aiData[_type] as KillUntilDieData;
            if (m_Hero.SelectTarget != null)
            if (_fightTarget != null)
            {
                _data.targetServerInstID = m_Hero.SelectTarget.ServerInstID;
                _data.targetServerInstID = _fightTarget.ServerInstID;
            }
            _data.defaultSkillID = m_WillUsedSkillID;
            m_Hero.aiHandler.currentType = E_HeroAIType.KillUntilDie;
Fight/Stage/Dungeon/MapTransfer.cs
@@ -25,6 +25,11 @@
        {
            _fight = _actorList[i] as GActorFight;
            if (_fight == null)
            {
                continue;
            }
            _chkDistSqrt = MathUtility.DistanceSqrtXZ(transform.position, _actorList[i].Pos);
            if (_chkDistSqrt < 3)
            {
Fight/Stage/StageManager.cs
@@ -137,6 +137,12 @@
#if UNITY_EDITOR
            Debug.LogFormat("StageManager出现加载相同地图行为:" + mapResConfigID);
#endif
            if (loadTimeOutCatcher != null)
            {
                loadTimeOutCatcher.Stop();
                loadTimeOutCatcher = null;
            }
            ExceptionCatcher.ReportException("场景加载 Step1", StringUtility.Contact("StageManager出现加载相同地图行为:", mapResConfigID));
            yield break;
        }
@@ -418,6 +424,12 @@
        {
            ModelCenter.Instance.GetModel<DungeonModel>().ExitCurrentDungeon();
        }
        if (loadTimeOutCatcher != null)
        {
            loadTimeOutCatcher.Stop();
        }
        loadTimeOutCatcher = null;
    }
    private void InitHero()