From f4a702e212d1853735f8dae399da69d23bfa510e Mon Sep 17 00:00:00 2001
From: yyl <yyl>
Date: 星期四, 26 三月 2026 18:16:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into h5version
---
Main/System/HeroUI/HeroBestWin.cs | 19 ++++++++++++++-----
1 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/Main/System/HeroUI/HeroBestWin.cs b/Main/System/HeroUI/HeroBestWin.cs
index 2bb3e8f..3d7bd97 100644
--- a/Main/System/HeroUI/HeroBestWin.cs
+++ b/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();
+ }
}
--
Gitblit v1.8.0