From cf2e49d50152a7dad144d44aea8c5f2cb6cb28c6 Mon Sep 17 00:00:00 2001
From: client_Hale <339726288@qq.com>
Date: 星期一, 13 八月 2018 14:45:49 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/Welfare/WelfareWin.cs | 67 ---------------------------------
1 files changed, 1 insertions(+), 66 deletions(-)
diff --git a/System/Welfare/WelfareWin.cs b/System/Welfare/WelfareWin.cs
index cccf8ac..b35c77b 100644
--- a/System/Welfare/WelfareWin.cs
+++ b/System/Welfare/WelfareWin.cs
@@ -19,19 +19,14 @@
[SerializeField] FunctionButton Btn_InSeven;
[SerializeField] FunctionButton m_LevelGiftBtn;
[SerializeField] FunctionButton m_ExchangeBtn;
- [SerializeField] FunctionButton m_MultipleExpBtn;
- [SerializeField] FunctionButton m_ConsumeRebateBtn;
[SerializeField] FunctionButton m_BossReornBtn;
[SerializeField] FunctionButton m_NpracticeBtn;
[SerializeField] FunctionButtonGroup buttonGroup;
[SerializeField] Button closeBtn;
- [SerializeField] Text m_MultipleExtTitle;
[SerializeField] Text m_MultipleRealmPointTitle;
- MultipleExpModel multipleExpModel { get { return ModelCenter.Instance.GetModel<MultipleExpModel>(); } }
MultipleRealmPointModel multipleRealmModel { get { return ModelCenter.Instance.GetModel<MultipleRealmPointModel>(); } }
- ConsumeRebateModel consumeRebateModel { get { return ModelCenter.Instance.GetModel<ConsumeRebateModel>(); } }
InSevenDayModel m_InSevenDayModel;
InSevenDayModel inSevenDay { get { return m_InSevenDayModel ?? (m_InSevenDayModel = ModelCenter.Instance.GetModel<InSevenDayModel>()); } }
@@ -51,8 +46,6 @@
m_ExchangeBtn.onClick.AddListener(OnExchange);
m_NpracticeBtn.AddListener(OnNPractice);
closeBtn.onClick.AddListener(CloseClick);
- m_MultipleExpBtn.onClick.AddListener(OnMultipleExp);
- m_ConsumeRebateBtn.onClick.AddListener(ConsumeRebateBtn);
m_BossReornBtn.AddListener(BossRebornBtn);
}
@@ -96,20 +89,6 @@
WindowCenter.Instance.Open<LevelGiftWin>();
}
functionOrder = 3;
- }
-
- private void ConsumeRebateBtn()
- {
- CloseChildWin();
- if (windowState == WindowState.Opened)
- {
- WindowCenter.Instance.OpenWithoutAnimation<ConsumeRebateWin>();
- }
- else
- {
- WindowCenter.Instance.Open<ConsumeRebateWin>();
- }
- functionOrder = 4;
}
private void BossRebornBtn()
@@ -157,19 +136,6 @@
functionOrder = 8;
}
- private void OnMultipleExp()
- {
- CloseChildWin();
- if (windowState == WindowState.Opened)
- {
- WindowCenter.Instance.OpenWithoutAnimation<MultipleExpWin>();
- }
- else
- {
- WindowCenter.Instance.Open<MultipleExpWin>();
- }
- functionOrder = 5;
- }
private void OnSignIn()
{
CloseChildWin();
@@ -204,10 +170,6 @@
protected override void OnActived()
{
base.OnActived();
- //if (!Btn_InSeven.gameObject.activeInHierarchy)
- //{
- // functionOrder = 2;
- //}
buttonGroup.TriggerByOrder(functionOrder);
}
@@ -258,14 +220,6 @@
{
WindowCenter.Instance.CloseImmediately<AwardExchangeWin>();
}
- if (WindowCenter.Instance.CheckOpen<MultipleExpWin>())
- {
- WindowCenter.Instance.CloseImmediately<MultipleExpWin>();
- }
- if (WindowCenter.Instance.CheckOpen<ConsumeRebateWin>())
- {
- WindowCenter.Instance.CloseImmediately<ConsumeRebateWin>();
- }
if (WindowCenter.Instance.CheckOpen<NPracticePointWin>())
{
WindowCenter.Instance.CloseImmediately<NPracticePointWin>();
@@ -281,15 +235,7 @@
private void OperationEndEvent(Operation type, int state)
{
OperationBase operation;
- if (type == Operation.MultipleExp && !multipleExpModel.Open() && WindowCenter.Instance.CheckOpen<MultipleExpWin>())
- {
- buttonGroup.TriggerByOrder(WelfareCenter.Instance.GetWelfareFuncOrder());
- }
- else if (type == Operation.BossReborn && !bossRebornModel.IsOpen() && WindowCenter.Instance.CheckOpen<BossRebornWin>())
- {
- buttonGroup.TriggerByOrder(WelfareCenter.Instance.GetWelfareFuncOrder());
- }
- else if (type == Operation.ConsumeRebate && !consumeRebateModel.IsOpen && WindowCenter.Instance.CheckOpen<ConsumeRebateWin>())
+ if (type == Operation.BossReborn && !bossRebornModel.IsOpen() && WindowCenter.Instance.CheckOpen<BossRebornWin>())
{
buttonGroup.TriggerByOrder(WelfareCenter.Instance.GetWelfareFuncOrder());
}
@@ -301,18 +247,7 @@
void CheckOperationOpen()
{
- m_MultipleExpBtn.gameObject.SetActive(multipleExpModel.Open());
- m_ConsumeRebateBtn.gameObject.SetActive(consumeRebateModel.IsOpen);
m_BossReornBtn.gameObject.SetActive(bossRebornModel.IsOpen());
-
- if (multipleExpModel.Open())
- {
- OperationBase operationBase;
- if (OperationTimeHepler.Instance.TryGetOperationTime(Operation.MultipleExp, out operationBase))
- {
- m_MultipleExtTitle.text = Language.Get("ExpActivity_Text5", (operationBase as OperationMultiExp).GetMultipleCHS());
- }
- }
OperationBase operation = null;
bool isOpen = Open(Operation.MultipRealmPoint, out operation);
--
Gitblit v1.8.0