Commit 3480a93a authored by Sebastian Frey's avatar Sebastian Frey
Browse files

Merge remote-tracking branch 'origin/master'

parents c76d0176 7b8d9392
fileFormatVersion: 2
guid: 19b911b8f83dc0a43b784f990a0f1b64
TextureImporter:
fileIDToRecycleName: {}
externalObjects: {}
serializedVersion: 9
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: -1
aniso: -1
mipBias: -100
wrapU: 1
wrapV: 1
wrapW: -1
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 1024
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
platformSettings:
- serializedVersion: 2
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: b4264f14c84bfa245873740abc17c2f4
vertices: []
indices:
edges: []
weights: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:
This diff is collapsed.
...@@ -68,10 +68,10 @@ SpriteRenderer: ...@@ -68,10 +68,10 @@ SpriteRenderer:
m_AutoUVMaxDistance: 0.5 m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89 m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0} m_LightmapParameters: {fileID: 0}
m_SortingLayerID: -614652393 m_SortingLayerID: -480944179
m_SortingLayer: 4 m_SortingLayer: 2
m_SortingOrder: 0 m_SortingOrder: -1
m_Sprite: {fileID: 21300000, guid: 8c87685c35fcc344986ede86ef394fdb, type: 3} m_Sprite: {fileID: 21300000, guid: 19b911b8f83dc0a43b784f990a0f1b64, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1} m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0 m_FlipX: 0
m_FlipY: 0 m_FlipY: 0
...@@ -99,7 +99,7 @@ BoxCollider2D: ...@@ -99,7 +99,7 @@ BoxCollider2D:
m_SpriteTilingProperty: m_SpriteTilingProperty:
border: {x: 0, y: 0, z: 0, w: 0} border: {x: 0, y: 0, z: 0, w: 0}
pivot: {x: 0.5, y: 0.5} pivot: {x: 0.5, y: 0.5}
oldSize: {x: 1, y: 1} oldSize: {x: 8, y: 8}
newSize: {x: 1, y: 1} newSize: {x: 1, y: 1}
adaptiveTilingThreshold: 0.5 adaptiveTilingThreshold: 0.5
drawMode: 0 drawMode: 0
......
This diff is collapsed.
This diff is collapsed.
fileFormatVersion: 2
guid: b7bf4d880d42d444f8da98c29b8ee5ec
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
This diff is collapsed.
fileFormatVersion: 2
guid: a557c41513022e744831753cb4ad512f
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
This diff is collapsed.
...@@ -1494,129 +1494,6 @@ Transform: ...@@ -1494,129 +1494,6 @@ Transform:
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 13 m_RootOrder: 13
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &641165127
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 8474030530107407617, guid: d15c6360ddc5f6d45994b7a8ad351996,
type: 3}
propertyPath: m_Name
value: Minimap
objectReference: {fileID: 0}
- target: {fileID: 8474030530107407621, guid: d15c6360ddc5f6d45994b7a8ad351996,
type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8474030530107407621, guid: d15c6360ddc5f6d45994b7a8ad351996,
type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8474030530107407621, guid: d15c6360ddc5f6d45994b7a8ad351996,
type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8474030530107407621, guid: d15c6360ddc5f6d45994b7a8ad351996,
type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8474030530107407621, guid: d15c6360ddc5f6d45994b7a8ad351996,
type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8474030530107407621, guid: d15c6360ddc5f6d45994b7a8ad351996,
type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8474030530107407621, guid: d15c6360ddc5f6d45994b7a8ad351996,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 8474030530107407621, guid: d15c6360ddc5f6d45994b7a8ad351996,
type: 3}
propertyPath: m_RootOrder
value: 21
objectReference: {fileID: 0}
- target: {fileID: 8474030530107407621, guid: d15c6360ddc5f6d45994b7a8ad351996,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8474030530107407621, guid: d15c6360ddc5f6d45994b7a8ad351996,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8474030530107407621, guid: d15c6360ddc5f6d45994b7a8ad351996,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8474030530107407621, guid: d15c6360ddc5f6d45994b7a8ad351996,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8474030530107407621, guid: d15c6360ddc5f6d45994b7a8ad351996,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8474030530107407621, guid: d15c6360ddc5f6d45994b7a8ad351996,
type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8474030530107407621, guid: d15c6360ddc5f6d45994b7a8ad351996,
type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8474030530107407621, guid: d15c6360ddc5f6d45994b7a8ad351996,
type: 3}
propertyPath: m_AnchorMin.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8474030530107407621, guid: d15c6360ddc5f6d45994b7a8ad351996,
type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8474030530107407621, guid: d15c6360ddc5f6d45994b7a8ad351996,
type: 3}
propertyPath: m_AnchorMax.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8474030530107407621, guid: d15c6360ddc5f6d45994b7a8ad351996,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8474030530107407621, guid: d15c6360ddc5f6d45994b7a8ad351996,
type: 3}
propertyPath: m_Pivot.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8474030530107407621, guid: d15c6360ddc5f6d45994b7a8ad351996,
type: 3}
propertyPath: m_Pivot.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 574052652, guid: d15c6360ddc5f6d45994b7a8ad351996, type: 3}
propertyPath: player
value:
objectReference: {fileID: 435083157}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: d15c6360ddc5f6d45994b7a8ad351996, type: 3}
--- !u!1001 &674588446 --- !u!1001 &674588446
PrefabInstance: PrefabInstance:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -2749,6 +2626,11 @@ PrefabInstance: ...@@ -2749,6 +2626,11 @@ PrefabInstance:
propertyPath: m_Pivot.y propertyPath: m_Pivot.y
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 2362585430913481208, guid: 35f9d08058ae666458aadeaeab77cf00,
type: 3}
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
m_RemovedComponents: [] m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 35f9d08058ae666458aadeaeab77cf00, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 35f9d08058ae666458aadeaeab77cf00, type: 3}
--- !u!1001 &1020248502 --- !u!1001 &1020248502
...@@ -2801,7 +2683,7 @@ PrefabInstance: ...@@ -2801,7 +2683,7 @@ PrefabInstance:
- target: {fileID: 2888112478438871478, guid: 50a0ddec8ac259c46a58a6b5324a759d, - target: {fileID: 2888112478438871478, guid: 50a0ddec8ac259c46a58a6b5324a759d,
type: 3} type: 3}
propertyPath: m_RootOrder propertyPath: m_RootOrder
value: 22 value: 21
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 2888112478438871478, guid: 50a0ddec8ac259c46a58a6b5324a759d, - target: {fileID: 2888112478438871478, guid: 50a0ddec8ac259c46a58a6b5324a759d,
type: 3} type: 3}
...@@ -2868,6 +2750,11 @@ PrefabInstance: ...@@ -2868,6 +2750,11 @@ PrefabInstance:
propertyPath: m_Pivot.y propertyPath: m_Pivot.y
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 2362585432661986845, guid: 50a0ddec8ac259c46a58a6b5324a759d,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: [] m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 50a0ddec8ac259c46a58a6b5324a759d, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 50a0ddec8ac259c46a58a6b5324a759d, type: 3}
--- !u!1 &1025537126 --- !u!1 &1025537126
......
This diff is collapsed.
fileFormatVersion: 2
guid: ce014a08630f7db4e8960e2e3e639b42
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
...@@ -3,32 +3,36 @@ using System.Collections.Generic; ...@@ -3,32 +3,36 @@ using System.Collections.Generic;
using UnityEngine; using UnityEngine;
using LevelauswahlScript; using LevelauswahlScript;
using PlayerSpawnPointScript; using PlayerSpawnPointScript;
using UnityEngine.UI;
public class SavePoint : MonoBehaviour public class SavePoint : MonoBehaviour
{ {
private bool isUsed; private bool isUsed;
private Transform options; private Transform options;
public Button button;
private void Start() private void Start()
{ {
button.interactable = false;
isUsed = false; isUsed = false;
options = gameObject.transform.Find("Options"); options = gameObject.transform.Find("Options");
} }
public void OnTriggerEnter2D(Collider2D other) public void OnTriggerEnter2D(Collider2D other)
{ {
options.gameObject.SetActive(true); //options.gameObject.SetActive(true);
} }
public void OnTriggerExit2D(Collider2D other) public void OnTriggerExit2D(Collider2D other)
{ {
options.gameObject.SetActive(false); //options.gameObject.SetActive(false);
} }
public void OnTriggerStay2D(Collider2D collision) public void OnTriggerStay2D(Collider2D collision)
{ {
if (Input.GetButtonDown("Interact")) if (Input.GetButtonDown("Interact"))
{ {
button.interactable = true;
isUsed = true; isUsed = true;
SaveSystem.SavePointUpdate(this); SaveSystem.SavePointUpdate(this);
} else if (Input.GetButtonDown("Teleport") && Levelauswahl.la.auswahlIsActive() == false) } else if (Input.GetButtonDown("Teleport") && Levelauswahl.la.auswahlIsActive() == false)
...@@ -44,6 +48,7 @@ public class SavePoint : MonoBehaviour ...@@ -44,6 +48,7 @@ public class SavePoint : MonoBehaviour
public void SetIsUsed(bool var) public void SetIsUsed(bool var)
{ {
button.interactable = var;
isUsed = var; isUsed = var;
} }
......
...@@ -15,7 +15,6 @@ public class MainMenu : MonoBehaviour ...@@ -15,7 +15,6 @@ public class MainMenu : MonoBehaviour
private Button _selectedBtn; private Button _selectedBtn;
private GameObject _old, _new; private GameObject _old, _new;
void Start() void Start()
{ {
......
...@@ -8,16 +8,16 @@ using LevelauswahlScript; ...@@ -8,16 +8,16 @@ using LevelauswahlScript;
public class PauseMenu : MonoBehaviour public class PauseMenu : MonoBehaviour
{ {
public GameObject pauseMenu, optionsMenu; public GameObject pauseMenu;
private EventSystem _myEventSystem; public EventSystem _myEventSystem;
public Button firstSelect; public Button firstSelect;
private GameObject _backScreen, _currentScreen;
private bool isPaused = false; private bool isPaused = false;
private GameObject _old, _new; private GameObject _old, _new;
public GameObject HUD;
// Start is called before the first frame update // Start is called before the first frame update
void Start() void Start()
{ {
_myEventSystem = EventSystem.current;
} }
IEnumerator highlightBtn() IEnumerator highlightBtn()
...@@ -36,61 +36,39 @@ public class PauseMenu : MonoBehaviour ...@@ -36,61 +36,39 @@ public class PauseMenu : MonoBehaviour
{ {
_old = _new; _old = _new;
} }
if(Input.GetButtonDown ("Cancel") && isPaused == true && _backScreen == null) if(Input.GetButtonDown ("Cancel") && isPaused == true)
{ {
Resume(); Resume();
} else if (Input.GetButtonDown ("Cancel") && isPaused == false && _backScreen == null && Levelauswahl.la.auswahlIsActive() == false) } else if (Input.GetButtonDown ("Cancel") && isPaused == false && Levelauswahl.la.auswahlIsActive() == false)
{ {
Pause(); Pause();
} }
else if (Input.GetButtonDown ("Cancel") && isPaused == true && _backScreen != null) if (Input.GetMouseButtonDown(0))
{
_backScreen.SetActive(true);
_currentScreen.SetActive(false);
//firstSelect.Select();
_backScreen = null;
}
if (Input.GetMouseButtonDown(0) && !EventSystem.current.IsPointerOverGameObject())
{ {
_myEventSystem.SetSelectedGameObject(_old); _myEventSystem.SetSelectedGameObject(_old);
} }
} }
public void SetBackScreen(GameObject bScreen)
{
_backScreen = bScreen;
}
public void ResetBackScreen()
{
_backScreen = null;
}
public void selectBtn(Button optionBtn) public void selectBtn(Button optionBtn)
{ {
optionBtn.Select(); optionBtn.Select();
} }
public void SetCurrentScreen(GameObject cScreen)
{
_currentScreen = cScreen;
}
public void Resume() public void Resume()
{ {
isPaused = false; isPaused = false;
pauseMenu.SetActive(false); pauseMenu.SetActive(false);
optionsMenu.SetActive(false);
Time.timeScale = 1f; Time.timeScale = 1f;
HUD.SetActive(true);
} }
public void Pause() public void Pause()
{ {
Time.timeScale = 0f;
isPaused = true; isPaused = true;
pauseMenu.SetActive(true); pauseMenu.SetActive(true);
Time.timeScale = 0f;
StartCoroutine("highlightBtn"); StartCoroutine("highlightBtn");
HUD.SetActive(false);
} }
public void SwitchToMouse() public void SwitchToMouse()
......
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