app.hypergames.hypersdk 1.4.12 → 1.4.14

package/Runtime/Internal/Managers/BackendManager.cs

@@ -42,7 +42,7 @@ namespace Hyper.Internal.Managers
 
         #region Public Properties (Internal API)
 
-        public int scoreSubmissionTimeout { get; private set; } = 3;
+        public int scoreSubmissionTimeout { get; private set; } = 4;
         public int CurrentRetryCount => _currentRetryCount;
         public bool isSocketConnected { get; private set; }
         public bool tutorialFetchSuccess { get; private set; }
@@ -373,6 +373,7 @@ namespace Hyper.Internal.Managers
                     };
 
                     string json = JsonConvert.SerializeObject(message);
+                    HyperDebug.Log($"Sending game resumed message: {json}");
                     SendWebSocketMessage(json);
                 }
                 catch (Exception ex)
@@ -381,7 +382,7 @@ namespace Hyper.Internal.Managers
                 }
 
                 float elapsed = 0f;
-                const float timeout = 2f;
+                const float timeout = 1f;
 
                 while (!_gameResumed && elapsed < timeout)
                 {
@@ -390,7 +391,7 @@ namespace Hyper.Internal.Managers
                 }
             }
 
-            yield return new WaitForSecondsRealtime(2f);
+            yield return new WaitForSecondsRealtime(1.5f);
 
             _sendGameResumedCoroutine = null;
         }
@@ -529,6 +530,12 @@ namespace Hyper.Internal.Managers
                 _eventManager?.InvokeWebSocketScoreSubmitted(_lastScoreData);
             }
 
+            if (_isFinalScoreSubmission)
+            {
+                _finalScoreSubmitted = true;
+                _isFinalScoreSubmission = false;
+            }
+
             TryUpdateCSRFToken(message);
         }
 
@@ -621,22 +628,22 @@ namespace Hyper.Internal.Managers
 
         #endregion
 
-        #region Score Submission (HTTPS)
+        #region Final Score Submission
 
-        private Coroutine _endGameCoroutine;
+        private Coroutine _finalScoreSubmissionCoroutine;
 
         public void SubmitScore()
         {
-            if (_endGameCoroutine != null)
+            if (_finalScoreSubmissionCoroutine != null)
             {
                 HyperDebug.LogError("Score submission already in progress");
                 return;
             }
 
 #if UNITY_WEBGL && !UNITY_EDITOR
-            _endGameCoroutine = StartCoroutine(SubmitScoreCoroutine());
+            _finalScoreSubmissionCoroutine = StartCoroutine(FinalScoreSubmissionCoroutine());
 #else
-            _endGameCoroutine = StartCoroutine(SubmitScoreCoroutineDemo());
+            _finalScoreSubmissionCoroutine = StartCoroutine(FinalScoreSubmissionCoroutineDemo());
 #endif
         }
 
@@ -649,27 +656,34 @@ namespace Hyper.Internal.Managers
                 return;
             }
 
-            if (_endGameCoroutine != null)
+            if (_finalScoreSubmissionCoroutine != null)
             {
-                StopCoroutine(_endGameCoroutine);
+                StopCoroutine(_finalScoreSubmissionCoroutine);
             }
 
-            _endGameCoroutine = null;
+            _finalScoreSubmissionCoroutine = null;
 
 #if UNITY_WEBGL && !UNITY_EDITOR
-            _endGameCoroutine = StartCoroutine(SubmitScoreCoroutine());
+            _finalScoreSubmissionCoroutine = StartCoroutine(FinalScoreSubmissionCoroutine());
 #else
-            _endGameCoroutine = StartCoroutine(SubmitScoreCoroutineDemo());
+            _finalScoreSubmissionCoroutine = StartCoroutine(FinalScoreSubmissionCoroutineDemo());
 #endif
         }
 
