Pull request #22: GameLogic

Merge in CEGJ/32bit_jam_conjure from GameLogic to Dev * commit '758777b8ab33d768b3bd5bc5430b03981beda8fb': missing in last commit Add ui controller fix duplicate gameControllers
2022-10-30 00:35:35 +00:00 · 2022-10-30 00:35:35 +00:00 · f344527f0e
commit f344527f0e
parent 6ba5e5b97c 758777b8ab
17 changed files with 5592 additions and 1821 deletions
--- a/Assets/Prefabs/EnvChanger.prefab
+++ b/Assets/Prefabs/EnvChanger.prefab
@ -0,0 +1,134 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &8663551935946957054
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 8663551935946957053}
+  - component: {fileID: 8663551935946957055}
+  - component: {fileID: 8663551935946957050}
+  m_Layer: 0
+  m_Name: EnvChanger
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &8663551935946957053
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8663551935946957054}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 13.6, y: 6.07, z: 0}
+  m_LocalScale: {x: 0, y: 2.8058, z: 7.862}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 8663551936364023222}
+  m_Father: {fileID: 0}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!65 &8663551935946957055
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8663551935946957054}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 1
+  m_Enabled: 1
+  serializedVersion: 2
+  m_Size: {x: 1, y: 1, z: 1}
+  m_Center: {x: 0, y: 0, z: 0}
+--- !u!114 &8663551935946957050
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8663551935946957054}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 90baab3719135f24bb2f7611276bf3ab, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  linkedObj: {fileID: 0}
+  onEnter: 0
+  onStay: 0
+  OnExit: 1
+  enterEvent:
+    m_PersistentCalls:
+      m_Calls: []
+  stayEvent:
+    m_PersistentCalls:
+      m_Calls: []
+  exitEvent:
+    m_PersistentCalls:
+      m_Calls:
+      - m_Target: {fileID: 8663551936364023209}
+        m_TargetAssemblyTypeName: EnvChanger, Assembly-CSharp
+        m_MethodName: ChangeEnvironnement
+        m_Mode: 1
+        m_Arguments:
+          m_ObjectArgument: {fileID: 0}
+          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+          m_IntArgument: 0
+          m_FloatArgument: 0
+          m_StringArgument: 
+          m_BoolArgument: 0
+        m_CallState: 2
+--- !u!1 &8663551936364023208
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 8663551936364023222}
+  - component: {fileID: 8663551936364023209}
+  m_Layer: 0
+  m_Name: GameObject
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &8663551936364023222
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8663551936364023208}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 8663551935946957053}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &8663551936364023209
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8663551936364023208}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d472a146f9945154b9f33e0da19e3c69, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  targetAmbientIntensity: 0
+  targetRefIntensity: 0
+  enterFromLeft: 1
+  playerPos: {fileID: 0}
--- a/Assets/Prefabs/EnvChanger.prefab.meta
+++ b/Assets/Prefabs/EnvChanger.prefab.meta
@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: e17c6ec8444100a4cbefb113440fda78
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Prefabs/GameController.prefab
+++ b/Assets/Prefabs/GameController.prefab
@ -1,5 +1,88 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
+--- !u!1 &1829324947821761427
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1679323109552408359}
+  - component: {fileID: 9084314980681338242}
+  - component: {fileID: 9067677296112434199}
+  m_Layer: 5
+  m_Name: Canvas
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1679323109552408359
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1829324947821761427}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 0, y: 0, z: 0}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 2391504647050640505}
+  m_Father: {fileID: 4515361964050757684}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0, y: 0}
+--- !u!223 &9084314980681338242
+Canvas:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1829324947821761427}
+  m_Enabled: 1
+  serializedVersion: 3
+  m_RenderMode: 0
+  m_Camera: {fileID: 0}
+  m_PlaneDistance: 100
+  m_PixelPerfect: 0
+  m_ReceivesEvents: 1
+  m_OverrideSorting: 0
+  m_OverridePixelPerfect: 0
+  m_SortingBucketNormalizedSize: 0
+  m_AdditionalShaderChannelsFlag: 0
+  m_SortingLayerID: 0
+  m_SortingOrder: 100
+  m_TargetDisplay: 0
+--- !u!114 &9067677296112434199
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1829324947821761427}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_UiScaleMode: 0
+  m_ReferencePixelsPerUnit: 100
+  m_ScaleFactor: 1
+  m_ReferenceResolution: {x: 800, y: 600}
+  m_ScreenMatchMode: 0
+  m_MatchWidthOrHeight: 0
+  m_PhysicalUnit: 3
+  m_FallbackScreenDPI: 96
+  m_DefaultSpriteDPI: 96
+  m_DynamicPixelsPerUnit: 1
+  m_PresetInfoIsWorld: 0
 --- !u!1 &4515361964050757686
 GameObject:
  m_ObjectHideFlags: 0
