Transport UI Part 2

Assets/GWConquest/Prefabs/UI/TransportUI.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 3bd7c0d51e0c24b44a5aa7d1fba6801b
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/GWConquest/Prefabs/UI/ItemIcon.prefab → Assets/GWConquest/Prefabs/UI/TransportUI/ItemIcon.prefab

@@ -133,7 +133,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
   m_AnchoredPosition: {x: 10, y: 0}
-  m_SizeDelta: {x: 70, y: 52.5}
+  m_SizeDelta: {x: 70, y: 35}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!222 &6815987390155653558
 CanvasRenderer:

Assets/GWConquest/Prefabs/UI/TransportUIElement.prefab → Assets/GWConquest/Prefabs/UI/TransportUI/TransportUIElement.prefab

@@ -30,11 +30,11 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 2673194343769095890}
-  m_RootOrder: 0
+  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: -10}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 1}
 --- !u!114 &2673194343061756527
@@ -134,7 +134,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 0}
+  m_Sprite: {fileID: 21300000, guid: 43c0c67fc0299df49ad542b1d669f483, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -233,6 +233,7 @@ GameObject:
   - component: {fileID: 2673194343700811299}
   - component: {fileID: 2673194343700811297}
   - component: {fileID: 2673194343700811298}
+  - component: {fileID: 2998075407794075377}
   m_Layer: 5
   m_Name: Arrow
   m_TagString: Untagged
@@ -247,13 +248,13 @@ RectTransform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2673194343700811292}
-  m_LocalRotation: {x: -0, y: -0, z: -0.70710576, w: 0.70710784}
+  m_LocalRotation: {x: 0, y: 0, z: 1, w: 0}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 5679444454996556218}
   m_RootOrder: 1
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: -90.00001}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 180}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
   m_AnchoredPosition: {x: 17, y: -32.950867}
@@ -286,7 +287,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 657e9827235cbab4fab69ff19b87f738, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 69b225ba56c7a7748999b6991955b4d1, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -296,6 +297,60 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
+--- !u!114 &2998075407794075377
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2673194343700811292}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Navigation:
+    m_Mode: 0
+    m_SelectOnUp: {fileID: 0}
+    m_SelectOnDown: {fileID: 0}
+    m_SelectOnLeft: {fileID: 0}
+    m_SelectOnRight: {fileID: 0}
+  m_Transition: 1
+  m_Colors:
+    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+    m_HighlightedColor: {r: 0.88699996, g: 0.88699996, b: 0.88699996, a: 1}
+    m_PressedColor: {r: 1, g: 1, b: 1, a: 1}
+    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+    m_ColorMultiplier: 1
+    m_FadeDuration: 0.1
+  m_SpriteState:
+    m_HighlightedSprite: {fileID: 0}
+    m_PressedSprite: {fileID: 0}
+    m_SelectedSprite: {fileID: 0}
+    m_DisabledSprite: {fileID: 0}
+  m_AnimationTriggers:
+    m_NormalTrigger: Normal
+    m_HighlightedTrigger: Highlighted
+    m_PressedTrigger: Pressed
+    m_SelectedTrigger: Selected
+    m_DisabledTrigger: Disabled
+  m_Interactable: 1
+  m_TargetGraphic: {fileID: 2673194343700811298}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls:
+      - m_Target: {fileID: 8452816462676908967}
+        m_MethodName: ToggleExpand
+        m_Mode: 1
+        m_Arguments:
+          m_ObjectArgument: {fileID: 0}
+          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+          m_IntArgument: 0
+          m_FloatArgument: 0
+          m_StringArgument: 
+          m_BoolArgument: 0
+        m_CallState: 2
 --- !u!1 &2673194343769095891
 GameObject:
   m_ObjectHideFlags: 0
@@ -325,6 +380,7 @@ RectTransform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
+  - {fileID: 8124626333675718970}
   - {fileID: 2673194343061756521}
   m_Father: {fileID: 2673194344194583631}
   m_RootOrder: 1
@@ -332,7 +388,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 1, y: 1}
   m_AnchoredPosition: {x: 39.197, y: -70}
-  m_SizeDelta: {x: -101.60681, y: 35}
+  m_SizeDelta: {x: -101.60681, y: 0}
   m_Pivot: {x: 0.5, y: 1}
 --- !u!114 &4672820892231590445
 MonoBehaviour:
@@ -346,6 +402,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: b0cffe833675a2942be0665d6d259496, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  Padding: 0
   Spacing: 10
 --- !u!114 &9046570603510387992
 MonoBehaviour:
