Work on card zones

finol-digital · Aug 2, 2023 · 4071e6c · 4071e6c
1 parent 9b09084
commit 4071e6c
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 7 deletions.
diff --git a/Assets/Scenes/PlayGame.unity b/Assets/Scenes/PlayGame.unity
diff --git a/Assets/Scripts/Cgs/CardGameView/Multiplayer/CardZone.cs b/Assets/Scripts/Cgs/CardGameView/Multiplayer/CardZone.cs
@@ -3,7 +3,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 using System.Collections.Generic;
-using Cgs.CardGameView.Multiplayer;
+using Cgs.UI.ScrollRects;
 using UnityEngine;
 using UnityEngine.Events;
 using UnityEngine.EventSystems;
@@ -23,7 +23,7 @@ public enum CardZoneType
         Area
     }
 
-    public class CardZone : CgsNetPlayable, IPointerEnterHandler, IPointerExitHandler
+    public class CardZone : CgsNetPlayable
     {
         public CardZoneType type;
         public bool allowsFlip;
@@ -43,14 +43,21 @@ protected override void OnPointerEnterPlayable(PointerEventData eventData)
             if (cardModel != null && (type != CardZoneType.Area || cardModel.transform.parent != transform) &&
                 !cardModel.IsStatic)
                 cardModel.PlaceHolderCardZone = this;
+
+            if (type == CardZoneType.Area && scrollRectContainer is RotateZoomableScrollRect scrollRect)
+                scrollRect.OnPointerEnter(eventData);
         }
 
         protected override void OnPointerExitPlayable(PointerEventData eventData)
         {
             var cardModel = CardModel.GetPointerDrag(eventData);
             if (cardModel != null && cardModel.PlaceHolderCardZone == this)
                 cardModel.PlaceHolderCardZone = null;
+
             OnLayout?.Invoke();
+
+            if (type == CardZoneType.Area && scrollRectContainer is RotateZoomableScrollRect scrollRect)
+                scrollRect.OnPointerExit(eventData);
         }
 
         protected override void OnPointerDownPlayable(PointerEventData eventData)
@@ -75,17 +82,20 @@ protected override void OnDeselectPlayable(BaseEventData eventData)
 
         protected override void OnBeginDragPlayable(PointerEventData eventData)
         {
-            // Nothing
+            if (type == CardZoneType.Area && scrollRectContainer is RotateZoomableScrollRect scrollRect)
+                scrollRect.OnBeginDrag(eventData);
         }
 
         protected override void OnDragPlayable(PointerEventData eventData)
         {
-            // Nothing
+            if (type == CardZoneType.Area && scrollRectContainer is RotateZoomableScrollRect scrollRect)
+                scrollRect.OnDrag(eventData);
         }
 
         protected override void OnEndDragPlayable(PointerEventData eventData)
         {
-            // Nothing
+            if (type == CardZoneType.Area && scrollRectContainer is RotateZoomableScrollRect scrollRect)
+                scrollRect.OnEndDrag(eventData);
         }
 
         protected override void PostDragPlayable(PointerEventData eventData)

diff --git a/Assets/Scripts/Cgs/Play/Multiplayer/CgsNetPlayer.cs b/Assets/Scripts/Cgs/Play/Multiplayer/CgsNetPlayer.cs
@@ -6,7 +6,6 @@
 using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
-using Cgs.CardGameView;
 using Cgs.CardGameView.Multiplayer;
 using Cgs.Play.Drawer;
 using FinolDigital.Cgs.CardGameDef;