Card Zone fixes

finol-digital · Sep 29, 2024 · c0078c7 · c0078c7
1 parent 536ba44
commit c0078c7
Show file tree

Hide file tree

Showing 10 changed files with 65 additions and 107 deletions.
diff --git a/Assets/Scripts/Cgs/CardGameView/CardDropArea.cs b/Assets/Scripts/Cgs/CardGameView/CardDropArea.cs
@@ -26,7 +26,7 @@ private void OnTriggerEnter2D(Collider2D other)
         {
             var cardModel = other.GetComponent<CardModel>();
             if (cardModel == null || cardModel.ParentCardZone == null ||
-                cardModel.ParentCardZone.type != CardZoneType.Area)
+                cardModel.ParentCardZone.Type != CardZoneType.Area)
                 return;
 
             cardModel.DropTarget = this;
@@ -53,8 +53,8 @@ public void OnDrop(PointerEventData eventData)
         {
             var cardModel = CardModel.GetPointerDrag(eventData);
             if (cardModel == null
-                || cardModel.ParentCardZone != null && cardModel.ParentCardZone.type != CardZoneType.Area
-                || cardModel.PlaceHolderCardZone != null && cardModel.PlaceHolderCardZone.type != CardZoneType.Area)
+                || cardModel.ParentCardZone != null && cardModel.ParentCardZone.Type != CardZoneType.Area
+                || cardModel.PlaceHolderCardZone != null && cardModel.PlaceHolderCardZone.Type != CardZoneType.Area)
                 return;
 
             var drawerViewer = DropHandler as DrawerViewer;

diff --git a/Assets/Scripts/Cgs/CardGameView/Multiplayer/CardModel.cs b/Assets/Scripts/Cgs/CardGameView/Multiplayer/CardModel.cs
@@ -191,7 +191,7 @@ protected override void OnStartPlayable()
             if (PlayController.Instance != null &&
                 PlayController.Instance.playAreaCardZone.transform == transform.parent)
             {
-                PlayController.SetPlayActions(this);
+                PlayController.SetPlayAreaActions(this);
                 var cardDropArea = gameObject.GetOrAddComponent<CardDropArea>();
                 cardDropArea.isBlocker = true;
                 cardDropArea.DropHandler = this;
@@ -424,10 +424,10 @@ protected override void PostDragPlayable(PointerEventData eventData)
                 var dropTargetCardModel = DropTarget.GetComponent<CardModel>();
 
                 var shouldDiscard = false;
-                if (Visibility.blocksRaycasts && ParentCardZone != null && ParentCardZone.type == CardZoneType.Area
-                    || PlaceHolderCardZone != null && PlaceHolderCardZone.type == CardZoneType.Area
+                if (Visibility.blocksRaycasts && ParentCardZone != null && ParentCardZone.Type == CardZoneType.Area
+                    || PlaceHolderCardZone != null && PlaceHolderCardZone.Type == CardZoneType.Area
                     || dropTargetCardModel != null && dropTargetCardModel.ParentCardZone != null &&
-                    dropTargetCardModel.ParentCardZone.type == CardZoneType.Area)
+                    dropTargetCardModel.ParentCardZone.Type == CardZoneType.Area)
                 {
                     var hits = new List<RaycastResult>();
                     EventSystem.current.RaycastAll(eventData, hits);
@@ -446,7 +446,7 @@ protected override void PostDragPlayable(PointerEventData eventData)
                 }
 
                 if (dropTargetCardModel != null && dropTargetCardModel.ParentCardZone != null &&
-                    dropTargetCardModel.ParentCardZone.type == CardZoneType.Area)
+                    dropTargetCardModel.ParentCardZone.Type == CardZoneType.Area)
                 {
                     PlaceHolderCardZone = dropTargetCardModel.ParentCardZone;
                     PlaceHolderCardZone.UpdateLayout(PlaceHolder, transform.position);
@@ -466,7 +466,7 @@ protected override void PostDragPlayable(PointerEventData eventData)
                 IsMovingToPlaceHolder = true;
             else if (ParentCardZone == null)
                 Discard();
-            else if (ParentCardZone.type == CardZoneType.Area)
+            else if (ParentCardZone.Type == CardZoneType.Area)
                 SnapToGrid();
         }
 
