Skip to content

GitLab

Commit 9dbf0e43 authored by Alexander Brendel's avatar Alexander Brendel
Browse files

Fixed Pausemenu not controllable by mouse

parent 55bfbdd2
Hide whitespace changes
Inline Side-by-side
Assets/_Game/Prefabs/UI/EndScreen.prefab
View file @ 9dbf0e43
......@@ -113,7 +113,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!1 &1625777755864502
GameObject:
m_ObjectHideFlags: 0
......
Assets/_Game/Prefabs/UI/PauseMenu.prefab
View file @ 9dbf0e43
......@@ -28,7 +28,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!1 &1109323826155286
GameObject:
m_ObjectHideFlags: 0
......@@ -521,7 +521,7 @@ MonoBehaviour:
m_margin: {x: 0, y: 0, z: 0, w: 0}
m_textInfo:
textComponent: {fileID: 114459445965733110}
characterCount: 10
characterCount: 7
spriteCount: 0
spaceCount: 0
wordCount: 1
......@@ -529,11 +529,11 @@ MonoBehaviour:
lineCount: 1
pageCount: 1
materialCount: 1
m_havePropertiesChanged: 1
m_havePropertiesChanged: 0
m_isUsingLegacyAnimationComponent: 0
m_isVolumetricText: 0
m_spriteAnimator: {fileID: 0}
m_isInputParsingRequired: 1
m_isInputParsingRequired: 0
m_inputSource: 0
m_hasFontAssetChanged: 0
m_subTextObjects:
......@@ -686,19 +686,19 @@ MonoBehaviour:
m_margin: {x: 0, y: 0, z: 0, w: 0}
m_textInfo:
textComponent: {fileID: 114699487794165794}
characterCount: 11
characterCount: 8
spriteCount: 0
spaceCount: 1
spaceCount: 0
wordCount: 1
linkCount: 0
lineCount: 1
pageCount: 1
materialCount: 1
m_havePropertiesChanged: 1
m_havePropertiesChanged: 0
m_isUsingLegacyAnimationComponent: 0
m_isVolumetricText: 0
m_spriteAnimator: {fileID: 0}
m_isInputParsingRequired: 1
m_isInputParsingRequired: 0
m_inputSource: 0
m_hasFontAssetChanged: 0
m_subTextObjects:
......@@ -818,19 +818,19 @@ MonoBehaviour:
m_margin: {x: 0, y: 0, z: 0, w: 0}
m_textInfo:
textComponent: {fileID: 114920630877486874}
characterCount: 5
characterCount: 10
spriteCount: 0
spaceCount: 1
wordCount: 1
spaceCount: 2
wordCount: 2
linkCount: 0
lineCount: 1
pageCount: 1
materialCount: 1
m_havePropertiesChanged: 1
m_havePropertiesChanged: 0
m_isUsingLegacyAnimationComponent: 0
m_isVolumetricText: 0
m_spriteAnimator: {fileID: 0}
m_isInputParsingRequired: 1
m_isInputParsingRequired: 0
m_inputSource: 0
m_hasFontAssetChanged: 0
m_subTextObjects:
......
Assets/_Game/Scenes/LuisTestScene.unity
View file @ 9dbf0e43
......@@ -38,7 +38,7 @@ RenderSettings:
m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 0}
m_IndirectSpecularColor: {r: 0.44657844, g: 0.49641222, b: 0.57481694, a: 1}
m_IndirectSpecularColor: {r: 0.44657826, g: 0.49641263, b: 0.57481676, a: 1}
m_UseRadianceAmbientProbe: 0
--- !u!157 &3
LightmapSettings:
......@@ -327,7 +327,7 @@ Prefab:
- target: {fileID: 224587373832354594, guid: 4024f8c7a63424f459b828df49d208ff,
type: 2}
propertyPath: m_RootOrder
value: 2
value: 1
objectReference: {fileID: 0}
- target: {fileID: 224587373832354594, guid: 4024f8c7a63424f459b828df49d208ff,
type: 2}
......@@ -780,7 +780,7 @@ Prefab:
- target: {fileID: 224593697746542336, guid: c2f5110473b8e964baf9b0cfadc3902d,
type: 2}
propertyPath: m_RootOrder
value: 1
value: 2
objectReference: {fileID: 0}
- target: {fileID: 224593697746542336, guid: c2f5110473b8e964baf9b0cfadc3902d,
type: 2}
......@@ -837,22 +837,22 @@ Prefab:
propertyPath: input
value:
objectReference: {fileID: 1914542975}
- target: {fileID: 114699487794165794, guid: c2f5110473b8e964baf9b0cfadc3902d,
- target: {fileID: 114920630877486874, guid: c2f5110473b8e964baf9b0cfadc3902d,
type: 2}
propertyPath: m_havePropertiesChanged
value: 1
objectReference: {fileID: 0}
- target: {fileID: 114699487794165794, guid: c2f5110473b8e964baf9b0cfadc3902d,
- target: {fileID: 114920630877486874, guid: c2f5110473b8e964baf9b0cfadc3902d,
type: 2}
propertyPath: m_isInputParsingRequired
value: 1
objectReference: {fileID: 0}
- target: {fileID: 114920630877486874, guid: c2f5110473b8e964baf9b0cfadc3902d,
- target: {fileID: 114699487794165794, guid: c2f5110473b8e964baf9b0cfadc3902d,
type: 2}
propertyPath: m_havePropertiesChanged
value: 1
objectReference: {fileID: 0}
- target: {fileID: 114920630877486874, guid: c2f5110473b8e964baf9b0cfadc3902d,
- target: {fileID: 114699487794165794, guid: c2f5110473b8e964baf9b0cfadc3902d,
type: 2}
propertyPath: m_isInputParsingRequired
value: 1
......@@ -867,61 +867,6 @@ Prefab:
propertyPath: m_isInputParsingRequired
value: 1
objectReference: {fileID: 0}
- target: {fileID: 224476559526652544, guid: c2f5110473b8e964baf9b0cfadc3902d,
type: 2}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 224476559526652544, guid: c2f5110473b8e964baf9b0cfadc3902d,
type: 2}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 224476559526652544, guid: c2f5110473b8e964baf9b0cfadc3902d,
type: 2}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 224178307435599336, guid: c2f5110473b8e964baf9b0cfadc3902d,
type: 2}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 224178307435599336, guid: c2f5110473b8e964baf9b0cfadc3902d,
type: 2}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 224178307435599336, guid: c2f5110473b8e964baf9b0cfadc3902d,
type: 2}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 224178307435599336, guid: c2f5110473b8e964baf9b0cfadc3902d,
type: 2}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 224659642064775636, guid: c2f5110473b8e964baf9b0cfadc3902d,
type: 2}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 224659642064775636, guid: c2f5110473b8e964baf9b0cfadc3902d,
type: 2}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 224659642064775636, guid: c2f5110473b8e964baf9b0cfadc3902d,
type: 2}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 224659642064775636, guid: c2f5110473b8e964baf9b0cfadc3902d,
type: 2}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: c2f5110473b8e964baf9b0cfadc3902d, type: 2}
m_IsPrefabAsset: 0
......@@ -1260,8 +1205,8 @@ RectTransform:
m_LocalScale: {x: 0, y: 0, z: 0}
m_Children:
- {fileID: 1952939718}
- {fileID: 632297329}
- {fileID: 1325589388}
- {fileID: 632297329}
m_Father: {fileID: 0}
m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
......
Assets/_Game/Scripts/HUD/EndScreenController.cs
View file @ 9dbf0e43
......@@ -46,12 +46,12 @@ public class EndScreenController : MenuController {
#region Logic
private void Start() {
Block();
flashCanvas.alpha = 0;
endscreenCanvas.alpha = 0;
}
public void Show(bool victory) {
Block();
GameManager.Instance.AllowPauseMenu = false;
backgroundImage.sprite = victory ? victorySprite : endlessMode.Value ? endlessSprite : failureSprite;
StartCoroutine(victory ? ShowVictoryScreen() : ShowDefeatScreen());
......
Assets/_Game/Scripts/HUD/PauseController.cs
View file @ 9dbf0e43
......@@ -67,6 +67,7 @@ public class PauseController : MenuController {
#region Animation
private IEnumerator Show() {
canvasGroup.blocksRaycasts = true;
yield return canvasGroup.FadeIn(fadeTime, true);
Unblock(baseSelection);
}
......@@ -75,6 +76,8 @@ public class PauseController : MenuController {
yield return canvasGroup.FadeOut(fadeTime, true);
Time.timeScale = 1;
shown = false;
Unblock(blockingButton);
canvasGroup.blocksRaycasts = false;
}
#endregion
......
Supports Markdown
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