@ -28,7 +111,8 @@ Transform:
  m_LocalPosition: {x: -6.887238, y: -1.6704996, z: -7.8771486}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_ConstrainProportionsScale: 0
-  m_Children: []
+  m_Children:
+  - {fileID: 1679323109552408359}
  m_Father: {fileID: 0}
  m_RootOrder: 0
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -47,3 +131,81 @@ MonoBehaviour:
  startScene: MainMenu
  mainScene: LevelDesign
  endScene: ThanksScene
+  fadeSpeed: 2.5
+  fadeImg: {fileID: 3902665078773332606}
+--- !u!1 &5180033606312474289
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 2391504647050640505}
+  - component: {fileID: 1761860175039081855}
+  - component: {fileID: 3902665078773332606}
+  m_Layer: 5
+  m_Name: FadeToBlack
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &2391504647050640505
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5180033606312474289}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 1679323109552408359}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &1761860175039081855
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5180033606312474289}
+  m_CullTransparentMesh: 1
+--- !u!114 &3902665078773332606
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5180033606312474289}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0, g: 0, b: 0, a: 0}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
--- a/Assets/Prefabs/Main
+++ b/Assets/Prefabs/Main
@ -0,0 +1,115 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &3809469071693447799
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 3809469071693447787}
+  - component: {fileID: 3809469071693447796}
+  - component: {fileID: 3809469071693447797}
+  - component: {fileID: 3809469071693447798}
+  - component: {fileID: 3809469071693447786}
+  m_Layer: 5
+  m_Name: Main Canvas
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &3809469071693447787
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3809469071693447799}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 0, y: 0, z: 0}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0, y: 0}
+--- !u!223 &3809469071693447796
+Canvas:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3809469071693447799}
+  m_Enabled: 1
+  serializedVersion: 3
+  m_RenderMode: 1
+  m_Camera: {fileID: 0}
+  m_PlaneDistance: 100
+  m_PixelPerfect: 0
+  m_ReceivesEvents: 1
+  m_OverrideSorting: 0
+  m_OverridePixelPerfect: 0
+  m_SortingBucketNormalizedSize: 0
+  m_AdditionalShaderChannelsFlag: 25
+  m_SortingLayerID: 0
+  m_SortingOrder: 0
+  m_TargetDisplay: 0
+--- !u!114 &3809469071693447797
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3809469071693447799}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_UiScaleMode: 1
+  m_ReferencePixelsPerUnit: 100
+  m_ScaleFactor: 1
+  m_ReferenceResolution: {x: 320, y: 240}
+  m_ScreenMatchMode: 0
+  m_MatchWidthOrHeight: 0
+  m_PhysicalUnit: 3
+  m_FallbackScreenDPI: 96
+  m_DefaultSpriteDPI: 96
+  m_DynamicPixelsPerUnit: 1
+  m_PresetInfoIsWorld: 0
+--- !u!114 &3809469071693447798
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3809469071693447799}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_IgnoreReversedGraphics: 1
+  m_BlockingObjects: 0
+  m_BlockingMask:
+    serializedVersion: 2
+    m_Bits: 4294967295
+--- !u!114 &3809469071693447786
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3809469071693447799}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 06cd37efca880db4c897922a3b05a3d9, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
--- a/Assets/Prefabs/Main
+++ b/Assets/Prefabs/Main
@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 6aef2419a46abbf498f5297fc906f3b4
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Scenes/EnvChanger.unity
+++ b/Assets/Scenes/EnvChanger.unity
--- a/Assets/Scenes/EnvChanger.unity.meta
+++ b/Assets/Scenes/EnvChanger.unity.meta
@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: c5b2dd5ab8d5a76409ef6eb463363c59
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Scenes/MainMenu.unity
+++ b/Assets/Scenes/MainMenu.unity
--- a/Assets/Scenes/ThanksScene.unity
+++ b/Assets/Scenes/ThanksScene.unity
--- a/Assets/Scripts/EnvChanger.cs
+++ b/Assets/Scripts/EnvChanger.cs
@ -0,0 +1,63 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class EnvChanger : MonoBehaviour
+{
+    private float initAmbientIntensity;
+    private float initRefIntensity;
+    [SerializeField]
+    private float targetAmbientIntensity, targetRefIntensity;
+    [SerializeField]
+    private bool enterFromLeft = true;
+    [SerializeField]
+    private Transform playerPos;
+    private bool isInEnviro = false;
+    public void ChangeEnvironnement(){
+        
+        if(ExitOnCorrectSide()){
+            isInEnviro = !isInEnviro;
+            if(isInEnviro){
+                initAmbientIntensity = RenderSettings.ambientIntensity;
+                initRefIntensity = RenderSettings.reflectionIntensity;
+                RenderSettings.ambientIntensity = targetAmbientIntensity;
+                RenderSettings.reflectionIntensity = targetRefIntensity;
+                
+            }else{
+                RenderSettings.ambientIntensity = initAmbientIntensity;
+                RenderSettings.reflectionIntensity = initRefIntensity;
+            }
+        }
+        
+    }
+
+    private bool ExitOnCorrectSide(){
+        
+        if(enterFromLeft){
+            if(!isInEnviro){
+                if(playerPos.position.x > transform.position.x){
+                    
+                    return true;
+                }
+            }else{
+                if(playerPos.position.x < transform.position.x){
+                    
+                    return true;
+                }
+            }
+            
+        }else{
+            if(!isInEnviro){
+                if(playerPos.position.x < transform.position.x){
+                    return true;
+                }
+            }else{
+                if(playerPos.position.x > transform.position.x){
+                    return true;
+                }
+            }
+        }
+        
+        return false;
+    }
+}
--- a/Assets/Scripts/EnvChanger.cs.meta
+++ b/Assets/Scripts/EnvChanger.cs.meta
@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: d472a146f9945154b9f33e0da19e3c69
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Scripts/GameController.cs
+++ b/Assets/Scripts/GameController.cs
@ -2,12 +2,18 @@ using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
 using UnityEngine.SceneManagement;
