diff --git a/Assets/Resources/Prefabs/HorseRush/HorseRushCanvas.prefab b/Assets/Resources/Prefabs/HorseRush/HorseRushCanvas.prefab index 0258857..bb05d2b 100644 --- a/Assets/Resources/Prefabs/HorseRush/HorseRushCanvas.prefab +++ b/Assets/Resources/Prefabs/HorseRush/HorseRushCanvas.prefab @@ -1576,7 +1576,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: "\uB7ED\uD0A4 \uBCF4\uB108\uC2A4 \uACB0\uACFC" + m_text: "\uAC8C\uC784 \uACB0\uACFC" m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 3055b5c28f94e6c4ea6b9a379bb315a5, type: 2} m_sharedMaterial: {fileID: -3574565475228871172, guid: 3055b5c28f94e6c4ea6b9a379bb315a5, type: 2} diff --git a/Assets/Resources/Prefabs/HorseRush/Script/HorseRushPanel.cs b/Assets/Resources/Prefabs/HorseRush/Script/HorseRushPanel.cs index e962962..db4f1cb 100644 --- a/Assets/Resources/Prefabs/HorseRush/Script/HorseRushPanel.cs +++ b/Assets/Resources/Prefabs/HorseRush/Script/HorseRushPanel.cs @@ -178,13 +178,7 @@ public class HorseRushPanel : AddrHandleBase if (_rushTime <= 0 || _limitTime <= 0) { - _isGameStart = false; - _isGameOver = true; - _horseRushManager.GameOver( - _isFree, _score, _normalDoubleScoreCount, _maxcombo, _maxFeverStreak, _missionSuccessPhotoID, - OnClick_GameLeave); - - //gameObject.SetActive(false); + OnClick_GameLeave(); } _timer.value = _limitTime / DEFAULT_LIMIT_TIME; @@ -436,10 +430,7 @@ public class HorseRushPanel : AddrHandleBase if (lastBubbleCard.IsSkullStone) { - _isGameStart = false; - _isGameOver = true; - _horseRushManager.GameOver(_isFree, _score, _normalDoubleScoreCount, _maxcombo, _maxFeverStreak, - _missionSuccessPhotoID, OnClick_GameLeave); + OnClick_GameLeave(); } else { @@ -656,6 +647,13 @@ public class HorseRushPanel : AddrHandleBase } public void OnClick_GameLeave() + { + _isGameStart = false; + _isGameOver = true; + _horseRushManager.GameOver( + _isFree, _score, _normalDoubleScoreCount, _maxcombo, _maxFeverStreak, _missionSuccessPhotoID, Close); + } + void Close() { gameObject.SetActive(false); DSUtil.InActivateGameObjects(gos_sexy);