Merge branch 'master' into CrossServerBoss

client_Wu Xijin

2019-01-09 d8858636e56bee3ed13e408bc089e53c1c717e88

Merge branch 'master' into CrossServerBoss

 UI/Common/UIRoot.cs

@@ -58,7 +58,14 @@
                C320C_tagCGMCMD gmCmd = new C320C_tagCGMCMD();

                gmCmd.Cmd = "KillScreenNPC";

                gmCmd.CmdLen = 13;

                GameNetSystem.Instance.SendInfo(gmCmd);

                if (CrossServerUtility.IsCrossServer())

                {

                    GameNetSystem.Instance.SendToCrossServer(gmCmd);

                }

                else

                {

                    GameNetSystem.Instance.SendInfo(gmCmd);

                }

            }



            if (StageManager.Instance.CurrentStage != null)