125 战斗 修复因为自己技能造成自身死亡的卡死问题

yyl

2025-12-24 a38e02687f52e6d81e6fb6c1dcbf85ee76938325

 Main/System/Main/MainWin.cs

@@ -31,6 +31,8 @@
    [SerializeField] Text hammerText;
    [SerializeField] Text multiFightText;

    [SerializeField] Transform gameTip; //10连

    bool isForcePlayFightUIAnim = true; //强制播放战斗锤子框动画

    public static event Action TabChangeEvent;
@@ -58,6 +60,13 @@
        RenameManager.Instance.OnUpdateRenameResultEvent += OnUpdateRenameResultEvent;
        UIManager.Instance.OnCloseWindow += OnCloseWindow;
        GlobalTimeEvent.Instance.MSEvent += OnMSEvent;
        var xbInfo = HappyXBModel.Instance.GetXBInfoByType((int)HappXBTitle.HeroCallAdvanced);
        gameTip.SetActive(false);
        if (xbInfo != null && xbInfo.treasureCount < GeneralDefine.herocall10TipLimit)
        {
            GlobalTimeEvent.Instance.fiveSecondEvent += OnFiveSecondEvent;
        }
        EventBroadcast.Instance.AddListener<string>(EventName.BATTLE_START, OnBattleStart);
        base.OnPreOpen();

        // 刷新UI
@@ -71,6 +80,8 @@
        RenameManager.Instance.OnUpdateRenameResultEvent -= OnUpdateRenameResultEvent;
        UIManager.Instance.OnCloseWindow -= OnCloseWindow;
        GlobalTimeEvent.Instance.MSEvent -= OnMSEvent;
        GlobalTimeEvent.Instance.fiveSecondEvent -= OnFiveSecondEvent;
        EventBroadcast.Instance.RemoveListener<string>(EventName.BATTLE_START, OnBattleStart);

        base.OnPreClose();
        isForcePlayFightUIAnim = true;
@@ -79,6 +90,23 @@
    private void OnUpdateRenameResultEvent()
    {
        Display();
    }

    void OnFiveSecondEvent()
    {
        if (HappyXBModel.Instance.bestXB10Red.state != RedPointState.None)
        {
            gameTip.SetActive(true);
        }
        else
        {
            gameTip.SetActive(false);
            var xbInfo = HappyXBModel.Instance.GetXBInfoByType((int)HappXBTitle.HeroCallAdvanced);
            if (xbInfo != null && xbInfo.treasureCount >= GeneralDefine.herocall10TipLimit)
            {
                GlobalTimeEvent.Instance.fiveSecondEvent -= OnFiveSecondEvent;
            }
        }
    }

    void DisplayTopBar()
@@ -345,7 +373,24 @@
        }
    }

    void OnBattleStart(string guid)
    {
        if (string.IsNullOrEmpty(guid))
        {
            var tmpHero = TeamManager.Instance.GetTeam(TeamType.Story).GetNextServerHero("");
            if (tmpHero != null)
            {
                AutoFightModel.Instance.fightingHeroSkinID = tmpHero.SkinID;
            }
            else
            {
                Debug.LogError("没有找到下一个攻击武将");
                return;
            }

            fightHeroImg.SetOrgSprite(HeroSkinConfig.Get(AutoFightModel.Instance.fightingHeroSkinID).SquareIcon, "HeroHead");
        }
    }

    void RefreshFightIng(bool isfighting = false)
    {