From bddf4df7cbb292011a974b705d6f6d94c0ac6cc1 Mon Sep 17 00:00:00 2001
From: yyl <yyl>
Date: 星期二, 09 十二月 2025 11:44:17 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.1.20:10010/r/Project_SG_scripts
---
Main/System/Main/HomeWin.cs | 41 ++++++++++++++++++++++++++++++++++++++---
1 files changed, 38 insertions(+), 3 deletions(-)
diff --git a/Main/System/Main/HomeWin.cs b/Main/System/Main/HomeWin.cs
index bdd24a0..599bafc 100644
--- a/Main/System/Main/HomeWin.cs
+++ b/Main/System/Main/HomeWin.cs
@@ -61,6 +61,8 @@
[SerializeField] RightFuncInHome rightFuncInHome;
[SerializeField] Button FirstChargeBtn;
+ [SerializeField] Button osMainLevelBtn;
+ [SerializeField] Button osHeroCallBtn;
//鍧愰獞
[SerializeField] Image horseBGImg;
@@ -187,6 +189,15 @@
UpdateSendButton();
inputFastChat.text = string.Empty;
});
+
+ osMainLevelBtn.AddListener(() =>
+ {
+ UIManager.Instance.OpenWindow<OSMainLevelBaseWin>();
+ });
+ osHeroCallBtn.AddListener(() =>
+ {
+ UIManager.Instance.OpenWindow<OSHeroCallBaseWin>();
+ });
}
@@ -234,8 +245,10 @@
HorseManager.Instance.OnHorseUpdateEvent += DisplayHorse;
ChatManager.Instance.OnChatTabChangeEvent += OnChatTabChangeEvent;
GuildManager.Instance.EnterOrQuitGuildEvent += EnterOrQuitGuildEvent;
+ TimeMgr.Instance.OnDayEvent += OnDayEvent;
Display();
DisplayFirstChargeBtn();
+ DisplayOSActivity();
// var battleWin = UIManager.Instance.OpenWindow<BattleWin>();
// battleWin.SetBattleField(BattleManager.Instance.storyBattleField);
@@ -264,6 +277,7 @@
HorseManager.Instance.OnHorseUpdateEvent -= DisplayHorse;
ChatManager.Instance.OnChatTabChangeEvent -= OnChatTabChangeEvent;
GuildManager.Instance.EnterOrQuitGuildEvent -= EnterOrQuitGuildEvent;
+ TimeMgr.Instance.OnDayEvent -= OnDayEvent;
// 鍏抽棴鐨勬椂鍊欐妸鎴樻枟鐣岄潰涔熺粰鍏充簡 铏界劧鏄湪澶栭潰寮�鐨�
UIManager.Instance.CloseWindow<BattleWin>();
@@ -277,6 +291,7 @@
txtFastChatSend.text = isCanSend ? Language.Get("Chat11") : Language.Get("Chat14", remainingSeconds);
txtFastChatSend.colorType = isCanSend ? TextColType.NavyBrown : TextColType.LightWhite;
}
+
private void EnterOrQuitGuildEvent(bool obj)
@@ -319,11 +334,10 @@
async UniTask DelayPlayMusic()
{
- await UniTask.Delay(2000);
+ await UniTask.Delay(1200);
if (!SoundPlayer.Instance.IsPlayBackGroundMuisic())
SoundPlayer.Instance.PlayBackGroundMusic(38);
}
-
private void OnClickEnterBoss()
@@ -597,6 +611,10 @@
}
}
+
+
+
+
private void OnFirstChargeTaskUpdateEvent()
{
DisplayFirstChargeBtn();
@@ -611,6 +629,10 @@
else if (funcId == (int)FuncOpenEnum.Horse)
{
DisplayHorse();
+ }
+ else if (funcId == (int)FuncOpenEnum.OSMainLevl || funcId == (int)FuncOpenEnum.OSHeroCall)
+ {
+ DisplayOSActivity();
}
}
@@ -654,4 +676,17 @@
UIManager.Instance.OpenWindow<HorseWin>();
}
}
-}
\ No newline at end of file
+
+ void DisplayOSActivity()
+ {
+ osMainLevelBtn.SetActive(OSActivityManager.Instance.IsOpened(3));
+ osHeroCallBtn.SetActive(OSActivityManager.Instance.IsOpened(4));
+ }
+
+ void OnDayEvent()
+ {
+ DisplayOSActivity();
+ }
+}
+
+
--
Gitblit v1.8.0