From fbb6076405ea9b234fdb04a62904158e44e15c9c Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期二, 16 四月 2019 10:02:56 +0800
Subject: [PATCH] Merge branch 'HazyRegion'
---
System/CrossServerOneVsOne/CrossServerWin.cs | 11 +++++++++++
1 files changed, 11 insertions(+), 0 deletions(-)
diff --git a/System/CrossServerOneVsOne/CrossServerWin.cs b/System/CrossServerOneVsOne/CrossServerWin.cs
index 350eb01..b9c8583 100644
--- a/System/CrossServerOneVsOne/CrossServerWin.cs
+++ b/System/CrossServerOneVsOne/CrossServerWin.cs
@@ -13,6 +13,7 @@
[SerializeField] Button closeBtn;
[SerializeField] FunctionButton arenaFunc;
[SerializeField] FunctionButton bossFunc;
+ [SerializeField] FunctionButton m_HazyRegion;
[SerializeField] FunctionButtonGroup funcGroup;
#region Built-in
protected override void BindController()
@@ -26,6 +27,7 @@
rightBtn.AddListener(ClickRight);
arenaFunc.AddListener(ClickArenaFunc);
bossFunc.AddListener(ClickBossFunc);
+ m_HazyRegion.AddListener(OpenHazyRegion);
}
protected override void OnPreOpen()
@@ -61,12 +63,21 @@
{
CloseSubWindows();
WindowCenter.Instance.Open<CrossServerBossWin>();
+ functionOrder = bossFunc.order;
}
private void ClickArenaFunc()
{
CloseSubWindows();
WindowCenter.Instance.Open<CrossServerOneVsOneWin>();
+ functionOrder = arenaFunc.order;
+ }
+
+ private void OpenHazyRegion()
+ {
+ CloseSubWindows();
+ WindowCenter.Instance.Open<HazyRegionWin>();
+ functionOrder = m_HazyRegion.order;
}
private void ClickRight()
--
Gitblit v1.8.0