Merge branch 'master' into h5version

yyl

2026-05-11 51b0f6ed9f4e1d3bb6f8144470b46908c7699a96

 Main/System/Guild/GuildCreateWin.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>
/// 创建公会界面
@@ -19,7 +20,7 @@
    {
        changeEmblemBtn.AddListener(() =>
        {
            UIManager.Instance.OpenWindow<GuildEmblemWin>(1);
            UIManager.Instance.OpenWindowAsync<GuildEmblemWin>(1).Forget();
        });
        createBtn.AddListener(CreateGuild);
    }
@@ -43,7 +44,7 @@

    void Display()
    {
        emblemCell.Display(GuildEmblemModel.Instance.createSelectEmblemId, GuildEmblemModel.Instance.createEmblemWord, 1.5f);
        emblemCell.Display(GuildEmblemModel.Instance.createSelectEmblemId, GuildEmblemModel.Instance.createEmblemWord, 0.8f);
        moneyIcon.SetIconWithMoneyType(GuildManager.Instance.createMoneyType);
        moneyText.text = UIHelper.ShowUseMoney(GuildManager.Instance.createMoneyType, GuildManager.Instance.createFairyCost);
    }