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

client_linchunjie

2018-09-03 6e6db61a11186d9a616488b761b93fc7f0ccef6c

 System/MainInterfacePanel/HeadPortraitTip.cs

@@ -190,6 +190,7 @@
        private void OnSwitchAttackMode(E_AttackMode obj)//PK状态切换

        {

            TextSwitch((int)obj);

          
        }

        void PatternButton(GameObject obj)

        {

@@ -208,7 +209,9 @@
                    }

                    return;

                }

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

                var activityline = 0;

                fairyGrabBossModel.TryGetFairyGrabBossLine(out activityline);

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

                {

                    SysNotifyMgr.Instance.ShowTip("Map_AtkType");

                    return;

@@ -224,7 +227,6 @@
            {

                SysNotifyMgr.Instance.ShowTip("Map_AtkType");

            }



        }

        void TextSwitch(int _EnumType)

        {

@@ -270,10 +272,7 @@
                    break;

                default:

                    break;





            }



        }



        void BuffButton(GameObject obj)

@@ -394,10 +393,7 @@
                    break;

                default:

                    break;



            }





        }