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

yyl

2026-03-26 f4a702e212d1853735f8dae399da69d23bfa510e

 Main/System/HeroUI/HeroCollectionLvUpWin.cs

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

@@ -96,8 +95,8 @@
        {
            // fullPanel.SetActive(true);
            lvupPanel.SetActive(state == 1);
            fullHeadCell.Init(HeroUIManager.Instance.selectCollectHeroID, config.SkinIDList[0], colData.BookStarLV).Forget();
            name3.text = colData.BookBreakLV == 0 ? config.Name : Language.Get("herocardbreaklv", config.Name, colData.BookBreakLV);
            fullHeadCell.Init(HeroUIManager.Instance.selectCollectHeroID, config.SkinIDList[0]);
            name3.text = config.Name;


            btn.SetActive(true);
@@ -110,8 +109,6 @@
            awardInfo.text = string.Empty;
            unActiveGo.SetActive(false);
            // titleText.text = Language.Get("HeroAwake12");
            int afterBreakLV = colData.BookBreakLV;
            int afterStarLV = colData.BookStarLV;
            if (state == 1)
            {
                lvupPanel.SetActive(true);