Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

client_Zxw

2018-09-18 54ac5706baaf557f692b341c00fda783ef958948

 System/Team/TeamModel.cs

@@ -1011,6 +1011,10 @@
                    prepareBeginTime = DateTime.MinValue;

                    WindowCenter.Instance.Close<TeamPrepareWin>();

                }

                else if (teamPrepare.IsAllOk())

                {

                    prepareBeginTime = DateTime.MinValue;

                }

                else

                {

                    Teammate mate;