Merge pull request #5 from sentry-demos/feat/merge-upstream

Author: bitsandfoxes

.github/workflows/run-demo.yml

@@ -53,7 +53,7 @@ jobs:
             Write-Output "Found executable: $($exePath.FullName)"
             $startTime = Get-Date
             
-            Start-Process -FilePath $exePath -Wait -PassThru -NoNewWindow
+            Start-Process -FilePath $exePath -ArgumentList "-demo" -Wait -PassThru -NoNewWindow
             
             $endTime = Get-Date
             $duration = $endTime - $startTime

Assets/Resources/DemoConfig.asset

@@ -12,12 +12,12 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: dd9ba42fbcfea443dae0540ef0f44176, type: 3}
   m_Name: DemoConfig
   m_EditorClassIdentifier: 
-  _enabled: 1
-  _apiUrl: https://sentaur-leaderboard-f7z2cjcdzq-uc.a.run.app
+  _enabled: 0
+  _apiUrl:
   _user:
-    Username: 
-    Password: 
-  _autoPlay: 1
-  _notHotDogParticleEffect: 1
-  _fetchUpgradeFromServer: 1
-  _crashOnGameOver: 1
+    Username:
+    Password:
+  _autoPlay: 0
+  _notHotDogParticleEffect: 0
+  _fetchUpgradeFromServer: 0
+  _crashOnGameOver: 0

Assets/Scripts/Characters/Arrow.cs

@@ -1,19 +1,22 @@
 using UnityEngine;
+using UnityEngine.InputSystem;
 
 public class Arrow : MonoBehaviour
 {
     [SerializeField] private bool _forceEnable;
+    
     private void Awake()
     {
         if (_forceEnable)
         {
             return;
         }
-            
-        if (Application.platform != RuntimePlatform.Android && 
-            Application.platform != RuntimePlatform.IPhonePlayer)
-        {
-            gameObject.SetActive(false);    
-        }
+        
+        // Show arrow on mobile platforms or when a gamepad is connected
+        bool shouldShowArrow = Application.platform == RuntimePlatform.Android || 
+                               Application.platform == RuntimePlatform.IPhonePlayer ||
+                               Gamepad.current != null;
+        
+        gameObject.SetActive(shouldShowArrow);
     }
 }

Assets/Scripts/Characters/DemoPlayerController.cs

@@ -15,7 +15,7 @@ public class DemoPlayerController : MonoBehaviour
 
         private void Awake()
         {
-            _demoConfig = Resources.Load("DemoConfig") as DemoConfiguration;
+            _demoConfig = DemoConfiguration.Load();
         }
 
         private void OnEnable()

Assets/Scripts/Config/ArgumentReader.cs

@@ -14,4 +14,15 @@ public static string GetCommandLineArg(string name)
       }
       return null;
   }
+
+  public static bool HasCommandLineFlag(string name)
+  {
+      var args = Environment.GetCommandLineArgs();
+      for (var i = 0; i < args.Length; i++)
+      {
+          if (args[i] == "-" + name)
+              return true;
+      }
+      return false;
+  }
 }

Assets/Scripts/Config/DemoConfiguration.cs

@@ -16,15 +16,45 @@ public class DemoConfiguration : ScriptableObject
     [SerializeField] private bool _notHotDogParticleEffect;
     [SerializeField] private bool _fetchUpgradeFromServer;
     [SerializeField] private bool _crashOnGameOver;
-    
+
+    private bool _overridesApplied;
+
     public bool Enabled => _enabled;
     public string ApiUrl => _apiUrl;
     public User User => _user;
-    
+
     public bool AutoPlay => _enabled && _autoPlay;
     public bool NotHotDogParticleEffect => _enabled && _notHotDogParticleEffect;
     public bool FetchUpgradeFromServer => _enabled && _fetchUpgradeFromServer;
     public bool CrashOnGameOver => _enabled && _crashOnGameOver;
+
+    public void ApplyRuntimeOverrides()
+    {
+        if (_overridesApplied)
+            return;
+        _overridesApplied = true;
+
+        if (ArgumentReader.HasCommandLineFlag("demo"))
+        {
+            _enabled = true;
+            _autoPlay = true;
+            _crashOnGameOver = true;
+            _notHotDogParticleEffect = true;
+            _fetchUpgradeFromServer = true;
+        }
+    }
+
+    private static DemoConfiguration _instance;
+
+    public static DemoConfiguration Load()
+    {
+        if (_instance == null)
+        {
+            _instance = Resources.Load("DemoConfig") as DemoConfiguration;
+            _instance?.ApplyRuntimeOverrides();
+        }
+        return _instance;
+    }
 }
 
 [Serializable]

