From aae092fccd5bb4468a43804264956d74b05b5d93 Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期四, 30 八月 2018 20:38:25 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/MainInterfacePanel/HeadPortraitTip.cs | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 deletions(-)
diff --git a/System/MainInterfacePanel/HeadPortraitTip.cs b/System/MainInterfacePanel/HeadPortraitTip.cs
index bf75628..216ff65 100644
--- a/System/MainInterfacePanel/HeadPortraitTip.cs
+++ b/System/MainInterfacePanel/HeadPortraitTip.cs
@@ -61,6 +61,7 @@
RolePromoteModel promoteModel { get { return m_PromoteModel ?? (m_PromoteModel = ModelCenter.Instance.GetModel<RolePromoteModel>()); } }
CapacityDelayModel m_CapacityDelayModel;
CapacityDelayModel capacityDelayModel { get { return m_CapacityDelayModel ?? (m_CapacityDelayModel = ModelCenter.Instance.GetModel<CapacityDelayModel>()); } }
+ FairyGrabBossModel fairyGrabBossModel { get { return ModelCenter.Instance.GetModel<FairyGrabBossModel>(); } }
private int vipExperienceSurplusTime = 0;
public void Init()
{
@@ -198,7 +199,16 @@
bool IsBossBool = MapArea.IsInMapArea(PlayerDatas.Instance.hero.CurMapArea, MapArea.E_Type.Boss);//鏄惁鍦˙oss鍖哄煙
if (atkInt.Length > 1)
{
- if (PlayerDatas.Instance.baseData.MapID == 10040 && !IsBossBool)
+ if (PlayerDatas.Instance.baseData.MapID == 10040 && IsBossBool)//寰″墤灞卞簞boss鍖哄煙鐗规畩澶勭悊锛堝彲鍒囨崲鐘舵�侊級
+ {
+ WindowCenter.Instance.Open<CombatModeWin>();
+ if (WindowCenter.Instance.CheckOpen<FunctionForecastWin>())
+ {
+ WindowCenter.Instance.Close<FunctionForecastWin>();
+ }
+ return;
+ }
+ if (onMainModel.ActivityList.Contains(PlayerDatas.Instance.baseData.MapID) && !fairyGrabBossModel.grabBossHintOpen)//鍐嶅墠鍥涚珷鏂版墜鍦板浘涓斾笉鍦ㄦ椿鍔ㄥ尯鍩�
{
SysNotifyMgr.Instance.ShowTip("Map_AtkType");
return;
--
Gitblit v1.8.0