| System/MainInterfacePanel/HighSettingFadeInFadeOut.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/MainInterfacePanel/HighSettingTip.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/MainInterfacePanel/TopAnimationPlay.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/OpenServerActivity/OSGiftModel.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/OpenServerActivity/OpenServerActivityWin.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/OpenServerActivity/OpenServerGiftWin.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
System/MainInterfacePanel/HighSettingFadeInFadeOut.cs
@@ -72,7 +72,6 @@ TimeUtility.OnServerOpenDayRefresh += OnStepServerDay; FuncOpen.Instance.OnFuncStateChangeEvent += OnFuncStateChange; hostModel.TreasureFindHostCompleteAct += TreasureFindHostCompleteAct; osGiftModel.OnOSGiftStateChange += OnOSGiftStateChange; RedpointCenter.Instance.redpointValueChangeEvent += UpdateRedpoint; OpenServerActivityCenter.Instance.openServerActivityStateChange += OpenServerActivityStateChange; OperationTimeHepler.Instance.operationStartEvent += operationStartEvent; @@ -85,7 +84,6 @@ StopIEnumerator(); FuncOpen.Instance.OnFuncStateChangeEvent -= OnFuncStateChange; hostModel.TreasureFindHostCompleteAct -= TreasureFindHostCompleteAct; osGiftModel.OnOSGiftStateChange -= OnOSGiftStateChange; TimeUtility.OnServerOpenDayRefresh -= OnStepServerDay; OpenServerActivityCenter.Instance.openServerActivityStateChange -= OpenServerActivityStateChange; RedpointCenter.Instance.redpointValueChangeEvent -= UpdateRedpoint; System/MainInterfacePanel/HighSettingTip.cs
@@ -97,7 +97,6 @@ } CoroutineMgr.Instance.MainHighTipCdTimeEvent += OnMainHighTipCdTime; FunctionUnlockFlyObjectTarget.IsPlayerUiEffect += IsPlayerUiEffect; osGiftModel.OnOSGiftStateChange += CheckOSGift; storeModel.StoreFuncOpenAct += OnStoreFuncOpen; OpenServerActivityCenter.Instance.openServerActivityStateChange += OpenServerActivityStateChange; } @@ -145,7 +144,6 @@ FunctionUnlockFlyObjectTarget.IsPlayerUiEffect -= IsPlayerUiEffect; FuncOpen.Instance.OnFuncStateChangeEvent -= OnFuncStateChange; storeModel.StoreFuncOpenAct -= OnStoreFuncOpen; osGiftModel.OnOSGiftStateChange -= CheckOSGift; OpenServerActivityCenter.Instance.openServerActivityStateChange -= OpenServerActivityStateChange; CoroutineMgr.Instance.OnMainStopCorUP(); m_HighSettingFadeInFadeOut.Unit(); @@ -280,11 +278,7 @@ private void OSGiftBtn() { if (osGiftModel.giftGetNotify) { osGiftModel.giftGetNotify = false; } WindowCenter.Instance.Open<OpenServerGiftWin>(); //WindowCenter.Instance.Open<OpenServerGiftWin>(); } void RuneTaButton()//符印塔 System/MainInterfacePanel/TopAnimationPlay.cs
@@ -30,7 +30,6 @@ { FuncOpen.Instance.OnFuncStateChangeEvent += OnFuncStateChange; hostModel.TreasureFindHostCompleteAct += TreasureFindHostCompleteAct; osGiftModel.OnOSGiftStateChange += OnOSGiftStateChange; RedpointCenter.Instance.redpointValueChangeEvent += UpdateRedpoint; TimeUtility.OnServerOpenDayRefresh += OnStepServerDay; OpenServerActivityCenter.Instance.openServerActivityStateChange += OpenServerActivityStateChange; @@ -133,7 +132,6 @@ { FuncOpen.Instance.OnFuncStateChangeEvent -= OnFuncStateChange; hostModel.TreasureFindHostCompleteAct -= TreasureFindHostCompleteAct; osGiftModel.OnOSGiftStateChange -= OnOSGiftStateChange; RedpointCenter.Instance.redpointValueChangeEvent -= UpdateRedpoint; TimeUtility.OnServerOpenDayRefresh -= OnStepServerDay; OpenServerActivityCenter.Instance.openServerActivityStateChange -= OpenServerActivityStateChange; System/OpenServerActivity/OSGiftModel.cs
@@ -5,13 +5,14 @@ using UnityEngine; namespace Snxxz.UI { public class OSGiftModel : Model, IPlayerLoginOk, IBeforePlayerDataInitialize public class OSGiftModel : Model, IPlayerLoginOk, IBeforePlayerDataInitialize, IOpenServerActivity { public override void Init() { PlayerDatas.Instance.PlayerDataRefreshInfoEvent += PlayerDataRefreshInfoEvent; storeModel.RefreshBuyShopLimitEvent += RefreshBuyShopLimitEvent; vipModel.firstChargeRewardEvent += firstChargeRewardEvent; vipModel.firstChargeRewardEvent += FirstChargeRewardEvent; OpenServerActivityCenter.Instance.Register(6, this); } public override void UnInit() @@ -22,13 +23,13 @@ public void OnPlayerLoginOk() { activate = CheckActivate(); if (OnOSGiftStateChange != null) if (onStateUpate != null) { OnOSGiftStateChange(); onStateUpate(6); } } public event Action OnOSGiftStateChange; public event Action<int> onStateUpate; public bool activate { get; private set; } @@ -40,10 +41,6 @@ { m_GiftGetNotify = value; OSGiftRedpoint.state = value ? RedPointState.Simple : RedPointState.None; if (OnOSGiftStateChange != null) { OnOSGiftStateChange(); } } } @@ -57,35 +54,20 @@ VipModel vipModel { get { return ModelCenter.Instance.GetModel<VipModel>(); } } public bool CheckOpen() public bool IsOpen { if (!login) get { return false; return CheckActivate(); } login = false; if (!PreFightMission.Instance.IsFinished() || DayRemind.Instance.GetDayRemind(DayRemind.OSGIFT_TIP) || PlayerDatas.Instance.baseData.coinPointTotal == 0 || !ModelCenter.Instance.GetModel<VipModel>().firstChargeRewardGet) } public bool priorityOpen { get { return false; return OSGiftRedpoint.state == RedPointState.Simple; } var _list = StoreConfig.GetTypeStoreModel((int)StoreFunc.OSGift); for (int i = 0; i < _list.Count; i++) { var _limit = storeModel.GetBuyShopLimit((uint)_list[i].ID); if (_limit == null || _limit.BuyCnt < _list[i].PurchaseNumber[0]) { if (!WindowCenter.Instance.CheckOpen<OpenServerGiftWin>()) { DayRemind.Instance.SetDayRemind(DayRemind.OSGIFT_TIP, true); WindowCenter.Instance.Open<OpenServerGiftWin>(); return true; } break; } } return false; } private void RefreshBuyShopLimitEvent() @@ -94,22 +76,22 @@ if (activate != _activate) { activate = _activate; if (OnOSGiftStateChange != null) if (onStateUpate != null) { OnOSGiftStateChange(); onStateUpate(6); } } } private void firstChargeRewardEvent() private void FirstChargeRewardEvent() { bool _activate = CheckActivate(); if (activate != _activate) { activate = _activate; if (OnOSGiftStateChange != null) if (onStateUpate != null) { OnOSGiftStateChange(); onStateUpate(6); } } } @@ -139,28 +121,19 @@ if (_type == PlayerDataRefresh.ChangeCoinPointTotal && activate != _activate) { activate = _activate; if (OnOSGiftStateChange != null) if (onStateUpate != null) { OnOSGiftStateChange(); onStateUpate(6); } } } private bool login = false; public void OnBeforePlayerDataInitialize() { giftGetNotify = false; if (!(StageManager.Instance.CurrentStage is DungeonStage)) { login = true; } else { login = false; } } public Redpoint OSGiftRedpoint = new Redpoint(2, 36); public Redpoint OSGiftRedpoint = new Redpoint(MainRedDot.REDPOINT_OPENSERVER, 20906); } }
@@ -283,9 +283,6 @@ m_ActivityCtrl.AddCell(ScrollerDataType.Normal, sort * 100 + _type); } break; case 1: m_ActivityCtrl.AddCell(ScrollerDataType.Header, sort); continue; case 2: m_ActivityCtrl.AddCell(ScrollerDataType.Header, sort); if (!m_ActivitySpreadDict[sort]) @@ -295,11 +292,7 @@ m_ActivityCtrl.AddCell(ScrollerDataType.Normal, sort * 100 + 1); m_ActivityCtrl.AddCell(ScrollerDataType.Normal, sort * 100 + 2); break; case 3: case 4: case 5: case 8: case 9: default: m_ActivityCtrl.AddCell(ScrollerDataType.Header, sort); break; } @@ -391,6 +384,16 @@ WindowCenter.Instance.Open<MultipleExpWin>(true); } break; case 6: if (windowState == WindowState.Opened) { WindowCenter.Instance.OpenWithoutAnimation<OpenServerGiftWin>(); } else { WindowCenter.Instance.Open<OpenServerGiftWin>(true); } break; case 8: if (windowState == WindowState.Opened) { @@ -441,6 +444,7 @@ WindowCenter.Instance.CloseImmediately<MultipleExpWin>(); WindowCenter.Instance.CloseImmediately<NPracticePointWin>(); WindowCenter.Instance.CloseImmediately<BossRebornWin>(); WindowCenter.Instance.CloseImmediately<OpenServerGiftWin>(); } private int Compare(int x, int y) System/OpenServerActivity/OpenServerGiftWin.cs
@@ -43,7 +43,7 @@ { WindowCenter.Instance.windowAfterOpenEvent += WindowAfterOpenEvent; WindowCenter.Instance.windowAfterCloseEvent += windowAfterCloseEvent; ModelCenter.Instance.GetModel<OSGiftModel>().giftGetNotify = false; model.RefreshBuyShopLimitEvent += RefreshBuyShopLimitEvent; Display();
