Fixed Weapon Reload & UI Scaling

Fixed an issue where the weapon would not check if the weapon was already full before reloading. Also fixed UI scaling on the menu and credits scenes.
Dunnatello-DifferentFusion · May 2, 2024 · 630758c · 630758c
1 parent b188496
commit 630758c
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -60,3 +60,5 @@ crashlytics-build.properties
 
 UserSettings/EditorUserSettings.asset
 UserSettings/Layouts/default-2021.dwlt
+UserSettings/EditorUserSettings.asset
+UserSettings/Layouts/default-2023.dwlt
diff --git a/Assets/Game/Scenes/Credits.unity b/Assets/Game/Scenes/Credits.unity
diff --git a/Assets/Game/Scenes/Menu.unity b/Assets/Game/Scenes/Menu.unity
diff --git a/Assets/Game/Scripts/InGameMenu.cs b/Assets/Game/Scripts/InGameMenu.cs
@@ -19,8 +19,6 @@ public void SetGameMenuState( bool newState ) {
             Cursor.visible = newState;
             menuScreen.enabled = newState;
 
-            print( menuScreen.enabled );
-
             if ( newState ) {
 
                 Cursor.lockState = CursorLockMode.None;

diff --git a/Assets/Game/Scripts/Weapon/Gun.cs b/Assets/Game/Scripts/Weapon/Gun.cs
@@ -84,7 +84,7 @@ private void Start( ) {
             UpdateUI( );
         }
         public void StartReload( ) {
-            if ( !gunData.reloading ) {
+            if ( !gunData.reloading && gunData.magSize != gunData.currentAmmo ) {
                 StartCoroutine( Reload( ) );
             }
         }