@@ -399,7 +456,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 1, y: 1}
   m_AnchoredPosition: {x: 0, y: -10}
-  m_SizeDelta: {x: -20, y: 145}
+  m_SizeDelta: {x: -20, y: 60}
   m_Pivot: {x: 0.5, y: 1}
 --- !u!114 &2673194344194583630
 MonoBehaviour:
@@ -430,8 +487,12 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   SpriteImage: {fileID: 2673194343256469687}
   NameText: {fileID: 2673194343329978765}
+  Arrow: {fileID: 2673194343700811299}
   ChildrenTransform: {fileID: 2673194343769095890}
+  UnitIconsTransform: {fileID: 8124626333675718970}
   ItemIconsTransform: {fileID: 2673194343061756521}
+  UnitIconPrefab: {fileID: 7040377985677661857, guid: 26cdb07b02226ae43bc7084adbe6d1a7,
+    type: 3}
   ItemIconPrefab: {fileID: 6815987390155653563, guid: 06641392b6ebf5645b031c3f0700a917,
     type: 3}
 --- !u!1 &2673194344478261952
@@ -598,6 +659,76 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
+--- !u!1 &5751378604422160674
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 8124626333675718970}
+  - component: {fileID: 8111753019859703589}
+  - component: {fileID: 3857091023847797514}
+  m_Layer: 5
+  m_Name: UnitIcons
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &8124626333675718970
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5751378604422160674}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 2673194343769095890}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 1}
+--- !u!114 &8111753019859703589
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5751378604422160674}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 048208b8918c3c74c821e2e69e3d613d, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  padding:
+    m_Left: 0
+    m_Right: 0
+    m_Top: 0
+    m_Bottom: 0
+  Spacing: {x: 15, y: 15}
+--- !u!114 &3857091023847797514
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5751378604422160674}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 68d57de996f29404f8d57bdeb85ab942, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  Padding: 0
+  Horizontal: 0
+  Vertical: 1
 --- !u!1 &8269959926955605590
 GameObject:
   m_ObjectHideFlags: 0

Assets/GWConquest/Prefabs/UI/TransportUI/UnitIcon.prefab

@@ -0,0 +1,76 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &7040377985677661857
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 7040377985677660588}
+  - component: {fileID: 7040377985677661732}
+  - component: {fileID: 7040377985677660403}
+  m_Layer: 5
+  m_Name: UnitIcon
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &7040377985677660588
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7040377985677661857}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 0, y: -25}
+  m_SizeDelta: {x: 50, y: 50}
+  m_Pivot: {x: 0, y: 0.5}
+--- !u!222 &7040377985677661732
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7040377985677661857}
+  m_CullTransparentMesh: 0
+--- !u!114 &7040377985677660403
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7040377985677661857}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1

Assets/GWConquest/Prefabs/UI/TransportUI/UnitIcon.prefab.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 26cdb07b02226ae43bc7084adbe6d1a7
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/GWConquest/Scripts/UI/ChildrenSizeFit.cs

@@ -60,8 +60,9 @@ namespace GWConquest
             for(int i = 0; i < rt.childCount; i++)
             {
                 RectTransform child = rt.GetChild(i) as RectTransform;
-                //Rect rect = child.rect;
-                //float childHeight = LayoutUtility.GetPreferredHeight(child);
+                if(!child.gameObject.activeSelf)
+                    continue;
+                  
                 float childHeight = child.sizeDelta[axis];
 
                 if(childHeight <= 0)
@@ -86,12 +87,12 @@ namespace GWConquest
                     maxY = Mathf.Max(pos + childHeight, pos, maxY);
                 }
 
-                Debug.LogFormat("Child: {0}, Height: {1}, Miny: {2}, Maxy: {3}", child, childHeight, minY, maxY);
+                //Debug.LogFormat("Child: {0}, Height: {1}, Miny: {2}, Maxy: {3}", child, childHeight, minY, maxY);
             }
 
             float height = Mathf.Max(Mathf.Abs(maxY - minY), 0f) + Padding;
 
-            Debug.LogFormat("Setting height to {0}", height);
+            //Debug.LogFormat("Setting height to {0}", height);
 
             rt.SetSizeWithCurrentAnchors(axis == 0 ? RectTransform.Axis.Horizontal : RectTransform.Axis.Vertical, height);
         }

Assets/GWConquest/Scripts/UI/TransportUI.cs

