From b0a5d4688f1af73b5ad03ccc2df11c9aac1523a9 Mon Sep 17 00:00:00 2001
From: yyl <yyl>
Date: 星期二, 29 七月 2025 16:56:23 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.1.20:10010/r/Project_SG_scripts
---
Main/System/HeroUI/HeroListWin.cs | 51 ++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 38 insertions(+), 13 deletions(-)
diff --git a/Main/System/HeroUI/HeroListWin.cs b/Main/System/HeroUI/HeroListWin.cs
index 5f7eb94..87389aa 100644
--- a/Main/System/HeroUI/HeroListWin.cs
+++ b/Main/System/HeroUI/HeroListWin.cs
@@ -16,33 +16,36 @@
[SerializeField] GameObject attrOnTip;
[SerializeField] Button attrOnTipBtn;
- [SerializeField] GameObject foldObject;
- [SerializeField] Button unFoldBtn; //灞曞紑鎸夐挳
- [SerializeField] List<Button> countryBtnList;
- [SerializeField] GameObject unFoldObject;
- [SerializeField] Button foldBtn; //鏀惰捣鎸夐挳
- [SerializeField] List<Button> jobBtnList; //鍏ㄩ儴锛岃緭鍑恒�佽倝鐩俱�佽緟鍔┿�佹帶鍒�
[SerializeField] Button changeHeroPosBtn; //甯冮樀鎸夐挳
private List<Image> countrySelectImgList;
private List<Image> jobSelectImgList;
+ SinglePack singlePack;
+
/// </summary>
protected override void InitComponent()
{
- heroPackBtn.onClick.AddListener(() =>
+ heroPackBtn.AddListener(() =>
{
HeroUIManager.Instance.QueryUnLockHeroPack();
+ });
+ changeHeroPosBtn.AddListener(() =>
+ {
+ HeroUIManager.Instance.selectTeamType = TeamType.Story;
+ UIManager.Instance.OpenWindow<HeroPosWin>();
});
}
protected override void OnPreOpen()
{
+ singlePack = PackManager.Instance.GetSinglePack(PackType.Hero);
heroListScroller.OnRefreshCell += OnRefreshCell;
+ //闇�瑕佽�冭檻璋冩暣涓烘灏嗙殑浜嬩欢锛岃�屼笉鏄儗鍖�
PackManager.Instance.RefreshItemEvent += RefreshPakCount;
- HeroManager.Instance.SortHeroList();
+ HeroUIManager.Instance.SortHeroList();
CreateScroller();
Refresh();
}
@@ -56,7 +59,6 @@
public override void Refresh()
{
- SinglePack singlePack = PackManager.Instance.GetSinglePack(PackType.Item);
if (singlePack == null || singlePack.GetAllItems().Count <= 0)
{
heroListEmpty.SetActive(true);
@@ -68,10 +70,32 @@
heroListScroller.SetActive(true);
}
+ OnBattleTeamAttrPer();
+
+ RefreshPakCount(PackType.Hero, 0, 0);
+ }
+
+ //涓婇樀鍔犳垚
+ void OnBattleTeamAttrPer()
+ {
+ var valuePer = 0;
+ var team = TeamManager.Instance.GetTeam(TeamType.Story);
+ if (team != null)
+ {
+ for (int i = 0; i < team.serverData.Length; i++)
+ {
+ var hero = HeroManager.Instance.GetHero(team.serverData[i].guid);
+ if (hero != null)
+ {
+ valuePer += hero.GetOnBattleAddPer();
+ }
+ }
+
+ }
//涓婇樀灞炴��
for (int i = 0; i < attrOnList.Count; i++)
{
- attrOnList[i].text = PlayerPropertyConfig.GetFullDescription(new Int2 (PlayerPropertyConfig.baseAttrs[i], 1 ));
+ attrOnList[i].text = PlayerPropertyConfig.GetFullDescription(new Int2(PlayerPropertyConfig.basePerAttrs[i], valuePer));
}
}
@@ -84,7 +108,7 @@
void CreateScroller()
{
heroListScroller.Refresh();
- for (int i = 0; i < HeroManager.Instance.heroSortList.Count; i++)
+ for (int i = 0; i < HeroUIManager.Instance.heroSortList.Count; i++)
{
if (i % 4 == 0)
{
@@ -96,13 +120,14 @@
void RefreshPakCount(PackType type, int index, int itemID)
{
- SinglePack singlePack = PackManager.Instance.GetSinglePack(PackType.Item);
+ if (type != PackType.Hero)
+ return;
if (singlePack == null)
return;
int count = singlePack.GetAllItems().Count;
- heroPackText.text = UIHelper.AppendColor(count > singlePack.unlockedGridCount ? TextColType.Red : TextColType.NavyBrown,
+ heroPackText.text = UIHelper.AppendColor(count > singlePack.unlockedGridCount ? TextColType.Red : TextColType.NavyBrown,
string.Format("{0}/{1}", count, singlePack.unlockedGridCount));
}
--
Gitblit v1.8.0