From 6288796f8580fdcd765063342d14d5cb53125ace Mon Sep 17 00:00:00 2001 From: Zeo <67521686+ThatZeoGal@users.noreply.github.com> Date: Sun, 28 Apr 2024 13:17:48 -0500 Subject: [PATCH] rename spritesheet, editor toggle --- .../Prefabs/Common/MainMenu/Logo.prefab | 2 +- ...udiologo.png => heavenstudiologonightly.png} | Bin ...ng.meta => heavenstudiologonightly.png.meta} | 0 Assets/Scripts/TitleManager.cs | 16 +++++++++++++++- 4 files changed, 16 insertions(+), 2 deletions(-) rename Assets/Resources/Sprites/UI/Common/Opening/{heavenstudiologo.png => heavenstudiologonightly.png} (100%) rename Assets/Resources/Sprites/UI/Common/Opening/{heavenstudiologo.png.meta => heavenstudiologonightly.png.meta} (100%) diff --git a/Assets/Resources/Prefabs/Common/MainMenu/Logo.prefab b/Assets/Resources/Prefabs/Common/MainMenu/Logo.prefab index f660ecd0b..30c808131 100644 --- a/Assets/Resources/Prefabs/Common/MainMenu/Logo.prefab +++ b/Assets/Resources/Prefabs/Common/MainMenu/Logo.prefab @@ -162,7 +162,7 @@ SpriteRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 9 - m_Sprite: {fileID: 4223198500495046962, guid: c7a7c198fa143ea4f99a0b134dc5d17f, type: 3} + m_Sprite: {fileID: -7821188078364445226, guid: c7a7c198fa143ea4f99a0b134dc5d17f, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 diff --git a/Assets/Resources/Sprites/UI/Common/Opening/heavenstudiologo.png b/Assets/Resources/Sprites/UI/Common/Opening/heavenstudiologonightly.png similarity index 100% rename from Assets/Resources/Sprites/UI/Common/Opening/heavenstudiologo.png rename to Assets/Resources/Sprites/UI/Common/Opening/heavenstudiologonightly.png diff --git a/Assets/Resources/Sprites/UI/Common/Opening/heavenstudiologo.png.meta b/Assets/Resources/Sprites/UI/Common/Opening/heavenstudiologonightly.png.meta similarity index 100% rename from Assets/Resources/Sprites/UI/Common/Opening/heavenstudiologo.png.meta rename to Assets/Resources/Sprites/UI/Common/Opening/heavenstudiologonightly.png.meta diff --git a/Assets/Scripts/TitleManager.cs b/Assets/Scripts/TitleManager.cs index 25237b170..08adff341 100644 --- a/Assets/Scripts/TitleManager.cs +++ b/Assets/Scripts/TitleManager.cs @@ -61,7 +61,9 @@ namespace HeavenStudio //static bool firstBoot = true; Unused value - Marc [Header("Nightly Menu Stuff")] + [SerializeField] private bool enableNightlyInEditor = true; [SerializeField] private RawImage topGradient; + [SerializeField] private RawImage topRect; private AudioSource musicSource; @@ -107,12 +109,24 @@ namespace HeavenStudio #if HEAVENSTUDIO_PROD versionText.text = GlobalGameManager.friendlyReleaseName; topGradient.color = new Color(0.9490197f, 0.3607843f, 0.1058824f, 1f); + topRect.color = new Color(0.9490197f, 0.3607843f, 0.1058824f, 1f); #elif UNITY_EDITOR versionText.text = "EDITOR"; - topGradient.color = new Color(0.9490197f, 0.3607843f, 0.1058824f, 1f); + if (enableNightlyInEditor) + { + topGradient.color = new Color(0.764706f, 0.3686275f, 0.7411765f, 1f); + topRect.color = new Color(0.764706f, 0.3686275f, 0.7411765f, 1f); + } + else + { + topGradient.color = new Color(0.9490197f, 0.3607843f, 0.1058824f, 1f); + topRect.color = new Color(0.9490197f, 0.3607843f, 0.1058824f, 1f); + } + #else versionText.text = Application.buildGUID.Substring(0, 8) + " " + AppInfo.Date.ToString("dd/MM/yyyy hh:mm:ss"); topGradient.color = new Color(0.764706f, 0.3686275f, 0.7411765f, 1f); + topRect.color = new Color(0.764706f, 0.3686275f, 0.7411765f, 1f); #endif }