Card Zone move container in Deck Editor

finol-digital · Nov 5, 2023 · ecb5c73 · ecb5c73
1 parent 4e6643e
commit ecb5c73
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 4 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -58,7 +58,7 @@ jobs:
           key: Library-test-${{ hashFiles('Assets/**', 'Packages/**', 'ProjectSettings/**') }}
           restore-keys: Library-test-
       - name: Run Unit Tests
-        uses: game-ci/unity-test-runner@main
+        uses: game-ci/unity-test-runner@update-windows-images
         env:
           UNITY_EMAIL: ${{ secrets.UNITY_EMAIL }}
           UNITY_PASSWORD: ${{ secrets.UNITY_PASSWORD }}

diff --git a/Assets/Scripts/Cgs/CardGameView/Multiplayer/CardZone.cs b/Assets/Scripts/Cgs/CardGameView/Multiplayer/CardZone.cs
@@ -84,18 +84,24 @@ protected override void OnBeginDragPlayable(PointerEventData eventData)
         {
             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)
                 scrollRect.OnDrag(eventData);
+            else if (scrollRectContainer != null)
+                scrollRectContainer.OnDrag(eventData);
         }
 
         protected override void OnEndDragPlayable(PointerEventData eventData)
         {
             if (type == CardZoneType.Area && scrollRectContainer is RotateZoomableScrollRect scrollRect)
                 scrollRect.OnEndDrag(eventData);
+            else if (scrollRectContainer != null)
+                scrollRectContainer.OnEndDrag(eventData);
         }
 
         protected override void PostDragPlayable(PointerEventData eventData)

diff --git a/docs/pages/roadmap.md b/docs/pages/roadmap.md
@@ -5,10 +5,10 @@ permalink: roadmap.html
 # Roadmap
 
 ## What's New - v1.94
-- Bug-Fix: Apply rotation when spawning players objects
-- Bug-Fix: Card Zone should move containing scrollrect in Deck Editor
+- Bug-Fix: Card Zone should move container in Deck Editor
 
 ## Active Sprint
+- Bug-Fix: Apply rotation when spawning players objects
 - Game-Play: Combine Stacks when dropped on each other
 - Game-Play: Put Card on bottom of Stack when Stack is dropped on Card
 - Game-Play: Rename Stacks
@@ -28,7 +28,7 @@ permalink: roadmap.html
 - Cards: Support more than 1 card face (Dual-Faced Cards)
 - Cards: Support mix of different card sizes in the same game
 - Game-Play: Counter system for players and cards
-- Game-Play: Save/Load Games + Log of all (Player) actions
+- Game-Play: Save/Load Sessions + Log of all (Player) actions
 - Game-Play: Cut/Copy/Paste Cards
 - Game-Play: Undo with Ctrl-Z
 
@@ -47,6 +47,8 @@ permalink: roadmap.html
   - Option to have a hard deck size limit applied, as well as for extras, I.e. 50 card main deck, 5 card extra deck
 
 ## Backlog - 2024 Q3
+- Cards: Image quality management/LODs for card images
+- Accessibility: Add audio and sounds throughout the app
 - Cards Explorer & Deck Editor: Add sorting + Sort Menu
 - Game-Play: Support multiple playmats
 - Game-Play: Setup gamepad and keyboard shortcuts/hotkeys for Game-Play and Settings