From 99b9c9aec90b7a57c8b61ff53c1cb362fe5798fe Mon Sep 17 00:00:00 2001 From: Samir LABANE <samir.labane@ensiie.fr> Date: Mon, 5 Aug 2019 10:57:45 +0200 Subject: [PATCH] fixe played card anim --- Assets/GameObjects/Cards/Acrobatics.prefab | 13 +++++++++++++ Assets/GameObjects/Cards/AddScoreOnCardDrawn.prefab | 13 +++++++++++++ Assets/GameObjects/Cards/BaseCard.prefab | 13 +++++++++++++ Assets/GameObjects/Cards/Commit.prefab | 13 +++++++++++++ Assets/GameObjects/Cards/Controlled Jump.prefab | 13 +++++++++++++ Assets/GameObjects/Cards/Dance Move.prefab | 13 +++++++++++++ Assets/GameObjects/Cards/FinishingMove.prefab | 13 +++++++++++++ Assets/GameObjects/Cards/Follow The Rhythm.prefab | 13 +++++++++++++ Assets/GameObjects/Cards/Inhale.prefab | 13 +++++++++++++ .../Cards/Reconsider Life Choices.prefab | 13 +++++++++++++ Assets/GameObjects/Cards/Shy Move.prefab | 13 +++++++++++++ Assets/GameObjects/Cards/Stabilize.prefab | 13 +++++++++++++ Assets/GameObjects/Cards/Step Up.prefab | 13 +++++++++++++ Assets/GameObjects/Cards/TacticalMindset.prefab | 13 +++++++++++++ Assets/GameObjects/Cards/Tektonik.prefab | 13 +++++++++++++ Assets/GameObjects/Cards/Time To Shine.prefab | 13 +++++++++++++ Assets/Scripts/Deck/Dump.cs | 3 --- Assets/Scripts/Deck/Hand.cs | 2 ++ Assets/Scripts/Ui/CardUi.cs | 3 +-- 19 files changed, 211 insertions(+), 5 deletions(-) diff --git a/Assets/GameObjects/Cards/Acrobatics.prefab b/Assets/GameObjects/Cards/Acrobatics.prefab index f6a41f2..9dbfe94 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 7523fb2..555d502 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 64e03d8..210ea29 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 b47225a..7e21042 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 a4ecb28..134c420 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 cf7be51..158bd03 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 2eb3b7d..4a347d6 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 8444c07..862c60c 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 6fcd8c1..a208ed2 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 b43c15a..9d53162 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 1dec949..a04891f 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 7791aae..29e29d6 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 3531f10..e4507cf 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 857da32..61590f8 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 b67c5e8..5763010 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 b444f6b..e604953 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 84995c1..350d249 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 40b0d6e..31644ed 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 8215d64..ab54704 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; -- GitLab