From 78bfe524ea4776c47f6314e56e97f39970b00fce Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期二, 25 九月 2018 15:07:07 +0800
Subject: [PATCH] Merge branch 'master' into 1871天赋功能
---
System/Dungeon/TrialDungeonEntranceWin.cs | 21 +++++++++++++++++++--
1 files changed, 19 insertions(+), 2 deletions(-)
diff --git a/System/Dungeon/TrialDungeonEntranceWin.cs b/System/Dungeon/TrialDungeonEntranceWin.cs
index 2214828..7b5370f 100644
--- a/System/Dungeon/TrialDungeonEntranceWin.cs
+++ b/System/Dungeon/TrialDungeonEntranceWin.cs
@@ -40,6 +40,9 @@
[SerializeField] Image m_BossRealm;
[SerializeField] Text m_BossName;
+ [SerializeField] RectTransform m_ContainerGroup;
+ [SerializeField] Button m_Group;
+
[SerializeField] TrialRewardsBehaviour[] m_RewardBehaviours;
[SerializeField] ScrollRect m_RewardScroller;
@@ -72,6 +75,7 @@
m_SingleStart.AddListener(ChallengeDungeon);
m_AutoGroupStart.AddListener(AutoGroupChallenge);
m_CloseWin.AddListener(CloseClick);
+ m_Group.AddListener(OpenGroup);
}
protected override void OnPreOpen()
@@ -81,6 +85,9 @@
m_GroupStart.image.material = CheckChallenge() ? MaterialUtility.GetUIDefaultGraphicMaterial() : MaterialUtility.GetDefaultSpriteGrayMaterial();
m_SingleStart.image.material = CheckChallenge() ? MaterialUtility.GetUIDefaultGraphicMaterial() : MaterialUtility.GetDefaultSpriteGrayMaterial();
m_AutoGroupStart.image.material = CheckChallenge() ? MaterialUtility.GetUIDefaultGraphicMaterial() : MaterialUtility.GetDefaultSpriteGrayMaterial();
+ m_Group.image.material = CheckChallenge() ? MaterialUtility.GetUIDefaultGraphicMaterial() : MaterialUtility.GetDefaultSpriteGrayMaterial();
+ m_ContainerGroup.gameObject.SetActive(false);
+
DrawDungeonBaseInfo();
DrawRewards();
}
@@ -92,7 +99,7 @@
protected override void OnPreClose()
{
model.dungeonRecordChangeEvent -= UpdateDungeonTimes;
- UI3DModelExhibition.Instance.StopShowNPC();
+ UI3DModelExhibition.Instance.StopShow();
}
protected override void OnAfterClose()
@@ -100,6 +107,15 @@
}
#endregion
+ private void OpenGroup()
+ {
+ if (!CheckChallenge())
+ {
+ return;
+ }
+ var openGroup = m_ContainerGroup.gameObject.activeSelf;
+ m_ContainerGroup.gameObject.SetActive(!openGroup);
+ }
private void DrawDungeonBaseInfo()
{
@@ -113,6 +129,7 @@
m_GroupStart.gameObject.SetActive(fbType == 2 || fbType == 3);
m_SingleStart.gameObject.SetActive(fbType == 1 || fbType == 2);
m_AutoGroupStart.gameObject.SetActive(fbType == 2 || fbType == 3);
+ m_Group.gameObject.SetActive(fbType == 2 || fbType == 3);
var playerLevel = PlayerDatas.Instance.baseData.LV;
m_LevelLimit.gameObject.SetActive(playerLevel < dungeonConfig.LVLimitMin);
@@ -151,7 +168,7 @@
void DisplayBossInfo(int _npcId)
{
m_BossName.gameObject.SetActive(true);
- UI3DModelExhibition.Instance.BeginShowNPC(_npcId, Vector3.zero, m_BossPortrayal);
+ UI3DModelExhibition.Instance.ShowNPC(_npcId, Vector3.zero, m_BossPortrayal);
var npcConfig = Config.Instance.Get<NPCConfig>(_npcId);
if (npcConfig != null)
{
--
Gitblit v1.8.0