change Cursor and laptopface floatable

2024FALL-SWPP · Dec 16, 2024 · f6df782 · f6df782
1 parent 80bdb24
commit f6df782
Show file tree

Hide file tree

Showing 4 changed files with 957 additions and 19 deletions.
diff --git a/302/Assets/Scenes/DefaultGameScene.unity b/302/Assets/Scenes/DefaultGameScene.unity
@@ -10053,6 +10053,10 @@ PrefabInstance:
       propertyPath: m_Name
       value: LaptopFace
       objectReference: {fileID: 0}
+    - target: {fileID: 1673758693359768105, guid: 7c34e61c4c1b39040bc8b4a56d34f904, type: 3}
+      propertyPath: m_TagString
+      value: floatable
+      objectReference: {fileID: 0}
     - target: {fileID: 4455420850089973548, guid: 7c34e61c4c1b39040bc8b4a56d34f904, type: 3}
       propertyPath: player
       value: 

diff --git a/302/Assets/Scripts/PauseMenuSystem.cs b/302/Assets/Scripts/PauseMenuSystem.cs
@@ -36,8 +36,6 @@ void Update()
 
         if (isPaused)
         {
-            Cursor.visible = false;
-            Cursor.lockState = CursorLockMode.Locked;
 
             if (Input.anyKeyDown && !Input.GetKeyDown(KeyCode.Escape))
             {
@@ -49,11 +47,6 @@ void Update()
                 return;
             }
         }
-        else
-        {
-            Cursor.visible = true;
-            Cursor.lockState = CursorLockMode.None;
-        }
     }
 
     void TogglePause()

diff --git a/302/Assets/Scripts/PlayerController.cs b/302/Assets/Scripts/PlayerController.cs
@@ -79,11 +79,16 @@ private void Start()
 
     private void Update()
     {
-        if (!isAnimating && Time.timeScale !=0f)
+        if (!isAnimating && Time.timeScale != 0)
         {
-            HandleInput();
             HandleCamera();
+            //HandleInput();
+        }
+        if (!isAnimating)
+        {
+            HandleInput();
         }
+
     }
 
     private void FixedUpdate()