From e0872807ff52affb0cf7dec2796481ef3fcffe40 Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期一, 28 一月 2019 21:24:40 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/OpenServerActivity/AchievementActivityWin.cs | 72 ++++++++++++++++++++++++++++++++----
1 files changed, 64 insertions(+), 8 deletions(-)
diff --git a/System/OpenServerActivity/AchievementActivityWin.cs b/System/OpenServerActivity/AchievementActivityWin.cs
index 73f59e2..46ab611 100644
--- a/System/OpenServerActivity/AchievementActivityWin.cs
+++ b/System/OpenServerActivity/AchievementActivityWin.cs
@@ -9,7 +9,8 @@
using UnityEngine;
using UnityEngine.UI;
-namespace Snxxz.UI {
+namespace Snxxz.UI
+{
//鎴愬氨娲诲姩闈㈡澘
public class AchievementActivityWin : Window
{
@@ -20,6 +21,9 @@
[SerializeField] Button _LeftBtn;
[SerializeField] Button _RightBtn;
[SerializeField] FunctionButton m_OpenServiceAchievementBtn;//鍛ㄧ媯娆�
+ [SerializeField] FunctionButton m_SpringFestival;//鏄ヨ妭娲诲姩
+ OpenServiceAchievementModel openServiceAchievementModel { get { return ModelCenter.Instance.GetModel<OpenServiceAchievementModel>(); } }
+ SpringFestivalModel springFestivalModel { get { return ModelCenter.Instance.GetModel<SpringFestivalModel>(); } }
protected override void BindController()
{
}
@@ -30,16 +34,25 @@
_LeftBtn.AddListener(OnClickLeftBtn);
_RightBtn.AddListener(OnClickRight);
m_OpenServiceAchievementBtn.AddListener(OpenServiceAchievementButton);
+ m_SpringFestival.AddListener(SpringFestivalButton);
}
protected override void OnPreOpen()
{
+ OperationTimeHepler.Instance.operationStartEvent += operationStartEvent;
+ IsButtonNumber();
if (WindowCenter.Instance.IsOpen<MainInterfaceWin>())
{
WindowCenter.Instance.Close<MainInterfaceWin>();
}
- functionOrder = 0;
-
+ if (openServiceAchievementModel.IsOpenFeatures())
+ {
+ functionOrder = 0;
+ }
+ else if (springFestivalModel.IsOpenFeatures())
+ {
+ functionOrder = 1;
+ }
}
protected override void OnActived()
@@ -47,10 +60,18 @@
FuncBtnGroup.TriggerByOrder(functionOrder);
}
protected override void OnAfterOpen()
- {
-
- }
-
+ {
+ OperationTimeHepler.Instance.operationStartEvent -= operationStartEvent;
+ }
+
+ private void operationStartEvent(Operation arg1, int arg2)
+ {
+ if (arg1 == Operation.SpringFestival || arg1== Operation.OpenServiceAchievement)
+ {
+ IsButtonNumber();
+ }
+ }
+
protected override void OnPreClose()
{
CloseChild();
@@ -84,6 +105,10 @@
{
WindowCenter.Instance.CloseImmediately<OpenServiceAchievementWin>();
}
+ if (WindowCenter.Instance.IsOpen<SpringFestivalWin>())
+ {
+ WindowCenter.Instance.CloseImmediately<SpringFestivalWin>();
+ }
}
private void OpenServiceAchievementButton()
@@ -99,8 +124,39 @@
}
functionOrder = 0;
}
+ private void SpringFestivalButton()
+ {
+ CloseChild();
+ if (windowState == WindowState.Opened)
+ {
+ WindowCenter.Instance.OpenWithoutAnimation<SpringFestivalWin>();
+ }
+ else
+ {
+ WindowCenter.Instance.Open<SpringFestivalWin>(true);
+ }
+ functionOrder = 1;
+ }
#endregion
-
+ private void IsButtonNumber()
+ {
+ if (openServiceAchievementModel.IsOpenFeatures())
+ {
+ m_OpenServiceAchievementBtn.gameObject.SetActive(true);
+ }
+ else
+ {
+ m_OpenServiceAchievementBtn.gameObject.SetActive(false);
+ }
+ if (springFestivalModel.IsOpenFeatures())
+ {
+ m_SpringFestival.gameObject.SetActive(true);
+ }
+ else
+ {
+ m_SpringFestival.gameObject.SetActive(false);
+ }
+ }
}
}
--
Gitblit v1.8.0