Merge remote-tracking branch 'origin/master' into Cross_Server

client_Wu Xijin

2018-12-21 e5530e1ca1f28ab70c783d2b3ec685bb6569504b

 Fight/MapTransferUtility.cs

@@ -940,7 +940,10 @@
                if (!UserInputHandler.isTouched

                && (_hero.SkillMgr.CurCastSkill == null || _hero.SkillMgr.CurCastSkill.SkillCompelete))

                {

                    NPCInteractProcessor.InvokeEvent(E_NpcType.Func, NpcID, _npc.ServerInstID);

                    if (NpcID != GeneralDefine.GatherSoulDZ)

                    {

                        NPCInteractProcessor.InvokeEvent(E_NpcType.Func, NpcID, _npc.ServerInstID);

                    }

                    Clear();

                }

            }