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 |   40 +++++++++++++++++++++++-----------------
 1 files changed, 23 insertions(+), 17 deletions(-)

diff --git a/System/MainInterfacePanel/PlayerTaskDatas.cs b/System/MainInterfacePanel/PlayerTaskDatas.cs
index 579e58a..ccc3af9 100644
--- a/System/MainInterfacePanel/PlayerTaskDatas.cs
+++ b/System/MainInterfacePanel/PlayerTaskDatas.cs
@@ -312,8 +312,8 @@
         {
             return;
         }
-        bool IsOpenMain = WindowCenter.Instance.CheckOpen<MainInterfaceWin>();
-        if (!WindowCenter.Instance.CheckOpen<DefaultDialogueBoxWin>() && IsOpenMain)
+        bool IsOpenMain = WindowCenter.Instance.IsOpen<MainInterfaceWin>();
+        if (!WindowCenter.Instance.IsOpen<DefaultDialogueBoxWin>() && IsOpenMain)
         {
             WindowCenter.Instance.Open<DefaultDialogueBoxWin>();
             WindowCenter.Instance.Close<MainInterfaceWin>();
@@ -331,7 +331,7 @@
             return;
         }
         var config = Config.Instance.Get<StoryMissionsConfig>(taskID);
-        bool IsOpenMain = WindowCenter.Instance.CheckOpen<MainInterfaceWin>();
+        bool IsOpenMain = WindowCenter.Instance.IsOpen<MainInterfaceWin>();
         var treasureStageUpShow = ModelCenter.Instance.GetModel<TreasureModel>().treasureStageUpShow;
         if (config != null)
         {
@@ -339,7 +339,7 @@
             {
                 if (NPCid == config.NpcID[i])
                 {
-                    if (!WindowCenter.Instance.CheckOpen<DialogueDuidanceWin>() && IsOpenMain
+                    if (!WindowCenter.Instance.IsOpen<DialogueDuidanceWin>() && IsOpenMain
                         && !treasureStageUpShow && !WindowCenter.Instance.ExitAnyFullScreenOrMaskWin())
                     {
                         WindowCenter.Instance.Close<MainInterfaceWin>();
@@ -348,7 +348,7 @@
                     return;
                 }
             }
-            if (!WindowCenter.Instance.CheckOpen<TaskBoxBGMWin>() && IsOpenMain && !treasureStageUpShow)
+            if (!WindowCenter.Instance.IsOpen<TaskBoxBGMWin>() && IsOpenMain && !treasureStageUpShow)
             {
                 WindowCenter.Instance.Close<MainInterfaceWin>();
                 WindowCenter.Instance.Open<TaskBoxBGMWin>();
@@ -358,14 +358,17 @@
             {
                 if (BountyDic.ContainsKey(_TaskNow) || FairyAuDic.ContainsKey(_TaskNow))
                 {
-                    RequestGetTaskAward("OK");
+                    if (!ModelCenter.Instance.GetModel<TeamModel>().teamPrepare.isPreparing)
+                    {
+                        RequestGetTaskAward("OK");
+                    }
                 }
 
             }
         }
         else
         {
-            if (!WindowCenter.Instance.CheckOpen<TaskBoxBGMWin>() && IsOpenMain && !treasureStageUpShow)
+            if (!WindowCenter.Instance.IsOpen<TaskBoxBGMWin>() && IsOpenMain && !treasureStageUpShow)
             {
                 WindowCenter.Instance.Close<MainInterfaceWin>();
                 WindowCenter.Instance.Open<TaskBoxBGMWin>();
@@ -375,7 +378,10 @@
             {
                 if (BountyDic.ContainsKey(_TaskNow) || FairyAuDic.ContainsKey(_TaskNow))
                 {
-                    RequestGetTaskAward("OK");
+                    if (!ModelCenter.Instance.GetModel<TeamModel>().teamPrepare.isPreparing)
+                    {
+                        RequestGetTaskAward("OK");
+                    }               
                 }
             }
         }
@@ -885,7 +891,7 @@
             if (_DicTaskInformation[_MissionId].ContainsKey(_DictKey))
             {
                 _DicTaskInformation[_MissionId][_DictKey] = _DictValue.ToString();
-                if (_DictKey == "kaji" && _DictValue == 0)
+                if (_DictKey == "kaji" && (_DictValue == 0|| _DictValue == 1))//kaji:0涓轰富绾垮崱绾у彉鏇达紝kaji:1涓洪瓟鏃忓崱绾у彉鏇�
                 {
                     if (CardLevelChange != null)
                     {
@@ -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;
@@ -1289,12 +1295,12 @@
             yield break;
         }
 
-        if (WindowCenter.Instance.CheckOpen<TreasureLevelUpWin>())
+        if (WindowCenter.Instance.IsOpen<TreasureLevelUpWin>())
         {
             yield break;
         }
 
-        if (WindowCenter.Instance.CheckOpen<MysteriousMissionWin>())
+        if (WindowCenter.Instance.IsOpen<MysteriousMissionWin>())
         {
             yield break;
         }
@@ -1455,18 +1461,18 @@
 
     public static bool IsOPenAutoResolve()//浠诲姟闈㈡澘涓嶅紑鍚嚜鍔ㄦ寕鏈虹姸鎬�
     {
-        WindowCenter.Instance.CheckOpen<DefaultDialogueBoxWin>();
-        WindowCenter.Instance.CheckOpen<DialogueDuidanceWin>();
+        WindowCenter.Instance.IsOpen<DefaultDialogueBoxWin>();
+        WindowCenter.Instance.IsOpen<DialogueDuidanceWin>();
         bool _bool = true;
-        if (WindowCenter.Instance.CheckOpen<TaskBoxBGMWin>())
+        if (WindowCenter.Instance.IsOpen<TaskBoxBGMWin>())
         {
             _bool = false;
         }
-        else if (WindowCenter.Instance.CheckOpen<DefaultDialogueBoxWin>())
+        else if (WindowCenter.Instance.IsOpen<DefaultDialogueBoxWin>())
         {
             _bool = false;
         }
-        else if (WindowCenter.Instance.CheckOpen<DialogueDuidanceWin>())
+        else if (WindowCenter.Instance.IsOpen<DialogueDuidanceWin>())
         {
             _bool = false;
         }

--
Gitblit v1.8.0