Merge branch 'master' into builtinmove

client_Wu Xijin

2018-11-15 a08989bee578f43a2a9b1724366fdea969e9405e

 Fight/MapTransferUtility.cs

@@ -919,7 +919,8 @@
                Clear();

            }

        }

        else if (_npcConfig.NPCType == (int)E_NpcType.Collect)

        else if (_npcConfig.NPCType == (int)E_NpcType.Collect

              || _npcConfig.NPCType == (int)E_NpcType.Flag)

        {

            float _chkDist = GeneralDefine.CloseNpcDist + _npcConfig.ModelRadius + 0.3f;

            if (_chkDistSqrt <= Mathf.Pow(_chkDist, 2))