| System/OpenServerActivity/ImpactRankModel.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/OpenServerActivity/OpenServerActivityWin.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/Vip/FairyJadeInvestmentWin.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/Welfare/ConsumeRebateModel.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/Welfare/MultipleExpModel.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/Welfare/WelfareCenter.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/Welfare/WelfareWin.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
System/OpenServerActivity/ImpactRankModel.cs
@@ -633,6 +633,10 @@ OSTimeLimitGiftModel timeLimitGiftModel { get { return ModelCenter.Instance.GetModel<OSTimeLimitGiftModel>(); } } FlashSaleModel flashSaleModel { get { return ModelCenter.Instance.GetModel<FlashSaleModel>(); } } ConsumeRebateModel consumeRebateModel { get { return ModelCenter.Instance.GetModel<ConsumeRebateModel>(); } } MultipleExpModel multipleExpModel { get { return ModelCenter.Instance.GetModel<MultipleExpModel>(); } } public event Action openServerActivityStateChange; public OpenServerActivityCenter() @@ -693,6 +697,11 @@ _functionOrder = 0; return true; } if (IsConsumeRebateOpen()) { _functionOrder = 1; return true; } if (IsRedEnvelopeOpen()) { _functionOrder = 2; @@ -706,6 +715,11 @@ if (IsFlashSaleOpen()) { _functionOrder = 4; return true; } if (IsMultipleExpOpen()) { _functionOrder = 5; return true; } return false; @@ -744,6 +758,16 @@ return false; } public bool IsConsumeRebateOpen() { return consumeRebateModel.IsOpen; } public bool IsMultipleExpOpen() { return multipleExpModel.Open(); } public void ProcessErrorTip() { SysNotifyMgr.Instance.ShowTip("ActiveOutTime"); System/OpenServerActivity/OpenServerActivityWin.cs
@@ -12,8 +12,7 @@ [SerializeField] ScrollerController m_ActivityCtrl; [SerializeField] Button m_BtnClose; [SerializeField] Image m_TitleIcon; readonly int[] sortArray = new int[] { 3, 4, 0, 1, 2 }; [SerializeField, Header("排序")] List<int> m_SortArray; Dictionary<int, bool> m_ActivitySpreadDict = new Dictionary<int, bool>(); @@ -46,6 +45,13 @@ FlashSaleModel flashSaleModel { get { return ModelCenter.Instance.GetModel<FlashSaleModel>(); } } 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>(); protected override void BindController() { @@ -60,15 +66,15 @@ protected override void OnPreOpen() { TimeUtility.OnServerOpenDayRefresh += OnStepServerDayEvent; for (int i = 0; i < sortArray.Length; i++) OperationTimeHepler.Instance.operationTimeUpdateEvent += OperationTimeUpdateEvent; for (int i = 0; i < m_SortArray.Count; i++) { m_ActivitySpreadDict[sortArray[i]] = false; m_ActivitySpreadDict[m_SortArray[i]] = false; } impactRankModel.presentSelectType = impactRankModel.GetDefaultSelectType(); impactRankModel.gotoImpactRankType = 0; envelopeModel.selectType = 1; UpdateFunctionBtns(); m_TitleIcon.SetSprite(OpenServerActivityCenter.Instance.IsFlashSaleTitle() ? "XT_KF_32" : "XT_KF_9"); } protected override void OnActived() @@ -79,98 +85,18 @@ } if (functionOrder == 0 && !WindowJumpMgr.Instance.IsJumpState) { bool _step = false; functionOrder = 3; if (OpenServerActivityCenter.Instance.IsTimeLimitGiftOpen()) functionOrder = GetDefaultSelect(); for (int i = 0; i < m_SortArray.Count; i++) { if (timeLimitGiftModel.redpoint.state == RedPointState.Simple) { functionOrder = 3; _step = true; } } else if (!OpenServerActivityCenter.Instance.IsTimeLimitGiftOpen()) { functionOrder = 4; } if (!_step && OpenServerActivityCenter.Instance.IsFlashSaleOpen()) { if (flashSaleModel.flashSaleRedpoint.state == RedPointState.Simple) { functionOrder = 4; } } else if (!OpenServerActivityCenter.Instance.IsFlashSaleOpen() && functionOrder == 4) { functionOrder = 0; } if (!_step && OpenServerActivityCenter.Instance.IsImpactRankOpen() && impactRankModel.HasRedpoint()) { functionOrder = 0; _step = true; } else if (!OpenServerActivityCenter.Instance.IsImpactRankOpen() && functionOrder == 0) { functionOrder = 2; } if (!_step && OpenServerActivityCenter.Instance.IsRedEnvelopeOpen()) { if (envelopeModel.m_RedAchieveRedpoint.state == RedPointState.Simple) { functionOrder = 2; envelopeModel.selectType = 1; _step = true; } else if (envelopeModel.m_OpenServerGetRedpin.state == RedPointState.Simple) { functionOrder = 2; envelopeModel.selectType = 2; _step = true; } } else if (!OpenServerActivityCenter.Instance.IsRedEnvelopeOpen() && functionOrder == 2) { DesignDebug.Log("是不是逻辑有错误"); } //if (!_step && OpenServerActivityCenter.Instance.IsTimeLimitGiftOpen()) //{ // if (timeLimitGiftModel.redpoint.state == RedPointState.Simple) // { // functionOrder = 3; // _step = true; // } //} //else if (!OpenServerActivityCenter.Instance.IsTimeLimitGiftOpen() && functionOrder == 3) //{ // functionOrder = 4; //} // //if (!_step && OpenServerActivityCenter.Instance.IsFlashSaleOpen()) //{ // //} //else if (!OpenServerActivityCenter.Instance.IsFlashSaleOpen() && functionOrder == 4) //{ // DesignDebug.Log("是不是逻辑有错误"); //} for (int i = 0; i < sortArray.Length; i++) { m_ActivitySpreadDict[sortArray[i]] = sortArray[i] == functionOrder; m_ActivitySpreadDict[m_SortArray[i]] = m_SortArray[i] == functionOrder; } UpdateFunctionBtns(); } else { for (int i = 0; i < sortArray.Length; i++) for (int i = 0; i < m_SortArray.Count; i++) { m_ActivitySpreadDict[sortArray[i]] = sortArray[i] == functionOrder; m_ActivitySpreadDict[m_SortArray[i]] = m_SortArray[i] == functionOrder; } if (functionOrder == 2) { @@ -190,6 +116,7 @@ protected override void OnPreClose() { TimeUtility.OnServerOpenDayRefresh -= OnStepServerDayEvent; OperationTimeHepler.Instance.operationTimeUpdateEvent -= OperationTimeUpdateEvent; CloseOtherWin(); WindowCenter.Instance.Open<MainInterfaceWin>(); impactRankModel.gotoImpactRankType = 0; @@ -199,6 +126,78 @@ { } int GetDefaultSelect() { openActivitys.Clear(); activityReds.Clear(); if (OpenServerActivityCenter.Instance.IsTimeLimitGiftOpen()) { openActivitys.Add(3); if (timeLimitGiftModel.redpoint.state == RedPointState.Simple) { activityReds.Add(3); } } if (OpenServerActivityCenter.Instance.IsFlashSaleOpen()) { openActivitys.Add(4); if (flashSaleModel.flashSaleRedpoint.state == RedPointState.Simple) { activityReds.Add(4); } } if (OpenServerActivityCenter.Instance.IsImpactRankOpen()) { openActivitys.Add(0); if (impactRankModel.HasRedpoint()) { activityReds.Add(0); } } if (OpenServerActivityCenter.Instance.IsRedEnvelopeOpen()) { openActivitys.Add(2); if (envelopeModel.m_RedAchieveRedpoint.state == RedPointState.Simple) { activityReds.Add(2); envelopeModel.selectType = 1; } else if (envelopeModel.m_OpenServerGetRedpin.state == RedPointState.Simple) { activityReds.Add(2); 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); } } if (activityReds.Count > 0) { activityReds.Sort(Compare); return activityReds[0]; } else { openActivitys.Sort(Compare); return openActivitys[0]; } } private void OnOpenServerActivityRefresh(ScrollerDataType type, CellView cell) { switch (type) @@ -214,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); @@ -259,9 +270,9 @@ private void UpdateFunctionBtns() { m_ActivityCtrl.Refresh(); for (int i = 0; i < sortArray.Length; i++) for (int i = 0; i < m_SortArray.Count; i++) { var sort = sortArray[i]; var sort = m_SortArray[i]; switch (sort) { case 0: @@ -284,6 +295,11 @@ } break; case 1: if (!OpenServerActivityCenter.Instance.IsConsumeRebateOpen()) { continue; } m_ActivityCtrl.AddCell(ScrollerDataType.Header, sort); continue; case 2: if (!OpenServerActivityCenter.Instance.IsRedEnvelopeOpen()) @@ -307,6 +323,13 @@ break; case 4: if (!OpenServerActivityCenter.Instance.IsFlashSaleOpen()) { continue; } m_ActivityCtrl.AddCell(ScrollerDataType.Header, sort); break; case 5: if (!OpenServerActivityCenter.Instance.IsMultipleExpOpen()) { continue; } @@ -352,6 +375,14 @@ } break; case 1: if (windowState == WindowState.Opened) { WindowCenter.Instance.OpenWithoutAnimation<ConsumeRebateWin>(); } else { WindowCenter.Instance.Open<ConsumeRebateWin>(true); } break; case 2: if (windowState == WindowState.Opened) @@ -383,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; } } @@ -404,21 +445,26 @@ private void CloseOtherWin() { if (WindowCenter.Instance.CheckOpen<ImpactRankWin>()) WindowCenter.Instance.CloseImmediately<ImpactRankWin>(); WindowCenter.Instance.CloseImmediately<OpenServerRedEnvelopeWin>(); WindowCenter.Instance.CloseImmediately<OSTimeLimitGiftWin>(); WindowCenter.Instance.CloseImmediately<FlashSaleWin>(); WindowCenter.Instance.CloseImmediately<ConsumeRebateWin>(); WindowCenter.Instance.CloseImmediately<MultipleExpWin>(); } private int Compare(int x, int y) { var index_x = m_SortArray.IndexOf(x); var index_y = m_SortArray.IndexOf(y); return index_x.CompareTo(index_y); } private void OperationTimeUpdateEvent(Operation type) { if (type == Operation.MultipleExp) { WindowCenter.Instance.CloseImmediately<ImpactRankWin>(); } if (WindowCenter.Instance.CheckOpen<OpenServerRedEnvelopeWin>()) { WindowCenter.Instance.CloseImmediately<OpenServerRedEnvelopeWin>(); } if (WindowCenter.Instance.CheckOpen<OSTimeLimitGiftWin>()) { WindowCenter.Instance.CloseImmediately<OSTimeLimitGiftWin>(); } if (WindowCenter.Instance.CheckOpen<FlashSaleWin>()) { WindowCenter.Instance.CloseImmediately<FlashSaleWin>(); m_ActivityCtrl.m_Scorller.RefreshActiveCellViews(); } } } System/Vip/FairyJadeInvestmentWin.cs
@@ -15,6 +15,8 @@ { FairyJadeInvestmentModel m_FairyJadeInvestmentModel; FairyJadeInvestmentModel fairyJadeInvestmentModel { get { return m_FairyJadeInvestmentModel ?? (m_FairyJadeInvestmentModel = ModelCenter.Instance.GetModel<FairyJadeInvestmentModel>()); } } VipInvestModel m_VipInvestModel; VipInvestModel VipInvestModel { get { return m_VipInvestModel ?? (m_VipInvestModel = ModelCenter.Instance.GetModel<VipInvestModel>()); } } [SerializeField] ScrollerController m_ScrollerController; [SerializeField] Button m_InvestmentButton;//投资按钮 [SerializeField] GameObject m_MaxInverstment;//最大投资上限 @@ -46,7 +48,18 @@ { if (fairyJadeInvestmentModel.InvestGold < fairyJadeInvestmentModel.RecordSelectNumberMax) { fairyJadeInvestmentModel.SelectNumber = fairyJadeInvestmentModel.RecordSelectNumberMax; if (fairyJadeInvestmentModel.InvestGold < VipInvestModel.GetInvestGold(3, 0)) { fairyJadeInvestmentModel.SelectNumber = VipInvestModel.GetInvestGold(3, 0); } else if (fairyJadeInvestmentModel.InvestGold < VipInvestModel.GetInvestGold(3, 1)) { fairyJadeInvestmentModel.SelectNumber = VipInvestModel.GetInvestGold(3, 1); } else if (fairyJadeInvestmentModel.InvestGold < VipInvestModel.GetInvestGold(3, 2)) { fairyJadeInvestmentModel.SelectNumber = VipInvestModel.GetInvestGold(3, 2); } m_SelectButton.gameObject.SetActive(true); } else System/Welfare/ConsumeRebateModel.cs
@@ -162,7 +162,7 @@ return costTotal; } public Redpoint consumeRebateRedpoint = new Redpoint(201, 20105); public Redpoint consumeRebateRedpoint = new Redpoint(MainRedDot.REDPOINT_OPENSERVER, 20901); private void UpdateRedpoint() { consumeRebateRedpoint.state = RedPointState.None; System/Welfare/MultipleExpModel.cs
@@ -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,10 +13,6 @@ InSevenDayModel sevenDayModel { get { return ModelCenter.Instance.GetModel<InSevenDayModel>(); } } ConsumeRebateModel rebateModel { get { return ModelCenter.Instance.GetModel<ConsumeRebateModel>(); } } MultipleExpModel multipleExpModel { get { return ModelCenter.Instance.GetModel<MultipleExpModel>(); } } BossRebornModel bossRebornModel { get { return ModelCenter.Instance.GetModel<BossRebornModel>(); } } /// <summary> @@ -67,20 +63,6 @@ return; } if (rebateModel.IsOpen && rebateModel.consumeRebateRedpoint.state == RedPointState.Simple) { WindowCenter.Instance.Close<MainInterfaceWin>(); WindowCenter.Instance.Open<WelfareWin>(false, 4); 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>(); @@ -127,16 +109,6 @@ if (levelGiftModel.redpoint.state == RedPointState.Simple) { return 3; } if (rebateModel.IsOpen && rebateModel.consumeRebateRedpoint.state == RedPointState.Simple) { return 4; } if (multipleExpModel.Open() && multipleExpModel.multipleExpRedpoint.state == RedPointState.Simple) { return 5; } if (bossRebornModel.IsOpen() && RedpointCenter.Instance.GetRedpointState(20108) == RedPointState.Simple) 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);