+using UnityEngine.UI;

 public class GameController : MonoBehaviour
 {
    private static GameController instance;
    [SerializeField]
    private string startScene, mainScene, endScene;
+    [SerializeField]
+    private float fadeSpeed;
+    [SerializeField]
+    private Image fadeImg;
+    private Coroutine fadeCoroutine;
    public static GameController Instance{
        get{
            if(instance is null)Debug.LogError("Game controller is null");
@ -16,28 +22,62 @@ public class GameController : MonoBehaviour
    }

    private void Awake() {
-        instance = this;
-        DontDestroyOnLoad(this.gameObject);
+        if(GameController.Instance is null){
+            instance = this;
+            DontDestroyOnLoad(this.gameObject);
+            SceneManager.activeSceneChanged += ChangedScene;
+        }else{
+            Destroy(this.gameObject);
+        }
+        
    }
+    

    public void StartGame(){
-        SceneManager.LoadScene(mainScene);
+        fadeCoroutine = StartCoroutine(FadeToBlack(mainScene, true,fadeSpeed));
    }

    public void EndGame(){
        Debug.Log("Game is over");
-        SceneManager.LoadScene(endScene);
+        fadeCoroutine = StartCoroutine(FadeToBlack(endScene, true,fadeSpeed));
    }

    public void QuitGame(){
+        //fadeCoroutine = StartCoroutine(FadeToBlack(true,fadeTimer));
        Application.Quit();
    }

    public void Options(){
+        //fadeCoroutine = StartCoroutine(FadeToBlack(true,fadeTimer));
        Debug.Log("Clicked options");
    }

    public void MainMenu(){
-        SceneManager.LoadScene(startScene);
+        fadeCoroutine = StartCoroutine(FadeToBlack(startScene, true,fadeSpeed));
+    }
+
+    private void ChangedScene(Scene curr, Scene next){
+        fadeCoroutine = StartCoroutine(FadeToBlack(string.Empty, false, fadeSpeed));
+    }
+
+    public IEnumerator FadeToBlack(string sceneToLoad,bool fadeToBlack = true, float fadeSpeed = 2.5f){
+        Color imgColor = fadeImg.color;
+        float fadeAmount;
+        if(fadeToBlack){
+            while(fadeImg.color.a < 1){
+                fadeAmount = imgColor.a + (fadeSpeed * Time.deltaTime);
+                imgColor = new Color(imgColor.r, imgColor.g, imgColor.b, fadeAmount);
+                fadeImg.color = imgColor;
+                yield return null;
+            }
+            SceneManager.LoadScene(sceneToLoad);
+        }else{
+            while(fadeImg.color.a > 0){
+                fadeAmount = imgColor.a - (fadeSpeed * Time.deltaTime);
+                imgColor = new Color(imgColor.r, imgColor.g, imgColor.b, fadeAmount);
+                fadeImg.color = imgColor;
+                yield return null;
+            }
+        }
    }
 }
--- a/Assets/Scripts/SlidingDoor.cs
+++ b/Assets/Scripts/SlidingDoor.cs
@ -27,7 +27,7 @@ public class SlidingDoor : Triggerable
        }
    }

