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

yyl

2026-04-28 ad3ac1661daaf4b445914f87009d3d88c990f040

 Main/System/HeroReturn/HeroReturnStarUpWin.cs

@@ -37,9 +37,18 @@
        });
        lockButton.SetListener(() =>
        {
            manager.SaveStarUpLockState(manager.GetOperationHeroAppearInfo());
            Display();
            manager.UpdateRedpoint();
            ConfirmCancel.ShowPopConfirm(
                Language.Get("Mail101"),
                Language.Get("HeroReturnLockHero"),
                (bool isOK) =>
                {
                    if (isOK)
                    {
                        manager.SaveStarUpLockState(manager.GetOperationHeroAppearInfo());
                        Display();
                        manager.UpdateRedpoint();
                    }
                });
        });
    }

@@ -111,7 +120,7 @@

        bool isLockStarHero = manager.IsLockStarHero(act);
        changeButton.SetActive(!isLockStarHero);
        lockButton.interactable = !isLockStarHero;
        lockButton.SetActive(!isLockStarHero);

        heroHeadBaseCell.Init(heroConfig.HeroID, skinID, 0, 0, 0, () =>
        {