Commit 6787bb2b authored by Larrox's avatar Larrox

Merge branch 'work' of...

Merge branch 'work' of https://gitlab.fsi.hochschule-trier.de/GameDevWeek/ws-18_19/unity/explosive-temper into work
parents c8f9a26c 8e036a0c
......@@ -29,7 +29,7 @@ public class HUDController : MonoBehaviour
public bool skipBombSelection = false;
private bool hideStuff = false;
private bool BombSelectionIsHidden = false;
private bool init = false;
public void Init()
......@@ -148,7 +148,7 @@ public class HUDController : MonoBehaviour
DeactivateBombSelection();
return;
}
BombSelectionIsHidden = true;
ShowLoseMenu(false);
ShowBombSelection(true);
ShowInGameHud(false);
......@@ -201,10 +201,12 @@ public class HUDController : MonoBehaviour
DeactivateLevelSelection();
instWinScreen.SetActive(false);
instLoseMenu.SetActive(false);
}
private void PlayBombselectionCloseAnim()
{
BombSelectionIsHidden = true;
instBombSelection.GetComponent<Animator>().SetBool("close", true);
}
......@@ -240,8 +242,8 @@ public class HUDController : MonoBehaviour
//previewInstance.enabled = !showingPreview;
instBombSelection.GetComponent<Animator>().SetBool("close", false);
instBombSelection.GetComponent<Animator>().SetBool("hide", hideStuff);
hideStuff = !hideStuff;
instBombSelection.GetComponent<Animator>().SetBool("hide", BombSelectionIsHidden);
BombSelectionIsHidden = !BombSelectionIsHidden;
//ShowBombSelection(showingPreview);
//showingPreview = !showingPreview;
......
......@@ -42,7 +42,7 @@ public class PauseMenu : MonoBehaviour
//GameManager.Instance.HudController.ShowBombSelection(false);
// GameManager.Instance.HudController.ShowInGameHud(false);
GameManager.Instance.HudController.BackToStartScreen();
GameObject.FindGameObjectWithTag("MainCamera").GetComponent<Camera>().enabled = true;
//GameManager.Instance.HudController.GoToMainMenu();
}
......
......@@ -41,18 +41,27 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: -306
value: -10
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0
outWeight: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.31666666
value: 456
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_AnchoredPosition.x
path: Panel
path: LaunchButton
classID: 224
script: {fileID: 0}
- curve:
......@@ -60,27 +69,18 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: -10
value: -312
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.31666666
value: 456
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_AnchoredPosition.x
path: LaunchButton
path: BombsPanel
classID: 224
script: {fileID: 0}
m_PPtrCurves: []
......@@ -106,7 +106,7 @@ AnimationClip:
customType: 28
isPPtrCurve: 0
- serializedVersion: 2
path: 1668086795
path: 2233494849
attribute: 1460864421
script: {fileID: 0}
typeID: 224
......@@ -158,18 +158,27 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: -306
value: -10
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0
outWeight: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.31666666
value: 456
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_AnchoredPosition.x
path: Panel
path: LaunchButton
classID: 224
script: {fileID: 0}
- curve:
......@@ -177,27 +186,18 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: -10
value: -312
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.31666666
value: 456
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_AnchoredPosition.x
path: LaunchButton
path: BombsPanel
classID: 224
script: {fileID: 0}
m_EulerEditorCurves: []
......
......@@ -75,7 +75,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: 0
value: -10
inSlope: 0
outSlope: 0
tangentMode: 136
......@@ -83,8 +83,8 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.21666667
value: -310
time: 0.16666667
value: -10
inSlope: 0
outSlope: 0
tangentMode: 136
......@@ -95,7 +95,7 @@ AnimationClip:
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_AnchoredPosition.x
path: Panel
path: LaunchButton
classID: 224
script: {fileID: 0}
- curve:
......@@ -103,7 +103,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: -10
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
......@@ -111,8 +111,8 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.16666667
value: -10
time: 0.21666667
value: -299
inSlope: 0
outSlope: 0
tangentMode: 136
......@@ -123,7 +123,7 @@ AnimationClip:
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_AnchoredPosition.x
path: LaunchButton
path: BombsPanel
classID: 224
script: {fileID: 0}
m_PPtrCurves: []
......@@ -142,7 +142,7 @@ AnimationClip:
customType: 28
isPPtrCurve: 0
- serializedVersion: 2
path: 1668086795
path: 2233494849
attribute: 1460864421
script: {fileID: 0}
typeID: 224
......@@ -217,7 +217,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 136
......@@ -226,7 +226,7 @@ AnimationClip:
outWeight: 0.33333334
- serializedVersion: 3
time: 0.21666667
value: -310
value: 1
inSlope: 0
outSlope: 0
tangentMode: 136
......@@ -236,8 +236,8 @@ AnimationClip:
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_AnchoredPosition.x
path: Panel
attribute: m_LocalScale.x
path: LaunchButton
classID: 224
script: {fileID: 0}
- curve:
......@@ -264,7 +264,7 @@ AnimationClip:
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalScale.x
attribute: m_LocalScale.y
path: LaunchButton
classID: 224
script: {fileID: 0}
......@@ -292,7 +292,7 @@ AnimationClip:
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalScale.y
attribute: m_LocalScale.z
path: LaunchButton
classID: 224
script: {fileID: 0}
......@@ -301,7 +301,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: 1
value: -10
inSlope: 0
outSlope: 0
tangentMode: 136
......@@ -309,8 +309,8 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.21666667
value: 1
time: 0.16666667
value: -10
inSlope: 0
outSlope: 0
tangentMode: 136
......@@ -320,7 +320,7 @@ AnimationClip:
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalScale.z
attribute: m_AnchoredPosition.x
path: LaunchButton
classID: 224
script: {fileID: 0}
......@@ -329,7 +329,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: -10
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
......@@ -337,8 +337,8 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.16666667
value: -10
time: 0.21666667
value: -299
inSlope: 0
outSlope: 0
tangentMode: 136
......@@ -349,7 +349,7 @@ AnimationClip:
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_AnchoredPosition.x
path: LaunchButton
path: BombsPanel
classID: 224
script: {fileID: 0}
m_EulerEditorCurves: []
......
......@@ -184,25 +184,15 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_SizeDelta.x
path: Canvas/MenuButton
classID: 224
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0
time: 0.23333333
value: 1
inSlope: 0
outSlope: 0
......@@ -226,6 +216,25 @@ AnimationClip:
path: Canvas/Text
classID: 114
script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 21
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_AnchoredPosition.x
path: Canvas/Text
classID: 224
script: {fileID: 0}
m_PPtrCurves: []
m_SampleRate: 60
m_WrapMode: 0
......@@ -263,8 +272,8 @@ AnimationClip:
customType: 0
isPPtrCurve: 0
- serializedVersion: 2
path: 4073082918
attribute: 1967290853
path: 3180147811
attribute: 1460864421
script: {fileID: 0}
typeID: 224
customType: 28
......@@ -517,25 +526,15 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_SizeDelta.x
path: Canvas/MenuButton
classID: 224
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0
time: 0.23333333
value: 1
inSlope: 0
outSlope: 0
......@@ -559,6 +558,25 @@ AnimationClip:
path: Canvas/Text
classID: 114
script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 21
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_AnchoredPosition.x
path: Canvas/Text
classID: 224
script: {fileID: 0}
m_EulerEditorCurves:
- curve:
serializedVersion: 2
......
......@@ -100,15 +100,15 @@ AnimationClip:
- serializedVersion: 3
time: 1.0833334
value: 177
inSlope: -152.81252
outSlope: -152.81252
inSlope: -141.56252
outSlope: -141.56252
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1.6333333
value: 77
value: 89
inSlope: 0
outSlope: 0
tangentMode: 136
......@@ -246,7 +246,7 @@ AnimationClip:
outWeight: 0.33333334
- serializedVersion: 3
time: 1.6333333
value: 0
value: 21
inSlope: 0
outSlope: 0
tangentMode: 136
......@@ -279,25 +279,6 @@ AnimationClip:
path: Canvas/MenuButton
classID: 224
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: -1
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_SizeDelta.y
path: Canvas/MenuButton
classID: 224
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
......@@ -341,7 +322,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: 57.99994
value: 140
inSlope: 0
outSlope: 0
tangentMode: 136
......@@ -351,7 +332,7 @@ AnimationClip:
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_SizeDelta.x
attribute: m_SizeDelta.y
path: Canvas/MenuButton
classID: 224
script: {fileID: 0}
......@@ -412,13 +393,6 @@ AnimationClip:
typeID: 224
customType: 28
isPPtrCurve: 0
- serializedVersion: 2
path: 4073082918
attribute: 38095219
script: {fileID: 0}
typeID: 224
customType: 28
isPPtrCurve: 0
- serializedVersion: 2
path: 3180147811
attribute: 304273561
......@@ -435,7 +409,7 @@ AnimationClip:
isPPtrCurve: 0
- serializedVersion: 2
path: 4073082918
attribute: 1967290853
attribute: 38095219
script: {fileID: 0}
typeID: 224
customType: 28
......@@ -486,15 +460,15 @@ AnimationClip:
- serializedVersion: 3
time: 1.0833334
value: 177
inSlope: -152.81252
outSlope: -152.81252
inSlope: -141.56252
outSlope: -141.56252
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1.6333333
value: 77
value: 89
inSlope: 0
outSlope: 0
tangentMode: 136
......@@ -632,7 +606,7 @@ AnimationClip:
outWeight: 0.33333334
- serializedVersion: 3
time: 1.6333333
value: 0
value: 21
inSlope: 0
outSlope: 0
tangentMode: 136
......@@ -767,25 +741,6 @@ AnimationClip:
path: Canvas/MenuButton
classID: 224
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: -1
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_SizeDelta.y
path: Canvas/MenuButton
classID: 224
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
......@@ -886,7 +841,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: 57.99994
value: 140
inSlope: 0
outSlope: 0
tangentMode: 136
......@@ -896,7 +851,7 @@ AnimationClip:
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_SizeDelta.x
attribute: m_SizeDelta.y
path: Canvas/MenuButton
classID: 224
script: {fileID: 0}
......
......@@ -1363,6 +1363,11 @@ PrefabInstance:
m_Modification:
m_TransformParent: {fileID: 7445062149737681535}
m_Modifications:
- target: {fileID: 5771943459716008010, guid: 4f20bec1d9a427542af5d6c88d43bc9c,
type: 3}