Merge branch 'master' into leonard

client_Wu Xijin

2018-10-23 a974a2621a6dcb90b8fe52b23d075814873c0960

 System/Team/GroupDungeonChallengeProcessor.cs

@@ -28,6 +28,7 @@
                    var cB910 = new CB910_tagCGQueryTeamMemFuncData();

                    cB910.TeamMemFuncType = 0;

                    GameNetSystem.Instance.SendInfo(cB910);

                    main.IsSend = false;

                    StartCoroutine(Co_DelayShowFloorChooseWin(_isAutoMatch));

                }

            }

@@ -82,7 +83,10 @@
        IEnumerator Co_DelayShowFloorChooseWin(bool _isAutoMatch)

        {

            yield return WaitingForSecondConst.WaitMS700;



            if (!main.IsSend)

            {

                yield break;

            }

            if (main.LayerNumber == -1)

            {

                main.LayerNumberNow = 0;