Merge commit '72e9f78c364db3173ec1d5e0a37092d42de32a34'

MacBuilder

2018-08-23 9f1102900faf6adf5994cf6e870ce0716a06a09c

 System/Dungeon/DungeonModel.cs

@@ -464,6 +464,10 @@
                            {

                                CheckGroupEnterDungeon(_dungeon);

                            }

                            else

                            {

                                GroupCancelEnterDungeon(_dungeon.mapId);

                            }

                        });

                    }

                    else if (teamModel.myTeam.memberCount - teamModel.myTeam.GetOnlineMemberCnt() > 0)

@@ -488,6 +492,21 @@
            }

        }



        private void GroupCancelEnterDungeon(int _mapId)

        {

            switch (_mapId)

            {

                case RealmModel.REALM_DUNGEON_ID:

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

                    {

                        var teamModel = ModelCenter.Instance.GetModel<TeamModel>();

                        teamModel.missionBuf = teamModel.currentMission = new TeamMission(31110, 1);

                        WindowCenter.Instance.Open<TeamFrameWin>(false, teamModel.myTeam.inTeam ? 1 : 0);

                    }

                    break;

            }

        }



        private string GroupChallengeOnlyOneTip(int _mapId)

        {

            switch (_mapId)