656 布阵阵型增加混搭武将组合

lcy

12 小时以前 68869f5b4b4139958942294522471ff9f9f6c8f9

 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();
    }