Skip to content
Extraits de code Groupes Projets
Valider 5d098600 rédigé par Samir LABANE's avatar Samir LABANE
Parcourir les fichiers

fix draft not actually adding the cards

parent 8d419831
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
...@@ -16,6 +16,8 @@ public class Card : MonoBehaviour ...@@ -16,6 +16,8 @@ public class Card : MonoBehaviour
public string Name = ""; public string Name = "";
private DraftChoice mChoice = null; //dirty hack for ui : if you click on the card in ui it will just add it to deck
public List<Effect> GetEffects() public List<Effect> GetEffects()
{ {
if (mEffects == null) if (mEffects == null)
...@@ -41,7 +43,7 @@ public class Card : MonoBehaviour ...@@ -41,7 +43,7 @@ public class Card : MonoBehaviour
/* Run all effects */ /* Run all effects */
public void Apply() public void Apply()
{ {
if (Playable) if (mChoice == null)
{ {
CardEvent<Card>.Trigger(Event.CARD_PLAYED, this); CardEvent<Card>.Trigger(Event.CARD_PLAYED, this);
foreach (Effect effect in mEffects) foreach (Effect effect in mEffects)
...@@ -50,6 +52,15 @@ public class Card : MonoBehaviour ...@@ -50,6 +52,15 @@ public class Card : MonoBehaviour
} }
gameObject.GetComponentInParent<Hand>().Discard(this); gameObject.GetComponentInParent<Hand>().Discard(this);
} }
else
{
mChoice.Select();
}
}
public void SetDraftChoice(DraftChoice choice)
{
mChoice = choice;
} }
} }
...@@ -69,6 +69,7 @@ public class Deck : MonoBehaviour ...@@ -69,6 +69,7 @@ public class Deck : MonoBehaviour
{ {
totalCards.Insert(j, card); totalCards.Insert(j, card);
} }
PutCardInDeck(card);
} }
public void PutCardInDeck(Card card) public void PutCardInDeck(Card card)
......
...@@ -23,8 +23,7 @@ public class DraftChoice : MonoBehaviour ...@@ -23,8 +23,7 @@ public class DraftChoice : MonoBehaviour
mCard.transform.SetParent(transform); mCard.transform.SetParent(transform);
mCard.SetActive(true); mCard.SetActive(true);
mCard.transform.localScale = new Vector3(1, 1); // small adjustment mCard.transform.localScale = new Vector3(1, 1); // small adjustment
mCard.GetComponent<Image>().raycastTarget = false; mCard.GetComponent<Card>().SetDraftChoice(this);
mCard.GetComponent<Button>().interactable = false;
mCard.transform.localPosition = new Vector3(0, 0, 1); mCard.transform.localPosition = new Vector3(0, 0, 1);
} }
...@@ -33,6 +32,7 @@ public class DraftChoice : MonoBehaviour ...@@ -33,6 +32,7 @@ public class DraftChoice : MonoBehaviour
mCard.transform.localScale = new Vector3(0.5f, 0.5f); // small adjustment mCard.transform.localScale = new Vector3(0.5f, 0.5f); // small adjustment
mCard.GetComponent<Image>().raycastTarget = true; mCard.GetComponent<Image>().raycastTarget = true;
mCard.GetComponent<Button>().interactable = true; mCard.GetComponent<Button>().interactable = true;
mCard.GetComponent<Card>().SetDraftChoice(null);
GameManager.Instance.PlayerDeck.AddCard(mCard.GetComponent<Card>()); GameManager.Instance.PlayerDeck.AddCard(mCard.GetComponent<Card>());
GameManager.Instance.NextState(); GameManager.Instance.NextState();
mCard = null; mCard = null;
......
0% Chargement en cours ou .
You are about to add 0 people to the discussion. Proceed with caution.
Terminez d'abord l'édition de ce message.
Veuillez vous inscrire ou vous pour commenter