Commit 92495ff4 authored by Isa's avatar Isa

Credits Hauptmenü

parent c7d071b3
...@@ -2041,7 +2041,7 @@ Material: ...@@ -2041,7 +2041,7 @@ Material:
- _FaceColor: {r: 1, g: 1, b: 1, a: 1} - _FaceColor: {r: 1, g: 1, b: 1, a: 1}
- _GlowColor: {r: 0, g: 0.6698113, b: 0, a: 0.5} - _GlowColor: {r: 0, g: 0.6698113, b: 0, a: 0.5}
- _MaskCoord: {r: 0, g: 0, b: 32767, a: 32767} - _MaskCoord: {r: 0, g: 0, b: 32767, a: 32767}
- _OutlineColor: {r: 0.3561321, g: 0.3561321, b: 0.5, a: 1} - _OutlineColor: {r: 0.039215688, g: 0.015686275, b: 0.1882353, a: 1}
- _ReflectFaceColor: {r: 0, g: 0, b: 0, a: 1} - _ReflectFaceColor: {r: 0, g: 0, b: 0, a: 1}
- _ReflectOutlineColor: {r: 0, g: 0, b: 0, a: 1} - _ReflectOutlineColor: {r: 0, g: 0, b: 0, a: 1}
- _SpecularColor: {r: 1, g: 1, b: 1, a: 1} - _SpecularColor: {r: 1, g: 1, b: 1, a: 1}
......
This diff is collapsed.
...@@ -12,7 +12,6 @@ public class MainMenu : MonoBehaviour ...@@ -12,7 +12,6 @@ public class MainMenu : MonoBehaviour
public StartPointObject startPointObject; public StartPointObject startPointObject;
private EventSystem _myEventSystem; private EventSystem _myEventSystem;
private GameObject _backScreen, _currentScreen; private GameObject _backScreen, _currentScreen;
private Button _selectedBtn;
private GameObject _old, _new; private GameObject _old, _new;
...@@ -32,11 +31,10 @@ public class MainMenu : MonoBehaviour ...@@ -32,11 +31,10 @@ public class MainMenu : MonoBehaviour
{ {
_backScreen.SetActive(true); _backScreen.SetActive(true);
_currentScreen.SetActive(false); _currentScreen.SetActive(false);
_selectedBtn.Select();
_backScreen = null; _backScreen = null;
} }
if (Input.GetMouseButtonDown(0) && !EventSystem.current.IsPointerOverGameObject()) if (Input.GetMouseButtonDown(0))
{ {
_myEventSystem.SetSelectedGameObject(_old); _myEventSystem.SetSelectedGameObject(_old);
} }
...@@ -55,6 +53,7 @@ public class MainMenu : MonoBehaviour ...@@ -55,6 +53,7 @@ public class MainMenu : MonoBehaviour
public void SwitchToMouse() public void SwitchToMouse()
{ {
Debug.Log("Deselect all");
_myEventSystem.GetComponent<UnityEngine.EventSystems.EventSystem>().SetSelectedGameObject(null); _myEventSystem.GetComponent<UnityEngine.EventSystems.EventSystem>().SetSelectedGameObject(null);
} }
...@@ -67,9 +66,4 @@ public class MainMenu : MonoBehaviour ...@@ -67,9 +66,4 @@ public class MainMenu : MonoBehaviour
{ {
_currentScreen = cScreen; _currentScreen = cScreen;
} }
public void SelectBtn(Button btn)
{
_selectedBtn = btn;
}
} }
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment