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

client_linchunjie

2018-11-01 d77152c84fec0a366d9b817a91139792e9d2a788

 System/MainInterfacePanel/HeadPortraitTip.cs

@@ -212,6 +212,11 @@
                }

                var activityline = 0;

                fairyGrabBossModel.TryGetFairyGrabBossLine(out activityline);

                if (mapID == 10010)//Boss争夺战第一只boss道士鼠修改为只能是和平模式

                {

                    SysNotifyMgr.Instance.ShowTip("Map_AtkType");

                    return;

                }

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

                {

                    SysNotifyMgr.Instance.ShowTip("Map_AtkType");