2158【1.2.0】猫耳聊天屏蔽逻辑优化

client_linchunjie

2018-10-18 f93c57bfd57f97e78c3a00a29f302f5e8c83cdee

 System/MainInterfacePanel/PlayerTaskDatas.cs

@@ -358,7 +358,10 @@
            {

                if (BountyDic.ContainsKey(_TaskNow) || FairyAuDic.ContainsKey(_TaskNow))

                {

                    RequestGetTaskAward("OK");

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

                    {

                        RequestGetTaskAward("OK");

                    }

                }



            }

@@ -375,7 +378,10 @@
            {

                if (BountyDic.ContainsKey(_TaskNow) || FairyAuDic.ContainsKey(_TaskNow))

                {

                    RequestGetTaskAward("OK");

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

                    {

                        RequestGetTaskAward("OK");

                    }               
                }

            }

        }

@@ -1256,7 +1262,7 @@
        var _singleModel = PlayerBackModel.GetSinglePackModel(PackType.rptEquip);

        // 如果有守护, 则不拾取

        var _itemModel = _singleModel.GetItemModelByIndex((int)RoleEquipType.retSpiritAnimal);

        if (_itemModel == null || !GeneralConfig.Instance.GuardianPickUpID.Contains(_itemModel.itemId))

        if (_itemModel == null || !GeneralDefine.GuardianPickUpID.Contains(_itemModel.itemId))

        {

            float _chkDistanceSqrt;

            DropItemManager.DropObject _obj = null;