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

yyl

2026-03-26 f4a702e212d1853735f8dae399da69d23bfa510e

 Main/System/HeroUI/HeroBestWin.cs

@@ -25,7 +25,6 @@
    [SerializeField] SkillBaseCell normalSkillCell;
    [SerializeField] SkillBaseCell angerSkillCell;

    [SerializeField] Button closeBtn;   //关闭按钮
    [SerializeField] Button starBtn;   //显示星级文字
    [SerializeField] List<Image> starImgList;
    [SerializeField] Text nameText;
@@ -72,12 +71,13 @@
        showFuncBtn.AddListener(() =>
        {
            funcForm.SetActive(true);
            UIManager.Instance.GetUI<HeroBestBaseWin>().GetCanvasGroup().alpha = 1;
        });
        seeLhBtn.AddListener(() =>
        {
            funcForm.SetActive(false);
            UIManager.Instance.GetUI<HeroBestBaseWin>().GetCanvasGroup().alpha = 0;
        });
        closeBtn.AddListener(CloseWindow);
        rightBtn.AddListener(() =>
        {
            ChangeHero(1);
@@ -126,6 +126,8 @@
        unfoldState = false;
        allAttrScroll.verticalNormalizedPosition = 1;
        Display();
        HeroUIManager.Instance.skinRedpoint.state = HeroUIManager.Instance.HeroAllSkinStateForRedpoint(HeroUIManager.Instance.selectForPreviewHeroID, true) > 0 ? RedPointState.Simple : RedPointState.None;
    
    }


@@ -133,15 +135,15 @@
    public void Display()
    {
        heroConfig = HeroConfig.Get(HeroUIManager.Instance.selectForPreviewHeroID);
        bgTexture.SetTexture2D("countryBG" + heroConfig.Country);
        int skinID = heroConfig.SkinIDList[0];
        bgTexture.SetTexture2D(HeroUIManager.Instance.GetBGName(skinID, heroConfig.Country));
        roleLhModel.Create(skinID, 1, motionName: "", isLh: true);
        roleXsModel.Create(skinID, 1);
        jobImg.SetSprite(HeroUIManager.Instance.GetJobIconName(heroConfig.Class));
        jobPosNameText.text = HeroUIManager.Instance.GetJobName(heroConfig.Class);
        descText.text = heroConfig.Desc;


        HeroUIManager.Instance.PlayerLHSound(skinID);
        
        RefreshConn();
        normalSkillCell.Init(heroConfig.AtkSkillID, () =>
        {
@@ -221,6 +223,13 @@
        }
        HeroUIManager.Instance.selectForPreviewHeroID = HeroUIManager.Instance.heroCollectList[resultIndex];
        Display();
        
        //控制一级功能界面的皮肤按钮
        var ui = UIManager.Instance.GetUI<HeroBestBaseWin>();
        if (ui != null)
        {
            ui.ShowSkinBtn();
        }
    }