121 【武将】心愿符未选择弹框提示，图标次数显示优化

hch

4 天以前 f28b2dd275d6d987e151f3b8ce4f1b5ce398e07a

121 【武将】心愿符未选择弹框提示，图标次数显示优化

 Main/System/BoneField/AdsManager.cs

@@ -47,9 +47,12 @@
                break;
            case 3:
                //寻宝类型
                HeroUIManager.Instance.selectCallType = HappXBTitle.HeroCallAdvanced;
                HeroUIManager.Instance.selectCallIndex = 0;
                SendGetReward(ADID);
                HappyXBModel.Instance.HeroCallAfterCheckWish(() =>
                {
                    HeroUIManager.Instance.selectCallType = HappXBTitle.HeroCallAdvanced;
                    HeroUIManager.Instance.selectCallIndex = 0;
                    SendGetReward(ADID);
                });
                break;
            case 4:
            case 6:

 Main/System/HappyXB/HappyXBModel.Hero.cs

@@ -4,6 +4,7 @@
using System.Collections.Generic;

using System.Linq;

using UnityEngine;

using UnityEngine.Events;



//武将相关招募

public partial class HappyXBModel : GameSystemManager<HappyXBModel>

@@ -138,4 +139,39 @@
        }

        return TreasureSetConfig.Get((int)HappXBTitle.HeroCallAdvanced).WishLibCard[libID];

    }



    bool checkWish = false;     //是否勾选过心愿确认

    //未选择任何心愿武将且有任一免费次数，则弹窗提示

    public void HeroCallAfterCheckWish(UnityAction _action)

    {

        if (checkWish)

        {

            _action?.Invoke();

            return;

        }

        if (selectSHHeroWishID <= 0 && selectCSHeroWishID <= 0)

        {

            var shdata = GetWishDataByQuality(5);

            var csdata = GetWishDataByQuality(4);

            if ((shdata != null && shdata.wishCnt == 0) || (csdata != null && csdata.wishCnt == 0))

            {

                ConfirmCancel.ToggleConfirmCancel(Language.Get("Mail101"), Language.Get("HeroCall14"), Language.Get("TianziBillborad08"), (bool isOk, bool isToggle) =>

                {

                    if (isOk)

                    {

                        UIManager.Instance.OpenWindow<HeroCallHopeWin>();

                    }

                    else

                    {

                        _action?.Invoke();

                    }

                    checkWish = isToggle;

                });



                return;

            }

        }



        _action?.Invoke();

    }

}


 Main/System/HappyXB/HappyXBModel.cs

