diff --git a/Assets/GameObjects/Cards/Acrobatics.prefab b/Assets/GameObjects/Cards/Acrobatics.prefab index f6a41f2c6af3167e4dcd20aa5a9630969fabd3e8..9dbfe944f9f715a772968927c718eb07011586cc 100644 --- a/Assets/GameObjects/Cards/Acrobatics.prefab +++ b/Assets/GameObjects/Cards/Acrobatics.prefab @@ -89,6 +89,7 @@ GameObject: - component: {fileID: 697331425601601872} - component: {fileID: -8964111378535541973} - component: {fileID: 3420741560215158456} + - component: {fileID: -4614381331334101226} m_Layer: 5 m_Name: Acrobatics m_TagString: Untagged @@ -257,6 +258,18 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!225 &-4614381331334101226 +CanvasGroup: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 697331425601601878} + m_Enabled: 1 + m_Alpha: 1 + m_Interactable: 1 + m_BlocksRaycasts: 1 + m_IgnoreParentGroups: 0 --- !u!1 &4425823250339553156 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/GameObjects/Cards/AddScoreOnCardDrawn.prefab b/Assets/GameObjects/Cards/AddScoreOnCardDrawn.prefab index 7523fb201f7304761f4a9ee34f5c20d762149127..555d502d4b47c049b95774bb40c9765fe8bbd3a1 100644 --- a/Assets/GameObjects/Cards/AddScoreOnCardDrawn.prefab +++ b/Assets/GameObjects/Cards/AddScoreOnCardDrawn.prefab @@ -15,6 +15,7 @@ GameObject: - component: {fileID: 2931771172728402081} - component: {fileID: 697331425601601872} - component: {fileID: -6158870809297849959} + - component: {fileID: 9047452364720713895} m_Layer: 5 m_Name: AddScoreOnCardDrawn m_TagString: Untagged @@ -186,6 +187,18 @@ MonoBehaviour: validity: 1 type: 2 value: 2 +--- !u!225 &9047452364720713895 +CanvasGroup: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 697331425601601878} + m_Enabled: 1 + m_Alpha: 1 + m_Interactable: 1 + m_BlocksRaycasts: 1 + m_IgnoreParentGroups: 0 --- !u!1 &5092495464832705734 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/GameObjects/Cards/BaseCard.prefab b/Assets/GameObjects/Cards/BaseCard.prefab index 64e03d880e6728be59edb6b440c93b6d82396cf7..210ea29db8c505d2749e57bc7582a3f385b024f5 100644 --- a/Assets/GameObjects/Cards/BaseCard.prefab +++ b/Assets/GameObjects/Cards/BaseCard.prefab @@ -14,6 +14,7 @@ GameObject: - component: {fileID: 697331425601601875} - component: {fileID: 2931771172728402081} - component: {fileID: 697331425601601872} + - component: {fileID: 7378666297842922649} m_Layer: 5 m_Name: BaseCard m_TagString: Untagged @@ -170,6 +171,18 @@ MonoBehaviour: m_CallState: 2 m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null +--- !u!225 &7378666297842922649 +CanvasGroup: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 697331425601601878} + m_Enabled: 1 + m_Alpha: 1 + m_Interactable: 1 + m_BlocksRaycasts: 1 + m_IgnoreParentGroups: 0 --- !u!1 &908657380367480109 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/GameObjects/Cards/Commit.prefab b/Assets/GameObjects/Cards/Commit.prefab index b47225a478de7ba9dd079a0506ce754ba6f1711f..7e21042626fb1d9d7653006e2426ac00a0fced58 100644 --- a/Assets/GameObjects/Cards/Commit.prefab +++ b/Assets/GameObjects/Cards/Commit.prefab @@ -16,6 +16,7 @@ GameObject: - component: {fileID: 697331425601601872} - component: {fileID: -8858317718760572845} - component: {fileID: -6973623389691738253} + - component: {fileID: -2567725818595651106} m_Layer: 5 m_Name: Commit m_TagString: Untagged @@ -197,6 +198,18 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: energyGain: 2 +--- !u!225 &-2567725818595651106 +CanvasGroup: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 697331425601601878} + m_Enabled: 1 + m_Alpha: 1 + m_Interactable: 1 + m_BlocksRaycasts: 1 + m_IgnoreParentGroups: 0 --- !u!1 &3144126370386075520 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/GameObjects/Cards/Controlled Jump.prefab b/Assets/GameObjects/Cards/Controlled Jump.prefab index a4ecb283a99f2d06d9ffb1253d8e47010e7f6b93..134c4204abe1207bbe171e16aa5107e02e75db36 100644 --- a/Assets/GameObjects/Cards/Controlled Jump.prefab +++ b/Assets/GameObjects/Cards/Controlled Jump.prefab @@ -16,6 +16,7 @@ GameObject: - component: {fileID: 697331425601601872} - component: {fileID: 3271928827318276628} - component: {fileID: -295774250118619860} + - component: {fileID: -4389016377966753703} m_Layer: 5 m_Name: Controlled Jump m_TagString: Untagged @@ -197,6 +198,18 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: mDrawAmount: 1 +--- !u!225 &-4389016377966753703 +CanvasGroup: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 697331425601601878} + m_Enabled: 1 + m_Alpha: 1 + m_Interactable: 1 + m_BlocksRaycasts: 1 + m_IgnoreParentGroups: 0 --- !u!1 &908657380367480109 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/GameObjects/Cards/Dance Move.prefab b/Assets/GameObjects/Cards/Dance Move.prefab index cf7be51b72300daa022aa8a6b0013061fbb9ccf0..158bd039da04cd7af7459c809778ae9a6b4346db 100644 --- a/Assets/GameObjects/Cards/Dance Move.prefab +++ b/Assets/GameObjects/Cards/Dance Move.prefab @@ -15,6 +15,7 @@ GameObject: - component: {fileID: 2931771172728402081} - component: {fileID: 697331425601601872} - component: {fileID: 2807588322932491411} + - component: {fileID: 6849363301578667027} m_Layer: 5 m_Name: Dance Move m_TagString: Untagged @@ -183,6 +184,18 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: mScoreToApply: 6 +--- !u!225 &6849363301578667027 +CanvasGroup: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 697331425601601878} + m_Enabled: 1 + m_Alpha: 1 + m_Interactable: 1 + m_BlocksRaycasts: 1 + m_IgnoreParentGroups: 0 --- !u!1 &1445769512743566193 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/GameObjects/Cards/FinishingMove.prefab b/Assets/GameObjects/Cards/FinishingMove.prefab index 2eb3b7d8e28f96f20f40b7cdd65463e6d37da7c8..4a347d6d04a77b01025ca8f9aabb1c801d3c46b3 100644 --- a/Assets/GameObjects/Cards/FinishingMove.prefab +++ b/Assets/GameObjects/Cards/FinishingMove.prefab @@ -16,6 +16,7 @@ GameObject: - component: {fileID: 697331425601601872} - component: {fileID: 5130254894926632416} - component: {fileID: 7569384359370343401} + - component: {fileID: -5420574348766821766} m_Layer: 5 m_Name: FinishingMove m_TagString: Untagged @@ -197,6 +198,18 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: mScoreToApply: 12 +--- !u!225 &-5420574348766821766 +CanvasGroup: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 697331425601601878} + m_Enabled: 1 + m_Alpha: 1 + m_Interactable: 1 + m_BlocksRaycasts: 1 + m_IgnoreParentGroups: 0 --- !u!1 &908657380367480109 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/GameObjects/Cards/Follow The Rhythm.prefab b/Assets/GameObjects/Cards/Follow The Rhythm.prefab index 8444c0722a3510e8580df8f343dae8117d37fd18..862c60c75bcdfc65573ab47c332c8b62ea5d1b20 100644 --- a/Assets/GameObjects/Cards/Follow The Rhythm.prefab +++ b/Assets/GameObjects/Cards/Follow The Rhythm.prefab @@ -16,6 +16,7 @@ GameObject: - component: {fileID: 697331425601601872} - component: {fileID: 1569387475714886925} - component: {fileID: -8219196987663118658} + - component: {fileID: 3167050103553773193} m_Layer: 5 m_Name: Follow The Rhythm m_TagString: Untagged @@ -197,6 +198,18 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: energyGain: 1 +--- !u!225 &3167050103553773193 +CanvasGroup: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 697331425601601878} + m_Enabled: 1 + m_Alpha: 1 + m_Interactable: 1 + m_BlocksRaycasts: 1 + m_IgnoreParentGroups: 0 --- !u!1 &908657380367480109 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/GameObjects/Cards/Inhale.prefab b/Assets/GameObjects/Cards/Inhale.prefab index 6fcd8c1562fa1e4a0802dd48ae441db09d95f016..a208ed22e64f403a74337ddf1c7fc7a76d217443 100644 --- a/Assets/GameObjects/Cards/Inhale.prefab +++ b/Assets/GameObjects/Cards/Inhale.prefab @@ -90,6 +90,7 @@ GameObject: - component: {fileID: 697331425601601872} - component: {fileID: 5741578807293280646} - component: {fileID: -1118383902003591905} + - component: {fileID: -8918782379492709005} m_Layer: 5 m_Name: Inhale m_TagString: Untagged @@ -271,6 +272,18 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: mDrawAmount: 1 +--- !u!225 &-8918782379492709005 +CanvasGroup: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 697331425601601878} + m_Enabled: 1 + m_Alpha: 1 + m_Interactable: 1 + m_BlocksRaycasts: 1 + m_IgnoreParentGroups: 0 --- !u!1 &2434526703323137635 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/GameObjects/Cards/Reconsider Life Choices.prefab b/Assets/GameObjects/Cards/Reconsider Life Choices.prefab index b43c15ac925fa909c2596c9a054479a5658f659e..9d53162cbe1fc3672fc2c59426150eb27d3bc025 100644 --- a/Assets/GameObjects/Cards/Reconsider Life Choices.prefab +++ b/Assets/GameObjects/Cards/Reconsider Life Choices.prefab @@ -15,6 +15,7 @@ GameObject: - component: {fileID: 2931771172728402081} - component: {fileID: 697331425601601872} - component: {fileID: -8858317718760572845} + - component: {fileID: 4157986029801078357} m_Layer: 5 m_Name: Reconsider Life Choices m_TagString: Untagged @@ -183,6 +184,18 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: mDrawAmount: 2 +--- !u!225 &4157986029801078357 +CanvasGroup: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 697331425601601878} + m_Enabled: 1 + m_Alpha: 1 + m_Interactable: 1 + m_BlocksRaycasts: 1 + m_IgnoreParentGroups: 0 --- !u!1 &3144126370386075520 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/GameObjects/Cards/Shy Move.prefab b/Assets/GameObjects/Cards/Shy Move.prefab index 1dec949b0d6424a29d16380a64d498590887c64f..a04891fabba04fd3d8d3255576c751fcb9b285ea 100644 --- a/Assets/GameObjects/Cards/Shy Move.prefab +++ b/Assets/GameObjects/Cards/Shy Move.prefab @@ -15,6 +15,7 @@ GameObject: - component: {fileID: 2931771172728402081} - component: {fileID: 697331425601601872} - component: {fileID: -2328207469386312277} + - component: {fileID: -3220240275512583978} m_Layer: 5 m_Name: Shy Move m_TagString: Untagged @@ -183,6 +184,18 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: mScoreToApply: 2 +--- !u!225 &-3220240275512583978 +CanvasGroup: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 697331425601601878} + m_Enabled: 1 + m_Alpha: 1 + m_Interactable: 1 + m_BlocksRaycasts: 1 + m_IgnoreParentGroups: 0 --- !u!1 &908657380367480109 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/GameObjects/Cards/Stabilize.prefab b/Assets/GameObjects/Cards/Stabilize.prefab index 7791aae23e084b00de09fb6ebeb4b6567524ba7b..29e29d6f306f7d95fd4237597a7ce16e1391f9f7 100644 --- a/Assets/GameObjects/Cards/Stabilize.prefab +++ b/Assets/GameObjects/Cards/Stabilize.prefab @@ -15,6 +15,7 @@ GameObject: - component: {fileID: 2931771172728402081} - component: {fileID: 697331425601601872} - component: {fileID: 3585395209183949600} + - component: {fileID: 1869899765541527372} m_Layer: 5 m_Name: Stabilize m_TagString: Untagged @@ -183,6 +184,18 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: energyGain: 3 +--- !u!225 &1869899765541527372 +CanvasGroup: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 697331425601601878} + m_Enabled: 1 + m_Alpha: 1 + m_Interactable: 1 + m_BlocksRaycasts: 1 + m_IgnoreParentGroups: 0 --- !u!1 &2698195167997044428 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/GameObjects/Cards/Step Up.prefab b/Assets/GameObjects/Cards/Step Up.prefab index 3531f102310a9bcbd227955c94b8d974f81a816d..e4507cf593d8d0b61d0ec4e27911503b0de3f54f 100644 --- a/Assets/GameObjects/Cards/Step Up.prefab +++ b/Assets/GameObjects/Cards/Step Up.prefab @@ -16,6 +16,7 @@ GameObject: - component: {fileID: 697331425601601872} - component: {fileID: -5489781295460869164} - component: {fileID: 179639655867978532} + - component: {fileID: -8740457587430544077} m_Layer: 5 m_Name: Step Up m_TagString: Untagged @@ -200,6 +201,18 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: energyGain: 1 +--- !u!225 &-8740457587430544077 +CanvasGroup: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 697331425601601878} + m_Enabled: 1 + m_Alpha: 1 + m_Interactable: 1 + m_BlocksRaycasts: 1 + m_IgnoreParentGroups: 0 --- !u!1 &908657380367480109 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/GameObjects/Cards/TacticalMindset.prefab b/Assets/GameObjects/Cards/TacticalMindset.prefab index 857da32330fd8ed17adfc37322cb9f40429da470..61590f86356fdea1ba4b1c2b6d7c22580f00f1cc 100644 --- a/Assets/GameObjects/Cards/TacticalMindset.prefab +++ b/Assets/GameObjects/Cards/TacticalMindset.prefab @@ -16,6 +16,7 @@ GameObject: - component: {fileID: 697331425601601872} - component: {fileID: 8076641939201242003} - component: {fileID: 2319758201615265464} + - component: {fileID: 192743283793940331} m_Layer: 5 m_Name: TacticalMindset m_TagString: Untagged @@ -200,6 +201,18 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: energyGain: 1 +--- !u!225 &192743283793940331 +CanvasGroup: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 697331425601601878} + m_Enabled: 1 + m_Alpha: 1 + m_Interactable: 1 + m_BlocksRaycasts: 1 + m_IgnoreParentGroups: 0 --- !u!1 &908657380367480109 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/GameObjects/Cards/Tektonik.prefab b/Assets/GameObjects/Cards/Tektonik.prefab index b67c5e815fc7b3356f6b467133114c49fe539809..576301080209d4f91e3ea35d871ee1d55d95115c 100644 --- a/Assets/GameObjects/Cards/Tektonik.prefab +++ b/Assets/GameObjects/Cards/Tektonik.prefab @@ -15,6 +15,7 @@ GameObject: - component: {fileID: 2931771172728402081} - component: {fileID: 697331425601601872} - component: {fileID: -8980029780533886074} + - component: {fileID: 8435084534602226281} m_Layer: 5 m_Name: Tektonik m_TagString: Untagged @@ -186,6 +187,18 @@ MonoBehaviour: validity: 0 type: 1 value: 4 +--- !u!225 &8435084534602226281 +CanvasGroup: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 697331425601601878} + m_Enabled: 1 + m_Alpha: 1 + m_Interactable: 1 + m_BlocksRaycasts: 1 + m_IgnoreParentGroups: 0 --- !u!1 &4681556507859909130 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/GameObjects/Cards/Time To Shine.prefab b/Assets/GameObjects/Cards/Time To Shine.prefab index b444f6b1353f33f3dddfec5a4b7d5158f3c046af..e60495335687eed8400fd6111f7d5e2c8756a80b 100644 --- a/Assets/GameObjects/Cards/Time To Shine.prefab +++ b/Assets/GameObjects/Cards/Time To Shine.prefab @@ -15,6 +15,7 @@ GameObject: - component: {fileID: 2931771172728402081} - component: {fileID: 697331425601601872} - component: {fileID: -8980029780533886074} + - component: {fileID: -8958366242818283824} m_Layer: 5 m_Name: Time To Shine m_TagString: Untagged @@ -186,6 +187,18 @@ MonoBehaviour: validity: 0 type: 1 value: 1 +--- !u!225 &-8958366242818283824 +CanvasGroup: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 697331425601601878} + m_Enabled: 1 + m_Alpha: 1 + m_Interactable: 1 + m_BlocksRaycasts: 1 + m_IgnoreParentGroups: 0 --- !u!1 &4681556507859909130 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/Deck/Dump.cs b/Assets/Scripts/Deck/Dump.cs index 84995c16a74f878c0b40f612584656ea8ba1be6f..350d2492b1eeffb27a633ce35c01620ff7b4a3b8 100644 --- a/Assets/Scripts/Deck/Dump.cs +++ b/Assets/Scripts/Deck/Dump.cs @@ -28,13 +28,10 @@ public class Dump : MonoBehaviour public void Discard(Card card) { - Debug.Log("discarding"); - // duplication flags are cleared on discard card.OnCardPlayed(delegate { DiscardNoAnim(card); }); - } public void DiscardNoAnim(Card card) diff --git a/Assets/Scripts/Deck/Hand.cs b/Assets/Scripts/Deck/Hand.cs index 40b0d6eb574b277efc35bd2f9f592f400a1339cc..31644edb517f3444d7bcda4b3a58e85faf19c9ee 100644 --- a/Assets/Scripts/Deck/Hand.cs +++ b/Assets/Scripts/Deck/Hand.cs @@ -42,6 +42,7 @@ public class Hand : MonoBehaviour hand.Add(newCard); newCard.transform.SetParent(transform); newCard.gameObject.SetActive(true); + newCard.GetComponent<CardUi>().Show(); CardEvent<Card>.Trigger(Event.CARD_DRAW, newCard); } else @@ -59,6 +60,7 @@ public class Hand : MonoBehaviour hand.Add(newCard); newCard.transform.SetParent(transform); newCard.gameObject.SetActive(true); + newCard.GetComponent<CardUi>().Show(); } else { diff --git a/Assets/Scripts/Ui/CardUi.cs b/Assets/Scripts/Ui/CardUi.cs index 8215d641ebb321b88c0b6ffc6f3b9d17cf1649d3..ab54704c08d33f9b09a868fab07efc7525c3e15b 100644 --- a/Assets/Scripts/Ui/CardUi.cs +++ b/Assets/Scripts/Ui/CardUi.cs @@ -19,7 +19,7 @@ public class CardUi : MonoBehaviour // Field related to animations private float mAnimationTime = 2f; - private float mMoveSpeed = 1f; + private float mMoveSpeed = 0.3f; public void OnPointerEnter(PointerEventData eventData) { transform.SetAsLastSibling(); @@ -48,7 +48,6 @@ public class CardUi : MonoBehaviour { CanvasGroup image = GetComponent<CanvasGroup>(); Transform transform = GetComponent<Transform>(); - if (image != null && transform != null) { image.blocksRaycasts = false;