From fb0570bdb7e73e7d4dca211f365ee67b43628240 Mon Sep 17 00:00:00 2001
From: yyl <yyl>
Date: 星期五, 03 四月 2026 14:03:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into h5version
---
Main/System/Main/HomeWin.cs | 24 ++++++++++++++++++++++--
1 files changed, 22 insertions(+), 2 deletions(-)
diff --git a/Main/System/Main/HomeWin.cs b/Main/System/Main/HomeWin.cs
index 45cd75c..50b0424 100644
--- a/Main/System/Main/HomeWin.cs
+++ b/Main/System/Main/HomeWin.cs
@@ -73,6 +73,7 @@
[SerializeField] Button osMinggeBtn;
[SerializeField] TimeRushCell timeRushCell;
[SerializeField] HeroDebutCell heroDebutCell;
+ [SerializeField] HeroReturnCell heroReturnCell;
//鍧愰獞
[SerializeField] Image horseBGImg;
@@ -296,6 +297,7 @@
DisplayTimeRush();
DisplayHeroDebut();
+ DisplayHeroReturn();
DelayPlayMusic().Forget();
}
@@ -336,6 +338,10 @@
{
DisplayHeroDebut();
}
+ else if (type == OperationType.HeroReturn)
+ {
+ DisplayHeroReturn();
+ }
}
@@ -343,6 +349,7 @@
{
DisplayTimeRush();
DisplayHeroDebut();
+ DisplayHeroReturn();
}
private void OnShowGiftIdListAddEvent()
@@ -840,8 +847,8 @@
DisplayHorse();
}
else if (funcId == (int)FuncOpenEnum.OSMainLevl || funcId == (int)FuncOpenEnum.OSHeroCall
- || funcId == (int)FuncOpenEnum.OSGala|| funcId == (int)FuncOpenEnum.OSHeroTrain
- || funcId == (int)FuncOpenEnum.OSBeautyMM || funcId == (int)FuncOpenEnum.OSMingge)
+ || funcId == (int)FuncOpenEnum.OSGala || funcId == (int)FuncOpenEnum.OSHeroTrain
+ || funcId == (int)FuncOpenEnum.OSBeautyMM || funcId == (int)FuncOpenEnum.OSMingge)
{
DisplayOSActivity();
}
@@ -860,6 +867,10 @@
else if (funcId == (int)FuncOpenEnum.HeroDebut)
{
DisplayHeroDebut();
+ }
+ else if (funcId == (int)FuncOpenEnum.HeroReturn)
+ {
+ DisplayHeroReturn();
}
}
@@ -937,6 +948,15 @@
return;
heroDebutCell.Display();
}
+
+ void DisplayHeroReturn()
+ {
+ bool isOpen = HeroReturnManager.Instance.IsHeroReturnOpen();
+ heroReturnCell.SetActive(isOpen);
+ if (!isOpen)
+ return;
+ heroReturnCell.Display();
+ }
}
--
Gitblit v1.8.0