MTurnSeatManager -> MTurnBaseManager, 디벨롭

- `MTurnSeatManager`의 네이밍을 `MTurnBaseManager`로 직관적으로 역할을 알 수 있도록 변경 - `MTurnBaseManager` 를 추상클래스로 변경 - `MTurnBaseManager.OnGameStateChange()`가 `DataChangeState`를 매개변수로 받도록 수정
Mascari4615 · Aug 31, 2024 · a0dd3d3 · a0dd3d3
1 parent 8fa16de
commit a0dd3d3
Show file tree

Hide file tree

Showing 23 changed files with 56 additions and 60 deletions.
diff --git a/Packages/com.mascari4615.m-udons/Runtime/MSeat/Base/Scripts/Core/MSeat.cs b/Packages/com.mascari4615.m-udons/Runtime/MSeat/Base/Scripts/Core/MSeat.cs
@@ -36,7 +36,7 @@ public int Data
 
 		public int Index { get; private set; }
 
-		protected MTurnSeatManager seatManager;
+		protected MTurnBaseManager seatManager;
 
 		[Header("_" + nameof(MSeat))]
 		[SerializeField] private MBool ownerMBool;
@@ -55,7 +55,7 @@ public bool IsSeatOwner(VRCPlayerApi targetPlayer = null)
 			return OwnerID == targetPlayer.playerId;
 		}
 
