Merge branch 'master' into h5version

yyl

2026-05-11 51b0f6ed9f4e1d3bb6f8144470b46908c7699a96

 Main/System/Guild/GuildBaseWin.cs

@@ -1,4 +1,4 @@
using System;
using System;
using System.Collections;
using System.Collections.Generic;
using Cysharp.Threading.Tasks;
@@ -43,23 +43,23 @@
    {
        guildBtn.AddListener(() =>
        {
            UIManager.Instance.OpenWindow<GuildHallWin>();
            UIManager.Instance.OpenWindowAsync<GuildHallWin>().Forget();
        });

        requestBtn.AddListener(() =>
        {
            UIManager.Instance.OpenWindow<GuildApplyListWin>();
            UIManager.Instance.OpenWindowAsync<GuildApplyListWin>().Forget();
        });

        guildHawkerBtn.AddListener(OpenHawker);
        storeBtn.AddListener(() =>
        {
            StoreModel.Instance.selectStoreFuncType = StoreFunc.Guild;
            UIManager.Instance.OpenWindow<StoreBaseWin>();
            UIManager.Instance.OpenWindowAsync<StoreBaseWin>().Forget();
        });
        rankBtn.AddListener(() =>
        {
            UIManager.Instance.OpenWindow<GuildRankWin>();
            UIManager.Instance.OpenWindowAsync<GuildRankWin>().Forget();
        });
        InitHawker();
        talkBtn.AddListener(OnClickTalkButton);
@@ -72,7 +72,6 @@
        if (PlayerDatas.Instance.fairyData.fairy == null)
            return;

        GuildManager.Instance.RequestGuildData();
        GlobalTimeEvent.Instance.secondEvent += OnSecondEvent;
        GlobalTimeEvent.Instance.fiveSecondEvent += OnFiveSecondEvent;
        ChatManager.Instance.OnUpdateTalkEvent += OnUpdateTalkEvent;
@@ -128,7 +127,7 @@
            SysNotifyMgr.Instance.ShowTip("GuildSys17");
            return;
        }
        UIManager.Instance.OpenWindow<GuildHawkerWin>();
        UIManager.Instance.OpenWindowAsync<GuildHawkerWin>().Forget();
    }

    void ShowHawkerTime(bool modelPlay = false)
@@ -220,9 +219,9 @@

    public void OnClickTalkButton()
    {
        ChatManager.Instance.nowChatTab = ChatTab.Guild;
        ChatManager.Instance.nowChatTab = ChatChannel.Guild;
        ChatManager.Instance.nowChatChannel = ChatChannel.Guild;
        UIManager.Instance.OpenWindow<ChatWin>();
        UIManager.Instance.OpenWindowAsync<ChatWin>().Forget();
    }

    public string GetGuildChatAreaContent(TalkData talkData)