Fix bug

finol-digital · May 29, 2023 · 68b4c53 · 68b4c53
1 parent f6809ce
commit 68b4c53
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 24 deletions.
diff --git a/Assets/Prefabs/Menus/Card Editor Menu.prefab b/Assets/Prefabs/Menus/Card Editor Menu.prefab
diff --git a/Assets/Scripts/Cgs/CardGameView/Multiplayer/CardStack.cs b/Assets/Scripts/Cgs/CardGameView/Multiplayer/CardStack.cs
@@ -236,9 +236,8 @@ private void DragCard(PointerEventData eventData)
             else
                 PopCard();
 
-            var cardModel = CardModel.CreateDrag(eventData, cardModelPrefab, transform, unityCard, true,
+            CardModel.CreateDrag(eventData, cardModelPrefab, transform, unityCard, true,
                 PlayController.Instance.playMat);
-            CgsNetManager.Instance.LocalPlayer.RemovedCard = cardModel;
 
             RemovePointer(eventData);
 

diff --git a/Assets/Scripts/Cgs/Play/Multiplayer/CgsNetPlayer.cs b/Assets/Scripts/Cgs/Play/Multiplayer/CgsNetPlayer.cs
@@ -100,8 +100,6 @@ public IReadOnlyList<IReadOnlyList<UnityCard>> HandCards
 
         private NetworkList<CgsNetString> _handNames;
 
-        public CardModel RemovedCard { get; set; }
-
         private void Awake()
         {
             _handCards = new NetworkList<CgsNetStringList>();
@@ -344,17 +342,7 @@ private void RemoveAtServerRpc(NetworkObjectReference stack, int index)
         {
             Debug.Log($"[CgsNet Player] Remove at {index}!");
             var cardStack = ((NetworkObject) stack).GetComponent<CardStack>();
-            var removedCardId = cardStack.RemoveAt(index);
-            SyncRemovedCardOwnerClientRpc(removedCardId, OwnerClientRpcParams);
-        }
-
-        [ClientRpc]
-        // ReSharper disable once UnusedParameter.Local
-        private void SyncRemovedCardOwnerClientRpc(string removedCardId, ClientRpcParams clientRpcParams = default)
-        {
-            if (RemovedCard != null)
-                RemovedCard.Value = CardGameManager.Current.Cards[removedCardId];
-            RemovedCard = null;
+            cardStack.RemoveAt(index);
         }
 
         public void RequestDeal(NetworkObject stack, int count)

diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset
diff --git a/docs/pages/roadmap.md b/docs/pages/roadmap.md
@@ -5,10 +5,10 @@ permalink: roadmap.html
 # Roadmap
 
 ## What's New - v1.84
+- Bug-Fix: Card in hand transforms into card that is drawn
 - Added labels to buttons
 
 ## Active Sprint
-- Bug: Card in hand transforms into card that is drawn (https://www.youtube.com/shorts/pYG0N9TqMmA)
 - Bug: Card gets stuck on screen
 - Bug: Card get stuck on screen when dragging from search results in deck editor
 - Cards: Validation for id