From 3a5b622da063da32fb7b0ac4786ae0f0632fdb90 Mon Sep 17 00:00:00 2001 From: Samir LABANE <samir.labane@ensiie.fr> Date: Sat, 3 Aug 2019 17:53:08 +0200 Subject: [PATCH] fix ui and add discard --- Assets/Scenes/Integration.unity | 34 +++++++++++++++++++++------------ Assets/Scripts/Cards/Card.cs | 1 + Assets/Scripts/Deck/Dump.cs | 2 ++ Assets/Scripts/Deck/Hand.cs | 3 ++- Assets/Scripts/Ui/HandUi.cs | 4 +++- 5 files changed, 30 insertions(+), 14 deletions(-) diff --git a/Assets/Scenes/Integration.unity b/Assets/Scenes/Integration.unity index 21b393c..f2031e7 100644 --- a/Assets/Scenes/Integration.unity +++ b/Assets/Scenes/Integration.unity @@ -413,12 +413,12 @@ PrefabInstance: - target: {fileID: 697331425601601877, guid: 04c974020468ba94f9cb502255a15dd1, type: 3} propertyPath: m_AnchoredPosition.x - value: 30 + value: -20 objectReference: {fileID: 0} - target: {fileID: 697331425601601877, guid: 04c974020468ba94f9cb502255a15dd1, type: 3} propertyPath: m_AnchoredPosition.y - value: -40 + value: 60 objectReference: {fileID: 0} - target: {fileID: 697331425601601877, guid: 04c974020468ba94f9cb502255a15dd1, type: 3} @@ -433,22 +433,22 @@ PrefabInstance: - target: {fileID: 697331425601601877, guid: 04c974020468ba94f9cb502255a15dd1, type: 3} propertyPath: m_AnchorMin.x - value: 0 + value: 0.5 objectReference: {fileID: 0} - target: {fileID: 697331425601601877, guid: 04c974020468ba94f9cb502255a15dd1, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 697331425601601877, guid: 04c974020468ba94f9cb502255a15dd1, type: 3} propertyPath: m_AnchorMax.x - value: 0 + value: 0.5 objectReference: {fileID: 0} - target: {fileID: 697331425601601877, guid: 04c974020468ba94f9cb502255a15dd1, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 697331425601601877, guid: 04c974020468ba94f9cb502255a15dd1, type: 3} @@ -460,6 +460,11 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} + - target: {fileID: 697331425601601874, guid: 04c974020468ba94f9cb502255a15dd1, + type: 3} + propertyPath: m_Color.a + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 04c974020468ba94f9cb502255a15dd1, type: 3} --- !u!1 &872592474 @@ -950,12 +955,12 @@ PrefabInstance: - target: {fileID: 4934257969187937547, guid: ca7d6d67dabc35c4cbfde5d6408b8c3b, type: 3} propertyPath: m_AnchoredPosition.x - value: 30 + value: -20 objectReference: {fileID: 0} - target: {fileID: 4934257969187937547, guid: ca7d6d67dabc35c4cbfde5d6408b8c3b, type: 3} propertyPath: m_AnchoredPosition.y - value: -40 + value: 60 objectReference: {fileID: 0} - target: {fileID: 4934257969187937547, guid: ca7d6d67dabc35c4cbfde5d6408b8c3b, type: 3} @@ -970,22 +975,22 @@ PrefabInstance: - target: {fileID: 4934257969187937547, guid: ca7d6d67dabc35c4cbfde5d6408b8c3b, type: 3} propertyPath: m_AnchorMin.x - value: 0 + value: 0.5 objectReference: {fileID: 0} - target: {fileID: 4934257969187937547, guid: ca7d6d67dabc35c4cbfde5d6408b8c3b, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4934257969187937547, guid: ca7d6d67dabc35c4cbfde5d6408b8c3b, type: 3} propertyPath: m_AnchorMax.x - value: 0 + value: 0.5 objectReference: {fileID: 0} - target: {fileID: 4934257969187937547, guid: ca7d6d67dabc35c4cbfde5d6408b8c3b, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4934257969187937547, guid: ca7d6d67dabc35c4cbfde5d6408b8c3b, type: 3} @@ -997,5 +1002,10 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} + - target: {fileID: 4934257969187937548, guid: ca7d6d67dabc35c4cbfde5d6408b8c3b, + type: 3} + propertyPath: m_Color.a + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: ca7d6d67dabc35c4cbfde5d6408b8c3b, type: 3} diff --git a/Assets/Scripts/Cards/Card.cs b/Assets/Scripts/Cards/Card.cs index 38effa6..1c11390 100644 --- a/Assets/Scripts/Cards/Card.cs +++ b/Assets/Scripts/Cards/Card.cs @@ -33,6 +33,7 @@ public class Card : MonoBehaviour { effect.Apply(); } + gameObject.GetComponentInParent<Hand>().Discard(this); } } diff --git a/Assets/Scripts/Deck/Dump.cs b/Assets/Scripts/Deck/Dump.cs index 3429e2d..5556ae3 100644 --- a/Assets/Scripts/Deck/Dump.cs +++ b/Assets/Scripts/Deck/Dump.cs @@ -50,6 +50,8 @@ public class Dump : MonoBehaviour public void Discard(Card card) { Debug.Log("dump size: "+dumpStack.Count); + card.transform.SetParent(transform); + card.gameObject.SetActive(false); dumpStack.Push(card); } diff --git a/Assets/Scripts/Deck/Hand.cs b/Assets/Scripts/Deck/Hand.cs index 15c6faf..58b9fb7 100644 --- a/Assets/Scripts/Deck/Hand.cs +++ b/Assets/Scripts/Deck/Hand.cs @@ -45,8 +45,9 @@ public class Hand : MonoBehaviour { Debug.Log("draw succed"); hand.Add(newCard); - CardEvent<Card>.Trigger(Event.CARD_DRAW, newCard); + newCard.transform.SetParent(transform); newCard.gameObject.SetActive(true); + CardEvent<Card>.Trigger(Event.CARD_DRAW, newCard); } else { diff --git a/Assets/Scripts/Ui/HandUi.cs b/Assets/Scripts/Ui/HandUi.cs index b493f64..432c0be 100644 --- a/Assets/Scripts/Ui/HandUi.cs +++ b/Assets/Scripts/Ui/HandUi.cs @@ -13,6 +13,7 @@ public class HandUi : MonoBehaviour void Start() { CardEvent<Card>.Register(Event.CARD_DRAW, OnCardDraw); + CardEvent<Card>.Register(Event.CARD_PLAYED, OnCardDraw); } public void OnCardDraw(Card card) @@ -31,7 +32,8 @@ public class HandUi : MonoBehaviour float starting = -(decal * cards.Count) / 2f; foreach (Card card in cards) { - Vector3 newpos = new Vector3(starting + decal * mod, card.transform.localPosition.y, -mod); + Vector3 newpos = new Vector3(starting + (decal * mod), card.GetComponent<RectTransform>().rect.height/2 , -mod); + Debug.Log(newpos); card.transform.localPosition = newpos; mod++; } -- GitLab