Merge branch 'master' into h5version

yyl

2026-05-11 51b0f6ed9f4e1d3bb6f8144470b46908c7699a96

 Main/System/SkillUI/SkillBaseCell.cs

@@ -1,6 +1,7 @@
using UnityEngine;
using UnityEngine.UI;
using UnityEngine.Events;
using Cysharp.Threading.Tasks;

public class SkillBaseCell : MonoBehaviour
{
@@ -61,12 +62,13 @@

    void Awake()
    {
        LoadPrefab();
        LoadPrefab().Forget();
    }

    public void Init(int skillID, UnityAction onclick = null, bool showType = false)
    public async UniTask Init(int skillID, UnityAction onclick = null, bool showType = false)
    {
        LoadPrefab();   //存在被卸载的可能，重新加载
        await LoadPrefab();   //存在被卸载的可能，重新加载
        if (this == null) return;
        var config = SkillConfig.Get(skillID);
        if (config == null)
        {
@@ -100,7 +102,7 @@
    }

    GameObject cellContainer;
    protected void LoadPrefab()
    protected async UniTask LoadPrefab()
    {
        if (cellContainer != null)
            return;
@@ -111,15 +113,26 @@
            cellContainer = tmp.gameObject;
            return;
        }
        if (cellContainer == null)
        {
            cellContainer = UIUtility.CreateWidget("SkillBaseCell", "Container_SkillCell");

            if (cellContainer != null)
            {
                cellContainer.transform.SetParentEx(this.transform, Vector3.zero, Quaternion.identity, Vector3.one);
                cellContainer.transform.SetAsFirstSibling();
            }
        var inst = await UIUtility.CreateWidget("SkillBaseCell", "Container_SkillCell");

        if (this == null)
        {
            if (null != inst) DestroyImmediate(inst);
            return;
        }

        if (cellContainer != null)
        {
            DestroyImmediate(inst);
            return;
        }
        cellContainer = inst;

        if (cellContainer != null)
        {
            cellContainer.transform.SetParentEx(this.transform, Vector3.zero, Quaternion.identity, Vector3.one);
            cellContainer.transform.SetAsFirstSibling();
        }
        
        //缩放到和父rect一样大