@@ -10,6 +10,7 @@ namespace GWConquest
         [System.Serializable]
         public class TransportUIPanel {
             public RectTransform ContentTransform;
+            public RectTransform ItemsTransform;
             public Text PlanetNameText;
         }
 
@@ -17,6 +18,7 @@ namespace GWConquest
         public TransportUIPanel SpacePanel;
 
         public GameObject ElementPrefab;
+        public GameObject ItemIconPrefab;
 
         private Planet CurrentPlanet;
 
@@ -24,43 +26,91 @@ namespace GWConquest
         {
             CurrentPlanet = planet;
 
-            RebuildGroundPanel();
+            RebuildPanel(GroundPanel);
 
             
         }
 
-        public void RebuildGroundPanel()
+        private void Update() {
+            GWLayout.UpdateLayout(GroundPanel.ContentTransform);
+        }
+
+        private TransportUIElement AddElement(RectTransform parent) {
+            var elementGO = Instantiate(ElementPrefab);
+
+            var elementRT = elementGO.GetComponent<RectTransform>();
+
+            elementRT.SetParent(parent);
+            elementRT.anchoredPosition = Vector2.zero;
+            var size = elementRT.sizeDelta;
+            size.x = 0f;
+            elementRT.sizeDelta = size;
+
+            var elementComp = elementGO.GetComponent<TransportUIElement>();
+
+            return elementComp;
+        }
+
+        private void RebuildItemsPanel(RectTransform parent, Dictionary<string, int> items)
         {
-            Util.DestroyAllChildren(GroundPanel.ContentTransform);
+            Util.DestroyAllChildren(parent);
 
-            foreach(Zone z in CurrentPlanet.groundZones)
+            foreach(var itemType in items)
             {
-                District d = z.GetComponent<District>();
-                if(d != null)
-                {
-                    var elementGO = Instantiate(ElementPrefab);
+                var item = ItemRegistry.Instance.GetEntry(itemType.Key);
+                var amount = itemType.Value;
 
-                    var elementRT = elementGO.GetComponent<RectTransform>();
+                var itemIconGO = Instantiate(ItemIconPrefab);
 
-                    elementRT.SetParent(GroundPanel.ContentTransform);
-                    elementRT.anchoredPosition = Vector2.zero;
-                    var size = elementRT.sizeDelta;
-                    size.x = 0f;
-                    elementRT.sizeDelta = size;
+                itemIconGO.GetComponentInChildren<Image>().sprite = item.Icon;
+                itemIconGO.GetComponentInChildren<Image>().color = item.Color;
+                itemIconGO.GetComponentInChildren<Text>().text = amount.ToString();
 
-                    var elementComp = elementGO.GetComponent<TransportUIElement>();
-                    elementComp.IsDistrict = true;
-                    elementComp.District = d;
-                    elementComp.Rebuild();
-                }
+                itemIconGO.GetComponent<RectTransform>().SetParent(parent);
+                itemIconGO.GetComponent<RectTransform>().anchoredPosition = Vector2.zero;
             }
 
-            GWLayout.UpdateLayout(GroundPanel.ContentTransform);
+            GWLayout.UpdateLayout(parent);
+        }
+
+        public void RebuildPanel(TransportUIPanel panel)
+        {
+            Util.DestroyAllChildren(panel.ContentTransform);
+
+            Dictionary<string, int> allItems = new Dictionary<string, int>();
+
+            if(panel == GroundPanel)
+            {
+                foreach(Zone z in CurrentPlanet.groundZones)
+                {
+                    District d = z.GetComponent<District>();
+                    if(d != null)
+                    {
+                        var elementComp = AddElement(panel.ContentTransform);
+
+                        elementComp.IsDistrict = true;
+                        elementComp.District = d;
+                        elementComp.Rebuild();
+
+                        foreach(ItemStack stack in d.Inventory)
+                        {
+                            if(allItems.ContainsKey(stack.ItemName))
+                            {
+                                allItems[stack.ItemName] += stack.Amount;
+                            }
+                            else {
+                                allItems[stack.ItemName] = stack.Amount;
+                            }
+                        }
+                    }
+                }
+            }
 
-            //LayoutRebuilder.MarkLayoutForRebuild(GroundPanel.ContentTransform);
+            GWLayout.UpdateLayout(panel.ContentTransform);
 
-            //LayoutRebuilder.ForceRebuildLayoutImmediate(GroundPanel.ContentTransform);
+            RebuildItemsPanel(panel.ItemsTransform, allItems);
 
+            panel.PlanetNameText.text = CurrentPlanet.planetName;
         }
     }
 }

