Commit 9384f9bd authored by Jan Meissner's avatar Jan Meissner
Browse files

In Progress InLevelController & MainMenuController

parent 12021341
......@@ -38,7 +38,7 @@ RenderSettings:
m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 0}
m_IndirectSpecularColor: {r: 0.37311926, g: 0.38074008, b: 0.35872707, a: 1}
m_IndirectSpecularColor: {r: 0.37311918, g: 0.3807398, b: 0.35872716, a: 1}
m_UseRadianceAmbientProbe: 0
--- !u!157 &3
LightmapSettings:
......@@ -152,7 +152,7 @@ Transform:
m_Children:
- {fileID: 1209361585}
m_Father: {fileID: 0}
m_RootOrder: 3
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &486798065
Prefab:
......@@ -191,11 +191,51 @@ Prefab:
objectReference: {fileID: 0}
- target: {fileID: 4398632234699092, guid: 2900943b51305b14f9775fce7e170064, type: 2}
propertyPath: m_RootOrder
value: 1
value: 2
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 2900943b51305b14f9775fce7e170064, type: 2}
m_IsPrefabAsset: 0
--- !u!1 &737042435
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 737042437}
- component: {fileID: 737042436}
m_Layer: 0
m_Name: InLevelController
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!114 &737042436
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 737042435}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 8f0dfd6fa8b456e438a849cde399950f, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!4 &737042437
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 737042435}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 11.786097, y: 1.735902, z: -9.874574}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &904505988
Prefab:
m_ObjectHideFlags: 0
......@@ -233,7 +273,7 @@ Prefab:
objectReference: {fileID: 0}
- target: {fileID: 4979966340574982, guid: 8423f8de9823deb4b8e438ad4f85f721, type: 2}
propertyPath: m_RootOrder
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 114577748845638106, guid: 8423f8de9823deb4b8e438ad4f85f721,
type: 2}
......@@ -3580,7 +3620,7 @@ Transform:
m_Children:
- {fileID: 1273832802}
m_Father: {fileID: 0}
m_RootOrder: 2
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1914544528
GameObject:
......@@ -3793,5 +3833,5 @@ Transform:
m_Children:
- {fileID: 1914544529}
m_Father: {fileID: 0}
m_RootOrder: 4
m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
......@@ -725,7 +725,7 @@ MonoBehaviour:
m_OnClick:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 370245079}
- m_Target: {fileID: 0}
m_MethodName: LoadLevel
m_Mode: 3
m_Arguments:
......@@ -1047,7 +1047,7 @@ MonoBehaviour:
m_OnClick:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 370245079}
- m_Target: {fileID: 0}
m_MethodName: LoadLevel
m_Mode: 3
m_Arguments:
......@@ -1316,7 +1316,7 @@ MonoBehaviour:
m_OnClick:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 370245079}
- m_Target: {fileID: 0}
m_MethodName: LoadLevel
m_Mode: 3
m_Arguments:
......@@ -2010,7 +2010,7 @@ MonoBehaviour:
m_OnClick:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 370245079}
- m_Target: {fileID: 0}
m_MethodName: LoadLevel
m_Mode: 3
m_Arguments:
......@@ -2118,7 +2118,7 @@ MonoBehaviour:
m_OnClick:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 370245079}
- m_Target: {fileID: 0}
m_MethodName: LoadLevel
m_Mode: 3
m_Arguments:
......@@ -2786,46 +2786,6 @@ CanvasRenderer:
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 361697059}
m_CullTransparentMesh: 0
--- !u!1 &370245078
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 370245080}
- component: {fileID: 370245079}
m_Layer: 0
m_Name: GameManager
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!114 &370245079
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 370245078}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 793bd4810490d9a408fdcc3601cdb9e5, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!4 &370245080
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 370245078}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: -10}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &408457787
GameObject:
m_ObjectHideFlags: 0
......@@ -3779,7 +3739,7 @@ MonoBehaviour:
m_OnClick:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 370245079}
- m_Target: {fileID: 0}
m_MethodName: LoadLevel
m_Mode: 3
m_Arguments:
......@@ -4153,7 +4113,7 @@ Transform:
- {fileID: 1796587313}
- {fileID: 288777}
m_Father: {fileID: 0}
m_RootOrder: 3
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &805473915
MonoBehaviour:
......@@ -5124,7 +5084,7 @@ MonoBehaviour:
m_OnClick:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 370245079}
- m_Target: {fileID: 0}
m_MethodName: LoadLevel
m_Mode: 3
m_Arguments:
......@@ -5683,7 +5643,7 @@ MonoBehaviour:
m_OnClick:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 370245079}
- m_Target: {fileID: 0}
m_MethodName: LoadLevel
m_Mode: 3
m_Arguments:
......@@ -6356,7 +6316,7 @@ MonoBehaviour:
m_OnClick:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 370245079}
- m_Target: {fileID: 0}
m_MethodName: LoadLevel
m_Mode: 3
m_Arguments:
......@@ -6668,6 +6628,17 @@ GameObject:
m_CorrespondingSourceObject: {fileID: 1003090352860126, guid: 28691e34a255994418a523676d503274,
type: 2}
m_PrefabInternal: {fileID: 1757140884}
--- !u!114 &1284376702
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1284376701}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: ab33f0762b466854ba7f674d0be0a075, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &1298487919
GameObject:
m_ObjectHideFlags: 0
......@@ -6727,7 +6698,7 @@ MonoBehaviour:
m_OnClick:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 370245079}
- m_Target: {fileID: 0}
m_MethodName: LoadLevel
m_Mode: 3
m_Arguments:
......@@ -6962,7 +6933,7 @@ MonoBehaviour:
m_OnClick:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 370245079}
- m_Target: {fileID: 0}
m_MethodName: LoadLevel
m_Mode: 3
m_Arguments:
......@@ -7124,7 +7095,7 @@ MonoBehaviour:
m_OnClick:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 370245079}
- m_Target: {fileID: 0}
m_MethodName: LoadLevel
m_Mode: 3
m_Arguments:
......@@ -7232,7 +7203,7 @@ MonoBehaviour:
m_OnClick:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 370245079}
- m_Target: {fileID: 0}
m_MethodName: LoadLevel
m_Mode: 3
m_Arguments:
......@@ -8410,7 +8381,7 @@ MonoBehaviour:
m_OnClick:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 370245079}
- m_Target: {fileID: 0}
m_MethodName: LoadLevel
m_Mode: 3
m_Arguments:
......@@ -8642,7 +8613,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 1
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1526597591
GameObject:
......@@ -10479,7 +10450,7 @@ MonoBehaviour:
m_OnClick:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 370245079}
- m_Target: {fileID: 0}
m_MethodName: LoadLevel
m_Mode: 3
m_Arguments:
......@@ -10609,7 +10580,7 @@ MonoBehaviour:
m_OnClick:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 370245079}
- m_Target: {fileID: 0}
m_MethodName: LoadLevel
m_Mode: 3
m_Arguments:
......@@ -10695,13 +10666,13 @@ Prefab:
objectReference: {fileID: 0}
- target: {fileID: 4072187319000630, guid: 28691e34a255994418a523676d503274, type: 2}
propertyPath: m_RootOrder
value: 2
value: 1
objectReference: {fileID: 0}
- target: {fileID: 114649729087557186, guid: 28691e34a255994418a523676d503274,
type: 2}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target
value:
objectReference: {fileID: 370245079}
objectReference: {fileID: 0}
- target: {fileID: 114239850295400252, guid: 28691e34a255994418a523676d503274,
type: 2}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_Target
......@@ -10721,7 +10692,7 @@ Prefab:
type: 2}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target
value:
objectReference: {fileID: 370245079}
objectReference: {fileID: 0}
- target: {fileID: 1003090352860126, guid: 28691e34a255994418a523676d503274, type: 2}
propertyPath: m_IsActive
value: 1
......@@ -10843,7 +10814,7 @@ MonoBehaviour:
m_OnClick:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 370245079}
- m_Target: {fileID: 0}
m_MethodName: LoadLevel
m_Mode: 3
m_Arguments:
......@@ -11024,7 +10995,7 @@ MonoBehaviour:
m_OnClick:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 370245079}
- m_Target: {fileID: 0}
m_MethodName: LoadLevel
m_Mode: 3
m_Arguments:
......@@ -11963,7 +11934,7 @@ Transform:
- {fileID: 1953308717}
- {fileID: 1033940833}
m_Father: {fileID: 0}
m_RootOrder: 4
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1980719552
GameObject:
......
fileFormatVersion: 2
guid: 7302d929ac7a2f44180b44e09592ac8a
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
......@@ -2,7 +2,6 @@
using System.Collections.Generic;
using Soraphis;
using UnityEditor;
using UnityEditor.VersionControl;
using UnityEngine;
using UnityEngine.Experimental.PlayerLoop;
using UnityEngine.SceneManagement;
......@@ -21,7 +20,7 @@ public class GameManager : SingletonBehaviour<GameManager>
private GameObject PauseMenu =null ; //Damit wird das PauseMenu gespeichert
private bool inLevel = false;
public bool inLevel = false;
private LoadSave ls = new LoadSave();
......@@ -36,7 +35,6 @@ public class GameManager : SingletonBehaviour<GameManager>
lastLevel = SceneManager.sceneCountInBuildSettings-2;
if (ls.DoesSaveFileExist())
{
int tmp = 1;
......@@ -48,29 +46,36 @@ public class GameManager : SingletonBehaviour<GameManager>
}
private void Update()
void Update()
{
/*
if (inLevel)
{
if (Input.GetKey("escape"))
Debug.Log("In Level");
if (Input.GetKeyDown(KeyCode.Escape))
{
Debug.Log("Escape");
if( !(PauseMenu.activeSelf))
PauseLevel();
{
PauseLevel();
}
else
{
ContinueLevel();
}
}
Debug.Log("InLevel= " + inLevel);
}
*/
}
// Update nicht benötigt da alle veränderungen über Methodenaufrufe laufen
public bool PauseMenuActive()
{
if(PauseMenu != null)
return PauseMenu.activeSelf;
}
public void LoadLevel(int lvl) //lädt das ausgewählte lvl abhängig seiner Nummer
{
......@@ -164,7 +169,6 @@ public class GameManager : SingletonBehaviour<GameManager>
public void ContinueLevel() // weiter button im PauseMenu ; Pause Menu wird inaktiv
{
Time.timeScale = 1.0f;
PauseMenu.SetActive(false);
......
......@@ -26,7 +26,7 @@ public class LoadSave
public void Safe(int currentLevel, int highestLevel)
{
......
fileFormatVersion: 2
guid: bb0be3b3c46d09b4a9a3fea5ce01b51e
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: b83db63dd5d8c0741bb0203a211d99ae
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: b56ee37828e17c741b663298c9e30a3c
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: ccfe9bf63a9f2214db0028dccb6b6e2b
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
......@@ -5,10 +5,34 @@ EditorBuildSettings:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Scenes:
- enabled: 0
path:
guid: 00000000000000000000000000000000
- enabled: 1
path: Assets/_Game/Scenes/MainMenu.unity
guid: 93caa8387f26fc6468010a04cfbe9835
- enabled: 1
path: Assets/_Game/Scenes/Levels/Level01.unity
guid: a2d4202c0f0370d41a7e224681439446
- enabled: 1
path: Assets/_Game/Scenes/Levels/Level02.unity
guid: 72a0004acb9fc7440afc74dd554c1af1
- enabled: 1
path: Assets/_Game/Scenes/Levels/Level03.unity
guid: b59286d088e528744b932b1ec3cc3ccf
- enabled: 1
path: Assets/_Game/Scenes/Levels/Level04.unity
guid: 0b84f3b3cacf9d14fb4235c715ac6cb1
- enabled: 1
path: Assets/_Game/Scenes/Levels/Level05.unity
guid: b2d28a41e1ca58846aac9677e741e5be
- enabled: 1
path: Assets/_Game/Scenes/Levels/Level06.unity
guid: 6a6369a5199336d4297a0e2f92d33482
- enabled: 1
path: Assets/_Game/Scenes/Levels/Level07.unity
guid: 0176f8cb818291749bad672bc557027d
- enabled: 1
path: Assets/_Game/Scenes/Levels/Level08.unity
guid: 7efe599e3ba0e3847a1a72ba64d52964
- enabled: 1
path: Assets/_Game/Scenes/Levels/Level09.unity
guid: 54a2da4869f066146ac7e96c1d928268
m_configObjects: {}
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment