From b6a9e525aa30f6ea7b26ca41c0400b60b7118806 Mon Sep 17 00:00:00 2001 From: miepzerino <o.skotnik@gmail.com> Date: Thu, 03 Apr 2025 22:24:55 +0000 Subject: [PATCH] fix build --- ProjectSettings/ProjectSettings.asset | 3 ++- ProjectSettings/EditorBuildSettings.asset | 2 +- Assets/Scenes/GameplayScene.unity | 2 +- Assets/Scripts/Inventory/ItemUIScript.cs | 1 - Assets/Scripts/Managers/MainMenuManager.cs | 6 ++---- Assets/Scripts/GenerateTileMap.cs | 5 ++--- 6 files changed, 8 insertions(+), 11 deletions(-) diff --git a/Assets/Scenes/GameplayScene.unity b/Assets/Scenes/GameplayScene.unity index ca54f89..58cf609 100644 --- a/Assets/Scenes/GameplayScene.unity +++ b/Assets/Scenes/GameplayScene.unity @@ -4543,7 +4543,7 @@ m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &1794216240 Transform: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/GenerateTileMap.cs b/Assets/Scripts/GenerateTileMap.cs index 36ffa81..fff1636 100644 --- a/Assets/Scripts/GenerateTileMap.cs +++ b/Assets/Scripts/GenerateTileMap.cs @@ -3,11 +3,8 @@ using System.Collections.Generic; using Unity.Collections; using Unity.Jobs; -using Unity.VisualScripting; using UnityEngine; using UnityEngine.Tilemaps; -using UnityEngine.UIElements; -using static UnityEditor.Progress; //[Serializable] //public class Ore @@ -470,6 +467,7 @@ return size; } +#if UNITY_EDITOR private void OnDrawGizmos() { if (!Application.isPlaying) return; @@ -506,4 +504,5 @@ } } } +#endif } diff --git a/Assets/Scripts/Inventory/ItemUIScript.cs b/Assets/Scripts/Inventory/ItemUIScript.cs index a4ad058..e45c7ca 100644 --- a/Assets/Scripts/Inventory/ItemUIScript.cs +++ b/Assets/Scripts/Inventory/ItemUIScript.cs @@ -5,7 +5,6 @@ using TMPro; using UnityEngine; using UnityEngine.UI; -using static UnityEditor.Progress; public enum ItemUIType { diff --git a/Assets/Scripts/Managers/MainMenuManager.cs b/Assets/Scripts/Managers/MainMenuManager.cs index 2b2cb0d..6e2af25 100644 --- a/Assets/Scripts/Managers/MainMenuManager.cs +++ b/Assets/Scripts/Managers/MainMenuManager.cs @@ -7,8 +7,6 @@ public class MainMenuManager : SettingsManager { - [SerializeField] - public SceneAsset startGameScene; public LevelChanger levelChanger; private void Start() { @@ -17,12 +15,12 @@ public void StartGame() { SaveSystem.isGameLoaded = false; - levelChanger.FadeToScene(startGameScene.name); + levelChanger.FadeToScene("GameplayScene"); } public void LoadGame() { SaveSystem.isGameLoaded = true; - levelChanger.FadeToScene(startGameScene.name); + levelChanger.FadeToScene("GameplayScene"); } public void EndGame() diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset index 264dd27..a217306 100644 --- a/ProjectSettings/EditorBuildSettings.asset +++ b/ProjectSettings/EditorBuildSettings.asset @@ -11,7 +11,7 @@ - enabled: 1 path: Assets/Scenes/GameplayScene.unity guid: 8c9cfa26abfee488c85f1582747f6a02 - - enabled: 0 + - enabled: 1 path: Assets/Scenes/LoadingScene.unity guid: 196356abeef14804ca19d775065d69ce m_configObjects: diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index d4828cf..de514e2 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -137,7 +137,8 @@ vulkanEnableCommandBufferRecycling: 1 loadStoreDebugModeEnabled: 0 bundleVersion: 0.0.1 - preloadedAssets: [] + preloadedAssets: + - {fileID: 11400000, guid: 7e04de496fcdd9940a7686f07b3ded72, type: 2} metroInputSource: 0 wsaTransparentSwapchain: 0 m_HolographicPauseOnTrackingLoss: 1 -- Gitblit v1.9.3