Merge branch 'master' of http://mobile.secondworld.net.cn:10010/r/Project_S...

hch

2 天以前 364bb6a6623e49eec17075074a33121b6706fb31

 Main/System/Battle/BoneFieldBattleWin.cs

@@ -18,6 +18,7 @@
    {
        base.OnPreOpen();
        MainWin.TabChangeEvent += OnTabChangeEvent;
        UIManager.Instance.OnOpenWindow += OnOpenWindow;
        bool isOpenBattleChangeTab = IsOpenBattleChangeTab();
        transButtons.localPosition = new Vector3(0, isOpenBattleChangeTab ? 130 : 0, 0);
        if (isOpenBattleChangeTab)
@@ -28,6 +29,7 @@
        {
            UIManager.Instance.CloseWindow<MainWin>();
        }
        isClickSkip = false;
    }

    protected override void OnPreClose()
@@ -35,6 +37,7 @@
        base.OnPreClose();

        MainWin.TabChangeEvent -= OnTabChangeEvent;
        UIManager.Instance.OnOpenWindow -= OnOpenWindow;
        bool isOpenBattleChangeTab = IsOpenBattleChangeTab();
        if (isOpenBattleChangeTab)
        {
@@ -54,8 +57,53 @@
            bossBattleObject = null;
        }

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

    void OnOpenWindow(UIBase win)
    {
        if (win is BoneBattleVictoryWin || win is BoneBattleFailWin)
        {
            isClickSkip = false;
        }
    }

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

    }

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

    private void TryPass()
    {
        if (UIManager.Instance.IsOpened<BoneBattleVictoryWin>() ||
            UIManager.Instance.IsOpened<BoneBattleFailWin>())
            return;
        CloseWindow();
        Debug.LogError($"OnBattleEnd 异常关闭");
        BattleSettlementManager.Instance.WinShowOver(BattleConst.BoneBattleField);

    }
    private void OnTabChangeEvent()
    {
        UIManager.Instance.CloseWindow<BoneFieldBattleWin>();
@@ -142,7 +190,7 @@
    {
        // Debug.LogError("OnDamageTaken 被调用 调用者是 " + info.battleHurtParam.caster.casterObj?.teamHero.name + " 对象 " + info.battleHurtParam.hurter.hurtObj?.teamHero.name);
        base.OnDamageTaken(info);
        

        if (battleField == null || info.battleFieldGuid != battleField.guid)
            return;