From 68869f5b4b4139958942294522471ff9f9f6c8f9 Mon Sep 17 00:00:00 2001
From: lcy <1459594991@qq.com>
Date: 星期三, 27 五月 2026 14:56:13 +0800
Subject: [PATCH] 656 布阵阵型增加混搭武将组合
---
Main/System/HeroUI/HeroFormationWin.cs | 28 ++++++++++++++++++++--------
1 files changed, 20 insertions(+), 8 deletions(-)
diff --git a/Main/System/HeroUI/HeroFormationWin.cs b/Main/System/HeroUI/HeroFormationWin.cs
index 60acf92..3ff97dd 100644
--- a/Main/System/HeroUI/HeroFormationWin.cs
+++ b/Main/System/HeroUI/HeroFormationWin.cs
@@ -23,19 +23,29 @@
{
scroller.OnRefreshCell += OnRefreshCell;
CreateScroller();
- Int2 result;
+
+ // 浼樺厛妫�鏌ユ贩鎼樀鍨�
+ HeroLineupHaloConfig activeConfig = null;
if (HeroUIManager.Instance.isCustonHeroFormation)
{
- result = HeroUIManager.Instance.GetMaxCountHeroCountry(HeroUIManager.Instance.custonTeamHeroes);;
+ activeConfig = HeroUIManager.Instance.GetMixedFormationConfig(HeroUIManager.Instance.custonTeamHeroes);
+ if (activeConfig == null)
+ {
+ var result = HeroUIManager.Instance.GetMaxCountHeroCountry(HeroUIManager.Instance.custonTeamHeroes);
+ activeConfig = HeroLineupHaloConfig.GetConfig(result.x, result.y);
+ }
}
else
{
- result = HeroUIManager.Instance.GetMaxCountHeroCountry(HeroUIManager.Instance.selectTeamType, true);
+ activeConfig = HeroUIManager.Instance.GetMixedFormationConfig(HeroUIManager.Instance.selectTeamType, true);
+ if (activeConfig == null)
+ {
+ var result = HeroUIManager.Instance.GetMaxCountHeroCountry(HeroUIManager.Instance.selectTeamType, true);
+ activeConfig = HeroLineupHaloConfig.GetConfig(result.x, result.y);
+ }
}
-
- var config = HeroLineupHaloConfig.GetConfig(result.x, result.y);
- if (config == null)
+ if (activeConfig == null)
{
totalAttrText.text = "";
}
@@ -43,10 +53,10 @@
{
string lineText = string.Empty;
- for (int i = 0; i < config.AttrIDList.Length; i++)
+ for (int i = 0; i < activeConfig.AttrIDList.Length; i++)
{
string format = "{0}+" + UIHelper.AppendColor(TextColType.Green, "{1}");
- lineText += " " + PlayerPropertyConfig.GetFullDescription(config.AttrIDList[i], config.AttrValueList[i], format);
+ lineText += " " + PlayerPropertyConfig.GetFullDescription(activeConfig.AttrIDList[i], activeConfig.AttrValueList[i], format);
}
totalAttrText.text = Language.Get("herocard36") + lineText.Trim();
}
@@ -72,6 +82,8 @@
{
scroller.AddCell(ScrollerDataType.Header, i);
}
+ // 绗�5涓负娣锋惌闃靛瀷鏍煎瓙锛堟樉绀哄湪鏈�鍚庯級
+ scroller.AddCell(ScrollerDataType.Header, 4);
scroller.Restart();
}
--
Gitblit v1.8.0