From eed44c4e855611e2ca9bcb94c040b4eaa6266939 Mon Sep 17 00:00:00 2001
From: client_Zxw <826696702@qq.com>
Date: 星期二, 04 九月 2018 17:32:46 +0800
Subject: [PATCH] 3240 前端 主界面任务显示和自动选中逻辑修改
---
System/MainInterfacePanel/MainInterfaceWin.cs | 19 ++++++++++++++-----
1 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/System/MainInterfacePanel/MainInterfaceWin.cs b/System/MainInterfacePanel/MainInterfaceWin.cs
index 3a5d454..58a0678 100644
--- a/System/MainInterfacePanel/MainInterfaceWin.cs
+++ b/System/MainInterfacePanel/MainInterfaceWin.cs
@@ -97,6 +97,8 @@
[SerializeField] ClickScreenOtherSpace _MarkRay;//渚挎嵎鍒囨崲鎸夐挳
[SerializeField] TeamInvitationEntrance m_TeamInvitationEntrance;
+
+ [SerializeField] FairyCallMemberBehaviour m_FairyCallBehaviour;
#region
private int mapId = 0;
public delegate void OnChatCallback();//鑱婂ぉ鍥炶皟
@@ -193,6 +195,7 @@
m_SkillButtonEffects.Init();
m_AnimationFadeOut.Init();
m_TeamInvitationEntrance.Init();
+ m_FairyCallBehaviour.Init();
m_BossBriefInfos.gameObject.SetActive(false);
ArticleExperience();//鍏充簬缁忛獙鏉�
@@ -292,7 +295,16 @@
if (isNeutralMap)
{
m_BossBriefInfos.gameObject.SetActive(true);
- m_BossBriefInfos.Display(ModelCenter.Instance.GetModel<WorldBossModel>().GetWorldBosses(PlayerDatas.Instance.baseData.MapID));
+ if (PlayerDatas.Instance.baseData.MapID==DogzDungeonModel.DATA_MAPID)
+ {
+ var bosses = ModelCenter.Instance.GetModel<DogzDungeonModel>().GetBosses();
+ m_BossBriefInfos.Display(bosses);
+ }
+ else
+ {
+ var bosses = ModelCenter.Instance.GetModel<WorldBossModel>().GetWorldBosses(PlayerDatas.Instance.baseData.MapID);
+ m_BossBriefInfos.Display(bosses);
+ }
}
else
{
@@ -348,6 +360,7 @@
m_FunctionForecastTip.Unit();
m_AnimationFadeOut.Unit();
m_TeamInvitationEntrance.UnInit();
+ m_FairyCallBehaviour.UnInit();
horseRidBool = false;
PlayerDatas.Instance.PlayerDataRefreshInfoEvent -= Updatefighting;
FunctionUnlockFlyObject.functionUnLockShowBeginEvent -= UnFlodFunctionArea;
@@ -1052,10 +1065,6 @@
private void bossGrabHintEvent()
{
IsShowTaskPanel();
- if (!fairyGrabBossModel.grabBossHintOpen && Buffmodel.PkType != 0)
- {
- DTCA202_tagMCAttackMode.Send_SwitchAttackMode((E_AttackMode)0);
- }
}
}
--
Gitblit v1.8.0