From e4760685d02fcc329d15df43f9ba9440b86f5491 Mon Sep 17 00:00:00 2001
From: laurids <miucat17@gmail.com>
Date: Sun, 18 Apr 2021 18:04:15 +0200
Subject: [PATCH] UI Fixes

---
 Assets/GWConquest/Scripts/UI/BattleArmyPanel.cs |  2 +-
 Assets/GWConquest/Scripts/UI/BattleUI.cs        | 14 ++++++++++++++
 Assets/GWConquest/Scripts/UI/DragDropElement.cs |  1 -
 Assets/GWConquest/Scripts/UI/PlanetViewUI.cs    |  1 +
 4 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/Assets/GWConquest/Scripts/UI/BattleArmyPanel.cs b/Assets/GWConquest/Scripts/UI/BattleArmyPanel.cs
index 8a5dd21..65fb3bd 100644
--- a/Assets/GWConquest/Scripts/UI/BattleArmyPanel.cs
+++ b/Assets/GWConquest/Scripts/UI/BattleArmyPanel.cs
@@ -183,7 +183,7 @@ namespace GWConquest {
 
         public void UpdateIcons()
         {
-            UpdateSelectedUI();
+            //UpdateSelectedUI();
 
             foreach(var fui in FormationUIList)
             {
diff --git a/Assets/GWConquest/Scripts/UI/BattleUI.cs b/Assets/GWConquest/Scripts/UI/BattleUI.cs
index 278bdf4..513a4aa 100644
--- a/Assets/GWConquest/Scripts/UI/BattleUI.cs
+++ b/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()
diff --git a/Assets/GWConquest/Scripts/UI/DragDropElement.cs b/Assets/GWConquest/Scripts/UI/DragDropElement.cs
index f23781a..61ec3ea 100644
--- a/Assets/GWConquest/Scripts/UI/DragDropElement.cs
+++ b/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;
diff --git a/Assets/GWConquest/Scripts/UI/PlanetViewUI.cs b/Assets/GWConquest/Scripts/UI/PlanetViewUI.cs
index c04f36b..606c6fd 100644
--- a/Assets/GWConquest/Scripts/UI/PlanetViewUI.cs
+++ b/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);