Merge branch 'master' into 1871天赋功能

client_linchunjie

2018-09-26 7da5f5b780af330ecda645f5538e0917bd9eeb01

 Fight/GameActor/GA_NpcClientFunc.cs

@@ -69,7 +69,7 @@


                if (_configID > 0)

                {

                    if (!WindowCenter.Instance.CheckOpen<GuideDialogueWin>())

                    if (!WindowCenter.Instance.IsOpen<GuideDialogueWin>())

                    {

                        GuideDialogueModel _model = ModelCenter.Instance.GetModel<GuideDialogueModel>();

                        _model.dialogID = _configID;