Merge branch 'master' into 1871天赋功能

client_linchunjie

2018-09-25 78bfe524ea4776c47f6314e56e97f39970b00fce

 System/Dungeon/DungeonModel.cs

@@ -453,7 +453,7 @@
                            }

                            else

                            {

                                CancelGroupEnter(_dungeon.mapId);

                                CancelGroupEnter(_dungeon);

                            }

                        });

                    }

@@ -479,9 +479,9 @@
            }

        }



        private void CancelGroupEnter(int _mapId)

        private void CancelGroupEnter(Dungeon _dungeon)

        {

            switch (_mapId)

            switch (_dungeon.mapId)

            {

                case RealmModel.REALM_DUNGEON_ID:

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

@@ -491,20 +491,19 @@
                        WindowCenter.Instance.Open<TeamFrameWin>(false, teamModel.myTeam.inTeam ? 1 : 0);

                    }

                    break;

                default:

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

                    {

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

                        teamModel.missionBuf = teamModel.currentMission = new TeamMission(_dungeon.mapId, _dungeon.lineId);

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

                    }

                    break;

            }

        }



        private string GroupChallengeOnlyOneTip(int _mapId)

        {

            switch (_mapId)

            {

                case 60010:

                    if (PlayerDatas.Instance.baseData.LV < GeneralConfig.Instance.trialDungeonGroupChallengeTipLv)

                    {

                        return Language.Get("SingleIntoFB");

                    }

                    break;

            }

            return Language.Get("FBEnter_OnlyYou");

        }



@@ -1168,7 +1167,7 @@
                var mapResConfig = DTCA127_tagMCStartChangeMap.GetMapResourcesConfig(_dataMapId, _lineId);

                var assetVersion = AssetVersionUtility.GetAssetVersion(StringUtility.Contact("maps/", mapResConfig.MapResources.ToLower()));



                if (!assetVersion.IsPriorAsset())

                if (assetVersion != null && !assetVersion.IsPriorAsset())

                {

                    InGameDownLoad.Instance.TryDownLoad(InGameDownLoad.Dominant.Whole);

                    return;