From 1071a1347e8439841fbf8c2fdbc37cc1168de81a Mon Sep 17 00:00:00 2001
From: Zenny <zenayi@gmail.com>
Date: Sat, 13 Aug 2022 17:56:11 -0700
Subject: [PATCH] Fix loading base and first pre-rendered scene from title
 screen

---
 Assets/Scenes/BaseScene.unity      | 103 ++++++++++++++++-------------
 Assets/Scripts/BaseSceneManager.cs |  15 +++++
 Assets/Scripts/TitleScreen.cs      |   1 -
 3 files changed, 73 insertions(+), 46 deletions(-)
 create mode 100644 Assets/Scripts/BaseSceneManager.cs

diff --git a/Assets/Scenes/BaseScene.unity b/Assets/Scenes/BaseScene.unity
index bca2933..88a7368 100644
--- a/Assets/Scenes/BaseScene.unity
+++ b/Assets/Scenes/BaseScene.unity
@@ -123,6 +123,63 @@ NavMeshSettings:
     debug:
       m_Flags: 0
   m_NavMeshData: {fileID: 0}
+--- !u!1 &1238217887
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1238217889}
+  - component: {fileID: 1238217888}
+  - component: {fileID: 1238217890}
+  m_Layer: 0
+  m_Name: BaseSceneManager
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!114 &1238217888
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1238217887}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 438ec7acec4f7004682b7953c3b96401, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+--- !u!4 &1238217889
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1238217887}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: -121.53613, y: -87.0343, z: -125.143005}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_RootOrder: 3
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &1238217890
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1238217887}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 253db048700363d419cdd2430bb39594, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1 &1239917892
 GameObject:
   m_ObjectHideFlags: 0
@@ -207,50 +264,6 @@ Transform:
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &1843716674
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 1843716676}
-  - component: {fileID: 1843716675}
-  m_Layer: 0
-  m_Name: CharacterManager
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!114 &1843716675
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1843716674}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 253db048700363d419cdd2430bb39594, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
---- !u!4 &1843716676
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1843716674}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: -253.56213, y: 163.4443, z: -279.9872}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 0}
-  m_RootOrder: 2
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &2001385625
 GameObject:
   m_ObjectHideFlags: 0
@@ -395,7 +408,7 @@ Transform:
   - {fileID: 8776096139135766244}
   - {fileID: 5127251163467898061}
   m_Father: {fileID: 0}
-  m_RootOrder: 3
+  m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &919132147785118731
 GameObject:
diff --git a/Assets/Scripts/BaseSceneManager.cs b/Assets/Scripts/BaseSceneManager.cs
new file mode 100644
index 0000000..f673a2f
--- /dev/null
+++ b/Assets/Scripts/BaseSceneManager.cs
@@ -0,0 +1,15 @@
+using Scampz.GameJam.Assets.Scripts;
+using UnityEngine;
+using UnityEngine.SceneManagement;
+
+namespace Scampz.GameJam
+{
+  public class BaseSceneManager : MonoBehaviour
+  {
+    // Start is called before the first frame update
+    void Start()
+    {
+      GameManager.Instance.LoadScene(SceneNames.FirstPreRenderedScene, LoadSceneMode.Additive);
+    }
+  }
+}
diff --git a/Assets/Scripts/TitleScreen.cs b/Assets/Scripts/TitleScreen.cs
index 8fa34e2..99eb566 100644
--- a/Assets/Scripts/TitleScreen.cs
+++ b/Assets/Scripts/TitleScreen.cs
@@ -11,7 +11,6 @@ namespace Scampz.GameJam
       if (Input.GetButtonDown(InputOptions.Submit))
       {
         GameManager.Instance.LoadScene(SceneNames.BaseScene, LoadSceneMode.Single);
-        GameManager.Instance.LoadScene(SceneNames.FirstPreRenderedScene, LoadSceneMode.Additive);
       }
     }
   }