Icon flip, hex mask

Assets/GWConquest/Prefabs/UI/BattleUnitIconFlank.prefab

@@ -74,6 +74,11 @@ PrefabInstance:
       propertyPath: m_Color.r
       value: 0.021
       objectReference: {fileID: 0}
+    - target: {fileID: 1305083518370968854, guid: 70bba337c1bb2d64e83a214cd4a781ea,
+        type: 3}
+      propertyPath: m_Enabled
+      value: 1
+      objectReference: {fileID: 0}
     - target: {fileID: 1305083518370968854, guid: 70bba337c1bb2d64e83a214cd4a781ea,
         type: 3}
       propertyPath: m_RaycastPadding.w
@@ -340,7 +345,8 @@ PrefabInstance:
       propertyPath: m_Padding.z
       value: 7
       objectReference: {fileID: 0}
-    m_RemovedComponents: []
+    m_RemovedComponents:
+    - {fileID: 6876257253298647874, guid: 70bba337c1bb2d64e83a214cd4a781ea, type: 3}
     m_RemovedGameObjects: []
     m_AddedGameObjects: []
     m_AddedComponents:
@@ -348,18 +354,10 @@ PrefabInstance:
         type: 3}
       insertIndex: -1
       addedObject: {fileID: 1944167245271204771}
-    - targetCorrespondingSourceObject: {fileID: 1162488441138915787, guid: 70bba337c1bb2d64e83a214cd4a781ea,
-        type: 3}
-      insertIndex: -1
-      addedObject: {fileID: 5603113574183130447}
-    - targetCorrespondingSourceObject: {fileID: 1162488441138915787, guid: 70bba337c1bb2d64e83a214cd4a781ea,
-        type: 3}
-      insertIndex: -1
-      addedObject: {fileID: 4170411342755423844}
-    - targetCorrespondingSourceObject: {fileID: 1162488441138915787, guid: 70bba337c1bb2d64e83a214cd4a781ea,
+    - targetCorrespondingSourceObject: {fileID: 1687732570946376588, guid: 70bba337c1bb2d64e83a214cd4a781ea,
         type: 3}
       insertIndex: -1
-      addedObject: {fileID: 6660687591994652966}
+      addedObject: {fileID: 2885744882983667378}
   m_SourcePrefab: {fileID: 100100000, guid: 70bba337c1bb2d64e83a214cd4a781ea, type: 3}
 --- !u!1 &6000337078063549025 stripped
 GameObject:
@@ -381,60 +379,16 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   parameter: IsFlank
   value: 1
---- !u!1 &6055230501786873894 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 1162488441138915787, guid: 70bba337c1bb2d64e83a214cd4a781ea,
-    type: 3}
-  m_PrefabInstance: {fileID: 4911594431217981933}
-  m_PrefabAsset: {fileID: 0}
---- !u!222 &5603113574183130447
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6055230501786873894}
-  m_CullTransparentMesh: 1
---- !u!114 &4170411342755423844
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6055230501786873894}
-  m_Enabled: 0
-  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_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
-  m_Maskable: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 5e6069bf34313bc44aeccf43d98fb633, type: 3}
-  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
---- !u!114 &6660687591994652966
+--- !u!114 &2885744882983667378
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6055230501786873894}
-  m_Enabled: 0
+  m_GameObject: {fileID: 6000337078063549025}
+  m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  m_ShowMaskGraphic: 0
+  m_ShowMaskGraphic: 1

Assets/GWConquest/Scripts/BattleFlank.cs

@@ -217,7 +217,7 @@ namespace GWConquest
                 }
             }
 
-            columnCount = currentColumn / 2f;
+            columnCount = currentColumn / 2f + 1f;
         }
 
         public Vector2 GetPosition(int index)

Assets/GWConquest/Scripts/UI/BattleFormationUI.cs

@@ -94,10 +94,6 @@ namespace GWConquest
                 var fui = go.GetComponent<BattleUnitIcon>();
                 IconList.Add(fui);
                 fui.Init(u);
-                if (isOwnPlayer)
-                {
-                    fui.FlipIcon();
-                }
             }
 
 

Assets/GWConquest/Scripts/UI/BattleUnitIcon.cs

@@ -115,6 +115,8 @@ namespace GWConquest
                 SetUnitSpriteActive(true);
 
                 GetComponent<Animator>().SetBool("IsSpace", Unit.Class.ZoneType == ZoneType.Space);
+
+                FlipIcon(Unit.Player == Player.CurrentPlayer);
             }
             else
             {
@@ -443,12 +445,12 @@ namespace GWConquest
                 (Unit.Player == Player.CurrentPlayer || DebugUI.MoveEnemyUnits);
         }
 
-        public void FlipIcon()
+        public void FlipIcon(bool shouldFlip)
         {
             var scale = IconImage.rectTransform.localScale;
-            scale.x = -scale.x;
+            scale.x = shouldFlip ? -Mathf.Abs(scale.x) : Mathf.Abs(scale.x);
             IconImage.rectTransform.localScale = scale;
-            Animator.SetBool("IsFlipped", true);
+            Animator.SetBool("IsFlipped", shouldFlip);
         }