From 9fb3c8e114a67c0cdf353b32b1b50e90414fd597 Mon Sep 17 00:00:00 2001
From: yyl <yyl>
Date: 星期三, 25 二月 2026 16:34:07 +0800
Subject: [PATCH] Merge branch 'master' into h5version
---
Main/System/Main/HomeWin.cs | 31 +++++++++++++++++++++++++++++--
1 files changed, 29 insertions(+), 2 deletions(-)
diff --git a/Main/System/Main/HomeWin.cs b/Main/System/Main/HomeWin.cs
index e102de8..da47121 100644
--- a/Main/System/Main/HomeWin.cs
+++ b/Main/System/Main/HomeWin.cs
@@ -1,6 +1,7 @@
using System;
using System.Collections;
using System.Collections.Generic;
+using System.Linq;
using Cysharp.Threading.Tasks;
using DG.Tweening;
using UnityEngine;
@@ -67,6 +68,7 @@
[SerializeField] Button osHeroCallBtn;
[SerializeField] Button osGalaBtn;
[SerializeField] TimingGiftCell timingGiftCell;
+ [SerializeField] TimeRushCell timeRushCell;
//鍧愰獞
[SerializeField] Image horseBGImg;
@@ -269,13 +271,14 @@
ChatManager.Instance.OnUpdateTalkEvent += OnUpdateTalkEvent;
UIManager.Instance.OnOpenWindow += OnOpenWindow;
TimingGiftManager.Instance.OnShowGiftIdListAddEvent += OnShowGiftIdListAddEvent;
+ OpenServerActivityCenter.Instance.openServerActivityStateChange += OpenServerActivityStateChange;
TryPlayAutoFightBoss();
Display();
DisplayFirstChargeBtn();
DisplayOSActivity();
timingGiftCell.InitUI();
- // var battleWin = UIManager.Instance.OpenWindow<BattleWin>();
- // battleWin.SetBattleField(BattleManager.Instance.storyBattleField);
+
+ DisplayTimeRush();
DelayPlayMusic().Forget();
@@ -305,8 +308,14 @@
ChatManager.Instance.OnUpdateTalkEvent -= OnUpdateTalkEvent;
UIManager.Instance.OnOpenWindow -= OnOpenWindow;
TimingGiftManager.Instance.OnShowGiftIdListAddEvent -= OnShowGiftIdListAddEvent;
+ OpenServerActivityCenter.Instance.openServerActivityStateChange -= OpenServerActivityStateChange;
// 鍏抽棴鐨勬椂鍊欐妸鎴樻枟鐣岄潰涔熺粰鍏充簡 铏界劧鏄湪澶栭潰寮�鐨�
UIManager.Instance.CloseWindow<BattleWin>();
+ }
+
+ private void OpenServerActivityStateChange()
+ {
+ DisplayTimeRush();
}
private void OnShowGiftIdListAddEvent()
@@ -365,6 +374,10 @@
case ChatChannel.Guild:
ChatManager.Instance.nowChatTab = ChatTab.Guild;
ChatManager.Instance.nowChatChannel = ChatChannel.Guild;
+ break;
+ case ChatChannel.CrossServer:
+ ChatManager.Instance.nowChatTab = ChatTab.CrossServer;
+ ChatManager.Instance.nowChatChannel = ChatChannel.CrossServer;
break;
}
}
@@ -794,6 +807,10 @@
{
timingGiftCell.InitUI();
}
+ else if (funcId == (int)FuncOpenEnum.TimeRush)
+ {
+ DisplayTimeRush();
+ }
}
private void OnUpdateFirstChargeInfo()
@@ -848,6 +865,16 @@
{
DisplayOSActivity();
}
+
+
+ void DisplayTimeRush()
+ {
+ bool isOpen = TimeRushManager.Instance.IsFuncOpen();
+ timeRushCell.SetActive(isOpen);
+ if (!isOpen)
+ return;
+ timeRushCell.InitUI();
+ }
}
--
Gitblit v1.8.0