Merge branch 'master' into leonard

client_Wu Xijin

2018-10-23 a974a2621a6dcb90b8fe52b23d075814873c0960

 System/Dungeon/DungeonModel.cs

@@ -532,6 +532,7 @@
            {

                var cB910 = new CB910_tagCGQueryTeamMemFuncData();

                cB910.TeamMemFuncType = 0;

                mainModel.IsSend = false;

                GameNetSystem.Instance.SendInfo(cB910);

            }

            else

@@ -571,6 +572,7 @@
                {

                    mainModel.LayerNumber = 0;

                }

                mainModel.IsSend = true;

            }

            SnxxzGame.Instance.StartCoroutine(AwaitTime());

        }

@@ -578,6 +580,11 @@
        IEnumerator AwaitTime()

        {

            yield return WaitingForSecondConst.WaitMS700;

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

            if (!mainModel.IsSend)

            {

                yield break;

            }

            WindowCenter.Instance.Open<FloorChooseWin>();

        }