From eb27e5fd31f73b998a4bbd85511a31e40b8c61b7 Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期五, 21 十一月 2025 17:03:47 +0800
Subject: [PATCH] 0312 关闭游戏内日志

---
 Main/System/Guild/GuildBaseWin.cs |   54 +++++++++++++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 49 insertions(+), 5 deletions(-)

diff --git a/Main/System/Guild/GuildBaseWin.cs b/Main/System/Guild/GuildBaseWin.cs
index 49eedc0..ef5e6c9 100644
--- a/Main/System/Guild/GuildBaseWin.cs
+++ b/Main/System/Guild/GuildBaseWin.cs
@@ -9,11 +9,14 @@
 public class GuildBaseWin : UIBase
 {
     [SerializeField] Button guildBtn;
+    [SerializeField] Button guildHawkerBtn; //琛屽晢
+    [SerializeField] Text guildHawkerTimeText;
+    [SerializeField] Text guildHawkerInfo;  //澶囪揣
     [SerializeField] GuildEmblemCell emblemCell;
     [SerializeField] Text guildNameText;
     [SerializeField] Text guildMemberCountText;
     [SerializeField] Button rankBtn;
-
+    [SerializeField] Button storeBtn;
 
 
     [SerializeField] Button requestBtn;
@@ -22,12 +25,19 @@
     {
         guildBtn.AddListener(() =>
         {
-            // UIManager.Instance.OpenWindow<GuildWin>();
+            UIManager.Instance.OpenWindow<GuildHallWin>();
         });
-        
+
         requestBtn.AddListener(() =>
         {
             // UIManager.Instance.OpenWindow<GuildRequestWin>();
+        });
+
+        guildHawkerBtn.AddListener(OpenHawker);
+        storeBtn.AddListener(() =>
+        {
+            StoreModel.Instance.selectStoreFuncType = StoreFunc.Guild;
+            UIManager.Instance.OpenWindow<StoreBaseWin>();
         });
     }
 
@@ -36,27 +46,61 @@
     {
         if (PlayerDatas.Instance.fairyData.fairy == null)
             return;
-
+        GlobalTimeEvent.Instance.secondEvent += OnSecondEvent;
 
         Display();
     }
 
     protected override void OnPreClose()
     {
+        GlobalTimeEvent.Instance.secondEvent -= OnSecondEvent;
     }
 
 
     void Display()
     {
         ShowGuildInfo();
+        ShowHawkerTime();
     }
 
+    void OnSecondEvent()
+    {
+        ShowHawkerTime();
+    }
 
     void ShowGuildInfo()
     {
-        emblemCell.Display(PlayerDatas.Instance.fairyData.fairy.EmblemID, PlayerDatas.Instance.fairyData.fairy.EmblemWord);
+        emblemCell.Display(PlayerDatas.Instance.fairyData.fairy.EmblemID, PlayerDatas.Instance.fairyData.fairy.EmblemWord, 0.8f);
         guildNameText.text = PlayerDatas.Instance.fairyData.fairy.FamilyName;
         var config = FamilyConfig.Get(PlayerDatas.Instance.fairyData.fairy.FamilyLV);
         guildMemberCountText.text = PlayerDatas.Instance.fairyData.fairy.MemberCount + "/" + config.MemberMax;
     }
+
+    void OpenHawker()
+    {
+        if (TimeUtility.GetToTenClockSeconds() > 0)
+        {
+            SysNotifyMgr.Instance.ShowTip("GuildSys17");
+            return;
+        }
+        UIManager.Instance.OpenWindow<GuildHawkerWin>();
+    }
+
+    void ShowHawkerTime()
+    {
+        var toTenSeconds = TimeUtility.GetToTenClockSeconds();
+        if (toTenSeconds > 0)
+        {
+            guildHawkerTimeText.text = TimeUtility.SecondsToHMS(toTenSeconds);
+            guildHawkerInfo.SetActive(true);
+            var addStr = new string('.', (int)Time.time % 4);
+            guildHawkerInfo.text = Language.Get("Guild_72") + addStr;
+        }
+        else
+        {
+            guildHawkerTimeText.text = TimeUtility.SecondsToHMS((int)(TimeUtility.GetTodayEndTime() - TimeUtility.ServerNow).TotalSeconds);
+            guildHawkerInfo.SetActive(false);
+        }
+
+    }
 }
\ No newline at end of file

--
Gitblit v1.8.0