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

client_linchunjie

2018-11-22 42d8e7d989155e8f42d118fa4de3f3334c454346

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

 System/Dungeon/DungeonModel.cs

@@ -520,6 +520,7 @@
            if (ruinsTranscriptMapId == _dungeon.mapId)

            {

                OpenFloorChooseWin();

               
            }

            else

            {

@@ -588,7 +589,7 @@
            {

                yield break;

            }

            WindowCenter.Instance.Open<FloorChooseWin>();

            RequestChallangeDungeon(ruinsTranscriptMapId, mainModel.LayerNumber);

        }



        public void GroupChallenge(int _dungeonId, int _lineId = 0)


 System/Team/GroupDungeonChallengeProcessor.cs

@@ -122,20 +122,10 @@
            }

            else

            {

                if (_isAutoMatch)

                bool iamCaptainer = ModelCenter.Instance.GetModel<TeamModel>().myTeam.iamCaptainer;

                if (iamCaptainer)

                {

                    bool iamCaptainer = ModelCenter.Instance.GetModel<TeamModel>().myTeam.iamCaptainer;

                    if (iamCaptainer)

                    {

                        dungeonModel.RequestChallangeDungeon(GeneralDefine.ruinsTranscriptMapId, main.LayerNumberNow);

                    }

                    
                    //var dungeon = new Dungeon(GeneralDefine.ruinsTranscriptMapId, main.LayerNumberNow);

                    //dungeonModel.GroupChallenge(dungeon);

                }

                else

                {

                    WindowCenter.Instance.Open<FloorChooseWin>();

                    dungeonModel.RequestChallangeDungeon(GeneralDefine.ruinsTranscriptMapId, main.LayerNumberNow);

                }

            }