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

client_Wu Xijin

2018-11-07 3166ea1ee7ee919843481cda04dc3dd54d0aeca2

 System/MainInterfacePanel/HeadPortraitTip.cs

@@ -212,7 +212,7 @@
                }

                var activityline = 0;

                fairyGrabBossModel.TryGetFairyGrabBossLine(out activityline);

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

                if (mapID == 10010 || mapID == 10020 || mapID == 10030)//Boss争夺战前三只保底只能是和平模式

                {

                    SysNotifyMgr.Instance.ShowTip("Map_AtkType");

                    return;