Assets/Scripts/Pickups/NotHotDogPickup.cs

@@ -9,7 +9,7 @@ public class NotHotDogPickup : PickupBase
 
     private void Awake()
     {
-        _demoConfig = Resources.Load("DemoConfig") as DemoConfiguration;
+        _demoConfig = DemoConfiguration.Load();
     }
 
     protected override void OnCollect(Player player)

Assets/Scripts/SceneManagers/BattleSceneManager.cs

@@ -215,7 +215,7 @@ private enum GameState
 
     private void Awake()
     {
-        _demoConfig = Resources.Load("DemoConfig") as DemoConfiguration;
+        _demoConfig = DemoConfiguration.Load();
 
         InputSystem.actions.FindActionMap("Player").Enable();
         InputSystem.actions.FindActionMap("UI").Disable();
@@ -463,6 +463,12 @@ private void SetCurrentLevel(int level)
 
     public void OnPause()
     {
+        // Don't allow pausing if the level up UI is active (it already pauses the game)
+        if (_levelUpUI.activeSelf)
+        {
+            return;
+        }
+        
         if (_gameState == GameState.Playing)
         {
             PauseGame();

Assets/Scripts/SceneManagers/HUDManager.cs

@@ -23,12 +23,20 @@ private void Awake()
             _navigateAction = InputSystem.actions.FindAction("Navigate");
             _submitAction = InputSystem.actions.FindAction("Submit");
 
-            // Subscribe to the performed callback only
+            // Subscribe to input events
+            _navigateAction.performed += OnNavigatePerformed;
             _submitAction.performed += OnSubmitPerformed;
 
             _tryAgainHighlighter = tryAgainButton.GetComponent<Highlighter>();
             _quitHighlighter = quitButton.GetComponent<Highlighter>();
         }
+        
+        private void OnDestroy()
+        {
+            // Unsubscribe from input events
+            _navigateAction.performed -= OnNavigatePerformed;
+            _submitAction.performed -= OnSubmitPerformed;
+        }
 
         private void OnSubmitPerformed(InputAction.CallbackContext context)
         {
@@ -37,10 +45,14 @@ private void OnSubmitPerformed(InputAction.CallbackContext context)
                 return;
             }
 
-            _highlightedButton?.GetComponent<Button>().onClick.Invoke();
+            // Only invoke if the highlighted button is actually active
+            if (_highlightedButton != null && _highlightedButton.activeSelf)
+            {
+                _highlightedButton.GetComponent<Button>().onClick.Invoke();
+            }
         }
 
-        public void OnNavigate()
+        private void OnNavigatePerformed(InputAction.CallbackContext context)
         {
             if (!gameObject.activeSelf)
             {
@@ -52,12 +64,7 @@ public void OnNavigate()
                 return;
             }
 
-            if (!_navigateAction.WasPressedThisFrame())
-            {
-                return;
-            }
-
-            var direction = _navigateAction.ReadValue<Vector2>();
+            var direction = context.ReadValue<Vector2>();
 
             // Simple navigation between try again and quit buttons
             if (_highlightedButton == null)
@@ -92,5 +99,12 @@ public void SetHighlightedButton(Highlighter highlighted)
             highlighted.Highlight();
             _highlightedButton = highlighted.gameObject;
         }
+        
+        public void ClearHighlightedButton()
+        {
+            _tryAgainHighlighter.Highlight(false);
+            _quitHighlighter.Highlight(false);
+            _highlightedButton = null;
+        }
     }
 }

Assets/Scripts/SceneManagers/TitleSceneManager.cs

@@ -24,7 +24,7 @@ public class TitleSceneManager : MonoBehaviour
 
         private void Awake()
         {
-            _demoConfig = Resources.Load("DemoConfig") as DemoConfiguration;
+            _demoConfig = DemoConfiguration.Load();
             _navigateAction = InputSystem.actions.FindAction("Navigate");
             _startHighlighter = startButton.GetComponent<Highlighter>();
             _quitHighlighter = quitButton.GetComponent<Highlighter>();