-        private IEnumerator SubmitScoreCoroutine()
+        private IEnumerator FinalScoreSubmissionCoroutine()
         {
             _gameManager?.GameOverModalComponent?.Init();
             _currentRetryCount = 0;
 
             while (_currentRetryCount < MAX_RETRY_COUNT)
             {
+                if (_hasSessionEnded)
+                {
+                    _gameManager?.ShowRetryTimeExpiredModal();
+                    _finalScoreSubmissionCoroutine = null;
+                    yield break;
+                }
+
                 var finalScoreData = _dataManager?.CurrentScoreData;
                 finalScoreData.isFinal = true;
 
@@ -698,55 +712,100 @@ namespace Hyper.Internal.Managers
                     yield return _sendGameResumedCoroutine;
                 }
 
-                object encryptedObject = JsonConvert.DeserializeObject(encryptedScoreData);
-                var payload = new { encryptedData = encryptedObject };
-                string jsonData = JsonConvert.SerializeObject(payload);
+                if (!isSocketConnected)
+                {
+                    HyperDebug.LogError("WebSocket not connected - cannot submit final score");
+                    _currentRetryCount++;
+                    _gameManager?.GameOverModalComponent?.UpdateAttemptCount(_currentRetryCount, MAX_RETRY_COUNT);
 
-                string url = GetServerURL($"sessions/{_cachedSessionId}/scores");
+                    if (_currentRetryCount < MAX_RETRY_COUNT)
+                    {
+                        yield return new WaitForSecondsRealtime(1f);
+                    }
+                    continue;
+                }
 
-                using (UnityWebRequest request = new UnityWebRequest(url, "POST"))
+                // Sending final score via WebSocket
+                _finalScoreSubmitted = false;
+                _isFinalScoreSubmission = true;
+                _lastSentBatch = new List<ScoreData> { finalScoreData };
+
+                bool sendFailed = false;
+                try
                 {
-                    byte[] bodyRaw = Encoding.UTF8.GetBytes(jsonData);
-                    request.uploadHandler = new UploadHandlerRaw(bodyRaw);
-                    request.downloadHandler = new DownloadHandlerBuffer();
-                    request.SetRequestHeader("Content-Type", "application/json");
-                    request.SetRequestHeader("x-csrf-token", _csrfToken);
-                    request.timeout = scoreSubmissionTimeout;
+                    var message = new WebSocketScoreMessage(_cachedSessionId, _csrfToken, encryptedScoreData);
+                    string json = JsonConvert.SerializeObject(message);
+                    SendWebSocketMessage(json);
+                }
+                catch (Exception ex)
+                {
+                    HyperDebug.LogError($"Failed to send final score via WebSocket: {ex.Message}");
+                    _isFinalScoreSubmission = false;
+                    sendFailed = true;
+                }
 
-                    yield return request.SendWebRequest();
+                if (sendFailed)
+                {
+                    _currentRetryCount++;
+                    _gameManager?.GameOverModalComponent?.UpdateAttemptCount(_currentRetryCount, MAX_RETRY_COUNT);
 
-                    if (request.result == UnityWebRequest.Result.Success)
+                    if (_currentRetryCount < MAX_RETRY_COUNT)
                     {
-                        _gameManager?.GameOverModalComponent?.ScoreHasBeenSubmitted();
-                        // TryUpdateCSRFToken(request.downloadHandler.text);
-                        StopWebSocket();
-                        _endGameCoroutine = null;
-                        yield break;
+                        yield return new WaitForSecondsRealtime(1f);
                     }
-                    else if (_hasSessionEnded)
+                    continue;
+                }
+
+                // Waiting for WebSocket response
+                float elapsed = 0f;
+                float timeout = scoreSubmissionTimeout;
+
+                while (!_finalScoreSubmitted && elapsed < timeout)
+                {
+                    if (_hasSessionEnded)
                     {
                         _gameManager?.ShowRetryTimeExpiredModal();
-                        _endGameCoroutine = null;
+                        _isFinalScoreSubmission = false;
+                        _finalScoreSubmissionCoroutine = null;
                         yield break;
                     }
-                    else
-                    {
-                        _currentRetryCount++;
-                        _gameManager?.GameOverModalComponent?.UpdateAttemptCount(_currentRetryCount, MAX_RETRY_COUNT);
+                    yield return null;
+                    elapsed += Time.unscaledDeltaTime;
+                }
 
-                        if (_currentRetryCount < MAX_RETRY_COUNT)
-                        {
-                            yield return new WaitForSecondsRealtime(1f);
-                        }
+                if (_finalScoreSubmitted)
+                {
+                    _gameManager?.GameOverModalComponent?.ScoreHasBeenSubmitted();
+                    StopWebSocket();
+                    _finalScoreSubmissionCoroutine = null;
+                    yield break;
+                }
+                else if (_hasSessionEnded)
+                {
+                    _gameManager?.ShowRetryTimeExpiredModal();
+                    _isFinalScoreSubmission = false;
+                    _finalScoreSubmissionCoroutine = null;
+                    yield break;
+                }
+                else
+                {
+                    _isFinalScoreSubmission = false;
+                    _currentRetryCount++;
+                    _gameManager?.GameOverModalComponent?.UpdateAttemptCount(_currentRetryCount, MAX_RETRY_COUNT);
+
+                    if (_currentRetryCount < MAX_RETRY_COUNT)
+                    {
+                        yield return new WaitForSecondsRealtime(1f);
                     }
                 }
             }
 
+            _isFinalScoreSubmission = false;
             _gameManager?.GameOverModalComponent?.AllAttemptsHaveFailed();
-            _endGameCoroutine = null;
+            _finalScoreSubmissionCoroutine = null;
         }
 
