Merge remote-tracking branch 'origin/master' into h5version

yyl

2026-03-26 f4a702e212d1853735f8dae399da69d23bfa510e

 Main/System/HeroUI/HeroCollectionWin.cs

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

@@ -27,13 +26,15 @@
        {
            SmallTipWin.worldPos = CameraManager.uiCamera.ScreenToWorldPoint(Input.mousePosition);
            SmallTipWin.showText = Language.Get("herocard6");
            UIManager.Instance.OpenWindowAsync<SmallTipWin>().Forget();
            UIManager.Instance.OpenWindow<SmallTipWin>();
        });

        heroPackBtn.AddListener(() =>
        {
            HeroUIManager.Instance.QueryUnLockHeroPack();
        });

        fiterManager = HeroSelectBehaviour.Create(heroSelectBehaviour);
    }

    protected override void OnPreOpen()
@@ -43,43 +44,30 @@
        PackManager.Instance.RefreshItemEvent += RefreshItemEvent;
        HeroUIManager.Instance.OnHeroCollectEvent += OnHeroCollectEvent;
        heroListScroller.OnRefreshCell += OnRefreshCell;
        TimeMgr.Instance.OnDayEvent += OnDayEvent;
        HeroUIManager.Instance.SortHeroCollectList();
        Display();
    }

    protected override void OnPreClose()
    {

        PackManager.Instance.gridRefreshEvent -= GridRefreshEvent;
        PackManager.Instance.RefreshItemEvent -= RefreshItemEvent;
        HeroUIManager.Instance.OnHeroCollectEvent -= OnHeroCollectEvent;
        heroListScroller.OnRefreshCell -= OnRefreshCell;
        TimeMgr.Instance.OnDayEvent -= OnDayEvent;
    }

    private void OnDayEvent()
    {
        HeroUIManager.Instance.SortHeroCollectList();
        CreateScroller();
    }

    void Display()
    {
        if (null != fiterManager)
        {
            fiterManager.Display(0, SelectJobCountry);
        }
        else
        {
            HeroSelectBehaviour.Create(heroSelectBehaviour).ContinueWith(fmgr =>
            {
                if (this == null)
                {
                    if (fmgr != null)
                    {
                        GameObject.DestroyImmediate(fmgr.gameObject);
                    }
                    return;
                }
                fiterManager = fmgr;
                fiterManager.Display(0, SelectJobCountry);
            }).Forget();   
        }
        
        fiterManager.Display(0, SelectJobCountry);

        // CreateScroller();
        // RefreshTotalAttr();
        RefreshPackCount();