390 【武将】招募心愿设置 - 再次点击取消

hch

2025-12-17 9787220eb7ee09619720ce26a58a42ce8a6a5c31

390 【武将】招募心愿设置 - 再次点击取消

 Main/System/HappyXB/HappyXBModel.Hero.cs

@@ -17,8 +17,8 @@
    public int selectWishQuality = 5; //心愿选中的品质





    public int selectSHHeroWishID = 0;  //心愿选中的神话武将心愿ID 客户端

    public int selectCSHeroWishID = 0;  //心愿选中的传说武将心愿ID 客户端

    public int selectSHHeroWishID = 0;  //心愿选中的神话武将心愿ID 客户端  -1代表取消

    public int selectCSHeroWishID = 0;  //心愿选中的传说武将心愿ID 客户端  -1代表取消



    public Action OnSelectWishHeroEvent;




 Main/System/HappyXB/HeroCallHopeAddCell.cs

@@ -51,6 +51,11 @@
                //预览
                heroID = changeHeroID;
            }
            else if (changeHeroID == -1)
            {
                //取消预览
                heroID = 0;
            }
            if (heroID > 0)
            {
                head.SetActive(true);

 Main/System/HappyXB/HeroCallHopeSelectCell.cs

@@ -46,13 +46,29 @@
                }
            }

            //-1代表取消

            if (HappyXBModel.Instance.selectWishListTab == 0)
            {
                HappyXBModel.Instance.selectSHHeroWishID = wishID;
                if (HappyXBModel.Instance.selectSHHeroWishID == wishID)
                {
                    HappyXBModel.Instance.selectSHHeroWishID = -1;
                }
                else
                {
                    HappyXBModel.Instance.selectSHHeroWishID = wishID;
                }
            }
            else
            {
                HappyXBModel.Instance.selectCSHeroWishID = wishID;
                if (HappyXBModel.Instance.selectCSHeroWishID == wishID)
                {
                    HappyXBModel.Instance.selectCSHeroWishID = -1;
                }
                else
                {
                    HappyXBModel.Instance.selectCSHeroWishID = wishID;
                }
            }
            HappyXBModel.Instance.OnSelectWishHeroEvent?.Invoke();
        });

 Main/System/HappyXB/HeroCallHopeWin.cs

@@ -1,3 +1,4 @@
using System;
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
@@ -65,8 +66,36 @@

    void Display()
    {
        shHero.Display(5, AddHero, ShowHeroTip, HappyXBModel.Instance.selectSHHeroWishID == 0 ? 0 : TreasureItemLibConfig.Get(HappyXBModel.Instance.selectSHHeroWishID).ItemID);
        csHero.Display(4, AddHero, ShowHeroTip, HappyXBModel.Instance.selectCSHeroWishID == 0 ? 0 : TreasureItemLibConfig.Get(HappyXBModel.Instance.selectCSHeroWishID).ItemID);
        int shHeroID = 0;
        if (HappyXBModel.Instance.selectSHHeroWishID == -1)
        {
            shHeroID = -1;
        }
        else if (HappyXBModel.Instance.selectSHHeroWishID == 0)
        {
            shHeroID = 0;
        }
        else
        {
            shHeroID = TreasureItemLibConfig.Get(HappyXBModel.Instance.selectSHHeroWishID).ItemID;
        }

        int csHeroID = 0;
        if (HappyXBModel.Instance.selectCSHeroWishID == -1)
        {
            csHeroID = -1;
        }
        else if (HappyXBModel.Instance.selectCSHeroWishID == 0)
        {
            csHeroID = 0;
        }
        else
        {
            csHeroID = TreasureItemLibConfig.Get(HappyXBModel.Instance.selectCSHeroWishID).ItemID;
        }

        shHero.Display(5, AddHero, ShowHeroTip, shHeroID);
        csHero.Display(4, AddHero, ShowHeroTip, csHeroID);

        CreateScroller();

@@ -126,8 +155,36 @@

    void OnSelectWishHeroEvent()
    {
        shHero.Display(5, AddHero, ShowHeroTip, HappyXBModel.Instance.selectSHHeroWishID == 0 ? 0 : TreasureItemLibConfig.Get(HappyXBModel.Instance.selectSHHeroWishID).ItemID);
        csHero.Display(4, AddHero, ShowHeroTip, HappyXBModel.Instance.selectCSHeroWishID == 0 ? 0 : TreasureItemLibConfig.Get(HappyXBModel.Instance.selectCSHeroWishID).ItemID);
        int shHeroID = 0;
        if (HappyXBModel.Instance.selectSHHeroWishID == -1)
        {
            shHeroID = -1;
        }
        else if (HappyXBModel.Instance.selectSHHeroWishID == 0)
        {
            shHeroID = 0;
        }
        else
        {
            shHeroID = TreasureItemLibConfig.Get(HappyXBModel.Instance.selectSHHeroWishID).ItemID;
        }

        int csHeroID = 0;
        if (HappyXBModel.Instance.selectCSHeroWishID == -1)
        {
            csHeroID = -1;
        }
        else if (HappyXBModel.Instance.selectCSHeroWishID == 0)
        {
            csHeroID = 0;
        }
        else
        {
            csHeroID = TreasureItemLibConfig.Get(HappyXBModel.Instance.selectCSHeroWishID).ItemID;
        }

        shHero.Display(5, AddHero, ShowHeroTip, shHeroID);
        csHero.Display(4, AddHero, ShowHeroTip, csHeroID);
        scroller.m_Scorller.RefreshActiveCellViews();
    }

@@ -142,7 +199,8 @@
        var pack = new CA569_tagCSTreasureWishSelect();
        pack.TreasureType = (int)HappXBTitle.HeroCallAdvanced;

        pack.WishIDList = new uint[] { (uint)HappyXBModel.Instance.selectSHHeroWishID, (uint)HappyXBModel.Instance.selectCSHeroWishID };
        
        pack.WishIDList = new uint[] { (uint)Math.Max(0, HappyXBModel.Instance.selectSHHeroWishID), (uint)Math.Max(0, HappyXBModel.Instance.selectCSHeroWishID) };
        pack.WishCnt = 2;
        GameNetSystem.Instance.SendInfo(pack);
        CloseWindow();