@@ -580,25 +580,25 @@ private void UpdateCardZonePosition(Vector2 targetPosition)
             if (cardZone == null || LacksOwnership)
                 return;
 
-            if (!cardZone.DoesImmediatelyRelease && cardZone.type is CardZoneType.Vertical or CardZoneType.Horizontal)
+            if (!cardZone.DoesImmediatelyRelease && cardZone.Type is CardZoneType.Vertical or CardZoneType.Horizontal)
                 cardZone.UpdateScrollRect(CurrentDragPhase, CurrentPointerEventData);
             else if (!IsStatic)
                 cardZone.UpdateLayout(transform as RectTransform, targetPosition);
 
             if (IsStatic)
                 return;
 
-            if (cardZone.type == CardZoneType.Area)
+            if (cardZone.Type == CardZoneType.Area)
                 transform.SetAsLastSibling();
 
             var zoneCorners = new Vector3[4];
             ((RectTransform) cardZone.transform).GetWorldCorners(zoneCorners);
             var isOutYBounds = targetPosition.y < zoneCorners[0].y || targetPosition.y > zoneCorners[1].y;
             var isOutXBounds = targetPosition.x < zoneCorners[0].x || targetPosition.y > zoneCorners[2].x;
             if ((cardZone.DoesImmediatelyRelease && !IsProcessingSecondaryDragAction)
-                || (cardZone.type == CardZoneType.Vertical && isOutXBounds)
-                || (cardZone.type == CardZoneType.Horizontal && isOutYBounds)
-                || (cardZone.type == CardZoneType.Area && PlaceHolder != null &&
+                || (cardZone.Type == CardZoneType.Vertical && isOutXBounds)
+                || (cardZone.Type == CardZoneType.Horizontal && isOutYBounds)
+                || (cardZone.Type == CardZoneType.Area && PlaceHolder != null &&
                     PlaceHolder.parent != transform.parent))
                 ParentToCanvas(targetPosition);
         }

diff --git a/Assets/Scripts/Cgs/CardGameView/Multiplayer/CardZone.cs b/Assets/Scripts/Cgs/CardGameView/Multiplayer/CardZone.cs
@@ -110,7 +110,20 @@ protected override void OnAwakePlayable()
 
         protected override void OnNetworkSpawnPlayable()
         {
-            if (CardZoneType.Area.Equals(Type))
+            if (CardZoneType.Area.Equals(type))
+                type = (CardZoneType) _typeNetworkVariable.Value;
+            if (Vector2.zero.Equals(_size))
+                _size = _sizeNetworkVariable.Value;
+            if (FacePreference.Any.Equals(_facePreference))
+                _facePreference = (FacePreference) _faceNetworkVariable.Value;
+            if (CardAction.Move.Equals(_cardAction))
+                _cardAction = (CardAction) _actionNetworkVariable.Value;
+        }
+
+        protected override void OnStartPlayable()
+        {
+            if (PlayController.Instance == null ||
+                PlayController.Instance.playAreaCardZone.transform != transform.parent)
                 return;
 
             var rectTransform = (RectTransform) transform;
@@ -141,7 +154,6 @@ protected override void OnNetworkSpawnPlayable()
             if (layoutGroup != null)
                 layoutGroup.spacing = -225f;
 
-            type = Type;
             allowsFlip = true;
             allowsRotation = true;
             scrollRectContainer = PlayController.Instance.playArea;
@@ -150,27 +162,20 @@ protected override void OnNetworkSpawnPlayable()
             if (_faceNetworkVariable.Value != (int) _facePreference && (int) _facePreference != 0)
                 _faceNetworkVariable.Value = (int) _facePreference;
 
-            switch (DefaultFace)
-            {
-                case FacePreference.Any:
-                    OnAddCardActions.Add(PlayController.OnAddCardModel);
-                    break;
-                case FacePreference.Down:
-                    OnAddCardActions.Add(PlayController.OnAddCardModelFaceDown);
-                    break;
-                case FacePreference.Up:
-                    OnAddCardActions.Add(PlayController.OnAddCardModelFaceUp);
-                    break;
-                default:
-                    OnAddCardActions.Add(PlayController.OnAddCardModel);
-                    break;
-            }
-
             if (_actionNetworkVariable.Value != (int) _cardAction && (int) _cardAction != 0)
                 _actionNetworkVariable.Value = (int) _cardAction;
 
-            var defaultAction = CardActionPanel.CardActionDictionary[DefaultAction];
-            OnAddCardActions.Add((_, cardModel) => cardModel.DefaultAction = defaultAction);
+            OnAddCardActions.Add((cardZone, cardModel) =>
+            {
+                cardModel.IsFacedown = cardZone.DefaultFace switch
+                {
+                    FacePreference.Down => true,
+                    FacePreference.Up => false,
+                    _ => cardModel.IsFacedown
+                };
+                cardModel.DefaultAction = CardActionPanel.CardActionDictionary[cardZone.DefaultAction];
+                cardModel.SecondaryDragAction = cardModel.UpdateParentCardZoneScrollRect;
+            });
 
             StartCoroutine(WaitToAddMoveCardToServer());
         }
