From e03cc0580dba766fd4b1f64e81faa60a6b5a631a Mon Sep 17 00:00:00 2001
From: client_Hale <339726288@qq.com>
Date: 星期六, 05 一月 2019 14:07:27 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/MainInterfacePanel/HeadPortraitTip.cs | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/System/MainInterfacePanel/HeadPortraitTip.cs b/System/MainInterfacePanel/HeadPortraitTip.cs
index a55e864..9b8f07c 100644
--- a/System/MainInterfacePanel/HeadPortraitTip.cs
+++ b/System/MainInterfacePanel/HeadPortraitTip.cs
@@ -212,6 +212,13 @@
bool IsBossBool = MapArea.IsInMapArea(PlayerDatas.Instance.hero.CurMapArea, MapArea.E_Type.Boss);//鏄惁鍦˙oss鍖哄煙
if (atkInt.Length > 1)
{
+ var activityline = 0;
+ fairyGrabBossModel.TryGetFairyGrabBossLine(out activityline);
+ if (PlayerDatas.Instance.baseData.MapID == 10040 && activityline == PlayerDatas.Instance.baseData.FBID)//閫嶉仴鍩庢椿鍔ㄧ嚎涓嶅厑璁稿垏鎹㈡ā寮�
+ {
+ SysNotifyMgr.Instance.ShowTip("Map_AtkType");
+ return;
+ }
if (PlayerDatas.Instance.baseData.MapID == 10040 && IsBossBool && !fairyGrabBossModel.grabBossHintOpen)//閫嶉仴鍩巄oss鍖哄煙鐗规畩澶勭悊锛堝彲鍒囨崲鐘舵�侊級
{
WindowCenter.Instance.Open<CombatModeWin>();
@@ -221,8 +228,7 @@
}
return;
}
- var activityline = 0;
- fairyGrabBossModel.TryGetFairyGrabBossLine(out activityline);
+
if (onMainModel.ShieldedArea.Contains(mapID))//Boss浜夊ず鎴樺墠涓夊彧淇濆簳鍙兘鏄拰骞虫ā寮�
{
--
Gitblit v1.8.0