164 天子的考验-客户端 仅天子战场的跳过按钮添加保底机制：如果满足跳过条件后，点击跳过后2s没有结算界面，也结束战场

lcy

1 天以前 5330303f25db81c56f1c00874b01cfa37b980352

164 天子的考验-客户端 仅天子战场的跳过按钮添加保底机制：如果满足跳过条件后，点击跳过后2s没有结算界面，也结束战场

 Main/System/Battle/BaseBattleWin.cs

@@ -192,13 +192,20 @@
    /// </summary>
    protected virtual void OnClickPass()
    {
        if (null == battleField)
        if (!IsPass())
            return;
        battleField.ForceFinish();
    }

    public bool IsPass()
    {
        if (null == battleField)
            return false;
        // 检查是否为永久特权卡玩家
        bool hasForeverPrivilege = InvestModel.Instance.IsInvested(InvestModel.foreverCardType);

        if (!hasForeverPrivilege && !FuncOpen.Instance.IsFuncOpen(BattleManager.Instance.passFuncId, true))
            return;
            return false;

        int passRound = BattleManager.Instance.defaultPassRound;
        var name = battleField.ToString();
@@ -243,18 +250,16 @@

        if (passRound != 0)
        {
            int nowRound = battleField.round;   
            int nowRound = battleField.round;
            int realPassRound = passRound + 1;  // 配置是超过x回合可以跳,意味着x+1回合可以跳
            if (nowRound < realPassRound)
            {
                SysNotifyMgr.Instance.ShowTip("BattlePass", realPassRound - nowRound);
                return;
                return false;
            }
        }
        battleField.ForceFinish();
        return true;
    }




    /// <summary>

 Main/System/Battle/TianziBillboradBattleWin.cs

@@ -38,6 +38,7 @@
        {
            UIManager.Instance.CloseWindow<MainWin>();
        }
        isClickSkip = false;
    }

    private void OnPlayUiEffectAction()
@@ -73,6 +74,42 @@
            bossBattleObject = null;
        }

        if (isClickSkip)
        {
            isClickSkip = false;
            TryPass();
        }
    }

    bool isClickSkip = false;
    protected override void OnClickPass()
    {
        if (!IsPass())
            return;
        battleField.ForceFinish();
        isClickSkip = true;
        clickTime = Time.time;  // 记录点击时间
    }

    float stayTime = 2f;
    float clickTime = 0f;
    void LateUpdate()
    {
        if (isClickSkip && Time.time - clickTime >= stayTime)
        {
            isClickSkip = false;
            TryPass();
        }
    }

    private void TryPass()
    {
        if (!UIManager.Instance.IsOpened<TianziBillboradVictoryWin>())
        {
            CloseWindow();
            BattleSettlementManager.Instance.WinShowOver(BattleConst.TianziBillboradBattleField);
            TianziBillboradManager.Instance.isSweepVictory = false;
        }
    }

    private void OnUpdateBarInfoEvent(ulong loaclNowHunt, ulong loaclMaxHp, int loaclHpNum)