Merge animation logic into PlayEvent

Author: omundy

Assets/_Project/Scripts/Effects/AnimController.cs

@@ -9,8 +9,8 @@
 public class AnimController : MonoBehaviour {
 
     public Animator animator;
-    public int currentAnimation = 0;    // the animation to play
-    public string animEvent;            //
+    public int animIndex = 0;    // the animation to play
+    public string animName;            //
 
 
 
@@ -22,45 +22,31 @@ void Start ()
 
     void Update ()
     {
-
-        // set currentAnimation based on animEvent - string set from TimelineManager or key
-
-        // Swirl_r_sm
-        if (animEvent == "attack" || Input.GetKey (KeyCode.Alpha1)) {
-            currentAnimation = 1;
-        }
-        // Swirl_r_md
-        else if (animEvent == "badge" || Input.GetKey (KeyCode.Alpha2)) {
-            currentAnimation = 2;
-        }
-        // Pop_Shake_md
-        else if (animEvent == "stream" || Input.GetKey (KeyCode.Alpha3)) {
-            currentAnimation = 3;
-        }
-        // Pop_Shake_sm
-        else if (animEvent == "leaderboard" || Input.GetKey (KeyCode.Alpha4)) {
-            currentAnimation = 4;
-        }
-        // Pop_sm
-        else if (animEvent == "consumable" || Input.GetKey (KeyCode.Alpha5)) {
-            currentAnimation = 5;
-        }
-        // Rotate_md
-        else if (animEvent == "tracker" || Input.GetKey (KeyCode.Alpha6)) {
-            currentAnimation = 6;
-        }
-        // Rotate_Pop_sm
-        else if (animEvent == "disguise" || Input.GetKey (KeyCode.Alpha7)) {
-            currentAnimation = 7;
+        // set animIndex based on animName - string set from TimelineManager - or key
+
+        if (animName == "Swirl_r_sm" || Input.GetKey (KeyCode.Alpha1)) {
+            animIndex = 1;
+        } else if (animName == "Swirl_r_md" || Input.GetKey (KeyCode.Alpha2)) {
+            animIndex = 2;
+        } else if (animName == "Pop_Shake_md" || Input.GetKey (KeyCode.Alpha3)) {
+            animIndex = 3;
+        } else if (animName == "Pop_Shake_sm" || Input.GetKey (KeyCode.Alpha4)) {
+            animIndex = 4;
+        } else if (animName == "Pop_sm" || Input.GetKey (KeyCode.Alpha5)) {
+            animIndex = 5;
+        } else if (animName == "Rotate_md" || Input.GetKey (KeyCode.Alpha6)) {
+            animIndex = 6;
+        } else if (animName == "Rotate_Pop_sm" || Input.GetKey (KeyCode.Alpha7)) {
+            animIndex = 7;
         }
 
         // play the animation
-        animator.SetInteger ("state", currentAnimation);
+        animator.SetInteger ("state", animIndex);
 
         // then reset vars
-        if (currentAnimation >= 0) {
-            animEvent = "";
-            currentAnimation = 0;
+        if (animIndex >= 0) {
+            animName = "";
+            animIndex = 0;
         }
     }
 

Assets/_Project/Scripts/Players/PlayerManager.cs

@@ -119,6 +119,8 @@ public void CreateNewPlayer (string username, string avatarPath)
 
     /**
      *  Play a player event 
+     *  - The logic that determines effects. 
+     *  - For example, whether a GO with sprite animation or particle effect animation is attached, and what timeline animation (when tally twirls, etc.) is played. 
      */
     public void PlayEvent (FeedData feed)
     {
@@ -139,32 +141,64 @@ public void PlayEvent (FeedData feed)
 
         // BATTLES ARE MORE COMPLEX
         if (feed.eventType == "monster") {
-            StartCoroutine (PlayBattle (feed));
+            StartCoroutine (PlayBattleEffects (feed));
         } else {
 
 
+
+
             // STREAM (CLICK or LIKE)
             if (feed.eventType == "stream") {
                 AttachDetachAnimation (rippleAnim, false, 1f, 2.5f);
+                // play the timeline animation
+                currentPlayerScript.animControllerScript.animName = "Pop_Shake_md";
             }
+
             // ATTACK 
             else if (feed.eventType == "attack") {
                 AttachDetachAnimation (attackSpriteAnim, true, 2.3f, -1);
+                // play the timeline animation
+                currentPlayerScript.animControllerScript.animName = "Swirl_r_sm";
             }
+
             // BADGE 
             else if (feed.eventType == "badge") {
                 // PLACEHOLDER
                 AttachDetachAnimation (triangleTrailsAnim, false, 1f, 2.5f);
+                // play the timeline animation
+                currentPlayerScript.animControllerScript.animName = "Swirl_r_md";
             }
+
             // CONSUMABLE 
             else if (feed.eventType == "consumable") {
                 // PLACEHOLDER
                 AttachDetachAnimation (triangleTrailsAnim, false, 1f, 2.5f);
+                // play the timeline animation
+                currentPlayerScript.animControllerScript.animName = "Pop_sm";
             }
+
             // DISGUISE 
             else if (feed.eventType == "disguise") {
                 // PLACEHOLDER
                 AttachDetachAnimation (triangleTrailsAnim, false, 1f, 2.5f);
+                // play the timeline animation
+                currentPlayerScript.animControllerScript.animName = "Rotate_Pop_sm";
+            }
+
+            // TRACKER 
+            else if (feed.eventType == "tracker") {
+                // PLACEHOLDER
+                AttachDetachAnimation (triangleTrailsAnim, false, 1f, 2.5f);
+                // play the timeline animation
+                currentPlayerScript.animControllerScript.animName = "Rotate_md";
+            }
+
+            // LEADERBOARD - not currently storing / sending with API
+            else if (feed.eventType == "leaderboard") {
+                // PLACEHOLDER
+                AttachDetachAnimation (triangleTrailsAnim, false, 1f, 2.5f);
+                // play the timeline animation
+                currentPlayerScript.animControllerScript.animName = "Pop_Shake_sm";
             }
 
 
@@ -176,8 +210,7 @@ public void PlayEvent (FeedData feed)
         // test
         //StartCoroutine (PlayBattle (feed));
 
-        // play the timeline animation (loops, swirls, pops, etc.)
-        currentPlayerScript.animControllerScript.animEvent = feed.eventType;
+
     }
 
 
@@ -237,46 +270,20 @@ void AttachDetachAnimation (GameObject prefab, bool randomPosition, float scaleM
         Debug.Log ("AttachDetachAnimation() prefab.name = " + prefab.name);
 
 
-        // ATTACH GAME OBJECT WITH ANIM
-
-        //// default position
-        //Vector3 instPos = Vector3.zero;
-
-        //// or, set slightly random position 
-        //if (randomPosition) instPos = new Vector3 (Random.Range (-2, 2), Random.Range (-2, 2), 0);
-
-
-
-
-
-
+        // ATTACH THE GAME OBJECT WITH ANIMATION
 
         // instantiate prefab, parent under the Player obj transform, position is local space
         GameObject obj = (GameObject)Instantiate (prefab, currentPlayerScript.effects.transform, false);
 
-
-        // MARKED FOR DELETION
-
-        // disable so particle effect doesn't start yet
-        //obj.SetActive (false);
-        // parent under the player obj
-        //obj.transform.parent = currentPlayerScript.effects.transform;
-
-
-
         // set slightly random position 
         if (randomPosition) obj.transform.localPosition = new Vector3 (Random.Range (-2, 2), Random.Range (-2, 2), 0);
         // or a default position
         else obj.transform.localPosition = Vector3.zero;
 
-
         // set scale
         obj.transform.localScale = Vector3.one * scaleMultiplier;
 
-        // now that position is set turn it back on
-        //obj.SetActive (true);
-
-        // set state
+        // set state - not using this yet, but may need it
         currentPlayerScript.effectIsPlaying = true;
 
 
@@ -286,6 +293,7 @@ void AttachDetachAnimation (GameObject prefab, bool randomPosition, float scaleM
         if (destroyDelay < -0.1f) {
             // let the animation component destroy the gameobject after the last frame
             obj.GetComponent<FrameAnimation> ().playOnceAndDestroy = true;
+            StartCoroutine (ResetEffectPlayingState (1f));
         }
         // should this function destroy the gameobject with the animation after n seconds?
         else if (destroyDelay > 0.1f) {
@@ -308,7 +316,7 @@ IEnumerator ResetEffectPlayingState (float wait)
 
 
 
-    IEnumerator PlayBattle (FeedData feed)
+    IEnumerator PlayBattleEffects (FeedData feed)
     {
         Debug.Log ("PlayBattle() feed = " + feed.ToString ());