UI Fixes

Assets/GWConquest/Scripts/UI/BattleArmyPanel.cs

@@ -183,7 +183,7 @@ namespace GWConquest {
 
         public void UpdateIcons()
         {
-            UpdateSelectedUI();
+            //UpdateSelectedUI();
 
             foreach(var fui in FormationUIList)
             {

Assets/GWConquest/Scripts/UI/BattleUI.cs

@@ -69,6 +69,9 @@ namespace GWConquest
 
             InitFlankPanel();
 
+            PlayerPanel.Deselect();
+            EnemyPanel.Deselect();
+
             UpdateFormations();
 
             FixedUpdate();
@@ -77,6 +80,17 @@ namespace GWConquest
             {
                 SoundEffects.Instance.PlayMusic("MusicPreparing");
             }
+            else {
+                SoundEffects.Instance.StopMusic();
+            }
+        }
+
+        public void Close()
+        {
+            if(Battle.IsInPreparing)
+            {
+                SoundEffects.Instance.StopMusic();
+            }
         }
 
         public void InitFlankPanel()

Assets/GWConquest/Scripts/UI/DragDropElement.cs

@@ -25,7 +25,6 @@ namespace GWConquest
                 Vector3 mousePos = Input.mousePosition;
                 if(RectTransformUtility.RectangleContainsScreenPoint(rectTransform, mousePos))
                 {
-                    BoltLog.Info("Started dragging");
                     isDragging = true;
                     hasMoved = false;
                     origPosition = rectTransform.localPosition;

Assets/GWConquest/Scripts/UI/PlanetViewUI.cs

@@ -336,6 +336,7 @@ namespace GWConquest
 
         public void HideBattleUI()
         {
+            BattleUI.Close();
             BattleUI.gameObject.SetActive(false);
 
             DistrictIcons.gameObject.SetActive(true);