Merge branch 'master' into 1871天赋功能

client_linchunjie

2018-09-26 703337574c8d4d4e852ea90c778e3aff3523ce12

 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 /*&& vipmodel.GetVipPrivilegeCnt(VipPrivilegeType.AutoFairyMisstion) >= 1*/))

                {

                    taskmodel.RequestGetTaskAward("OK");

                    WindowCenter.Instance.CloseImmediately<TaskBoxBGMWin>();