-    public override void TriggerEvent(){
+    public override void TriggerEvent(Collider other){
        
        isOpen = !isOpen;
    }
--- a/Assets/Scripts/TriggerZone.cs
+++ b/Assets/Scripts/TriggerZone.cs
@ -16,7 +16,7 @@ public class TriggerZone : MonoBehaviour
    private void OnTriggerEnter(Collider other) {
        if(!onEnter)return;
        if(other.gameObject.tag.Equals("Player")){
-            linkedObj.TriggerEvent();
+            linkedObj?.TriggerEvent(other);
            enterEvent?.Invoke();
        }
    }
@ -24,7 +24,7 @@ public class TriggerZone : MonoBehaviour
    private void OnTriggerStay(Collider other) {
        if(!onStay)return;
        if(other.gameObject.tag.Equals("Player")){
-            linkedObj.TriggerEvent();
+            linkedObj?.TriggerEvent(other);
            stayEvent?.Invoke();
        }
    }
@ -32,7 +32,7 @@ public class TriggerZone : MonoBehaviour
    private void OnTriggerExit(Collider other) {
        if(!OnExit)return;
        if(other.gameObject.tag.Equals("Player")){
-            linkedObj.TriggerEvent();
+            linkedObj?.TriggerEvent(other);
            exitEvent?.Invoke();
        }
    }
--- a/Assets/Scripts/Triggerable.cs
+++ b/Assets/Scripts/Triggerable.cs
@ -4,5 +4,5 @@ using UnityEngine;

 public abstract class Triggerable : MonoBehaviour
 {
-    public abstract void TriggerEvent();
+    public abstract void TriggerEvent(Collider other = null);
 }
--- a/Assets/Scripts/UIController.cs
+++ b/Assets/Scripts/UIController.cs
@ -0,0 +1,26 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class UIController : MonoBehaviour
+{
+    public void StartGame(){
+        GameController.Instance.StartGame();
+    }
+
+    public void EndGame(){
+        GameController.Instance.EndGame();
+    }
+
+    public void QuitGame(){
+        GameController.Instance.QuitGame();
+    }
+
+    public void Options(){
+        GameController.Instance.Options();
+    }
+
+    public void MainMenu(){
+        GameController.Instance.MainMenu();
+    }
+}
--- a/Assets/Scripts/UIController.cs.meta
+++ b/Assets/Scripts/UIController.cs.meta
@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 06cd37efca880db4c897922a3b05a3d9
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: