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/HeadPortraitTip.cs | 19 ++++++++++++++-----
1 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/System/MainInterfacePanel/HeadPortraitTip.cs b/System/MainInterfacePanel/HeadPortraitTip.cs
index cfb1a3b..813ea0d 100644
--- a/System/MainInterfacePanel/HeadPortraitTip.cs
+++ b/System/MainInterfacePanel/HeadPortraitTip.cs
@@ -212,14 +212,23 @@
bool IsBossBool = MapArea.IsInMapArea(PlayerDatas.Instance.hero.CurMapArea, MapArea.E_Type.Boss);//鏄惁鍦˙oss鍖哄煙
if (atkInt.Length > 1)
{
- if (PlayerDatas.Instance.baseData.MapID == 10040 && IsBossBool)//寰″墤灞卞簞boss鍖哄煙鐗规畩澶勭悊锛堝彲鍒囨崲鐘舵�侊級
+ if (PlayerDatas.Instance.baseData.MapID == 10040 && IsBossBool)//閫嶉仴鍩巄oss鍖哄煙鐗规畩澶勭悊锛堝彲鍒囨崲鐘舵�侊級
{
- WindowCenter.Instance.Open<CombatModeWin>();
- if (WindowCenter.Instance.IsOpen<FunctionForecastWin>())
+ if (fairyGrabBossModel.grabBossHintOpen)//娲诲姩Boss涓嶈鍒囩姸鎬�
{
- WindowCenter.Instance.Close<FunctionForecastWin>();
+ return;
}
- return;
+ else
+ {
+ WindowCenter.Instance.Open<CombatModeWin>();
+ if (WindowCenter.Instance.IsOpen<FunctionForecastWin>())
+ {
+ WindowCenter.Instance.Close<FunctionForecastWin>();
+ }
+ return;
+ }
+
+
}
var activityline = 0;
fairyGrabBossModel.TryGetFairyGrabBossLine(out activityline);
--
Gitblit v1.8.0