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

client_Zxw

2019-01-16 b73ea3db37f14ffb23392cd7a7adbbab9ae69641

 System/MainInterfacePanel/MainInterfaceWin.cs

@@ -604,6 +604,8 @@


        private void SetAtkType()//逍遥城非boss区域特殊处理

        {

            if (PlayerDatas.Instance.hero != null)

            {

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

            if (PlayerDatas.Instance.baseData.MapID == 10040 && !IsBossBool && Buffmodel.PkType!=0)

            {

@@ -611,6 +613,7 @@
                Buffmodel.PkType = 0;

            }

        }

        }

        private void OnMaininterCDTime()

        {

            MarkRayButton();