Merge pull request #7 from 2024FALL-SWPP/feature/abstract_props_model

add: class hierarchy abstraction for Player, Prop, SystemObject

Assets/SWPPT3/Scripts/Main/PlayerLogic/Player.cs

@@ -0,0 +1,44 @@
+using System.Collections.Generic;
+using Unity;
+using UnityEngine;
+using SWPPT3.Main.Prop;
+using SWPPT3.Main.PlayerLogic.State;
+
+namespace SWPPT3.Main.PlayerLogic
+{
+    public class Player : MonoBehaviour
+    {
+        private States _currentState = States.Slime;
+        private PlayerState PlayerState => _playerStates[_currentState];
+
+        private readonly Dictionary<States, PlayerState> _playerStates = new()
+        {
+            { States.Metal, new MetalState() },
+            { States.Rubber, new RubberState() },
+            { States.Slime, new SlimeState() },
+        };
+
+        public void PlayerMove()
+        {
+
+        }
+
+        public void ChangeState(States state)
+        {
+            _currentState = state;
+        }
+
+        public void InteractWithObject(PropBase prop)
+        {
+            PlayerState.InteractWithProp(prop);
+        }
+
+        void OnCollisionEnter(Collision collision)
+        {
+            var obstacle = collision.gameObject.GetComponent<PropBase>();
+            InteractWithObject(obstacle);
+        }
+
+
+    }
+}

Assets/SWPPT3/Scripts/Main/PlayerLogic/State/MetalState.cs

@@ -0,0 +1,15 @@
+using SWPPT3.Main.Prop;
+using UnityEngine;
+
+namespace SWPPT3.Main.PlayerLogic.State
+{
+    public class MetalState : PlayerState
+    {
+        public override void InteractWithProp(PropBase obstacle)
+        {
+            // player의 변화
+            obstacle.InteractWithPlayer();
+        }
+
+    }
+}

Assets/SWPPT3/Scripts/Main/PlayerLogic/State/PlayerState.cs

@@ -0,0 +1,20 @@
+using SWPPT3.Main.Prop;
+
+namespace SWPPT3.Main.PlayerLogic.State
+{
+    public enum States
+    {
+        Slime = 0,
+        Metal,
+        Rubber,
+    }
+
+    public abstract class PlayerState
+    {
+        public virtual void InteractWithProp(PropBase obstacle)
+        {
+
+        }
+    }
+
+}

Assets/SWPPT3/Scripts/Main/PlayerLogic/State/RubberState.cs

@@ -0,0 +1,13 @@
+using SWPPT3.Main.Prop;
+
+namespace SWPPT3.Main.PlayerLogic.State
+{
+    public class RubberState : PlayerState
+    {
+        public override void InteractWithProp(PropBase obstacle)
+        {
+            // player의 변화
+            obstacle.InteractWithPlayer();
+        }
+    }
+}

Assets/SWPPT3/Scripts/Main/PlayerLogic/State/SlimeState.cs

@@ -0,0 +1,13 @@
+using SWPPT3.Main.Prop;
+
+namespace SWPPT3.Main.PlayerLogic.State
+{
+    public class SlimeState : PlayerState
+    {
+        public override void InteractWithProp(PropBase obstacle)
+        {
+            // player의 변화
+            obstacle.InteractWithPlayer();
+        }
+    }
+}

Assets/SWPPT3/Scripts/Main/Prop/Door.cs

@@ -0,0 +1,7 @@
+namespace SWPPT3.Main.Prop
+{
+    public class Door : StatefulProp
+    {
+
+    }
+}

Assets/SWPPT3/Scripts/Main/Prop/ElectricPool.cs

@@ -0,0 +1,7 @@
+namespace SWPPT3.Main.Prop
+{
+    public class ElectricPool : StatelessProp
+    {
+
+    }
+}

Assets/SWPPT3/Scripts/Main/Prop/ElectricWire.cs

@@ -0,0 +1,7 @@
+namespace SWPPT3.Main.Prop
+{
+    public class ElectricWire : StatefulProp
+    {
+
+    }
+}

Assets/SWPPT3/Scripts/Main/Prop/FloorButton.cs

@@ -0,0 +1,10 @@
+namespace SWPPT3.Main.Prop
+{
+    public class FloorButton : StateSource
+    {
+        public override void ActivateState(StatefulProp prop)
+        {
+
+        }
+    }
+}

Assets/SWPPT3/Scripts/Main/Prop/ItemBox.cs

@@ -0,0 +1,20 @@
+using SWPPT3.Main.PlayerLogic;
+using SWPPT3.Main.PlayerLogic.State;
+
+namespace SWPPT3.Main.Prop
+{
+    public class ItemBox : StatelessProp
+    {
+        private States _state;
+
+        public ItemBox(States state)
+        {
+            _state = state;
+        }
+
+        public override void InteractWithPlayer()
+        {
+            // Destroy(gameObject);
+        }
+    }
+}

Assets/SWPPT3/Scripts/Main/Prop/MagicCircle.cs

@@ -0,0 +1,7 @@
+namespace SWPPT3.Main.Prop
+{
+    public class MagicCircle : StatefulProp
+    {
+
+    }
+}

Assets/SWPPT3/Scripts/Main/Prop/PoisonPool.cs

@@ -0,0 +1,7 @@
+namespace SWPPT3.Main.Prop
+{
+    public class PoisonPool : StatelessProp
+    {
+
+    }
+}

Assets/SWPPT3/Scripts/Main/Prop/PropBase.cs

@@ -0,0 +1,13 @@
+using UnityEngine;
+
+namespace SWPPT3.Main.Prop
+{
+    public abstract class PropBase : MonoBehaviour
+    {
+        public virtual void InteractWithPlayer()
+        // Player에 의해 StateProb이 어떻게 변하는지
+        {
+
+        }
+    }
+}

Assets/SWPPT3/Scripts/Main/Prop/StateSource.cs

@@ -0,0 +1,7 @@
+namespace SWPPT3.Main.Prop
+{
+    public abstract class StateSource : StatefulProp
+    {
+        public abstract void ActivateState(StatefulProp prop);
+    }
+}

Assets/SWPPT3/Scripts/Main/Prop/StatefulProp.cs

@@ -0,0 +1,7 @@
+namespace SWPPT3.Main.Prop
+{
+    public abstract class StatefulProp : PropBase
+    {
+        public int State { get; set; } = 0;
+    }
+}