@@ -185,11 +190,11 @@ private IEnumerator WaitToAddMoveCardToServer()
         protected override void OnPointerEnterPlayable(PointerEventData eventData)
         {
             var cardModel = CardModel.GetPointerDrag(eventData);
-            if (cardModel != null && (type != CardZoneType.Area || cardModel.transform.parent != transform) &&
+            if (cardModel != null && (Type != CardZoneType.Area || cardModel.transform.parent != transform) &&
                 !cardModel.IsStatic)
                 cardModel.PlaceHolderCardZone = this;
 
-            if (type == CardZoneType.Area && scrollRectContainer is RotateZoomableScrollRect scrollRect)
+            if (Type == CardZoneType.Area && scrollRectContainer is RotateZoomableScrollRect scrollRect)
                 scrollRect.OnPointerEnter(eventData);
         }
 
@@ -201,7 +206,7 @@ protected override void OnPointerExitPlayable(PointerEventData eventData)
 
             OnLayout?.Invoke();
 
-            if (type == CardZoneType.Area && scrollRectContainer is RotateZoomableScrollRect scrollRect)
+            if (Type == CardZoneType.Area && scrollRectContainer is RotateZoomableScrollRect scrollRect)
                 scrollRect.OnPointerExit(eventData);
         }
 
@@ -227,23 +232,23 @@ protected override void OnDeselectPlayable(BaseEventData eventData)
 
         protected override void OnBeginDragPlayable(PointerEventData eventData)
         {
-            if (type == CardZoneType.Area && scrollRectContainer is RotateZoomableScrollRect scrollRect)
+            if (Type == CardZoneType.Area && scrollRectContainer is RotateZoomableScrollRect scrollRect)
                 scrollRect.OnBeginDrag(eventData);
             else if (scrollRectContainer != null)
                 scrollRectContainer.OnBeginDrag(eventData);
         }
 
         protected override void OnDragPlayable(PointerEventData eventData)
         {
-            if (type == CardZoneType.Area && scrollRectContainer is RotateZoomableScrollRect scrollRect)
+            if (Type == CardZoneType.Area && scrollRectContainer is RotateZoomableScrollRect scrollRect)
                 scrollRect.OnDrag(eventData);
             else if (scrollRectContainer != null)
                 scrollRectContainer.OnDrag(eventData);
         }
 
         protected override void OnEndDragPlayable(PointerEventData eventData)
         {
-            if (type == CardZoneType.Area && scrollRectContainer is RotateZoomableScrollRect scrollRect)
+            if (Type == CardZoneType.Area && scrollRectContainer is RotateZoomableScrollRect scrollRect)
                 scrollRect.OnEndDrag(eventData);
             else if (scrollRectContainer != null)
                 scrollRectContainer.OnEndDrag(eventData);
@@ -264,7 +269,7 @@ public void OnAdd(CardModel cardModel)
             if (cardModel == null)
                 return;
 
-            if (type == CardZoneType.Area)
+            if (Type == CardZoneType.Area)
                 cardModel.SnapToGrid();
 
             if (cardModel.ToDiscard)
@@ -288,14 +293,14 @@ public void UpdateLayout(RectTransform child, Vector2 targetPosition)
             if (child == null)
                 return;
 
-            switch (type)
+            switch (Type)
             {
                 case CardZoneType.Vertical:
                 case CardZoneType.Horizontal:
                     var newSiblingIndex = transform.childCount;
                     for (var i = 0; i < transform.childCount; i++)
                     {
-                        if (type == CardZoneType.Vertical
+                        if (Type == CardZoneType.Vertical
                                 ? targetPosition.y < transform.GetChild(i).position.y
                                 : targetPosition.x > transform.GetChild(i).position.x)
                             continue;

diff --git a/Assets/Scripts/Cgs/CardGameView/Multiplayer/CgsNetPlayable.cs b/Assets/Scripts/Cgs/CardGameView/Multiplayer/CgsNetPlayable.cs
@@ -406,7 +406,7 @@ protected virtual void OnEndDragPlayable(PointerEventData eventData)
 
         protected virtual void PostDragPlayable(PointerEventData eventData)
         {
-            if (ParentCardZone != null && ParentCardZone.type == CardZoneType.Area)
+            if (ParentCardZone != null && ParentCardZone.Type == CardZoneType.Area)
                 SnapToGrid();
         }
 

diff --git a/Assets/Scripts/Cgs/CardGameView/Viewer/CardActionPanel.cs b/Assets/Scripts/Cgs/CardGameView/Viewer/CardActionPanel.cs
@@ -16,8 +16,6 @@ namespace Cgs.CardGameView.Viewer
 
     public class CardActionPanel : MonoBehaviour
     {
-        public const float PositionOffsetAmount = 250f;
-
         public static IReadOnlyDictionary<FinolDigital.Cgs.CardGameDef.CardAction, CardAction> CardActionDictionary =>
             _cardActionDictionary ??= new Dictionary<FinolDigital.Cgs.CardGameDef.CardAction, CardAction>
             {

diff --git a/Assets/Scripts/Cgs/Decks/DeckEditor.cs b/Assets/Scripts/Cgs/Decks/DeckEditor.cs
@@ -211,7 +211,7 @@ private void Consolidate()
         private void AddCardZone()
         {
             var cardZone = Instantiate(cardZonePrefab, layoutContent).GetOrAddComponent<CardZone>();
-            cardZone.type = CardZoneType.Vertical;
+            cardZone.Type = CardZoneType.Vertical;
             cardZone.scrollRectContainer = scrollRect;
             cardZone.DoesImmediatelyRelease = true;
             cardZone.OnLayout = Consolidate;

diff --git a/Assets/Scripts/Cgs/Play/Multiplayer/CgsNetPlayer.cs b/Assets/Scripts/Cgs/Play/Multiplayer/CgsNetPlayer.cs
@@ -526,7 +526,8 @@ public void MoveCardToServer(CardZone cardZone, CardModel cardModel)
             var isFacedown = cardModel.IsFacedown && !cardModel.Value.IsBackFaceCard;
 
             if (cardZone.IsSpawned)
-                SpawnCardInZoneServerRpc(cardZone.gameObject, cardModel.Id, position, rotation, isFacedown);
+                SpawnCardInZoneServerRpc(cardZone.gameObject, cardModel.Id, position, rotation, isFacedown,
+                    cardZone.DefaultAction.ToString());
             else
                 SpawnCardInPlayAreaServerRpc(cardModel.Id, position, rotation, isFacedown);
 
@@ -539,9 +540,9 @@ public void MoveCardToServer(CardZone cardZone, CardModel cardModel)
         [ServerRpc]
         // ReSharper disable once MemberCanBeMadeStatic.Local
         private void SpawnCardInZoneServerRpc(NetworkObjectReference container, string cardId, Vector3 position,
-            Quaternion rotation, bool isFacedown)
+            Quaternion rotation, bool isFacedown, string defaultAction)
         {
-            PlayController.Instance.CreateCardModel(container, cardId, position, rotation, isFacedown);
+            PlayController.Instance.CreateCardModel(container, cardId, position, rotation, isFacedown, defaultAction);
         }
 
         [ServerRpc]