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/MainInterfaceWin.cs | 37 +++++++++++++++++++++++++++++++------
1 files changed, 31 insertions(+), 6 deletions(-)
diff --git a/System/MainInterfacePanel/MainInterfaceWin.cs b/System/MainInterfacePanel/MainInterfaceWin.cs
index 598edef..3a5d454 100644
--- a/System/MainInterfacePanel/MainInterfaceWin.cs
+++ b/System/MainInterfacePanel/MainInterfaceWin.cs
@@ -133,6 +133,7 @@
TreasureModel treasureModel { get { return ModelCenter.Instance.GetModel<TreasureModel>(); } }
DemonJarModel demonJarModel { get { return ModelCenter.Instance.GetModel<DemonJarModel>(); } }
DungeonModel dungeonModel { get { return ModelCenter.Instance.GetModel<DungeonModel>(); } }
+ FairyGrabBossModel fairyGrabBossModel { get { return ModelCenter.Instance.GetModel<FairyGrabBossModel>(); } }
#region Built-in
protected override void BindController()
@@ -217,7 +218,7 @@
PlayerTaskDatas.CompletionOfTaskEvent += CompletionOfTaskEvent;
RedpointCenter.Instance.redpointValueChangeEvent += RedpointValueChangeEvent;
NewBieCenter.Instance.guideBeginEvent += GuideBeginEvent;
-
+ fairyGrabBossModel.bossGrabHintEvent += bossGrabHintEvent;
}
private void CompletionOfTaskEvent(int obj)
@@ -229,6 +230,7 @@
protected override void OnActived()
{
m_HighSettingTip.OnActived();
+ IsShowTaskPanel();//鏄惁鏄剧ず浠诲姟闈㈡澘
}
IEnumerator Co_Load()
@@ -257,13 +259,11 @@
var inDungeon = IsDungeon();
if (inDungeon)
{
- m_TaskAndTeamTip.SetActive(!inDungeon);
m_FunctionForecastTip.gameObject.SetActive(false);
if (WindowCenter.Instance.CheckOpen<FunctionForecastWin>())
{
WindowCenter.Instance.Close<FunctionForecastWin>();
}
- m_TaskSwithButton.gameObject.SetActive(false);
if (mapId != PlayerDatas.Instance.baseData.MapID)
{
CopyOfThePanel.localPosition = CopyOfThePosition2.localPosition;
@@ -324,15 +324,13 @@
{
Event_Duplicates(true, CopyOfThePanelSpeed);
}
-
- m_TaskAndTeamTip.SetActive(true);
m_FunctionForecastTip.gameObject.SetActive(true);
- m_TaskSwithButton.gameObject.SetActive(true);
}
mapId = PlayerDatas.Instance.baseData.MapID;
m_HighSettingTip.AfterOpen();
m_ChatTip.OnAfterOpen();
HandleAchievement();
+
}
protected override void OnPreClose()
@@ -372,6 +370,7 @@
m_CollectBtn.RemoveAllListeners();
GA_NpcCollect.OnArrive -= OnArriveCollectNPC;
GA_NpcCollect.OnLeave -= OnLeaveCollectNpc;
+ fairyGrabBossModel.bossGrabHintEvent -= bossGrabHintEvent;
m_CollectBtn.gameObject.SetActive(false);
}
@@ -463,6 +462,10 @@
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) || fairyGrabBossModel.grabBossHintOpen)
+ {
+ return;
+ }
if (atkInt.Length > 1 && Buffmodel.PkType != 5)
{
onMainModel.AreaState = Buffmodel.PkType;
@@ -1032,6 +1035,28 @@
_MarkRay.gameObject.SetActive(false);
}
+ private void IsShowTaskPanel()//鏄惁鏄剧ず浠诲姟闈㈡澘
+ {
+ var inDungeon = IsDungeon();
+ if (inDungeon || fairyGrabBossModel.grabBossHintOpen)
+ {
+ m_TaskAndTeamTip.SetActive(false);
+ m_TaskSwithButton.gameObject.SetActive(false);
+ }
+ else
+ {
+ m_TaskAndTeamTip.SetActive(true);
+ m_TaskSwithButton.gameObject.SetActive(true);
+ }
+ }
+ private void bossGrabHintEvent()
+ {
+ IsShowTaskPanel();
+ if (!fairyGrabBossModel.grabBossHintOpen && Buffmodel.PkType != 0)
+ {
+ DTCA202_tagMCAttackMode.Send_SwitchAttackMode((E_AttackMode)0);
+ }
+ }
}
}
--
Gitblit v1.8.0