From 4b04baff631dfd22bda1898abbd02408049ece62 Mon Sep 17 00:00:00 2001
From: client_Zxw <826696702@qq.com>
Date: 星期五, 04 一月 2019 17:44:01 +0800
Subject: [PATCH] 5542 【1.4.100】骑宠争夺boss第四只(逍遥城)的boss修改为和平区域

---
 System/MainInterfacePanel/HeadPortraitTip.cs |   22 +++++++---------------
 1 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/System/MainInterfacePanel/HeadPortraitTip.cs b/System/MainInterfacePanel/HeadPortraitTip.cs
index 813ea0d..a55e864 100644
--- a/System/MainInterfacePanel/HeadPortraitTip.cs
+++ b/System/MainInterfacePanel/HeadPortraitTip.cs
@@ -212,27 +212,19 @@
             bool IsBossBool = MapArea.IsInMapArea(PlayerDatas.Instance.hero.CurMapArea, MapArea.E_Type.Boss);//鏄惁鍦˙oss鍖哄煙
             if (atkInt.Length > 1)
             {
-                if (PlayerDatas.Instance.baseData.MapID == 10040 && IsBossBool)//閫嶉仴鍩巄oss鍖哄煙鐗规畩澶勭悊锛堝彲鍒囨崲鐘舵�侊級
+                if (PlayerDatas.Instance.baseData.MapID == 10040 && IsBossBool && !fairyGrabBossModel.grabBossHintOpen)//閫嶉仴鍩巄oss鍖哄煙鐗规畩澶勭悊锛堝彲鍒囨崲鐘舵�侊級
                 {
-                    if (fairyGrabBossModel.grabBossHintOpen)//娲诲姩Boss涓嶈鍒囩姸鎬�
+                    WindowCenter.Instance.Open<CombatModeWin>();
+                    if (WindowCenter.Instance.IsOpen<FunctionForecastWin>())
                     {
-                        return;
+                        WindowCenter.Instance.Close<FunctionForecastWin>();
                     }
-                    else
-                    {
-                        WindowCenter.Instance.Open<CombatModeWin>();
-                        if (WindowCenter.Instance.IsOpen<FunctionForecastWin>())
-                        {
-                            WindowCenter.Instance.Close<FunctionForecastWin>();
-                        }
-                        return;
-                    }
-                 
-                  
+                    return;
                 }
                 var activityline = 0;
                 fairyGrabBossModel.TryGetFairyGrabBossLine(out activityline);
-                if (mapID == 10010 || mapID == 10020 || mapID == 10030)//Boss浜夊ず鎴樺墠涓夊彧淇濆簳鍙兘鏄拰骞虫ā寮�
+
+                if (onMainModel.ShieldedArea.Contains(mapID))//Boss浜夊ず鎴樺墠涓夊彧淇濆簳鍙兘鏄拰骞虫ā寮�
                 {
                     SysNotifyMgr.Instance.ShowTip("Map_AtkType");
                     return;

--
Gitblit v1.8.0