| System/MainInterfacePanel/HighSettingFadeInFadeOut.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/MainInterfacePanel/HighSettingTip.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/MainInterfacePanel/TopAnimationPlay.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
System/MainInterfacePanel/HighSettingFadeInFadeOut.cs
@@ -99,7 +99,7 @@ private void operationEndEvent(Operation arg1, int arg2) { if (arg1 == Operation.GiftPackage || arg1 == Operation.FairyCeremony) if (arg1 == Operation.FairyCeremony) { Classify(); } @@ -107,7 +107,7 @@ private void operationStartEvent(Operation arg1, int arg2) { if (arg1 == Operation.GiftPackage || arg1 == Operation.FairyCeremony) if (arg1 == Operation.FairyCeremony) { Classify(); } @@ -378,7 +378,6 @@ PositionReduction(); SetGroupTop(); SetGroupLow(); // SetGroupThree(); SetfatherNodeTop(); SetfatherNodeLow(); SetfatherNodeThree(); @@ -555,7 +554,8 @@ } else if (IndexOf == 1) { if (ModelCenter.Instance.GetModel<OSGiftModel>().activate)//超值礼包 var _funcOrder = 0; if (OpenServerActivityCenter.Instance.IsAnyActivityOpen(out _funcOrder))//开服活动 { if (!AnimationFadeOutDicLow.ContainsKey(highBtnRecord.Index)) { @@ -581,22 +581,8 @@ } else if (IndexOf == 2) { var _funcOrder = 0; if (OpenServerActivityCenter.Instance.IsAnyActivityOpen(out _funcOrder))//开服活动 { if (!AnimationFadeOutDicLow.ContainsKey(highBtnRecord.Index)) { SelectCaseRequest selectCaseRequest = new SelectCaseRequest(); selectCaseRequest.Tran = m_GroupIndex_Low.GetChild(i); selectCaseRequest.IsNagaaki = highBtnRecord.IsNagaaki; selectCaseRequest.Index = highBtnRecord.Index; AnimationFadeOutDicLow.Add(highBtnRecord.Index, selectCaseRequest); } } } else if (IndexOf == 3) { if (!AnimationFadeOutDicLow.ContainsKey(highBtnRecord.Index) && OperationTimeHepler.Instance.InOperationTime(Operation.FairyCeremony)) bool Isopen = OpenServerActivityCenter.Instance.IsActivityOpen(4); if (!AnimationFadeOutDicLow.ContainsKey(highBtnRecord.Index) && Isopen)//限时特惠 { if (AnimationFadeOutDicLow.Count < 6)//------第二层 { @@ -615,7 +601,51 @@ AnimationFadeOutDicThree.Add(highBtnRecord.Index, selectCaseRequest); } } } else if (IndexOf == 3) { bool Isopen = OpenServerActivityCenter.Instance.IsActivityOpen(0); if (!AnimationFadeOutDicLow.ContainsKey(highBtnRecord.Index) && Isopen)//限时特惠 { if (AnimationFadeOutDicLow.Count < 6)//------第二层 { SelectCaseRequest selectCaseRequest = new SelectCaseRequest(); selectCaseRequest.Tran = m_GroupIndex_Low.GetChild(i); selectCaseRequest.IsNagaaki = highBtnRecord.IsNagaaki; selectCaseRequest.Index = highBtnRecord.Index; AnimationFadeOutDicLow.Add(highBtnRecord.Index, selectCaseRequest); } else//------第三层 { SelectCaseRequest selectCaseRequest = new SelectCaseRequest(); selectCaseRequest.Tran = m_GroupIndex_Low.GetChild(i); selectCaseRequest.IsNagaaki = highBtnRecord.IsNagaaki; selectCaseRequest.Index = highBtnRecord.Index; AnimationFadeOutDicThree.Add(highBtnRecord.Index, selectCaseRequest); } } } else if (IndexOf == 4) { if (!AnimationFadeOutDicLow.ContainsKey(highBtnRecord.Index) && OperationTimeHepler.Instance.InOperationTime(Operation.FairyCeremony))//精灵盛典 { if (AnimationFadeOutDicLow.Count < 6)//------第二层 { SelectCaseRequest selectCaseRequest = new SelectCaseRequest(); selectCaseRequest.Tran = m_GroupIndex_Low.GetChild(i); selectCaseRequest.IsNagaaki = highBtnRecord.IsNagaaki; selectCaseRequest.Index = highBtnRecord.Index; AnimationFadeOutDicLow.Add(highBtnRecord.Index, selectCaseRequest); } else//------第三层 { SelectCaseRequest selectCaseRequest = new SelectCaseRequest(); selectCaseRequest.Tran = m_GroupIndex_Low.GetChild(i); selectCaseRequest.IsNagaaki = highBtnRecord.IsNagaaki; selectCaseRequest.Index = highBtnRecord.Index; AnimationFadeOutDicThree.Add(highBtnRecord.Index, selectCaseRequest); } } } } } System/MainInterfacePanel/HighSettingTip.cs
@@ -44,10 +44,12 @@ [SerializeField] Button m_FindHostBtn;//仙宝寻主 [SerializeField] RechargeBtnBehaviour m_RechargetBtnBehaviour; [SerializeField] Button m_OSGiftBtn; [SerializeField] Button m_LimitedTimePBtn;//限时礼包 [SerializeField] Button m_ElfFestivalBtn;//仙界盛典 [SerializeField] Button m_FlashSaleBtn;//限时特惠 [SerializeField] Button m_AllThePeopleBtn;//全民冲榜 private bool _bool = true; private int swicthCdTime = 0; private bool IsFadeOut = true; @@ -65,7 +67,6 @@ { swicthCdTime = int.Parse(ConfigManager.Instance.GetTemplate<FuncConfigConfig>("AutomaticSwitch").Numerical1); OpenServerActivityStateChange(); CheckOSGift(); m_RechargetBtnBehaviour.Init(); m_HighSettingFadeInFadeOut.Init(); storeDesBtn.AddListener(() => { storeDesBtn.gameObject.SetActive(false); }); @@ -82,10 +83,11 @@ m_HappyXBBtn.AddListener(OnClickHappyXBBtn); m_FindHostBtn.AddListener(OnClickFindHostBtn); m_OpenService.AddListener(OpenService); m_OSGiftBtn.AddListener(OSGiftBtn); _RuneTaBtn.onClick.AddListener(RuneTaButton); m_LimitedTimePBtn.AddListener(OnCliCkLimitedTimePBtn); m_ElfFestivalBtn.AddListener(OnClickElfFestivalBtn); m_FlashSaleBtn.AddListener(OnClickmFlashSaleBtn); m_AllThePeopleBtn.AddListener(OnClickmAllThePeopleBtn); if (_bool) { ColseButton(); @@ -137,9 +139,10 @@ m_OpenService.RemoveAllListeners(); m_HappyXBBtn.RemoveAllListeners(); m_FindHostBtn.RemoveAllListeners(); m_OSGiftBtn.RemoveAllListeners(); m_LimitedTimePBtn.RemoveAllListeners(); _RuneTaBtn.onClick.RemoveAllListeners(); m_FlashSaleBtn.RemoveAllListeners(); m_AllThePeopleBtn.RemoveAllListeners(); CoroutineMgr.Instance.MainHighTipCdTimeEvent -= OnMainHighTipCdTime; FunctionUnlockFlyObjectTarget.IsPlayerUiEffect -= IsPlayerUiEffect; FuncOpen.Instance.OnFuncStateChangeEvent -= OnFuncStateChange; @@ -266,32 +269,17 @@ WindowCenter.Instance.Open<FirstRechargeWin>(true); } break; //case 2: // WindowCenter.Instance.Open<OpenServerGiftWin>(); // break; case 3: WindowCenter.Instance.Close<MainInterfaceWin>(); WindowCenter.Instance.Open<VipRechargeWin>(false, 0); break; } } private void OSGiftBtn() { //WindowCenter.Instance.Open<OpenServerGiftWin>(); } void RuneTaButton()//符印塔 { WindowCenter.Instance.Close<MainInterfaceWin>(); WindowCenter.Instance.Open<RuneTowerWin>(); } private void CheckOSGift() { m_OSGiftBtn.gameObject.SetActive(osGiftModel.activate); SwithButtonObj(); } void OpenTreasure() { WindowCenter.Instance.Close<MainInterfaceWin>(); @@ -325,6 +313,17 @@ WindowCenter.Instance.Close<MainInterfaceWin>(); WindowCenter.Instance.Open<FairylandCeremonyWin>(); } void OnClickmFlashSaleBtn()//限时特惠 { WindowCenter.Instance.Close<MainInterfaceWin>(); WindowCenter.Instance.Open<OpenServerActivityWin>(false, 4); } void OnClickmAllThePeopleBtn()//全民冲榜 { WindowCenter.Instance.Close<MainInterfaceWin>(); WindowCenter.Instance.Open<OpenServerActivityWin>(false,0); } public void ShowButton()//向上 {
@@ -41,14 +41,14 @@ private void operationStartEvent(Operation arg1, int arg2) { if (arg1 == Operation.GiftPackage || arg1 == Operation.FairyCeremony) if (arg1 == Operation.FairyCeremony) { Await1(); } } private void operationEndEvent(Operation arg1, int arg2) { if (arg1 == Operation.GiftPackage || arg1 == Operation.FairyCeremony) if ( arg1 == Operation.FairyCeremony) { Await1(); }
