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/HeroCollectionCardCell.cs | 30 ++++++++----------------------
1 files changed, 8 insertions(+), 22 deletions(-)
diff --git a/Main/System/HeroUI/HeroCollectionCardCell.cs b/Main/System/HeroUI/HeroCollectionCardCell.cs
index e2e041c..5ea7b56 100644
--- a/Main/System/HeroUI/HeroCollectionCardCell.cs
+++ b/Main/System/HeroUI/HeroCollectionCardCell.cs
@@ -1,7 +1,6 @@
-锘縰sing UnityEngine;
+using UnityEngine;
using UnityEngine.UI;
using System.Collections.Generic;
-using Cysharp.Threading.Tasks;
public class HeroCollectionCardCell : MonoBehaviour
{
@@ -17,7 +16,7 @@
// [SerializeField] Button bookLVBtn;
[SerializeField] GameObject unGetObj;
[SerializeField] GameObject activeObj; // 鍙縺娲诲甫娴佸厜鏁堟灉鏉愯川
-
+ [SerializeField] GameObject actLimitObj; // 娲诲姩闄愬畾
public void Display(int index, int quality)
{
var heroID = HeroUIManager.Instance.heroCollectDict[quality][index];
@@ -35,6 +34,7 @@
activeObj.SetActive(funcState == 1);
// bookLVBtn.SetActive(funcState > 1);
unGetObj.SetActive(funcState == 0);
+ actLimitObj.SetActive(heroConfig.IsActLimit == 1);
countryImg.SetSprite(HeroUIManager.Instance.GetCountryIconName(heroConfig.Country));
jobImg.SetSprite(HeroUIManager.Instance.GetJobIconName(heroConfig.Class));
@@ -51,25 +51,11 @@
{
trainStateImg.SetActive(false);
}
- nameText.text = colData.BookBreakLV == 0 ? heroConfig.Name : Language.Get("herocardbreaklv", heroConfig.Name, colData.BookBreakLV);
+ nameText.text = heroConfig.Name;
for (int i = 0; i < starImgList.Count; i++)
{
- if (colData.BookStarLV == 0 && i == 0)
- {
- // 鏃犳槦绾� 鐗规畩澶勭悊
- starImgList[i].SetActive(true);
- starImgList[i].SetSprite("herostar" + colData.BookStarLV);
- }
- else if ((colData.BookStarLV - 1) % starImgList.Count >= i)
- {
- starImgList[i].SetActive(true);
- starImgList[i].SetSprite("herostar" + (((colData.BookStarLV - 1) / starImgList.Count) + 1) * starImgList.Count);
- }
- else
- {
- starImgList[i].SetActive(false);
- }
+ starImgList[i].SetActive(false);
}
heroCardBtn.AddListener(() =>
@@ -78,19 +64,19 @@
var state = HeroUIManager.Instance.GetHeroBookState(heroID, quality);
if (state == 1 || state == 3 || state == 4)
{
- UIManager.Instance.OpenWindowAsync<HeroCollectionLvUpWin>().Forget();
+ UIManager.Instance.OpenWindow<HeroCollectionLvUpWin>();
}
else
{
HeroUIManager.Instance.selectForPreviewHeroID = heroID;
- UIManager.Instance.OpenWindowAsync<HeroBestWin>().Forget();
+ UIManager.Instance.OpenWindow<HeroBestBaseWin>();
}
});
// bookLVBtn.AddListener(() =>
// {
// HeroUIManager.Instance.selectCollectHeroID = heroID;
- // UIManager.Instance.OpenWindowAsync<HeroCollectionLvUpWin>().Forget();
+ // UIManager.Instance.OpenWindow<HeroCollectionLvUpWin>();
// });
}
}
--
Gitblit v1.8.0