-        private IEnumerator SubmitScoreCoroutineDemo()
+        private IEnumerator FinalScoreSubmissionCoroutineDemo()
         {
             if (_dataManager == null) _dataManager = HyperRuntime.DataManager;
             if (_eventManager == null) _eventManager = HyperRuntime.EventManager;
@@ -761,7 +820,7 @@ namespace Hyper.Internal.Managers
 
             _gameManager.GameOverModalComponent.ScoreHasBeenSubmitted();
             StopWebSocket();
-            _endGameCoroutine = null;
+            _finalScoreSubmissionCoroutine = null;
         }
 
         #endregion
@@ -772,6 +831,8 @@ namespace Hyper.Internal.Managers
         private List<ScoreData> _lastSentBatch = new List<ScoreData>();
         private ScoreData _lastScoreData;
         private readonly WaitForSeconds _scoreSendInterval = new WaitForSeconds(1f);
+        private bool _isFinalScoreSubmission;
+        private bool _finalScoreSubmitted;
 
         public void StartSendingScores()
         {

package/Runtime/Internal/Managers/EventManager.cs

@@ -45,6 +45,8 @@ namespace Hyper.Internal.Managers
         internal event Action OnTutorialFetchFailed;
         internal event Action OnTutorialDoesNotExist;
         internal event Action<ScoreData> OnLastSubmittedScoreReceived;
+        internal event Action OnTimeScaleFrozen; // Fired when Time.timeScale becomes 0
+        internal event Action OnTimeScaleResumed; // Fired when Time.timeScale becomes 1 (from any value)
 
         #endregion
 
@@ -68,6 +70,8 @@ namespace Hyper.Internal.Managers
         internal void InvokeTutorialFetchFailedEvent() => OnTutorialFetchFailed?.Invoke();
         internal void InvokeTutorialNotExistsEvent() => OnTutorialDoesNotExist?.Invoke();
         internal void InvokeWebSocketScoreSubmitted(ScoreData scoreData) => OnLastSubmittedScoreReceived?.Invoke(scoreData);
+        internal void InvokeTimeScaleFrozenEvent() => OnTimeScaleFrozen?.Invoke();
+        internal void InvokeTimeScaleResumedEvent() => OnTimeScaleResumed?.Invoke();
 
         #endregion
     }

package/Runtime/Internal/Managers/GameManager.cs

