From 13cc3cead6484a2b227c227b84bddf1e42ed8d2e Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期五, 29 三月 2019 16:43:05 +0800
Subject: [PATCH] 3335 主界面修改.
---
System/MainInterfacePanel/HighSettingTip.cs | 164 ++----------------------------------------------------
1 files changed, 7 insertions(+), 157 deletions(-)
diff --git a/System/MainInterfacePanel/HighSettingTip.cs b/System/MainInterfacePanel/HighSettingTip.cs
index d8d24a1..2b885a9 100644
--- a/System/MainInterfacePanel/HighSettingTip.cs
+++ b/System/MainInterfacePanel/HighSettingTip.cs
@@ -14,6 +14,7 @@
public class HighSettingTip : MonoBehaviour
{
+
[SerializeField] Button _DaTreasureBtn;//鎵撳疂鎸夐挳
[SerializeField] Button m_LootPrecious;//澶哄疂
[SerializeField] Button _MarketBtn;//甯傚満鎸夐挳
@@ -22,14 +23,6 @@
[SerializeField] Button _WelfareBtn;//绂忓埄鎸夐挳
[SerializeField] Button m_OpenService;//寮�鏈嶆椿鍔ㄦ寜閽�
[SerializeField] Button _RuneTaBtn;//绗﹀嵃鎸夐挳
-
- [SerializeField] Image m_OpenServerTitle;
-
- [SerializeField] Transform m_HighSettingTip;//鍒ゅ畾
-
- [SerializeField] GameObject m_HighSettingShow;//鏄惁寮�鍚垏鎹㈠姛鑳�
- [SerializeField] Button _ShowBtn;//鍒囨崲鎸夐挳1
- [SerializeField] Button _ColseBtn;//鍒囨崲鎸夐挳2
[SerializeField] UIEffect m_OSCEffect;//寮�鏈嶆椿鍔ㄧ壒鏁�
[SerializeField] UIEffect m_StoreEffect;//鍟嗗煄鐗规晥
@@ -51,16 +44,12 @@
[SerializeField] Button m_CrossServerBtn;//璺ㄦ湇1V1鎸夐挳
[SerializeField] Button m_OpenServiceBtn;//鍛ㄧ媯娆㈡寜閽�
[SerializeField] Button m_NewYearBtn;//鏂板勾鐩涘吀
- private bool _bool = true;
- private int swicthCdTime = 0;
- private bool IsFadeOut = true;
private bool isNeedTip = true;
StoreModel storeModel { get { return ModelCenter.Instance.GetModel<StoreModel>(); } }
- OSGiftModel osGiftModel { get { return ModelCenter.Instance.GetModel<OSGiftModel>(); } }
- PlayerMainDate mainModel { get { return ModelCenter.Instance.GetModel<PlayerMainDate>(); } }
CrossServerOneVsOneModel crossServerModel { get { return ModelCenter.Instance.GetModel<CrossServerOneVsOneModel>(); } }
FairyGrabBossModel fairyGrabBossModel { get { return ModelCenter.Instance.GetModel<FairyGrabBossModel>(); } }
+
private void Start()
{
isNeedTip = true;
@@ -68,7 +57,6 @@
public void Init()
{
- swicthCdTime = int.Parse(FuncConfigConfig.Get("AutomaticSwitch").Numerical1);
OpenServerActivityStateChange();
m_RechargetBtnBehaviour.Init();
m_HighSettingFadeInFadeOut.Init();
@@ -79,8 +67,6 @@
_WelfareBtn.AddListener(WelfareButton);
_DaTreasureBtn.AddListener(DaTreasureButton);
_RechargeBtn.AddListener(RechargeButton);
- _ShowBtn.AddListener(ShowButton);
- _ColseBtn.AddListener(ColseButton);
m_HappyXBBtn.AddListener(OnClickHappyXBBtn);
m_FindHostBtn.AddListener(OnClickFindHostBtn);
m_OpenService.AddListener(OpenService);
@@ -93,40 +79,9 @@
m_CrossServerBtn.AddListener(OnClickCrossServerBtn);
m_OpenServiceBtn.AddListener(OnClickOpenServiceBtn);
m_NewYearBtn.AddListener(OnClickNewYearBtn);
- if (_bool)
- {
- ColseButton();
- }
- if (_ColseBtn.gameObject.activeSelf)
- {
- CoroutineMgr.Instance.OnMainStartCorUp(swicthCdTime);
- }
- CoroutineMgr.Instance.MainHighTipCdTimeEvent += OnMainHighTipCdTime;
- FunctionUnlockFlyObjectTarget.IsPlayerUiEffect += IsPlayerUiEffect;
storeModel.StoreFuncOpenAct += OnStoreFuncOpen;
OpenServerActivityCenter.Instance.openServerActivityStateChange += OpenServerActivityStateChange;
- }
-
-
- public void OnActived()
- {
-
- if (_ColseBtn.gameObject.activeInHierarchy)
- {
- m_HighSettingFadeInFadeOut.PositionNow();
- }
- else
- {
- if (mainModel.IsRedPointShowPanel())
- {
- ShowButtonNow();
- }
- else
- {
- m_HighSettingFadeInFadeOut.PositionDel();
- }
- }
}
public void UnInit()
@@ -137,8 +92,6 @@
_WelfareBtn.RemoveAllListeners();
_DaTreasureBtn.RemoveAllListeners();
_RechargeBtn.RemoveAllListeners();
- _ShowBtn.RemoveAllListeners();
- _ColseBtn.RemoveAllListeners();
m_OpenService.RemoveAllListeners();
m_HappyXBBtn.RemoveAllListeners();
m_FindHostBtn.RemoveAllListeners();
@@ -147,36 +100,15 @@
m_FlashSaleBtn.RemoveAllListeners();
m_AllThePeopleBtn.RemoveAllListeners();
m_NewYearBtn.RemoveAllListeners();
- CoroutineMgr.Instance.MainHighTipCdTimeEvent -= OnMainHighTipCdTime;
- FunctionUnlockFlyObjectTarget.IsPlayerUiEffect -= IsPlayerUiEffect;
- FuncOpen.Instance.OnFuncStateChangeEvent -= OnFuncStateChange;
storeModel.StoreFuncOpenAct -= OnStoreFuncOpen;
OpenServerActivityCenter.Instance.openServerActivityStateChange -= OpenServerActivityStateChange;
CoroutineMgr.Instance.OnMainStopCorUP();
- m_HighSettingFadeInFadeOut.Unit();
+ m_HighSettingFadeInFadeOut.UnInit();
m_RechargetBtnBehaviour.UnInit();
- }
-
- private void OnFuncStateChange(int obj)
- {
- if (this.gameObject.activeInHierarchy)
- {
- StartCoroutine(DelayFrame());
- }
- }
-
-
- IEnumerator DelayFrame()
- {
- yield return WaitingForSecondConst.WaitMS200;
- SwithButtonObj();
}
public void AfterOpen()
{
- FuncOpen.Instance.OnFuncStateChangeEvent += OnFuncStateChange;
- SwithButtonObj();
-
RefreshOSCEffect();
RefreshStoreEffect();
}
@@ -186,27 +118,10 @@
StopCoroutine(DelayHideStoreDes());
}
- private void IsPlayerUiEffect()
- {
- if (NewBieCenter.Instance.inGuiding)
- {
- return;
- }
- if (!m_HighSettingFadeInFadeOut.GetIsFadeIn())
- {
- m_HighSettingFadeInFadeOut.PositionDel();//绔嬪埢闅愯棌
- }
- }
-
private void OpenServerActivityStateChange()
{
int _order = 0;
m_OpenService.gameObject.SetActive(OpenServerActivityCenter.Instance.IsAnyActivityOpen(out _order));
- }
-
- private void OnMainHighTipCdTime()
- {
- ColseButton();
}
void MarketButton()//甯傚満鎸夐挳
@@ -220,7 +135,6 @@
WindowCenter.Instance.Close<MainInterfaceWin>();
WindowCenter.Instance.Open<OpenServerActivityWin>();
}
-
void ShoppingButton()//鍟嗗煄鎸夐挳
{
@@ -301,7 +215,7 @@
void OnCliCkLimitedTimePBtn()//闄愭椂绀煎寘
{
WindowCenter.Instance.Close<MainInterfaceWin>();
- WindowCenter.Instance.Open<OpenServerActivityWin>(false,7);
+ WindowCenter.Instance.Open<OpenServerActivityWin>(false, 7);
}
void OnClickElfFestivalBtn()
@@ -329,7 +243,7 @@
void OnClickCrossServerBtn()//璺ㄦ湇PK
{
int limitlv = FuncOpenLVConfig.Get(157).LimitLV;
- if (FuncOpen.Instance.IsFuncOpen(157)&& TimeUtility.OpenDay >= crossServerModel.afterOpenDayOpenCross)
+ if (FuncOpen.Instance.IsFuncOpen(157) && TimeUtility.OpenDay >= crossServerModel.afterOpenDayOpenCross)
{
WindowCenter.Instance.Close<MainInterfaceWin>();
WindowCenter.Instance.Open<CrossServerWin>();
@@ -343,65 +257,19 @@
else
{
SysNotifyMgr.Instance.ShowTip("CrossMatching15", crossServerModel.afterOpenDayOpenCross);
- }
+ }
}
}
void OnClickOpenServiceBtn()
{
WindowCenter.Instance.Open<AchievementActivityWin>();
-
}
void OnClickNewYearBtn()
{
WindowCenter.Instance.Close<MainInterfaceWin>();
WindowCenter.Instance.Open<NewYearFairylandCeremonyWin>();
- }
- public void ShowButton()//鍚戜笂
- {
-
- _ColseBtn.gameObject.SetActive(true);
- _ShowBtn.gameObject.SetActive(false);
- if (WindowCenter.Instance.IsOpen<MainInterfaceWin>() && m_HighSettingTip.gameObject.activeSelf)
- {
- m_HighSettingFadeInFadeOut.FadeOut();//娣″嚭
- }
- CoroutineMgr.Instance.OnMainStartCorUp(swicthCdTime);
-
- }
-
- public void ColseButton()//鍚戜笅
- {
- if (WindowCenter.Instance.IsOpen<MainInterfaceWin>() && m_HighSettingTip.gameObject.activeSelf)
- {
- _ShowBtn.gameObject.SetActive(true);
- _ColseBtn.gameObject.SetActive(false);
- m_HighSettingFadeInFadeOut.FadeIn();//娣″叆
- _bool = false;
- CoroutineMgr.Instance.OnMainStopCorUP();
- }
- }
- public void ColseButtonNow()//鍚戜笅锛堢珛鍒婚殣钘忥級
- {
- if (WindowCenter.Instance.IsOpen<MainInterfaceWin>() && m_HighSettingTip.gameObject.activeSelf)
- {
- _ShowBtn.gameObject.SetActive(true);
- _ColseBtn.gameObject.SetActive(false);
- m_HighSettingFadeInFadeOut.PositionDel();//绔嬪埢闅愯棌
- _bool = false;
- CoroutineMgr.Instance.OnMainStopCorUP();
- }
- }
-
- public void ShowButtonNow()//鍚戜笂锛堢珛鍒诲嚭鐜帮級
- {
- _ColseBtn.gameObject.SetActive(true);
- _ShowBtn.gameObject.SetActive(false);
- if (WindowCenter.Instance.IsOpen<MainInterfaceWin>() && m_HighSettingTip.gameObject.activeSelf)
- {
- m_HighSettingFadeInFadeOut.PositionNow();//绔嬪埢鍑虹幇
- }
}
private void RefreshOSCEffect()
@@ -416,7 +284,6 @@
m_OSCEffect.StopImediatly();
}
}
-
private void OnStoreFuncOpen()
{
@@ -433,7 +300,7 @@
var storeDatas = storeModel.TryGetStoreDatas(StoreFunc.MysteryStore);
if (storeDatas != null
- && storeDatas.Count > 0
+ && storeDatas.Count > 0
&& !m_StoreEffect.IsPlaying)
{
if (isNeedTip)
@@ -460,23 +327,6 @@
storeDesBtn.gameObject.SetActive(false);
}
- private void SwithButtonObj()
- {
- if (!PreFightMission.Instance.IsFinished())
- {
- return;
- }
-
- if (m_HighSettingFadeInFadeOut.IsShowButton())
- {
- m_HighSettingShow.SetActive(true);
- }
- else
- {
- m_HighSettingShow.SetActive(false);
- }
-
- }
}
}
--
Gitblit v1.8.0