Merge branch 'master' into h5version

yyl

2026-05-11 51b0f6ed9f4e1d3bb6f8144470b46908c7699a96

 Main/System/Guild/GuildJoinWin.cs

@@ -1,7 +1,8 @@
using System.Collections;
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using UnityEngine.UI;
using Cysharp.Threading.Tasks;

/// <summary>
/// 加入公会界面 ：公会查找列表，也是排行榜
@@ -14,6 +15,7 @@
    [SerializeField] Button quicklyJoinGuildBtn;
    [SerializeField] ScrollerController guildListScroller;
    [SerializeField] Transform noGuildTf;
    [SerializeField] Button serversBtn;

    string lastQuery = "";
    int lastPage = 0;
@@ -22,6 +24,10 @@
        findBtn.AddListener(() => OnFindBtnClick());
        createGuildBtn.AddListener(OnCreateGuildBtnClick);
        quicklyJoinGuildBtn.AddListener(OnQuicklyJoinGuildBtnClick);
        serversBtn.AddListener(()=>
        {
            UIHelper.ShowServersPanel(GuildManager.Instance.crossServerIDList);
        });
    }
    protected override void OnPreOpen()
    {
@@ -42,23 +48,20 @@
        guildListScroller.OnRefreshCell -= RefreshCell;
        PlayerDatas.Instance.fairyData.OnRefreshFairyInfo -= OnRefreshFairyInfo;

        var win = UIManager.Instance.GetUI<MainWin>();
        if (win)
            win.RestoreFuncBtn();
        
        UIManager.Instance.GetUI<MainWin>()?.RestoreFuncBtn();

    }

    void OnRefreshFairyInfo()
    {
        //当前界面下有刷新自家的公会数据，说明一定是加入了公会，需主动跳转到公会界面
        CloseWindow();
        var win = UIManager.Instance.GetUI<MainWin>();
        if (win)
            win.ClickFunc(4);
        UIManager.Instance.GetUI<MainWin>()?.ClickFunc(4);
    }

    void Display()
    {
        serversBtn.SetActive(GuildManager.Instance.zoneID != 0);
        CreateScroller();
    }

@@ -80,7 +83,7 @@
        noGuildTf.SetActive(false);
        guildListScroller.SetActive(true);

        var startCount = guildListScroller.GetNumberOfCells();
        var startCount = guildListScroller.GetCellTotalCount();
        if (startCount > GuildManager.Instance.pageIndexList.Count)
        {
            guildListScroller.Refresh();
@@ -136,7 +139,7 @@

    private void OnCreateGuildBtnClick()
    {
        UIManager.Instance.OpenWindow<GuildCreateWin>();
        UIManager.Instance.OpenWindowAsync<GuildCreateWin>().Forget();
    }

    private void OnQuicklyJoinGuildBtnClick()