First phase (playable game) is finished; Next phase is ml-agents inte…

…gration
kori4r2 · Nov 25, 2018 · 010b35f · 010b35f
1 parent 2cbabdc
commit 010b35f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 16 deletions.
diff --git a/Assets/Scripts/Battle/BattleManager.cs b/Assets/Scripts/Battle/BattleManager.cs
@@ -58,10 +58,10 @@ public static class BattleManager{
         foreach(Button button in survivor.skillButtons) {
             button.interactable = false;
         }
-        GameObject message = Resources.Load("WinMessage") as GameObject;
+
+        GameObject message = GameObject.Instantiate(Resources.Load("WinMessage") as GameObject, GameObject.Find("Canvas").transform);
         message.GetComponentInChildren<Text>().text += winningTeam;
-        ButtonFunctions.SetEndGame(message.GetComponent<Button>());
-        GameObject.Instantiate(message, GameObject.Find("Canvas").transform);
+        message.GetComponent<Button>().onClick.AddListener(ButtonFunctions.EndGame);
         battleStarted = false;
     }
     public static void StartTurn() {

diff --git a/Assets/Scripts/UI/ButtonFunctions.cs b/Assets/Scripts/UI/ButtonFunctions.cs
@@ -5,7 +5,6 @@
 using UnityEngine.UI;
 
 public class ButtonFunctions : MonoBehaviour{
-    private Button endGameButton;
     public void SkillPressed() {
         // The name of each button gameobject must be the same as the name of the skill
         // The ideal implementation would use IDs but let's keep it simple
@@ -17,19 +16,9 @@ public class ButtonFunctions : MonoBehaviour{
         BattleManager.targetUnit = EventSystem.current.currentSelectedGameObject.GetComponentInParent<Unit>();
         BattleManager.TargetSelected();
     }
-    public static void SetEndGame(Button button) {
-        Debug.Log("Assigning button");
-        ButtonFunctions script = GameObject.Find("Main Camera").GetComponent<ButtonFunctions>();
-        script.endGameButton = button;
-        button.onClick.AddListener((UnityEngine.Events.UnityAction)script.EndGame);
-    }
-    public void EndGame() {
-        Debug.Log("Button was pressed");
-        endGameButton.GetComponentInChildren<Text>().text.Remove(17);
+    public static void EndGame() {
 #if UNITY_EDITOR
-        // Application.Quit() does not work in the editor so
-        // UnityEditor.EditorApplication.isPlaying need to be set to false to end the game
-        UnityEditor.EditorApplication.Exit(0);
+        UnityEditor.EditorApplication.isPlaying = false;
 #else
         Application.Quit();
 #endif