etc/HeavenStudioPlus
0
0
Fork 0
mirror of https://github.com/RHeavenStudioPlus/HeavenStudioPlus.git synced 2024-11-10 03:35:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

do it in the editor too

Browse source
This commit is contained in:
minenice55 2024-01-21 16:54:10 -05:00
parent 8b3bca35c7
commit 291fabe197
3 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Assets/Scripts/GameManager.cs
View file

@ -1110,7 +1110,7 @@ namespace HeavenStudio
SetCurrentGame(game, useMinigameColor); SetCurrentGame(game, useMinigameColor);
} }
private void DestroyGame() public void DestroyGame()
{ {
SetGame("noGame"); SetGame("noGame");
} }

8
Assets/Scripts/LevelEditor/Editor.cs
View file

@ -106,7 +106,7 @@ namespace HeavenStudio.Editor
foreach (var minigame in EventCaller.instance.minigames.Values) foreach (var minigame in EventCaller.instance.minigames.Values)
AddIcon(minigame); AddIcon(minigame);
UpdateEditorStatus(true); UpdateEditorStatus(true);
#if HEAVENSTUDIO_PROD #if HEAVENSTUDIO_PROD
BuildDateDisplay.text = GlobalGameManager.friendlyReleaseName; BuildDateDisplay.text = GlobalGameManager.friendlyReleaseName;
@ -473,7 +473,7 @@ namespace HeavenStudio.Editor
GameManager.instance.CursorCam.enabled = (PlayerInput.CurrentControlStyle == InputSystem.InputController.ControlStyles.Touch) GameManager.instance.CursorCam.enabled = (PlayerInput.CurrentControlStyle == InputSystem.InputController.ControlStyles.Touch)
&& isCursorEnabled; && isCursorEnabled;
GameManager.instance.CursorCam.targetTexture = null; GameManager.instance.CursorCam.targetTexture = null;
GameManager.instance.CursorCam.rect = new Rect(0, 0, 1, 1); GameManager.instance.CursorCam.rect = new Rect(0, 0, 1, 1);
fullscreen = true; fullscreen = true;
} }
@ -507,12 +507,12 @@ namespace HeavenStudio.Editor
public static bool MouseInRectTransform(RectTransform rectTransform) public static bool MouseInRectTransform(RectTransform rectTransform)
{ {
return (rectTransform.gameObject.activeSelf && RectTransformUtility.RectangleContainsScreenPoint(rectTransform, Input.mousePosition, Editor.instance.EditorCamera)); return rectTransform.gameObject.activeSelf && RectTransformUtility.RectangleContainsScreenPoint(rectTransform, Input.mousePosition, Editor.instance.EditorCamera);
} }
public void ReturnToTitle() public void ReturnToTitle()
{ {
GlobalGameManager.LoadScene("Title"); GlobalGameManager.LoadScene("Title", callback: GameManager.instance.DestroyGame);
} }
public void SetAuthoritiveMenu(bool state) public void SetAuthoritiveMenu(bool state)

1
ProjectSettings/SatorImaging.UnitySourceGenerator.Editor.ProjectSettingsData.asset
View file

@ -39,5 +39,6 @@ MonoBehaviour:
- Assets/Scripts/Games/TossBoys/TossBoys.cs - Assets/Scripts/Games/TossBoys/TossBoys.cs
- Assets/Scripts/Games/DoubleDate/DoubleDate.cs - Assets/Scripts/Games/DoubleDate/DoubleDate.cs
- Assets/Scripts/Games/AirRally/AirRally.cs - Assets/Scripts/Games/AirRally/AirRally.cs
- Assets/Scripts/LevelEditor/Editor.cs
PathsToSkipImportEvent: [] PathsToSkipImportEvent: []
PathsToIgnoreOverwriteSettingOnAttribute: [] PathsToIgnoreOverwriteSettingOnAttribute: []