3335 切换模式修改

client_linchunjie

2019-04-22 f0c12c67497f7d949182f3e54b8b17aa3578b957

3335 切换模式修改

 System/MainInterfacePanel/HeadPortraitTip.cs

@@ -189,22 +189,22 @@
            bool IsBossBool = MapArea.IsInMapArea(PlayerDatas.Instance.hero.CurMapArea, MapArea.E_Type.Boss);//是否在Boss区域

            if (atkInt.Length > 1)

            {

                var activityline = 0;

                fairyGrabBossModel.TryGetFairyGrabBossLine(out activityline);

                if (PlayerDatas.Instance.baseData.MapID == 10040 && activityline == PlayerDatas.Instance.baseData.FBID)//逍遥城活动线不允许切换模式

                {

                    SysNotifyMgr.Instance.ShowTip("Map_AtkType");

                    return;

                }

                if (PlayerDatas.Instance.baseData.MapID == 10040 && IsBossBool && !fairyGrabBossModel.grabBossHintOpen)//逍遥城boss区域特殊处理（可切换状态）

                {

                    WindowCenter.Instance.Open<CombatModeWin>();

                    if (WindowCenter.Instance.IsOpen<FunctionForecastWin>())

                    {

                        WindowCenter.Instance.Close<FunctionForecastWin>();

                    }

                    return;

                }

                //var activityline = 0;

                //fairyGrabBossModel.TryGetFairyGrabBossLine(out activityline);

                //if (PlayerDatas.Instance.baseData.MapID == 10040 && activityline == PlayerDatas.Instance.baseData.FBID)//逍遥城活动线不允许切换模式

                //{

                //    SysNotifyMgr.Instance.ShowTip("Map_AtkType");

                //    return;

                //}

                //if (PlayerDatas.Instance.baseData.MapID == 10040 && IsBossBool && !fairyGrabBossModel.grabBossHintOpen)//逍遥城boss区域特殊处理（可切换状态）

                //{

                //    WindowCenter.Instance.Open<CombatModeWin>();

                //    if (WindowCenter.Instance.IsOpen<FunctionForecastWin>())

                //    {

                //        WindowCenter.Instance.Close<FunctionForecastWin>();

                //    }

                //    return;

                //}



                if (onMainModel.ShieldedArea.Contains(mapID))//Boss争夺战前三只保底只能是和平模式

                {

@@ -212,11 +212,11 @@
                    return;

                }



                if (onMainModel.ActivityList.Contains(PlayerDatas.Instance.baseData.MapID) && activityline != PlayerDatas.Instance.baseData.FBID)//再前四章新手地图且不在活动区域

                {

                    SysNotifyMgr.Instance.ShowTip("Map_AtkType");

                    return;

                }

                //if (onMainModel.ActivityList.Contains(PlayerDatas.Instance.baseData.MapID) && activityline != PlayerDatas.Instance.baseData.FBID)//再前四章新手地图且不在活动区域

                //{

                //    SysNotifyMgr.Instance.ShowTip("Map_AtkType");

                //    return;

                //}



                WindowCenter.Instance.Open<CombatModeWin>();

                if (WindowCenter.Instance.IsOpen<FunctionForecastWin>())