Merge branch 'dev' of https://git.iiens.net/labane2013/tekajam into dev

Assets/Scripts/Alterations/AddScoreOnCardDraw.cs

@@ -8,6 +8,7 @@ public class AddScoreOnCardDraw : Alteration
     public AddScoreOnCardDraw(AlterationInfo info, AlterationPool pool) : base(info, pool)
     {
         CardEvent<Card>.Register(Event.CARD_DRAW, OnCardPlayed);
+        CardEvent<Card>.Register(Event.EXTRA_CARD_DRAW, OnCardPlayed);
     }
 
     public void OnCardPlayed(Card card)
@@ -22,6 +23,7 @@ public class AddScoreOnCardDraw : Alteration
     public override void CleanUp()
     {
         CardEvent<Card>.Unregister(Event.CARD_DRAW, OnCardPlayed);
+        CardEvent<Card>.Unregister(Event.EXTRA_CARD_DRAW, OnCardPlayed);
         mPool.Remove(this);
     }
 }

Assets/Scripts/CardEvents.cs

@@ -8,7 +8,8 @@ public enum Event
     CARD_PLAYED,
     CARD_DRAW,
     CARD_DISCARD,
-    CARD_EFFECT_APPLIED
+    CARD_EFFECT_APPLIED,
+    EXTRA_CARD_DRAW
 }
 
 public class CardEvent<T>

Assets/Scripts/Deck/Hand.cs

@@ -61,6 +61,7 @@ public class Hand : MonoBehaviour
             newCard.transform.SetParent(transform);
             newCard.gameObject.SetActive(true);
             newCard.GetComponent<CardUi>().Show();
+            CardEvent<Card>.Trigger(Event.EXTRA_CARD_DRAW, newCard);
         }
         else
         {

Assets/Scripts/GameManager.cs

@@ -106,6 +106,7 @@ public class GameManager : MonoBehaviour
         currentState = GameState.FIGHT;
 
         CardEvent<Card>.Register(global::Event.CARD_DRAW, OnCardDraw);
+        CardEvent<Card>.Register(global::Event.EXTRA_CARD_DRAW, OnCardDraw);
         CardEvent<Card>.Register(global::Event.CARD_DISCARD, OnCardDiscard);
         mIsRegistered = true;
     }
@@ -113,6 +114,7 @@ public class GameManager : MonoBehaviour
     public void StartDraft()
     {
         CardEvent<Card>.Unregister(global::Event.CARD_DRAW, OnCardDraw);
+        CardEvent<Card>.Unregister(global::Event.EXTRA_CARD_DRAW, OnCardDraw);
         CardEvent<Card>.Unregister(global::Event.CARD_DISCARD, OnCardDiscard);
         mIsRegistered = false;
 

Assets/Scripts/Ui/HandUi.cs

@@ -12,6 +12,7 @@ public class HandUi : MonoBehaviour
     private void Awake()
     {
         CardEvent<Card>.Register(Event.CARD_DRAW, OnCardEvent);
+        CardEvent<Card>.Register(Event.EXTRA_CARD_DRAW, OnCardEvent);
         CardEvent<Card>.Register(Event.CARD_DISCARD, OnCardEvent);
     }