-		public virtual void Init(MTurnSeatManager seatManager, int index)
+		public virtual void Init(MTurnBaseManager seatManager, int index)
 		{
 			this.seatManager = seatManager;
 

diff --git a/...eat/Base/Scripts/Core/MTurnSeatManager.cs → ...eat/Base/Scripts/Core/MTurnBaseManager.cs b/...eat/Base/Scripts/Core/MTurnSeatManager.cs → ...eat/Base/Scripts/Core/MTurnBaseManager.cs
@@ -5,28 +5,28 @@
 namespace Mascari4615
 {
 	[UdonBehaviourSyncMode(BehaviourSyncMode.Manual)]
-	public class MTurnSeatManager : MEventSender
+	public abstract class MTurnBaseManager : MEventSender
 	{
 		[UdonSynced, FieldChangeCallback(nameof(CurGameState))] private int _curGameState = 0;
 		public int CurGameState
 		{
 			get => _curGameState;
-			set
+			private set
 			{
 				// MDebugLog($"{nameof(CurGameState)} Changed, {CurGameState} to {value}");
 
 				int origin = _curGameState;
 				_curGameState = value;
-				OnGameStateChange(origin, value);
+				OnGameStateChange(DataChangeStateUtil.GetChangeState(origin, value));
 			}
 		}
 
 		public MTurnSeat[] TurnSeats { get; private set; }
 
-		[field: Header("_" + nameof(MTurnSeatManager))]
+		[field: Header("_" + nameof(MTurnBaseManager))]
 		[field: SerializeField] public string[] StateToString { get; private set; }
 
-		[field: Header("_" + nameof(MTurnSeatManager) + "_Data")]
+		[field: Header("_" + nameof(MTurnBaseManager) + "_Data")]
 		[field: SerializeField] public int DefaultData { get; private set; } = 0;
 		[field: SerializeField] public string[] DataToString { get; protected set; }
 		[field: SerializeField] public bool ResetDataWhenOwnerChange { get; private set; }
@@ -35,7 +35,7 @@ public int CurGameState
 		[field: SerializeField] public Sprite[] DataSprites { get; protected set; }
 		[field: SerializeField] public Sprite DataNoneSprite { get; protected set; }
 
-		[field: Header("_" + nameof(MTurnSeatManager) + "_TurnData")]
+		[field: Header("_" + nameof(MTurnBaseManager) + "_TurnData")]
 		[field: SerializeField] public int DefaultTurnData { get; private set; } = 0;
 		[field: SerializeField] public string[] TurnDataToString { get; protected set; }
 		[field: SerializeField] public bool ResetTurnDataWhenOwnerChange { get; private set; }
@@ -53,12 +53,14 @@ public void SetGameState(int newGameState)
 			RequestSerialization();
 		}
 
+		public bool IsCurGameState(int gameState) => CurGameState == gameState;
+
 		public void NextGameState() => SetGameState(CurGameState + 1);
 		public void PrevGameState() => SetGameState(CurGameState - 1);
 
-		protected virtual void OnGameStateChange(int origin, int value)
+		protected virtual void OnGameStateChange(DataChangeState changeState)
 		{
-			// MDebugLog($"{nameof(OnGameStateChange)}, {origin} to {value}");
+			// MDebugLog($"{nameof(OnGameStateChange)}, {changeState}");
 
 			UpdateStuff();
 			SendEvents();

diff --git a/...ase/Scripts/Core/MTurnSeatManager.cs.meta → ...ase/Scripts/Core/MTurnBaseManager.cs.meta b/...ase/Scripts/Core/MTurnSeatManager.cs.meta → ...ase/Scripts/Core/MTurnBaseManager.cs.meta
diff --git a/Packages/com.mascari4615.m-udons/Runtime/MSeat/Base/Scripts/Core/MTurnSeat.cs b/Packages/com.mascari4615.m-udons/Runtime/MSeat/Base/Scripts/Core/MTurnSeat.cs
@@ -28,7 +28,7 @@ public int TurnData
 		[SerializeField] private TextMeshProUGUI[] turnDataTexts;
 		[SerializeField] private Image[] turnDataImages;
 
-		public override void Init(MTurnSeatManager seatManager, int index)
+		public override void Init(MTurnBaseManager seatManager, int index)
 		{
 			base.Init(seatManager, index);
 

diff --git a/Packages/com.mascari4615.m-udons/Runtime/MSeat/Base/Scripts/UI/UISeatManagerController.cs b/Packages/com.mascari4615.m-udons/Runtime/MSeat/Base/Scripts/UI/UISeatManagerController.cs
@@ -8,7 +8,7 @@ namespace Mascari4615
 	public class UISeatManagerController : MBase
 	{
 		[Header("_" + nameof(UISeatManagerController))]
-		[SerializeField] private MTurnSeatManager turnSeatManager;
+		[SerializeField] private MTurnBaseManager turnSeatManager;
 		[SerializeField] private TextMeshProUGUI curStateText;
 
 		private void Start()

diff --git a/Packages/com.mascari4615.m-udons/Runtime/MSeat/Base/UdonAsset/UISeatManagerController.asset b/Packages/com.mascari4615.m-udons/Runtime/MSeat/Base/UdonAsset/UISeatManagerController.asset
@@ -131,7 +131,7 @@ MonoBehaviour:
       Data: 8|System.RuntimeType, mscorlib
     - Name: 
       Entry: 1
-      Data: Mascari4615.MTurnSeatManager, MUdons
+      Data: Mascari4615.MTurnBaseManager, MUdons
     - Name: 
       Entry: 8
       Data: 

diff --git a/Packages/com.mascari4615.m-udons/Runtime/MSeat/MAuction/Scripts/Core/AuctionManager.cs b/Packages/com.mascari4615.m-udons/Runtime/MSeat/MAuction/Scripts/Core/AuctionManager.cs
@@ -5,7 +5,7 @@
 namespace Mascari4615
 {
 	[UdonBehaviourSyncMode(BehaviourSyncMode.Manual)]
-	public class AuctionManager : MTurnSeatManager
+	public class AuctionManager : MTurnBaseManager
 	{
 		[Header("_" + nameof(AuctionManager))]
 		[SerializeField] private TextMeshProUGUI debugText;
@@ -16,17 +16,14 @@ public class AuctionManager : MTurnSeatManager
 		public int WinnerIndex { get; private set; } = NONE_INT;
 		public AuctionSeat MaxTryPointSeat { get; private set; } = null;
 
-		protected override void OnGameStateChange(int origin, int value)
+		protected override void OnGameStateChange(DataChangeState changeState)
 		{
-			AuctionState originState = (AuctionState)origin;
-			AuctionState newState = (AuctionState)value;
-
-			if (originState == newState)
+			if (changeState == DataChangeState.Equal)
 				return;
 
 			MaxTryPointSeat = GetMaxTryPointSeat();
 
-			switch (newState)
+			switch ((AuctionState)CurGameState)
 			{
 				case AuctionState.Wait:
 					// 경매 대기
@@ -55,7 +52,7 @@ protected override void OnGameStateChange(int origin, int value)
 					break;
 			}
 
-			base.OnGameStateChange(origin, value);
+			base.OnGameStateChange(changeState);
 		}
 
 		protected virtual void OnWait()

diff --git a/Packages/com.mascari4615.m-udons/Runtime/MSeat/MAuction/UdonAsset/AuctionManager.asset b/Packages/com.mascari4615.m-udons/Runtime/MSeat/MAuction/UdonAsset/AuctionManager.asset
@@ -587,7 +587,7 @@ MonoBehaviour:
       Data: 38|UnityEngine.HeaderAttribute, UnityEngine.CoreModule
     - Name: header
       Entry: 1
-      Data: _MTurnSeatManager
+      Data: _MTurnBaseManager
     - Name: 
       Entry: 8
       Data: 
@@ -650,7 +650,7 @@ MonoBehaviour:
       Data: 42|UnityEngine.HeaderAttribute, UnityEngine.CoreModule
     - Name: header
       Entry: 1
-      Data: _MTurnSeatManager_Data
+      Data: _MTurnBaseManager_Data
     - Name: 
       Entry: 8
       Data: 
@@ -1049,7 +1049,7 @@ MonoBehaviour:
       Data: 66|UnityEngine.HeaderAttribute, UnityEngine.CoreModule
     - Name: header
       Entry: 1
-      Data: _MTurnSeatManager_TurnData
+      Data: _MTurnBaseManager_TurnData
     - Name: 
       Entry: 8
       Data: 

diff --git a/Packages/com.mascari4615.m-udons/Runtime/MSeat/MAuction/UdonAsset/AuctionSeat.asset b/Packages/com.mascari4615.m-udons/Runtime/MSeat/MAuction/UdonAsset/AuctionSeat.asset
@@ -305,7 +305,7 @@ MonoBehaviour:
       Data: 19|System.RuntimeType, mscorlib
     - Name: 
       Entry: 1
-      Data: Mascari4615.MTurnSeatManager, MUdons
+      Data: Mascari4615.MTurnBaseManager, MUdons
     - Name: 
       Entry: 8
       Data: 

diff --git a/...me/MSeat/MAuction/UdonAsset/SerializedUdonPrograms/c436e6bbf487a1644ac03fdb1f893d2d.asset b/...me/MSeat/MAuction/UdonAsset/SerializedUdonPrograms/c436e6bbf487a1644ac03fdb1f893d2d.asset