From 2f7aca7e821a7285c676e9706e09014e4e63042b Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期五, 04 一月 2019 13:54:14 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

---
 System/MainInterfacePanel/MainInterfaceWin.cs |   27 +++++++++++++++++++++++----
 1 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/System/MainInterfacePanel/MainInterfaceWin.cs b/System/MainInterfacePanel/MainInterfaceWin.cs
index 959cfe0..82c5b2f 100644
--- a/System/MainInterfacePanel/MainInterfaceWin.cs
+++ b/System/MainInterfacePanel/MainInterfaceWin.cs
@@ -574,17 +574,36 @@
             int mapID = PlayerDatas.Instance.baseData.MapID;
             var config = Config.Instance.Get<MapConfig>(mapID);
             int[] atkInt = pKModel.GetArea(config.AtkType).ToArray();
-            if (onMainModel.ShieldedArea.Contains(PlayerDatas.Instance.baseData.MapID))
+            bool IsBossBool = MapArea.IsInMapArea(PlayerDatas.Instance.hero.CurMapArea, MapArea.E_Type.Boss);//鏄惁鍦˙oss鍖哄煙
+            if (onMainModel.ShieldedArea.Contains(PlayerDatas.Instance.baseData.MapID))//鍓嶄笁鍙狟oss鍜屾椿鍔˙oss鐗规畩澶勭悊
             {
 
             }
             else
             {
-                if (fairyGrabBossModel.grabBossHintOpen && atkInt.Length > 1 && Buffmodel.PkType != 5)
+                if (mapID == 10040)
                 {
-                    onMainModel.AreaState = Buffmodel.PkType;
-                    DTCA202_tagMCAttackMode.Send_SwitchAttackMode((E_AttackMode)5);
+                  
+                    if (!fairyGrabBossModel.grabBossHintOpen && IsBossBool)//boss鍖哄煙鍙互鍒囨崲鐘舵��
+                    {
+                        onMainModel.AreaState = Buffmodel.PkType;
+                        DTCA202_tagMCAttackMode.Send_SwitchAttackMode((E_AttackMode)5);
+                    }
+                    else if (fairyGrabBossModel.grabBossHintOpen && IsBossBool)//娲诲姩boss涓嶈鍒�
+                    {
+                        DTCA202_tagMCAttackMode.Send_SwitchAttackMode((E_AttackMode)onMainModel.AreaState);
+                    }
                 }
+                else
+                {
+                    if (IsBossBool && atkInt.Length > 1 && Buffmodel.PkType != 5)
+                    {
+                        onMainModel.AreaState = Buffmodel.PkType;
+                        DTCA202_tagMCAttackMode.Send_SwitchAttackMode((E_AttackMode)5);
+                    }
+                }
+
+               
             }
 
         }

--
Gitblit v1.8.0