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

client_Wu Xijin

2018-11-22 b8b99e24035d9309e4fd4c5c0e0db52d38e06f61

 System/MainInterfacePanel/TaskBoxBGMWin.cs

@@ -143,7 +143,7 @@
            if (_AllMissionDict.ContainsKey(_TaskId))

            {



                if (_AllMissionDict[_TaskId].Type == 7 || (_AllMissionDict[_TaskId].Type == 12 && vipmodel.GetVipPrivilegeCnt(VipPrivilegeType.AutoFairyMisstion) >= 1))

                if (_AllMissionDict[_TaskId].Type == 7 || _AllMissionDict[_TaskId].Type == 12)

                {

                    if (!ModelCenter.Instance.GetModel<TeamModel>().teamPrepare.isPreparing)

                    {