Merge pull request #79 from Sandrem/Roster-for-P2-is-not-collapsed-bug

Unification for P1 and P2
Sandrem · Jun 13, 2017 · 7232522 · 7232522
2 parents b5512ba + 044badd
commit 7232522
Showing 1 changed file with 15 additions and 26 deletions.
diff --git a/Assets/Scripts/View/UI/Roster.cs b/Assets/Scripts/View/UI/Roster.cs
@@ -153,37 +153,26 @@ private static int CalculateRosterPanelSize(GameObject panel)
 
     private static void OrganizeRosterPositions()
     {
-        Vector3 defaultPosition = Game.PrefabsList.RostersHolder.transform.Find("TeamPlayer1").Find("RosterHolder").transform.position + new Vector3(5f, 0f, 0f);
+        for (int i = 1; i < 3; i++)
+        {
+            Vector3 defaultPosition = Game.PrefabsList.RostersHolder.transform.Find("TeamPlayer" + i).Find("RosterHolder").transform.position + new Vector3(5f, 0f, 0f);
 
-        rosterPlayer1 = rosterPlayer1
-            .OrderByDescending(x => x.transform.Find("ShipInfo").Find("ShipPilotSkillText").GetComponent<Text>().text)
-            .ThenBy(x => x.transform.Find("ShipInfo").Find("ShipId").GetComponent<Text>().text)
-            .ToList();
+            List<GameObject> rosterPlayer = (i == 1) ? rosterPlayer1 : rosterPlayer2;
+            rosterPlayer = rosterPlayer
+                .OrderByDescending(x => x.transform.Find("ShipInfo").Find("ShipPilotSkillText").GetComponent<Text>().text)
+                .ThenBy(x => x.transform.Find("ShipInfo").Find("ShipId").GetComponent<Text>().text)
+                .ToList();
 
-        float offset = 5;
-        foreach (var item in rosterPlayer1)
-        {
-            if (item.activeSelf)
+            float offset = 5;
+            foreach (var item in rosterPlayer)
             {
-                item.transform.position = defaultPosition + new Vector3(0f, -offset, 0f);
-                offset += item.transform.Find("ShipInfo").GetComponent<RectTransform>().sizeDelta.y + 5;
+                if (item.activeSelf)
+                {
+                    item.transform.position = defaultPosition + new Vector3(0f, -offset, 0f);
+                    offset += item.transform.Find("ShipInfo").GetComponent<RectTransform>().sizeDelta.y + 5;
+                }
             }
         }
-
-        /// Same for second player
-        defaultPosition = Game.PrefabsList.RostersHolder.transform.Find("TeamPlayer2").Find("RosterHolder").transform.position + new Vector3(5f, 0f, 0f);
-
-        rosterPlayer2 = rosterPlayer2
-            .OrderByDescending(x => x.transform.Find("ShipInfo").Find("ShipPilotSkillText").GetComponent<Text>().text)
-            .ThenBy(x => x.transform.Find("ShipInfo").Find("ShipId").GetComponent<Text>().text)
-            .ToList();
-
-        offset = 5;
-        foreach (var item in rosterPlayer2)
-        {
-            item.transform.position = defaultPosition + new Vector3(0f, -offset, 0f);
-            offset += item.transform.Find("ShipInfo").GetComponent<RectTransform>().sizeDelta.y + 5;
-        }
     }
 
     //TODO: rewrite to support TARGETSHIP