Merge branch 'master' into h5version

yyl

2026-05-11 51b0f6ed9f4e1d3bb6f8144470b46908c7699a96

 Main/System/Guild/GuildHallWin.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>
/// 公会大厅
@@ -38,11 +39,11 @@
        opBtn.AddListener(() =>
        {
            //管理按钮
            UIManager.Instance.OpenWindow<GuildOPWin>();
            UIManager.Instance.OpenWindowAsync<GuildOPWin>().Forget();
        });
        guildLVBtn.AddListener(() =>
        {
            // UIManager.Instance.OpenWindow<GuildLevelUpWin>();
            UIManager.Instance.OpenWindowAsync<GuildLevelWin>().Forget();
        });

        noticeBtn.AddListener(() =>
@@ -50,19 +51,18 @@
            var needLV = GuildManager.Instance.GetNeedGuildJobLV((int)GuildFuncType.PublishNotice);
            if (PlayerDatas.Instance.fairyData.mine.FmLV >= needLV)
            {
                UIManager.Instance.OpenWindow<GuildChangeBroadcastWin>();
                UIManager.Instance.OpenWindowAsync<GuildChangeBroadcastWin>().Forget();
            }
        });

        donateBtn.AddListener(() =>
        {
            UIManager.Instance.OpenWindow<GuildDonateWin>();
            UIManager.Instance.OpenWindowAsync<GuildDonateWin>().Forget();
        });
    }

    protected override void OnPreOpen()
    {
        GuildManager.Instance.RequestGuildData();

        GuildManager.Instance.memberOPIndex = -1;
        GuildManager.Instance.MemberOPIndexEvent += OnMemberOPIndexEvent;
@@ -98,8 +98,8 @@
        guildNameText.text = guildInfo.FamilyName + Language.Get("L1039", ServerListCenter.Instance.GetServerName(guildInfo.ServerID));
        guildNumText.text = GuildManager.Instance.EncryptGuildID(guildInfo.FamilyID);
        noticeText.text = string.IsNullOrEmpty(guildInfo.Broadcast) ? Language.Get("Guild_62") : guildInfo.Broadcast;
        lvExpProcess.fillAmount = (float)guildInfo.FamilyLVExp / config.NeedExp;
        expText.text = guildInfo.FamilyLVExp + "/" + config.NeedExp;
        lvExpProcess.fillAmount = config.NeedExp == 0 ? 1 : (float)guildInfo.FamilyLVExp / config.NeedExp;
        expText.text = config.NeedExp == 0 ? Language.Get("L1055") : StringUtility.Concat(guildInfo.FamilyLVExp.ToString(), "/", config.NeedExp.ToString());

    }