Merge remote-tracking branch 'origin/master' into Skill_Polymorph_BeatBackP...

client_Hale

2018-08-22 2b47fde8e7902ddddd898309f281b9c310fc877f

 Fight/MapTransferUtility.cs

@@ -38,7 +38,7 @@


    public void Initialize()

    {

        FuncConfigConfig _funcModel = ConfigManager.Instance.GetTemplate<FuncConfigConfig>("ConversationDistanc");

        FuncConfigConfig _funcModel = Config.Instance.Get<FuncConfigConfig>("ConversationDistanc");

        if (_funcModel != null)

        {

            conversationDistSqrt = float.Parse(_funcModel.Numerical1);

@@ -182,7 +182,7 @@


    public void MoveToNPC(int npcID)

    {

        NPCConfig _config = ConfigManager.Instance.GetTemplate<NPCConfig>(npcID);

        NPCConfig _config = Config.Instance.Get<NPCConfig>(npcID);



        if (_config == null)

        {

@@ -247,7 +247,7 @@
        GActor _npc = null;



        // 加入判断是否世界BOSS判断

        WorldBossConfig _worldBoss = ConfigManager.Instance.GetTemplate<WorldBossConfig>(npcID);

        WorldBossConfig _worldBoss = Config.Instance.Get<WorldBossConfig>(npcID);

        bool _isWorldBoss = _worldBoss != null;

        if (_isWorldBoss && _findLocation)

        {

@@ -262,7 +262,7 @@
            else

            {

                //Debug.LogFormat(" |-- 不在视野内");

                var _mapConfig = ConfigManager.Instance.GetTemplate<MapConfig>(_npcLocation.mapId);

                var _mapConfig = Config.Instance.Get<MapConfig>(_npcLocation.mapId);



                // 如果不是处于相同地图, 则切图

                if (_npcLocation.mapId != PlayerDatas.Instance.baseData.MapID)

@@ -379,7 +379,7 @@
                return;

            }



            var _curMapConfig = ConfigManager.Instance.GetTemplate<MapConfig>(PlayerDatas.Instance.baseData.MapID);

            var _curMapConfig = Config.Instance.Get<MapConfig>(PlayerDatas.Instance.baseData.MapID);

            // 副本中不可以传送

            if (_curMapConfig.MapFBType != 0)

            {

@@ -582,7 +582,7 @@
        // 如果处于相同地图且距离小于一定的值, 则不传送

        if (mapId == PlayerDatas.Instance.baseData.MapID)

        {

            FuncConfigConfig _func = ConfigManager.Instance.GetTemplate<FuncConfigConfig>("flyMinDistance");

            FuncConfigConfig _func = Config.Instance.Get<FuncConfigConfig>("flyMinDistance");

            if (_func != null)

            {

                float _distance = float.Parse(_func.Numerical1);

@@ -597,7 +597,7 @@
        }

        else

        {

            var _curMapConfig = ConfigManager.Instance.GetTemplate<MapConfig>(PlayerDatas.Instance.baseData.MapID);

            var _curMapConfig = Config.Instance.Get<MapConfig>(PlayerDatas.Instance.baseData.MapID);

            // 副本中不可以传送(某些特定地图可以进行传送Zxw)

            var mainModel = ModelCenter.Instance.GetModel<PlayerMainDate>();

            int MapId = PlayerDatas.Instance.baseData.MapID;

@@ -661,7 +661,7 @@
        // 如果处于相同地图且距离小于一定的值, 则不传送

        if (mapID == PlayerDatas.Instance.baseData.MapID && lineID == PlayerDatas.Instance.baseData.FBID)

        {

            FuncConfigConfig _func = ConfigManager.Instance.GetTemplate<FuncConfigConfig>("flyMinDistance");

            FuncConfigConfig _func = Config.Instance.Get<FuncConfigConfig>("flyMinDistance");

            if (_func != null)

            {

                float _distance = float.Parse(_func.Numerical1);

@@ -676,7 +676,7 @@
        }

        else

        {

            var _curMapConfig = ConfigManager.Instance.GetTemplate<MapConfig>(PlayerDatas.Instance.baseData.MapID);

            var _curMapConfig = Config.Instance.Get<MapConfig>(PlayerDatas.Instance.baseData.MapID);



            // 副本中不可以传送

            if (_curMapConfig.MapFBType != 0)

@@ -793,7 +793,7 @@
        }



        // 找不到配置, 不做后续操作

        NPCConfig _npcConfig = ConfigManager.Instance.GetTemplate<NPCConfig>(NpcID);

        NPCConfig _npcConfig = Config.Instance.Get<NPCConfig>(NpcID);

        if (_npcConfig == null)

        {

            Clear();