From f93c57bfd57f97e78c3a00a29f302f5e8c83cdee Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期四, 18 十月 2018 21:43:03 +0800
Subject: [PATCH] 2158【1.2.0】猫耳聊天屏蔽逻辑优化
---
System/MainInterfacePanel/PlayerTaskDatas.cs | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/System/MainInterfacePanel/PlayerTaskDatas.cs b/System/MainInterfacePanel/PlayerTaskDatas.cs
index 26d2e47..ccc3af9 100644
--- a/System/MainInterfacePanel/PlayerTaskDatas.cs
+++ b/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;
--
Gitblit v1.8.0