| System/OpenServerActivity/ImpactRankModel.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/OpenServerActivity/OpenServerActivityWin.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/Welfare/MultipleExpModel.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/Welfare/WelfareCenter.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/Welfare/WelfareWin.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
System/OpenServerActivity/ImpactRankModel.cs
@@ -635,6 +635,8 @@ ConsumeRebateModel consumeRebateModel { get { return ModelCenter.Instance.GetModel<ConsumeRebateModel>(); } } MultipleExpModel multipleExpModel { get { return ModelCenter.Instance.GetModel<MultipleExpModel>(); } } public event Action openServerActivityStateChange; public OpenServerActivityCenter() @@ -715,6 +717,11 @@ _functionOrder = 4; return true; } if (IsMultipleExpOpen()) { _functionOrder = 5; return true; } return false; } @@ -756,6 +763,11 @@ return consumeRebateModel.IsOpen; } public bool IsMultipleExpOpen() { return multipleExpModel.Open(); } public void ProcessErrorTip() { SysNotifyMgr.Instance.ShowTip("ActiveOutTime"); System/OpenServerActivity/OpenServerActivityWin.cs
@@ -47,6 +47,8 @@ ConsumeRebateModel consumeRebateModel { get { return ModelCenter.Instance.GetModel<ConsumeRebateModel>(); } } MultipleExpModel multipleExpModel { get { return ModelCenter.Instance.GetModel<MultipleExpModel>(); } } List<int> openActivitys = new List<int>(); List<int> activityReds = new List<int>(); @@ -64,6 +66,7 @@ protected override void OnPreOpen() { TimeUtility.OnServerOpenDayRefresh += OnStepServerDayEvent; OperationTimeHepler.Instance.operationTimeUpdateEvent += OperationTimeUpdateEvent; for (int i = 0; i < m_SortArray.Count; i++) { m_ActivitySpreadDict[m_SortArray[i]] = false; @@ -113,6 +116,7 @@ protected override void OnPreClose() { TimeUtility.OnServerOpenDayRefresh -= OnStepServerDayEvent; OperationTimeHepler.Instance.operationTimeUpdateEvent -= OperationTimeUpdateEvent; CloseOtherWin(); WindowCenter.Instance.Open<MainInterfaceWin>(); impactRankModel.gotoImpactRankType = 0; @@ -135,7 +139,6 @@ activityReds.Add(3); } } if (OpenServerActivityCenter.Instance.IsFlashSaleOpen()) { openActivitys.Add(4); @@ -144,7 +147,6 @@ activityReds.Add(4); } } if (OpenServerActivityCenter.Instance.IsImpactRankOpen()) { openActivitys.Add(0); @@ -153,7 +155,6 @@ activityReds.Add(0); } } if (OpenServerActivityCenter.Instance.IsRedEnvelopeOpen()) { openActivitys.Add(2); @@ -168,13 +169,20 @@ envelopeModel.selectType = 2; } } if (OpenServerActivityCenter.Instance.IsConsumeRebateOpen()) { openActivitys.Add(1); if (consumeRebateModel.consumeRebateRedpoint.state == RedPointState.Simple) { activityReds.Add(1); } } if (OpenServerActivityCenter.Instance.IsMultipleExpOpen()) { openActivitys.Add(5); if (multipleExpModel.multipleExpRedpoint.state == RedPointState.Simple) { activityReds.Add(5); } } @@ -205,7 +213,19 @@ private void RefreshOpenActivityCell(OpenServerActivityCell _cell) { _cell.title.text = Language.Get(StringUtility.Contact("OSActivityTitle_", _cell.index)); switch (_cell.index) { case 5: OperationBase operationBase; if (OperationTimeHepler.Instance.TryGetOperationTime(Operation.MultipleExp, out operationBase)) { _cell.title.text = Language.Get("ExpActivity_Text5", (operationBase as OperationMultiExp).GetMultipleCHS()); } break; default: _cell.title.text = Language.Get(StringUtility.Contact("OSActivityTitle_", _cell.index)); break; } _cell.order = _cell.index; _cell.redpoint.redpointId = MainRedDot.REDPOINT_OPENSERVER * 100 + _cell.index; _cell.ChangeState(_cell.order == functionOrder ? TitleBtnState.Click : TitleBtnState.Normal); @@ -308,6 +328,13 @@ } m_ActivityCtrl.AddCell(ScrollerDataType.Header, sort); break; case 5: if (!OpenServerActivityCenter.Instance.IsMultipleExpOpen()) { continue; } m_ActivityCtrl.AddCell(ScrollerDataType.Header, sort); break; } } m_ActivityCtrl.Restart(); @@ -387,6 +414,16 @@ WindowCenter.Instance.Open<FlashSaleWin>(true); } break; case 5: if (windowState == WindowState.Opened) { WindowCenter.Instance.OpenWithoutAnimation<MultipleExpWin>(); } else { WindowCenter.Instance.Open<MultipleExpWin>(true); } break; } } @@ -413,6 +450,7 @@ WindowCenter.Instance.CloseImmediately<OSTimeLimitGiftWin>(); WindowCenter.Instance.CloseImmediately<FlashSaleWin>(); WindowCenter.Instance.CloseImmediately<ConsumeRebateWin>(); WindowCenter.Instance.CloseImmediately<MultipleExpWin>(); } private int Compare(int x, int y) @@ -421,6 +459,14 @@ var index_y = m_SortArray.IndexOf(y); return index_x.CompareTo(index_y); } private void OperationTimeUpdateEvent(Operation type) { if (type == Operation.MultipleExp) { m_ActivityCtrl.m_Scorller.RefreshActiveCellViews(); } } } }
@@ -90,7 +90,7 @@ } } public Redpoint multipleExpRedpoint = new Redpoint(201, 20106); public Redpoint multipleExpRedpoint = new Redpoint(MainRedDot.REDPOINT_OPENSERVER, 20905); public void SetDayRemind() { System/Welfare/WelfareCenter.cs
@@ -13,8 +13,6 @@ InSevenDayModel sevenDayModel { get { return ModelCenter.Instance.GetModel<InSevenDayModel>(); } } MultipleExpModel multipleExpModel { get { return ModelCenter.Instance.GetModel<MultipleExpModel>(); } } BossRebornModel bossRebornModel { get { return ModelCenter.Instance.GetModel<BossRebornModel>(); } } /// <summary> @@ -65,13 +63,6 @@ return; } if (multipleExpModel.Open() && multipleExpModel.multipleExpRedpoint.state == RedPointState.Simple) { WindowCenter.Instance.Close<MainInterfaceWin>(); WindowCenter.Instance.Open<WelfareWin>(false, 5); return; } if (bossRebornModel.IsOpen() && RedpointCenter.Instance.GetRedpointState(20108) == RedPointState.Simple) { WindowCenter.Instance.Close<MainInterfaceWin>(); @@ -118,11 +109,6 @@ if (levelGiftModel.redpoint.state == RedPointState.Simple) { return 3; } if (multipleExpModel.Open() && multipleExpModel.multipleExpRedpoint.state == RedPointState.Simple) { return 5; } if (bossRebornModel.IsOpen() && RedpointCenter.Instance.GetRedpointState(20108) == RedPointState.Simple) System/Welfare/WelfareWin.cs
@@ -19,16 +19,13 @@ [SerializeField] FunctionButton Btn_InSeven; [SerializeField] FunctionButton m_LevelGiftBtn; [SerializeField] FunctionButton m_ExchangeBtn; [SerializeField] FunctionButton m_MultipleExpBtn; [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>(); } } InSevenDayModel m_InSevenDayModel; InSevenDayModel inSevenDay { get { return m_InSevenDayModel ?? (m_InSevenDayModel = ModelCenter.Instance.GetModel<InSevenDayModel>()); } } @@ -49,7 +46,6 @@ m_ExchangeBtn.onClick.AddListener(OnExchange); m_NpracticeBtn.AddListener(OnNPractice); closeBtn.onClick.AddListener(CloseClick); m_MultipleExpBtn.onClick.AddListener(OnMultipleExp); m_BossReornBtn.AddListener(BossRebornBtn); } @@ -140,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(); @@ -187,10 +170,6 @@ protected override void OnActived() { base.OnActived(); //if (!Btn_InSeven.gameObject.activeInHierarchy) //{ // functionOrder = 2; //} buttonGroup.TriggerByOrder(functionOrder); } @@ -241,10 +220,6 @@ { WindowCenter.Instance.CloseImmediately<AwardExchangeWin>(); } if (WindowCenter.Instance.CheckOpen<MultipleExpWin>()) { WindowCenter.Instance.CloseImmediately<MultipleExpWin>(); } if (WindowCenter.Instance.CheckOpen<NPracticePointWin>()) { WindowCenter.Instance.CloseImmediately<NPracticePointWin>(); @@ -260,11 +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>()) if (type == Operation.BossReborn && !bossRebornModel.IsOpen() && WindowCenter.Instance.CheckOpen<BossRebornWin>()) { buttonGroup.TriggerByOrder(WelfareCenter.Instance.GetWelfareFuncOrder()); } @@ -276,17 +247,7 @@ void CheckOperationOpen() { m_MultipleExpBtn.gameObject.SetActive(multipleExpModel.Open()); 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);
