From 74101a34120d715295fc4e52835593a200f2da95 Mon Sep 17 00:00:00 2001
From: client_Zxw <826696702@qq.com>
Date: 星期二, 18 九月 2018 17:15:20 +0800
Subject: [PATCH] 3625 【前端】功能预告配置，下下个功能不显示
---
System/MainInterfacePanel/FeatureNoticeWin.cs | 46 ++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 42 insertions(+), 4 deletions(-)
diff --git a/System/MainInterfacePanel/FeatureNoticeWin.cs b/System/MainInterfacePanel/FeatureNoticeWin.cs
index 78f6adb..66debf3 100644
--- a/System/MainInterfacePanel/FeatureNoticeWin.cs
+++ b/System/MainInterfacePanel/FeatureNoticeWin.cs
@@ -41,6 +41,10 @@
[SerializeField] RawImage m_RawImage3;
[SerializeField] RawImage m_RawImage4;
[SerializeField] Text m_keyName;
+ [SerializeField] FeatureNoticeTip m_FeatureNoticeTip;
+ [SerializeField] ScaleTween m_ScaleTween;
+ [SerializeField] PositionTween m_PositionTween;
+ [SerializeField] Transform m_Tran;
public int Offset = 0;//鍋忕Щ
TreasureModel treasureModel { get { return ModelCenter.Instance.GetModel<TreasureModel>(); } }
FeatureNoticeModel featureNoticeModel { get { return ModelCenter.Instance.GetModel<FeatureNoticeModel>(); } }
@@ -52,16 +56,19 @@
protected override void AddListeners()
{
- m_CloseButton.AddListener(() => { Close(); });
+ m_CloseButton.AddListener(OnClickBtn);
+ m_ScrollerController.OnRefreshCell += OnRefreshGridCell;
}
protected override void OnPreOpen()
{
+ m_ScaleTween.SetStartState();
+ m_PositionTween.SetStartState();
if (!WindowJumpMgr.Instance.IsJumpState)//鏄惁缁忓巻璺宠浆鎵撳紑
{
DefaultSelection();//鑾峰彇榛樿閫夋嫨
}
- m_ScrollerController.OnRefreshCell += OnRefreshGridCell;
+ m_FeatureNoticeTip.Init();
OnCreateGridLineCell(m_ScrollerController);
ContentDisplay();
@@ -77,7 +84,17 @@
FuncOpen.Instance.OnFuncStateChangeEvent += OnFuncStateChangeEvent;
PlayerDatas.Instance.PlayerDataRefreshInfoEvent += OnPlayersUpLV;
treasureModel.treasureStateChangeEvent += treasureStateChangeEvent;
- treasureModel.treasureStageUpEvent += treasureStageUpEvent;
+ treasureModel.treasureStageUpEvent += treasureStageUpEvent;
+ if (!WindowJumpMgr.Instance.IsJumpState)//鏄惁缁忓巻璺宠浆鎵撳紑
+ {
+ m_ScaleTween.Play(false, IsOpen);
+ m_PositionTween.Play(false);
+ }
+ else
+ {
+ m_ScaleTween.SetEndState();
+ m_PositionTween.SetEndState();
+ }
}
protected override void OnPreClose()
{
@@ -90,7 +107,6 @@
{
PlayerDatas.Instance.PlayerDataRefreshInfoEvent -= OnPlayersUpLV;
FuncOpen.Instance.OnFuncStateChangeEvent -= OnFuncStateChangeEvent;
- m_ScrollerController.OnRefreshCell -= OnRefreshGridCell;
treasureModel.treasureStateChangeEvent -= treasureStateChangeEvent;
treasureModel.treasureStageUpEvent -= treasureStageUpEvent;
if (featureNoticeModel.redPointStre1.state == RedPointState.Simple)
@@ -433,6 +449,28 @@
m_Textschedule.text = string.Format(Language.Get("YGNoFB"), _treasure.Name);
}
}
+
+ private void OnClickBtn()
+ {
+ if (!WindowJumpMgr.Instance.IsJumpState)//鏄惁缁忓巻璺�
+ {
+ m_FeatureNoticeTip.FeatureNoticeTipObj.SetActive(true);
+ m_ScaleTween.Play(true, IsClose);
+ m_PositionTween.Play(true);
+ }
+ else
+ {
+ Close();
+ }
+ }
+ private void IsOpen()
+ {
+ m_FeatureNoticeTip.FeatureNoticeTipObj.SetActive(false);
+ }
+ private void IsClose()
+ {
+ Close();
+ }
}
}
--
Gitblit v1.8.0