121 【武将】武将系统 - 生效武将版本，同步属性计算，更改新筛选模式

hch

2025-12-06 ff032a0d727eee13399e29391e1437bea912337c

 Main/System/HeroUI/HeroCollectionLvUpWin.cs

@@ -18,9 +18,9 @@
    [SerializeField] HeroHeadBaseCell afterHeadCell;
    [SerializeField] Text name2;

    [SerializeField] Text[] attrNames;
    [SerializeField] Text[] beforeAttrValues;
    [SerializeField] Text[] afterAttrValues;
    // [SerializeField] Text[] attrNames;
    // [SerializeField] Text[] beforeAttrValues;
    // [SerializeField] Text[] afterAttrValues;

    [SerializeField] RichText awardInfo;
    [SerializeField] Button btn;
@@ -59,39 +59,39 @@

        HB122_tagSCHeroInfo.tagSCHero colData;
        HeroUIManager.Instance.TryGetHeroBookInfo(HeroUIManager.Instance.selectCollectHeroID, out colData);
        var bookPer = HeroUIManager.Instance.GetHeroBookPer(HeroUIManager.Instance.selectCollectHeroID);
        if (state == 5 || state == 2)
        {
            //已满级
            titleText.text = state == 5 ? Language.Get("HeroAwake13") : Language.Get("HeroAwake12");
            fullPanel.SetActive(true);
            lvupPanel.SetActive(false);
        // var bookPer = HeroUIManager.Instance.GetHeroBookPer(HeroUIManager.Instance.selectCollectHeroID);
        // if (state == 5 || state == 2)
        // {
        //     //已满级
        //     titleText.text = state == 5 ? Language.Get("HeroAwake13") : Language.Get("HeroAwake12");
        //     fullPanel.SetActive(true);
        //     lvupPanel.SetActive(false);

            fullHeadCell.Init(HeroUIManager.Instance.selectCollectHeroID, config.SkinIDList[0], colData.BookStarLV);
            name3.text = colData.BookBreakLV == 0 ? config.Name : Language.Get("herocardbreaklv", config.Name, colData.BookBreakLV);
        //     fullHeadCell.Init(HeroUIManager.Instance.selectCollectHeroID, config.SkinIDList[0], colData.BookStarLV);
        //     name3.text = colData.BookBreakLV == 0 ? config.Name : Language.Get("herocardbreaklv", config.Name, colData.BookBreakLV);

            for (int i = 0; i < fullAttrs.Length; i++)
            {
                fullAttrs[i].text = PlayerPropertyConfig.GetFullDescription(PlayerPropertyConfig.basePerAttrs[i],
                    bookPer, "{0}    " + UIHelper.AppendColor(TextColType.Green, "+{1}"));
            }
            var nextHeroID = HeroUIManager.Instance.FindHeroIDCanAddCollectAttr(HeroUIManager.Instance.selectCollectHeroID);
            if (nextHeroID != 0)
            {
                fullImg.SetActive(false);
                btn.SetActive(true);
                //下一个
                btnText.text = Language.Get("HeroAwake14");
            }
            else
            {
                fullImg.SetActive(state == 5);
                btn.SetActive(state == 2);
                btnText.text = Language.Get("L1109");
            }
        //     for (int i = 0; i < fullAttrs.Length; i++)
        //     {
        //         fullAttrs[i].text = PlayerPropertyConfig.GetFullDescription(PlayerPropertyConfig.basePerAttrs[i],
        //             bookPer, "{0}    " + UIHelper.AppendColor(TextColType.Green, "+{1}"));
        //     }
        //     var nextHeroID = HeroUIManager.Instance.FindHeroIDCanAddCollectAttr(HeroUIManager.Instance.selectCollectHeroID);
        //     if (nextHeroID != 0)
        //     {
        //         fullImg.SetActive(false);
        //         btn.SetActive(true);
        //         //下一个
        //         btnText.text = Language.Get("HeroAwake14");
        //     }
        //     else
        //     {
        //         fullImg.SetActive(state == 5);
        //         btn.SetActive(state == 2);
        //         btnText.text = Language.Get("L1109");
        //     }

        }
        else
        // }
        // else
        {
            fullPanel.SetActive(false);
            lvupPanel.SetActive(true);
@@ -100,7 +100,7 @@
            beforeHeadCell.Init(HeroUIManager.Instance.selectCollectHeroID, config.SkinIDList[0], colData.BookStarLV);
            name1.text = colData.BookBreakLV == 0 ? config.Name : Language.Get("herocardbreaklv", config.Name, colData.BookBreakLV);

            int addPer = 0;
            // int addPer = 0;
            var qualityConfig = HeroQualityConfig.Get(config.Quality);
            awardInfo.text = string.Empty;
            unActiveGo.SetActive(false);
@@ -110,27 +110,27 @@
            if (state == 1)
            {
                //激活
                addPer = qualityConfig.BookInitAddPer;
                // addPer = qualityConfig.BookInitAddPer;
                btnText.text = Language.Get("L1131");   //L1131   激活
                awardInfo.text = Language.Get("HeroAwake10", UIHelper.GetIconNameWithMoneyType(qualityConfig.BookActAwardMoney[0]),
                    qualityConfig.BookActAwardMoney[1]);
                unActiveGo.SetActive(true);
                titleText.text = Language.Get("HeroAwake11");
            }
            else if (state == 3)
            {
                //突破
                addPer = qualityConfig.BookBreakLVAddPer;
                btnText.text = Language.Get("L1109");   //升级 
                afterBreakLV++;
            }
            else if (state == 4)
            {
                //升星
                addPer = qualityConfig.BookStarAddPer;
                btnText.text = Language.Get("L1109");
                afterStarLV++;
            }
            // else if (state == 3)
            // {
            //     //突破
            //     addPer = qualityConfig.BookBreakLVAddPer;
            //     btnText.text = Language.Get("L1109");   //升级 
            //     afterBreakLV++;
            // }
            // else if (state == 4)
            // {
            //     //升星
            //     addPer = qualityConfig.BookStarAddPer;
            //     btnText.text = Language.Get("L1109");
            //     afterStarLV++;
            // }
            else
            {
                var nextHeroID = HeroUIManager.Instance.FindHeroIDCanAddCollectAttr(HeroUIManager.Instance.selectCollectHeroID);
@@ -141,20 +141,27 @@
                }
                else
                {
                    btnText.text = Language.Get("L1109");
                    btnText.text = Language.Get("L1001");
                }

                fullPanel.SetActive(true);
                lvupPanel.SetActive(false);

                fullHeadCell.Init(HeroUIManager.Instance.selectCollectHeroID, config.SkinIDList[0], colData.BookStarLV);
                name3.text = colData.BookBreakLV == 0 ? config.Name : Language.Get("herocardbreaklv", config.Name, colData.BookBreakLV);

            }

            afterHeadCell.Init(HeroUIManager.Instance.selectCollectHeroID, config.SkinIDList[0], afterStarLV);
            name2.text = afterBreakLV == 0 ? config.Name :Language.Get("herocardbreaklv", config.Name, afterBreakLV);


            for (int i = 0; i < beforeAttrValues.Length; i++)
            {
                beforeAttrValues[i].text = PlayerPropertyConfig.GetValueDescription(PlayerPropertyConfig.basePerAttrs[i], bookPer);
                attrNames[i].text = PlayerPropertyConfig.Get(PlayerPropertyConfig.basePerAttrs[i]).Name;
                afterAttrValues[i].text = PlayerPropertyConfig.GetValueDescription(PlayerPropertyConfig.basePerAttrs[i], bookPer + addPer);
            }
            // for (int i = 0; i < beforeAttrValues.Length; i++)
            // {
            //     beforeAttrValues[i].text = PlayerPropertyConfig.GetValueDescription(PlayerPropertyConfig.basePerAttrs[i], bookPer);
            //     attrNames[i].text = PlayerPropertyConfig.Get(PlayerPropertyConfig.basePerAttrs[i]).Name;
            //     afterAttrValues[i].text = PlayerPropertyConfig.GetValueDescription(PlayerPropertyConfig.basePerAttrs[i], bookPer + addPer);
            // }
        }

    }
@@ -167,16 +174,16 @@
            //激活
            SendPack(0);
        }
        else if (state == 3)
        {
            //突破
            SendPack(2);
        }
        else if (state == 4)
        {
            //升星
            SendPack(1);
        }
        // else if (state == 3)
        // {
        //     //突破
        //     SendPack(2);
        // }
        // else if (state == 4)
        // {
        //     //升星
        //     SendPack(1);
        // }
        else
        {
            var nextHeroID = HeroUIManager.Instance.FindHeroIDCanAddCollectAttr(HeroUIManager.Instance.selectCollectHeroID);
@@ -188,7 +195,8 @@
            }
            else
            {
                SysNotifyMgr.Instance.ShowTip("HeroGift8");
                // SysNotifyMgr.Instance.ShowTip("HeroGift8");
                CloseWindow();
            }
        }
    }