v1.0.0 commit

Author: Tyler Eichten

Assets/Arm.cs

@@ -10,7 +10,8 @@ public class Arm : MonoBehaviour
     public GameObject Idle;
     public GameObject Punch;
     public GameObject Block;
-    // Update is called once per frame
+    
+
     void LateUpdate()
     {
         Idle.SetActive(Type == ArmType.Idle);

Assets/Head.cs

@@ -7,6 +7,8 @@ public enum HeadType { Idle, HitUp, HitDown, Stunned, Down }
 public class Head : MonoBehaviour
 {
 
+    public Player Player;
+
     public HeadType Type;
 
     public GameObject Idle;
@@ -17,10 +19,11 @@ public class Head : MonoBehaviour
 
     void LateUpdate()
     {
-        Idle.SetActive(Type == HeadType.Idle);
-        HitUp.SetActive(Type == HeadType.HitUp);
-        HitDown.SetActive(Type == HeadType.HitDown);
-        Stunned.SetActive(Type == HeadType.Stunned);
-        Down.SetActive(Type == HeadType.Down);
+
+        Idle.SetActive(!Player.IsDown && Type == HeadType.Idle);
+        HitUp.SetActive(!Player.IsDown && Type == HeadType.HitUp);
+        HitDown.SetActive(!Player.IsDown && Type == HeadType.HitDown);
+        Stunned.SetActive(!Player.IsDown && Type == HeadType.Stunned);
+        Down.SetActive(Player.IsDown);
     }
 }

Assets/Images/mainmenu.png

@@ -6745,6 +6745,11 @@ PrefabInstance:
   m_Modification:
     m_TransformParent: {fileID: 0}
     m_Modifications:
+    - target: {fileID: 4173967516212707280, guid: 747b3fe6621174b43a9334b604dd81e9,
+        type: 3}
+      propertyPath: Player
+      value: 
+      objectReference: {fileID: 1985387013}
     - target: {fileID: 7765708640091789642, guid: 747b3fe6621174b43a9334b604dd81e9,
         type: 3}
       propertyPath: m_Name
@@ -11739,6 +11744,11 @@ PrefabInstance:
   m_Modification:
     m_TransformParent: {fileID: 0}
     m_Modifications:
+    - target: {fileID: 4173967516212707280, guid: 747b3fe6621174b43a9334b604dd81e9,
+        type: 3}
+      propertyPath: Player
+      value: 
+      objectReference: {fileID: 519420030}
     - target: {fileID: 7765708640004995713, guid: 747b3fe6621174b43a9334b604dd81e9,
         type: 3}
       propertyPath: m_Color.r

Assets/Images/mainmenu.png.meta

@@ -854,7 +854,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: bfc03b7bb61581a42806d77b10a62677, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 8eb946bd03d380e4b9738cb3434c7c6e, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1

Assets/Scenes/InGame.unity

@@ -132,8 +132,8 @@ public PlayerData(char[] name, int style) : this(new string(name), style) { }
 }
 
 public static class GameData {
-    public static PlayerData P1Data = new PlayerData("P1L", 0);
-    public static PlayerData P2Data = new PlayerData("P2R", 1);
+    public static PlayerData P1Data = new PlayerData("P1L", 1);
+    public static PlayerData P2Data = new PlayerData("P2R", 0);
 
     public static PlayerStats P1Stats = new PlayerStats();
     public static PlayerStats P2Stats = new PlayerStats();

Assets/Scenes/MainMenu.unity

@@ -49,10 +49,4 @@ void Start() {
         BlockR.sprite = style.TPArmBlock;
         PunchR.sprite = style.TPArmPunch;
     }
-
-    // Update is called once per frame
-    void Update()
-    {
-        
-    }
 }