fix

m-garin · Mar 19, 2018 · c89ed0e · c89ed0e
1 parent dc75953
commit c89ed0e
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 3 deletions.
diff --git a/Assets/Scripts/PlacementArea/Fit.meta b/Assets/Scripts/PlacementArea/Fit.meta
diff --git a/Assets/Scripts/UI/BuildingManager/PopUpView.cs b/Assets/Scripts/UI/BuildingManager/PopUpView.cs
@@ -30,5 +30,11 @@ public IPopUpController Controller
                 controller = value;
             }
         }
+
+        void OnDestroy ()
+        {
+            infoBtn.onClick.RemoveListener(controller.ShowInfo);
+            deleteBtn.onClick.RemoveListener(controller.DeleteObject);
+        }
     }
 }
diff --git a/Assets/Scripts/UI/Craft/CraftMenuView.cs b/Assets/Scripts/UI/Craft/CraftMenuView.cs
@@ -37,12 +37,20 @@ void Start()
 
         public bool MenuIsOpen()
         {
-            return this.gameObject.activeSelf;
+            return gameObject.activeSelf;
         }
 
         public override void OnOutsideClick()
         {
             controller.ClickMenu();
         }
+
+        void OnDestroy()
+        {
+            craftButton.onClick.RemoveAllListeners();
+            building1x1Button.onClick.RemoveAllListeners();
+            building2x2Button.onClick.RemoveAllListeners();
+            building3x3Button.onClick.RemoveAllListeners();
+        }
     }
 }
diff --git a/Assets/Scripts/UI/IWindowView.cs b/Assets/Scripts/UI/IWindowView.cs
@@ -1,4 +1,3 @@
-using System;
 
 namespace UI
 {

diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt
@@ -1 +1 @@
-m_EditorVersion: 2017.2.0f3
+m_EditorVersion: 2017.3.0f3
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		m_EditorVersion: 2017.2.0f3
		m_EditorVersion: 2017.3.0f3