Cards animation

Team-on-gamejams · Jan 31, 2021 · bc6c593 · bc6c593
1 parent d5c9e88
commit bc6c593
Show file tree

Hide file tree

Showing 7 changed files with 313 additions and 110 deletions.
diff --git a/GGJ21/Assets/Plugins/GameTemplate/Scripts/UI/Menu/MenuManager.cs b/GGJ21/Assets/Plugins/GameTemplate/Scripts/UI/Menu/MenuManager.cs
@@ -12,13 +12,15 @@ public class MenuManager : MonoBehaviour {
 	Stack<MenuBase> currMenu;
 
 	void Start() {
+
 		currMenu = new Stack<MenuBase>();
 		currMenu.Push(Menus[FirstMenuId]);
+		MenuBase firstMenu = currMenu.Peek();
 
 		TemplateGameManager.Instance.uiinput.SetSelectedButton(null);
 
 		foreach (var menu in Menus) {
-			if (menu != currMenu.Peek())
+			if (menu != firstMenu)
 				menu.Hide(true);
 
 			if(menu.rt.anchorMin == Vector2.zero && menu.rt.anchorMax == Vector2.one && menu.rt.pivot.x == 0.5f && menu.rt.pivot.y == 0.5f && !(menu is PopupMenuBase)) {
@@ -35,7 +37,7 @@ void Start() {
 		IEnumerator DelayedShow() {
 			yield return null;
 			yield return null;
-			currMenu.Peek().Show(true);
+			firstMenu.Show(true);
 		}
 	}
 

diff --git a/GGJ21/Assets/Plugins/GameTemplate/Scripts/UI/Menu/PopupMenuBase.cs b/GGJ21/Assets/Plugins/GameTemplate/Scripts/UI/Menu/PopupMenuBase.cs
@@ -13,7 +13,9 @@ public class PopupMenuBase : MenuBase {
 
 	protected bool isShowed = true;
 
-	private void Start() {
+	protected override void Awake() {
+		base.Awake();
+
 		RecalcPos();
 
 		cg.interactable = cg.blocksRaycasts = true;