@@ -158,12 +158,6 @@ namespace Hyper.Internal.Managers
         {
             if (!_hasGameStarted || _isPaused || _hasGameEnded) return;
 
-            if (_backendManager.isSocketConnected)
-            {
-                _dataManager.StopCapturingScores();
-                _backendManager.StopSendingScores();
-            }
-
             _isPaused = true;
             _isFrozenBeforePause = Time.timeScale == 0;
             Time.timeScale = 0;
@@ -177,11 +171,6 @@ namespace Hyper.Internal.Managers
 
         internal void ResumeGame()
         {
-            if (_backendManager.isSocketConnected)
-            {
-                _backendManager.SendGameResumed();
-            }
-
             _isPaused = false;
 
             if (!_isFrozenBeforePause)
@@ -212,9 +201,37 @@ namespace Hyper.Internal.Managers
             {
                 PauseGame();
             }
-            else if (!shouldPause && _isPaused)
+        }
+
+        void Update()
+        {
+            float currentTimeScale = Time.timeScale;
+            if (currentTimeScale != _previousTimeScale)
             {
-                // ResumeGame();
+                // detect intentional game-freeze states
+                if (currentTimeScale == 0f && _previousTimeScale != 0f)
+                {
+                    _eventManager.InvokeTimeScaleFrozenEvent();
+                    HyperDebug.Log("Time scale frozen event invoked");
+
+                    if (_backendManager.isSocketConnected)
+                    {
+                        _dataManager.StopCapturingScores();
+                        _backendManager.StopSendingScores();
+                    }
+                }
+                else if (currentTimeScale == 1f && _previousTimeScale != 1f)
+                {
+                    _eventManager.InvokeTimeScaleResumedEvent();
+                    HyperDebug.Log("Time scale resumed event invoked");
+
+                    if (_backendManager.isSocketConnected && !_hasGameEnded && _hasGameStarted)
+                    {
+                        _backendManager.SendGameResumed();
+                    }
+                }
+
+                _previousTimeScale = currentTimeScale;
             }
         }
 
@@ -459,6 +476,8 @@ namespace Hyper.Internal.Managers
 
         internal void ShowGameOverModal()
         {
+            HidePauseModals();
+
             if (IsBattleMode)
             {
                 EnsureBattleGameOverModal();
@@ -469,7 +488,7 @@ namespace Hyper.Internal.Managers
                 EnsurePracticeGameOverModal();
                 _practiceGameOverModal.SetActive(true);
             }
-
+            
             SetBlockerActive(true);
         }
 
@@ -558,6 +577,7 @@ namespace Hyper.Internal.Managers
         private bool _hasGameEnded;
         private bool _isFrozenBeforePause;
         private bool _isPortrait;
+        private float _previousTimeScale = 1f;
 
         #endregion
 
@@ -769,6 +789,7 @@ namespace Hyper.Internal.Managers
         private void OnSceneLoaded(Scene scene, LoadSceneMode mode)
         {
             Time.timeScale = 1;
+            _previousTimeScale = 1f; // Sync tracking on scene load
             _dataManager.ConfigurePlayerSoundSetting();
 
             string menuSceneName = HyperRuntime.GameContent.IsPracticeMenu ?
@@ -808,6 +829,7 @@ namespace Hyper.Internal.Managers
             _hasGameEnded = false;
             _isPaused = false;
             _isFrozenBeforePause = false;
+            _previousTimeScale = Time.timeScale; // Sync with actual time scale on scene load
         }
 
         private void InitializeSceneUI()

package/Runtime/Internal/UI/Animation/SlideUp.cs

@@ -83,7 +83,7 @@ namespace Hyper.Internal
 
             // Animate to original position
             rectTransform.DOAnchorPosY(originalAnchoredPosition.y, 0.5f)
-                .SetEase(Animation.HyperTween.Ease.OutQuad)
+                .SetEase(HyperTween.Ease.OutQuad)
                 .SetUpdate(true);
         }
 
@@ -103,7 +103,7 @@ namespace Hyper.Internal
 
             // Animate to off-screen position
             rectTransform.DOAnchorPosY(offScreenY, 0.5f)
-                .SetEase(Animation.HyperTween.Ease.InQuad)
+                .SetEase(HyperTween.Ease.InQuad)
                 .SetUpdate(true)
                 .OnComplete(() =>
                 {

package/Runtime/Internal/UI/Modals/StartingInstructionModal.cs

@@ -5,6 +5,10 @@ using TMPro;
 using UnityEngine;
 using UnityEngine.UI;
 
+#if ENABLE_INPUT_SYSTEM
+using UnityEngine.InputSystem;
+#endif
+
 namespace Hyper.Internal
 {
     internal class StartingInstructionModal : MonoBehaviour
@@ -93,6 +97,8 @@ namespace Hyper.Internal
         {
             bool tapDetected = false;
 
+#if ENABLE_LEGACY_INPUT_MANAGER
+            // Old Input System
             // Check mouse input (works in editor and desktop)
             if (Input.GetMouseButtonDown(0))
             {
@@ -108,6 +114,20 @@ namespace Hyper.Internal
                     tapDetected = true;
                 }
             }
+#elif ENABLE_INPUT_SYSTEM
+            // New Input System
+            // Check mouse input (works in editor and desktop)
+            if (Mouse.current != null && Mouse.current.leftButton.wasPressedThisFrame)
+            {
+                tapDetected = true;
+            }
+
+            // Check touch input (works on mobile and WebGL)
+            if (Touchscreen.current != null && Touchscreen.current.primaryTouch.press.wasPressedThisFrame)
+            {
+                tapDetected = true;
+            }
+#endif
 
             if (tapDetected)
             {
@@ -123,6 +143,8 @@ namespace Hyper.Internal
             bool swipeDetected = false;
             Vector2 currentPosition = Vector2.zero;
 
+#if ENABLE_LEGACY_INPUT_MANAGER
+            // Old Input System
             // Check mouse input (works in editor and desktop)
             if (Input.GetMouseButtonDown(0))
             {
@@ -171,6 +193,60 @@ namespace Hyper.Internal
                     _isTrackingSwipe = false;
                 }
             }
+#elif ENABLE_INPUT_SYSTEM
+            // New Input System
+            // Check mouse input (works in editor and desktop)
+            if (Mouse.current != null)
+            {
+                if (Mouse.current.leftButton.wasPressedThisFrame)
+                {
+                    _swipeStartPosition = Mouse.current.position.ReadValue();
+                    _isTrackingSwipe = true;
+                }
+                else if (Mouse.current.leftButton.isPressed && _isTrackingSwipe)
+                {
+                    currentPosition = Mouse.current.position.ReadValue();
+                    Vector2 delta = currentPosition - _swipeStartPosition;
+                    
+                    if (IsSwipeDirectionValid(delta))
+                    {
+                        swipeDetected = true;
+                        _isTrackingSwipe = false;
+                    }
+                }
+                else if (Mouse.current.leftButton.wasReleasedThisFrame)
+                {
+                    _isTrackingSwipe = false;
+                }
+            }
+
+            // Check touch input (works on mobile and WebGL)
+            if (Touchscreen.current != null)
+            {
+                var touch = Touchscreen.current.primaryTouch;
+                
+                if (touch.press.wasPressedThisFrame)
+                {
+                    _swipeStartPosition = touch.position.ReadValue();
+                    _isTrackingSwipe = true;
+                }
+                else if (touch.press.isPressed && _isTrackingSwipe)
+                {
+                    currentPosition = touch.position.ReadValue();
+                    Vector2 delta = currentPosition - _swipeStartPosition;
+                    
+                    if (IsSwipeDirectionValid(delta))
+                    {
+                        swipeDetected = true;
+                        _isTrackingSwipe = false;
+                    }
+                }
+                else if (touch.press.wasReleasedThisFrame)
+                {
+                    _isTrackingSwipe = false;
+                }
+            }
+#endif
 
             if (swipeDetected)
             {

package/Runtime/Resources/Fonts/Wonder Boys/Wonder Boys + Hyper BIG.mat

@@ -87,8 +87,8 @@ Material:
     - _StencilOp: 0
     - _StencilReadMask: 255
     - _StencilWriteMask: 255
-    - _TextureHeight: 256
-    - _TextureWidth: 256
+    - _TextureHeight: 512
+    - _TextureWidth: 512
     - _UnderlayDilate: 1
     - _UnderlayOffsetX: 0
     - _UnderlayOffsetY: -0.85

package/Runtime/Resources/Fonts/Wonder Boys/Wonder Boys + Shadows.mat

@@ -87,8 +87,8 @@ Material:
     - _StencilOp: 0
     - _StencilReadMask: 255
     - _StencilWriteMask: 255
-    - _TextureHeight: 256
-    - _TextureWidth: 256
+    - _TextureHeight: 512
+    - _TextureWidth: 512
     - _UnderlayDilate: 0.05
     - _UnderlayOffsetX: 0
     - _UnderlayOffsetY: -1