From 038066e91398f2ae615cb731a5a24b141a6e18ce Mon Sep 17 00:00:00 2001
From: client_Hale <339726288@qq.com>
Date: 星期三, 10 四月 2019 15:53:15 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/FindPrecious/LootPreciousFrameWin.cs | 21 ++++++++++++++++++++-
1 files changed, 20 insertions(+), 1 deletions(-)
diff --git a/System/FindPrecious/LootPreciousFrameWin.cs b/System/FindPrecious/LootPreciousFrameWin.cs
index 43aaf2f..b8d0557 100644
--- a/System/FindPrecious/LootPreciousFrameWin.cs
+++ b/System/FindPrecious/LootPreciousFrameWin.cs
@@ -18,7 +18,10 @@
[SerializeField] FunctionButton m_FairyGrabBoss;
[SerializeField] FunctionButton m_DogzDungeon;
[SerializeField] FunctionButton m_JadeDynastyBoss;
+ [SerializeField] FunctionButton m_AllianceBoss;
[SerializeField] FunctionButton m_RidingPetContention;
+
+ [SerializeField] Transform m_NormalBottom;
[SerializeField] Button m_Left;
[SerializeField] Button m_Right;
@@ -36,6 +39,7 @@
m_RidingPetContention.AddListener(ShowRidingPetContention);
m_FairyGrabBoss.AddListener(FairyGrabBoss);
m_JadeDynastyBoss.AddListener(JadeDynastyBoss);
+ m_AllianceBoss.AddListener(AllianceBoss);
m_Left.AddListener(ShowLastFunction);
m_Right.AddListener(ShowNextFunction);
m_Close.AddListener(CloseClick);
@@ -76,7 +80,10 @@
private void ShowDemonJar()
{
- CloseSubWindows();
+ CloseSubWindows();
+
+ m_NormalBottom.gameObject.SetActive(true);
+
WindowCenter.Instance.Open<DemonJarWin>();
functionOrder = m_DemonJar.order;
}
@@ -91,6 +98,9 @@
private void ShowDogzDungeon()
{
CloseSubWindows();
+
+ m_NormalBottom.gameObject.SetActive(true);
+
WindowCenter.Instance.Open<DogzDungeonWin>();
functionOrder = m_DogzDungeon.order;
}
@@ -109,8 +119,17 @@
functionOrder = m_JadeDynastyBoss.order;
}
+ private void AllianceBoss()
+ {
+ CloseSubWindows();
+ WindowCenter.Instance.Open<AllianceBossEntranceWin>();
+ functionOrder = m_AllianceBoss.order;
+ }
+
private void CloseSubWindows()
{
+ m_NormalBottom.gameObject.SetActive(false);
+
var children = WindowConfig.Get().FindChildWindows("LootPreciousFrameWin");
foreach (var window in children)
{
--
Gitblit v1.8.0