Merge pull request #105 from 2024FALL-SWPP/feature/bugfix

chore
2024FALL-SWPP · Dec 18, 2024 · 089e997 · 089e997
2 parents 1cffe0c + 73a924a
commit 089e997
Show file tree

Hide file tree

Showing 7 changed files with 66 additions and 29 deletions.
diff --git a/Assets/SWPPT3/Scenes/Stage 2.unity b/Assets/SWPPT3/Scenes/Stage 2.unity
@@ -6475,6 +6475,16 @@ PrefabInstance:
       propertyPath: _cameraTransform
       value: 
       objectReference: {fileID: 2115476442}
+    - target: {fileID: 5865617930821872791, guid: b63037d539f98bc42a98baf0281987bd,
+        type: 3}
+      propertyPath: m_Materials.Array.data[1]
+      value: 
+      objectReference: {fileID: 2100000, guid: 21165d66baa9949edbc4302d0636e546, type: 2}
+    - target: {fileID: 5865617930821872791, guid: b63037d539f98bc42a98baf0281987bd,
+        type: 3}
+      propertyPath: m_Materials.Array.data[2]
+      value: 
+      objectReference: {fileID: 2100000, guid: 264f74bf3bd1b48c199dabcbaf507a00, type: 2}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: b63037d539f98bc42a98baf0281987bd, type: 3}
 --- !u!4 &1522870392 stripped

diff --git a/Assets/SWPPT3/Scripts/Main/AudioLogic/AudioObject.cs.meta b/Assets/SWPPT3/Scripts/Main/AudioLogic/AudioObject.cs.meta
diff --git a/Assets/SWPPT3/Scripts/Main/AudioLogic/BgmObject.cs.meta b/Assets/SWPPT3/Scripts/Main/AudioLogic/BgmObject.cs.meta
diff --git a/Assets/SWPPT3/Scripts/Main/AudioLogic/SfxObject.cs.meta b/Assets/SWPPT3/Scripts/Main/AudioLogic/SfxObject.cs.meta
diff --git a/Assets/SWPPT3/Scripts/Main/PlayerLogic/Player.cs b/Assets/SWPPT3/Scripts/Main/PlayerLogic/Player.cs
@@ -52,8 +52,8 @@ private void Awake()
                     { PlayerStates.Metal, 0 },
                     { PlayerStates.Rubber, 0 },
                 };
-                OnItemChanged?.Invoke();
             }
+            OnItemChanged?.Invoke();
             TryChangeState(PlayerStates.Slime);
 
         }
@@ -108,8 +108,8 @@ public void SetItemCounts(int newSlimeCount, int newMetalCount, int newRubberCou
                     { PlayerStates.Metal, 0 },
                     { PlayerStates.Rubber, 0 },
                 };
-                OnItemChanged?.Invoke();
             }
+            OnItemChanged?.Invoke();
             Item[PlayerStates.Slime] = newSlimeCount;
             Item[PlayerStates.Metal] = newMetalCount;
             Item[PlayerStates.Rubber] = newRubberCount;

diff --git a/Assets/SWPPT3/Scripts/Main/PlayerLogic/State/PlayerState.cs b/Assets/SWPPT3/Scripts/Main/PlayerLogic/State/PlayerState.cs
@@ -3,6 +3,9 @@
 using System;
 using SWPPT3.Main.Manager;
 using SWPPT3.Main.Prop;
+using SWPPT3.Main.PlayerLogic;
+using UnityEngine;
+using SWPPT3.Main.UI;
 
 #endregion
 
@@ -17,35 +20,58 @@ public enum PlayerStates
 
     public abstract class PlayerState
     {
+        private bool isDirty= false;
         public virtual void InteractWithProp(Player player, PropBase obstacle)
         {
-            if (obstacle is ItemBox itemBox)
-            {
-                player.SetItemCounts(0,
-                    itemBox.ItemState == PlayerStates.Metal ? player.Item[PlayerStates.Metal] + 1 : player.Item[PlayerStates.Metal],
-                    itemBox.ItemState == PlayerStates.Rubber ? player.Item[PlayerStates.Rubber] + 1 : player.Item[PlayerStates.Rubber]
-                );
-            }
-            else if (obstacle is PoisonPool)
+            isDirty = true;
+            if (isDirty)
             {
+                isDirty = false;
+                if (obstacle is ItemBox itemBox)
+                {
+                    itemBox.InteractWithPlayer();
+                    player.SetItemCounts(0,
+                        itemBox.ItemState == PlayerStates.Metal ? player.Item[PlayerStates.Metal] + 1 : player.Item[PlayerStates.Metal],
+                        itemBox.ItemState == PlayerStates.Rubber ? player.Item[PlayerStates.Rubber] + 1 : player.Item[PlayerStates.Rubber]
+                    );
+                }
+                else if (obstacle is PoisonPool)
+                {
                 //Debug.Log("collide with Poison pool");
-                GameManager.Instance.GameState = GameState.GameOver;
-            }
-            else if (obstacle is Gas)
-            {
-                foreach(PlayerStates playerState in Enum.GetValues(typeof(PlayerStates)))
+                    GameManager.Instance.GameState = GameState.GameOver;
+                }
+                else if (obstacle is Gas)
                 {
-                    player.SetItemCounts(0,0,0);
+                    foreach(PlayerStates playerState in Enum.GetValues(typeof(PlayerStates)))
+                    {
+
+                    player.SetItemCounts(0,
+                        itemBox.ItemState == PlayerStates.Metal ? player.Item[PlayerStates.Metal] + 1 : player.Item[PlayerStates.Metal],
+                        itemBox.ItemState == PlayerStates.Rubber ? player.Item[PlayerStates.Rubber] + 1 : player.Item[PlayerStates.Rubber]
+                    );
+                    itemBox.InteractWithPlayer();
+                }
+                else if (obstacle is PoisonPool)
+                {
+                    //Debug.Log("collide with Poison pool");
+                    GameManager.Instance.GameState = GameState.GameOver;
+                }
+                else if (obstacle is Gas)
+                {
+                    foreach(PlayerStates playerState in System.Enum.GetValues(typeof(PlayerStates)))
+                    {
+                        player.SetItemCounts(0,0,0);
+                    }
+                    player.TryChangeState(PlayerStates.Slime);
+                }
+                else if (obstacle is MagicCircle)
+                {
+                    GameManager.Instance.GameState = GameState.StageCleared;
+                }
+                else
+                {
+                    obstacle.InteractWithPlayer(player.CurrentState);
                 }
-                player.TryChangeState(PlayerStates.Slime);
-            }
-            else if (obstacle is MagicCircle)
-            {
-                GameManager.Instance.GameState = GameState.StageCleared;
-            }
-            else
-            {
-                obstacle.InteractWithPlayer(player.CurrentState);
             }
         }
 

diff --git a/Assets/SWPPT3/Scripts/Main/UI/InGameScreenBehaviour.cs b/Assets/SWPPT3/Scripts/Main/UI/InGameScreenBehaviour.cs
@@ -157,8 +157,9 @@ public void PlayTimeUpdate(int time){
             _playTimeTmp.text = $"{min:D2}:{sec:D2}";
         }
 
-        private void NumUpdate()
+        public void NumUpdate()
         {
+            Debug.Log("Numupdate");
             _metalNumTmp.text = $"{_player.Item[PlayerStates.Metal]}";
             _rubberNumTmp.text = $"{_player.Item[PlayerStates.Rubber]}";
         }