From c6a7ac3739907e8bb7c751d408e227e19f246f49 Mon Sep 17 00:00:00 2001
From: yyl <yyl>
Date: 星期五, 08 五月 2026 17:27:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into h5version
---
Main/System/Main/HomeWin.cs | 25 ++++++++++++++++++++++---
1 files changed, 22 insertions(+), 3 deletions(-)
diff --git a/Main/System/Main/HomeWin.cs b/Main/System/Main/HomeWin.cs
index 4e1ad8d..148394b 100644
--- a/Main/System/Main/HomeWin.cs
+++ b/Main/System/Main/HomeWin.cs
@@ -74,6 +74,7 @@
[SerializeField] TimeRushCell timeRushCell;
[SerializeField] HeroDebutCell heroDebutCell;
[SerializeField] HeroReturnCell heroReturnCell;
+ [SerializeField] Button festivalActivityBtn;
//鍧愰獞
[SerializeField] Image horseBGImg;
@@ -232,7 +233,10 @@
{
UIManager.Instance.OpenWindowAsync<DailySpecialsBaseWin>().Forget();
});
-
+ festivalActivityBtn.AddListener(() =>
+ {
+ UIManager.Instance.OpenWindow<FestivalActivityWin>();
+ });
}
@@ -298,6 +302,7 @@
DisplayTimeRush();
DisplayHeroDebut();
DisplayHeroReturn();
+ DisplayFestivalActivity();
DelayPlayMusic().Forget();
}
@@ -346,6 +351,10 @@
{
DisplayGalaBtn();
}
+ else if (type == OperationType.FestivalActivity)
+ {
+ DisplayFestivalActivity();
+ }
}
private void OpenServerActivityStateChange()
@@ -354,6 +363,7 @@
DisplayHeroDebut();
DisplayHeroReturn();
DisplayGalaBtn();
+ DisplayFestivalActivity();
}
private void OnShowGiftIdListAddEvent()
@@ -876,6 +886,10 @@
{
DisplayHeroReturn();
}
+ else if (funcId == (int)FuncOpenEnum.FestivalActivity)
+ {
+ DisplayFestivalActivity();
+ }
}
private void OnUpdateFirstChargeInfo()
@@ -946,8 +960,7 @@
void DisplayGalaBtn()
{
- bool isGalaOpen = TotDayRechargeManager.Instance.IsOpen || TotalRechargeManager.Instance.IsOpen;
- osGalaBtn.SetActive(OSActivityManager.Instance.IsOpenedOSGala() || isGalaOpen);
+ osGalaBtn.SetActive(OSActivityManager.Instance.IsOpenedOSGala());
}
void DisplayTimeRush()
@@ -976,6 +989,12 @@
return;
heroReturnCell.Display();
}
+
+ void DisplayFestivalActivity()
+ {
+ bool isOpen = FestivalActivityManager.Instance.IsFestivalActivityOpen();
+ festivalActivityBtn.SetActive(isOpen);
+ }
}
--
Gitblit v1.8.0