Merge branch 'master' of http://192.168.1.20:10010/r/Project_SG_scripts

yyl

6 天以前 68ceec72d78d328f9eaa05fce40caf99fe333ba1

 Main/System/Battle/BattleField/BattleField.cs

@@ -45,18 +45,22 @@
        }
        set
        {
            m_IsPause = value;

            if (m_IsPause)
            if (value)
            {
                m_IsPause = value;
                PauseGame();
                OnBattlePause?.Invoke(m_IsPause);
            }
            else
            {
                ResumeGame();
                if (CanResumeGame())
                {
                    m_IsPause = value;
                    ResumeGame();
                    OnBattlePause?.Invoke(m_IsPause);
                }
            }

            OnBattlePause?.Invoke(m_IsPause);
        }
    }

@@ -545,4 +549,21 @@
    {
        recordPlayer.ForceFinish();
    }
    

    //暂停的原因有很多，需要检查各种状态
    bool CanResumeGame()
    {
        if (UIManager.Instance.IsOpened<NewBieWin>())
        {
            return false;
        }

        if (UIManager.Instance.IsOpened<EquipExchangeWin>())
        {
            return false;
        }

        return true;
    }
}