Assets/GWConquest/Scripts/UI/TransportUIElement.cs

@@ -1,5 +1,4 @@
-using System.Collections;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using UnityEngine;
 using UnityEngine.UI;
 
@@ -9,13 +8,22 @@ namespace GWConquest
     {
         public Image SpriteImage;
         public Text NameText;
+        public RectTransform Arrow;
 
         public RectTransform ChildrenTransform;
 
+        public RectTransform UnitIconsTransform;
+
         public RectTransform ItemIconsTransform;
 
+
+        public GameObject UnitIconPrefab;
         public GameObject ItemIconPrefab;
 
+        private GameObject SubElementPrefab {
+            get => GetComponentInParent<TransportUI>().ElementPrefab;
+        }
+
         
         private List<TransportUIElement> ChildrenList = new List<TransportUIElement>();
 
@@ -28,6 +36,20 @@ namespace GWConquest
         [System.NonSerialized]
         public Formation Formation;
 
+        [System.NonSerialized]
+        public bool IsExpanded = true;
+
+        public void ToggleExpand()
+        {
+            Debug.Log("Toggle expansion");
+
+            IsExpanded = !IsExpanded;
+
+            ChildrenTransform.gameObject.SetActive(IsExpanded);
+
+            Arrow.localEulerAngles = new Vector3(0f, 0f, IsExpanded ? -180f : -90f);
+        }
+
         private IEnumerable<ItemStack> GetAllItems()
         {
             if(IsDistrict)
@@ -39,6 +61,18 @@ namespace GWConquest
             }
         }
 
+        private IEnumerable<Formation> GetSubFormations()
+        {
+            if(IsDistrict)
+            {
+                return District.Zone.Formations;
+            }
+            else {
+                //TODO
+                return null;
+            }
+        }
+
         public void Rebuild()
         {
             foreach(var child in ChildrenList)
@@ -49,6 +83,50 @@ namespace GWConquest
 
             ChildrenList.Clear();
 
+            var SubFormations = GetSubFormations();
+            if(SubFormations != null)
+            {
+                foreach(Formation f in SubFormations)
+                {
+                    var subElGO = Instantiate(SubElementPrefab);
+
+                    var elementRT = subElGO.GetComponent<RectTransform>();
+
+                    elementRT.SetParent(ChildrenTransform);
+                    elementRT.anchoredPosition = Vector2.zero;
+                    var size = elementRT.sizeDelta;
+                    size.x = 0f;
+                    elementRT.sizeDelta = size;
+
+                    var elementComp = subElGO.GetComponent<TransportUIElement>();
+                    elementComp.IsDistrict = false;
+                    elementComp.Formation = f;
+                    elementComp.Rebuild();
+
+                    ChildrenList.Add(elementComp);
+                }
+            }
+
+            UnitIconsTransform.SetAsLastSibling();
+            ItemIconsTransform.SetAsLastSibling();
+
+            Util.DestroyAllChildren(UnitIconsTransform);
+
+            if(!IsDistrict)
+            {
+                var AllUnits = Formation.Units;
+
+                foreach(Unit unit in AllUnits)
+                {
+                    var unitIconGO = Instantiate(UnitIconPrefab);
+
+                    unitIconGO.GetComponentInChildren<Image>().sprite = unit.Icon;
+
+                    unitIconGO.GetComponent<RectTransform>().SetParent(UnitIconsTransform);
+                    unitIconGO.GetComponent<RectTransform>().anchoredPosition = Vector2.zero;
+                }
+            }
+
             Util.DestroyAllChildren(ItemIconsTransform);            
 
             var AllItems = GetAllItems();
@@ -73,7 +151,7 @@ namespace GWConquest
                 NameText.text = District.GetDistrictName();
             }
             else {
-                
+                NameText.text = Formation.FormationName;
             }
 
             //LayoutRebuilder.MarkLayoutForRebuild(GetComponent<RectTransform>());

Assets/GWConquest/Textures/UI/triangle2.png.meta

@@ -0,0 +1,128 @@
+fileFormatVersion: 2
+guid: 69b225ba56c7a7748999b6991955b4d1
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 1
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 2
+    aniso: 2
+    mipBias: -100
+    wrapU: 1
+    wrapV: 1
+    wrapW: -1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 8192
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 8192
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 8192
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 8192
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: