From b24abe465bdc9725f7225aea36b049c9f99a94a5 Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期五, 21 九月 2018 16:55:46 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/Dungeon/NormalDungeonEntranceWin.cs | 13 +++++++++++++
1 files changed, 13 insertions(+), 0 deletions(-)
diff --git a/System/Dungeon/NormalDungeonEntranceWin.cs b/System/Dungeon/NormalDungeonEntranceWin.cs
index d57cc64..c0a495f 100644
--- a/System/Dungeon/NormalDungeonEntranceWin.cs
+++ b/System/Dungeon/NormalDungeonEntranceWin.cs
@@ -46,7 +46,10 @@
[SerializeField] ButtonEx m_GroupStart;
[SerializeField] ButtonEx m_SingleStart;
[SerializeField] ButtonEx m_AutoGroupStart;
+ [SerializeField] ButtonEx m_Group;
[SerializeField] Button m_CloseWin;
+
+ [SerializeField] RectTransform m_ContainerGroup;
DungeonModel model { get { return ModelCenter.Instance.GetModel<DungeonModel>(); } }
TeamModel teamModel { get { return ModelCenter.Instance.GetModel<TeamModel>(); } }
@@ -63,6 +66,7 @@
m_SingleStart.AddListener(ChallengeDungeon);
m_AutoGroupStart.AddListener(AutoGroupChallenge);
m_Sweep.AddListener(SweepDungeon);
+ m_Group.AddListener(OpenGroup);
m_CloseWin.AddListener(CloseClick);
}
@@ -99,6 +103,12 @@
}
#endregion
+ private void OpenGroup()
+ {
+ var openGroup = m_ContainerGroup.gameObject.activeSelf;
+ m_ContainerGroup.gameObject.SetActive(!openGroup);
+ }
+
private void UpdateDungeonEnterCD()
{
var dungeonId = model.GetDungeonId(model.currentDungeon);
@@ -118,6 +128,9 @@
m_SingleStart.gameObject.SetActive(fbType == 1 || fbType == 2);
m_AutoGroupStart.gameObject.SetActive(fbType == 2 || fbType == 3);
+ m_ContainerGroup.gameObject.SetActive(false);
+ m_Group.gameObject.SetActive(fbType == 2 || fbType == 3);
+
m_EntranceBG.SetSprite(dungeonOpenTimeConfig.PanelImg);
m_DungeonTitle.text = dungeonConfig.FBName;
--
Gitblit v1.8.0