From 6e6db61a11186d9a616488b761b93fc7f0ccef6c Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期一, 03 九月 2018 16:54:43 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/MainInterfacePanel/HeadPortraitTip.cs | 12 ++++--------
1 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/System/MainInterfacePanel/HeadPortraitTip.cs b/System/MainInterfacePanel/HeadPortraitTip.cs
index 216ff65..79b1b35 100644
--- a/System/MainInterfacePanel/HeadPortraitTip.cs
+++ b/System/MainInterfacePanel/HeadPortraitTip.cs
@@ -190,6 +190,7 @@
private void OnSwitchAttackMode(E_AttackMode obj)//PK鐘舵�佸垏鎹�
{
TextSwitch((int)obj);
+
}
void PatternButton(GameObject obj)
{
@@ -208,7 +209,9 @@
}
return;
}
- if (onMainModel.ActivityList.Contains(PlayerDatas.Instance.baseData.MapID) && !fairyGrabBossModel.grabBossHintOpen)//鍐嶅墠鍥涚珷鏂版墜鍦板浘涓斾笉鍦ㄦ椿鍔ㄥ尯鍩�
+ var activityline = 0;
+ fairyGrabBossModel.TryGetFairyGrabBossLine(out activityline);
+ if (onMainModel.ActivityList.Contains(PlayerDatas.Instance.baseData.MapID) && activityline!=PlayerDatas.Instance.baseData.FBID)//鍐嶅墠鍥涚珷鏂版墜鍦板浘涓斾笉鍦ㄦ椿鍔ㄥ尯鍩�
{
SysNotifyMgr.Instance.ShowTip("Map_AtkType");
return;
@@ -224,7 +227,6 @@
{
SysNotifyMgr.Instance.ShowTip("Map_AtkType");
}
-
}
void TextSwitch(int _EnumType)
{
@@ -270,10 +272,7 @@
break;
default:
break;
-
-
}
-
}
void BuffButton(GameObject obj)
@@ -394,10 +393,7 @@
break;
default:
break;
-
}
-
-
}
--
Gitblit v1.8.0