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

client_Wu Xijin

2018-08-31 7813b760419c2d5de3ee8a3b9fb9ff2c170c12e7

 System/MainInterfacePanel/CombatModeWin.cs

@@ -50,7 +50,15 @@
        {
            int MapID = PlayerDatas.Instance.baseData.MapID;
            var config = Config.Instance.Get<MapConfig>(MapID);

            AtkTypeList = pKModel.GetArea(config.AtkType).ToArray();

            if (fairyGrabBossModel.grabBossHintOpen)//再前四章新手地图且在活动区域

            {

                AtkTypeList = new int[] { 0, 5 };

            }

            else

            {

                AtkTypeList = pKModel.GetArea(config.AtkType).ToArray();

            }



            _PkType = Buffmodel.PkType;//获取当前PK状态
            if (_PkType != 2)
            {