@@ -45,7 +45,7 @@


    public override void Init()

    {

        DTC0102_tagCDBPlayer.beforePlayerDataInitializeEvent += OnBeforePlayerDataInitialize;

        DTC0102_tagCDBPlayer.beforePlayerDataInitializeEventOnRelogin += OnBeforePlayerDataInitialize;

        FuncOpen.Instance.OnFuncStateChangeEvent += UpdateFuncState;

        PackManager.Instance.RefreshItemEvent += RefreshXBTool;

        TimeMgr.Instance.OnDayEvent += OnDayEvent;

@@ -93,6 +93,7 @@
    {

        isXBCoolTime = false;

        xbTypeInfoDict.Clear();

        checkWish = false;

    }



    void OnPlayerLoginOk()


 Main/System/HappyXB/HeroCallHopeAddCell.cs

@@ -35,12 +35,20 @@

        if (wishData.wishCnt < HappyXBModel.wishMaxOutCnt)
        {
            tipRect.SetActive(true);
            freeText.SetActive(true);
            itemCntText?.SetActive(false);
            if (wishData == null || wishData.wishID == 0)
            {
                tipRect.SetActive(false);
            }
            else
            {
                tipRect.SetActive(true);
                freeText.SetActive(true);
                itemCntText?.SetActive(false);

            }
            headGray = false;
        }
        else if (wishData.auto && PackManager.Instance.GetItemCountByID(PackType.Item, itemID) > 0)
        else if (wishData.auto)
        {
            if (itemCntText == null)
            {
@@ -54,7 +62,7 @@
                itemIcon.SetItemSprite(itemID);
                itemCntText.text = UIHelper.ShowUseItem(PackType.Item, itemID, 1, bright: false);
            }
            headGray = false;
            headGray = PackManager.Instance.GetItemCountByID(PackType.Item, itemID) <= 0;
        }
        else
        {

 Main/System/HappyXB/HeroCallHopeSelectCell.cs

@@ -36,15 +36,15 @@
                SysNotifyMgr.Instance.ShowTip("HeroWishUnLock");
                return;
            }
            int quality = HappyXBModel.Instance.selectWishListTab == 0 ? 5 : 4;
            if (HappyXBModel.Instance.TryGetHeroWishIDByQuality((int)HappXBTitle.HeroCallAdvanced, quality, out int _wishID, out int _wishCnt, out bool auto))
            {
                if (_wishCnt >= HappyXBModel.wishMaxOutCnt)
                {
                    SysNotifyMgr.Instance.ShowTip("HeroWishFinish");
                    return;
                }
            }
            // int quality = HappyXBModel.Instance.selectWishListTab == 0 ? 5 : 4;
            // if (HappyXBModel.Instance.TryGetHeroWishIDByQuality((int)HappXBTitle.HeroCallAdvanced, quality, out int _wishID, out int _wishCnt, out bool auto))
            // {
            //     if (_wishCnt >= HappyXBModel.wishMaxOutCnt)
            //     {
            //         SysNotifyMgr.Instance.ShowTip("HeroWishFinish");
            //         return;
            //     }
            // }

            //-1代表取消


 Main/System/HappyXB/HeroCallResultWin.cs

@@ -68,11 +68,18 @@
    {
        okBtn.AddListener(CloseWindow);

        call1Btn.AddListener(SendHeroCall);
        call1Btn.AddListener(()=>
        {
            HappyXBModel.Instance.HeroCallAfterCheckWish(SendHeroCall);
        });
        call10Btn.AddListener(() =>
        {
            HeroUIManager.Instance.selectCallIndex = 1;
            HappyXBModel.Instance.SendXBManyQuest((int)HeroUIManager.Instance.selectCallType);
            HappyXBModel.Instance.HeroCallAfterCheckWish(() =>
            {
                HeroUIManager.Instance.selectCallIndex = 1;
                HappyXBModel.Instance.SendXBManyQuest((int)HeroUIManager.Instance.selectCallType);
            });

        });
        showNextlhOrCloseBtn.AddListener(()=>
        {

 Main/System/HappyXB/HeroCallWin.cs

@@ -42,12 +42,18 @@
            LocalSave.SetBool(HeroUIManager.skipKey + PlayerDatas.Instance.baseData.PlayerID, value);
        });
        ownItemCell.itemID = TreasureSetConfig.Get((int)HappXBTitle.HeroCallAdvanced).CostItemID;
        call1Btn.AddListener(SendHeroCall);
        call1Btn.AddListener(()=>
        {
            HappyXBModel.Instance.HeroCallAfterCheckWish(SendHeroCall);
        });
        call10Btn.AddListener(() =>
        {
            HeroUIManager.Instance.selectCallType = HappXBTitle.HeroCallAdvanced;
            HeroUIManager.Instance.selectCallIndex = 1;
            HappyXBModel.Instance.SendXBManyQuest((int)HappXBTitle.HeroCallAdvanced);
            HappyXBModel.Instance.HeroCallAfterCheckWish(() =>
            {
                HeroUIManager.Instance.selectCallType = HappXBTitle.HeroCallAdvanced;
                HeroUIManager.Instance.selectCallIndex = 1;
                HappyXBModel.Instance.SendXBManyQuest((int)HappXBTitle.HeroCallAdvanced);
            });
        });
        scoreBtn.AddListener(() =>
        {