tschesky/AppleHillsProduction
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed most horrifying scaling issues with the book

Browse Source
This commit is contained in:
journaliciouz
2025-11-08 22:16:43 +01:00
parent 2ec53629c6
commit eda7361702
6 changed files with 293 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Assets/Scripts/UI/CardSystem/AlbumViewPage.cs
View File

@@ -1,11 +1,13 @@
using System.Collections.Generic;
using System.Linq;
using AppleHills.Data.CardSystem;
using Core;
using Data.CardSystem;
using Pixelplacement;
using UI.Core;
using UI.DragAndDrop.Core;
using UnityEngine;
using UnityEngine.SceneManagement;
using UnityEngine.UI;
namespace UI.CardSystem
@@ -163,6 +165,15 @@ namespace UI.CardSystem
UIPageController.Instance.PopPage();
}
}
// If album exits while in Overworld, show AppSwitcher. If not, keep it hidden.
if (PlayerHudManager.Instance.currentUIMode == PlayerHudManager.UIMode.Overworld)
{
PlayerHudManager.Instance.appSwitcher.SetActive(true);
}
else
{
PlayerHudManager.Instance.appSwitcher.SetActive(false);
}
}
private void OnBoosterCountChanged(int newCount)

1
Assets/Scripts/UI/CardSystem/CardAlbumOpener.cs
View File

@@ -68,6 +68,7 @@ namespace UI.CardSystem
if (albumViewPage != null)
{
UIPageController.Instance.PushPage(albumViewPage);
PlayerHudManager.Instance.appSwitcher.SetActive(false);
}
}
// If we're already on the album main page, do nothing

9
Assets/Scripts/UI/PlayerHudManager.cs
View File

@@ -6,6 +6,7 @@ using System;
using UnityEngine.UI;
using UnityEngine.Playables;
using Core.Lifecycle;
using JetBrains.Annotations;
public class PlayerHudManager : ManagedBehaviour
{
@@ -118,18 +119,24 @@ public class PlayerHudManager : ManagedBehaviour
switch (mode)
{
case UIMode.Overworld:
// Update currentUIMode var
currentUIMode = UIMode.Overworld;
// Show app switcher
appSwitcher.SetActive(true);
// Hide eagle eye
eagleEye.SetActive(false);
break;
case UIMode.Puzzle:
// Update currentUIMode var
currentUIMode = UIMode.Puzzle;
// Hide app switcher
appSwitcher.SetActive(false);
// show eagle eye
eagleEye.SetActive(true);
break;
case UIMode.Minigame:
// Update currentUIMode var
currentUIMode = UIMode.Minigame;
// Hide app switcher
appSwitcher.SetActive(false);
// Hide birds eye
@@ -137,4 +144,6 @@ public class PlayerHudManager : ManagedBehaviour
break;
}
}
}