From 4e7dd603c96d5aedc1a0ca4c4c869c0c49b2af4e Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期二, 18 九月 2018 17:57:41 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/MainInterfacePanel/FeatureNoticeWin.cs | 47 +++++++++++++++++++++++++++++++++++++++++------
1 files changed, 41 insertions(+), 6 deletions(-)
diff --git a/System/MainInterfacePanel/FeatureNoticeWin.cs b/System/MainInterfacePanel/FeatureNoticeWin.cs
index 78f6adb..2b338f6 100644
--- a/System/MainInterfacePanel/FeatureNoticeWin.cs
+++ b/System/MainInterfacePanel/FeatureNoticeWin.cs
@@ -41,9 +41,13 @@
[SerializeField] RawImage m_RawImage3;
[SerializeField] RawImage m_RawImage4;
[SerializeField] Text m_keyName;
+ [SerializeField] FeatureNoticeTip m_FeatureNoticeTip;
+ [SerializeField] ScaleTween m_ScaleTween;
+ [SerializeField] Transform m_Tran;
public int Offset = 0;//鍋忕Щ
TreasureModel treasureModel { get { return ModelCenter.Instance.GetModel<TreasureModel>(); } }
- FeatureNoticeModel featureNoticeModel { get { return ModelCenter.Instance.GetModel<FeatureNoticeModel>(); } }
+ FeatureNoticeModel featureNoticeModel { get { return ModelCenter.Instance.GetModel<FeatureNoticeModel>(); } }
+ private bool IsJump = false;
#region Built-in
private int ClickFuncID = 0;
protected override void BindController()
@@ -52,16 +56,19 @@
protected override void AddListeners()
{
- m_CloseButton.AddListener(() => { Close(); });
+ m_CloseButton.AddListener(OnClickBtn);
+ m_ScrollerController.OnRefreshCell += OnRefreshGridCell;
}
protected override void OnPreOpen()
{
- if (!WindowJumpMgr.Instance.IsJumpState)//鏄惁缁忓巻璺宠浆鎵撳紑
+ m_ScaleTween.SetStartState();
+ IsJump = WindowJumpMgr.Instance.IsJumpState;
+ if (!IsJump)//鏄惁缁忓巻璺宠浆鎵撳紑
{
DefaultSelection();//鑾峰彇榛樿閫夋嫨
}
- m_ScrollerController.OnRefreshCell += OnRefreshGridCell;
+ m_FeatureNoticeTip.Init();
OnCreateGridLineCell(m_ScrollerController);
ContentDisplay();
@@ -77,7 +84,15 @@
FuncOpen.Instance.OnFuncStateChangeEvent += OnFuncStateChangeEvent;
PlayerDatas.Instance.PlayerDataRefreshInfoEvent += OnPlayersUpLV;
treasureModel.treasureStateChangeEvent += treasureStateChangeEvent;
- treasureModel.treasureStageUpEvent += treasureStageUpEvent;
+ treasureModel.treasureStageUpEvent += treasureStageUpEvent;
+ if (!IsJump)//鏄惁缁忓巻璺宠浆鎵撳紑
+ {
+ m_ScaleTween.Play(false, IsOpen);
+ }
+ else
+ {
+ m_ScaleTween.SetEndState();
+ }
}
protected override void OnPreClose()
{
@@ -90,7 +105,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 +447,27 @@
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);
+ }
+ else
+ {
+ Close();
+ }
+ }
+ private void IsOpen()
+ {
+ m_FeatureNoticeTip.FeatureNoticeTipObj.SetActive(false);
+ }
+ private void IsClose()
+ {
+ Close();
+ }
}
}
--
Gitblit v1.8.0