Skip to content

GitLab

E
Explosive Temper
Commit 973abb55 authored by Rene's avatar Rene
Browse files
Options

Double tab lost the fight

parent e565361e
Hide whitespace changes
Inline Side-by-side
Showing with 176 additions and 145 deletions
Assets/_Game/Scripts/Audio/SoundLists.meta deleted 100644 → 0
View file @ e565361e
fileFormatVersion: 2
guid: 22b50696c7e74294187ebd3a1ca35078
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Assets/_Game/Scripts/Tutorial/Level1.meta deleted 100644 → 0
View file @ e565361e
fileFormatVersion: 2
guid: f0e626d655663b54cace9c8ac40de916
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Assets/_Game/Scripts/UI/HUDController.cs
View file @ 973abb55
......@@ -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;
......
Assets/_Game/Scripts/UI/PauseMenu.cs
View file @ 973abb55
......@@ -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();
}
......
Assets/_Game/UI/Animations/CloseJustTheButton.anim
View file @ 973abb55
......@@ -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: []
......
Assets/_Game/UI/Animations/HideBombSelection.anim
View file @ 973abb55
......@@ -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: []
......
Assets/_Game/UI/Menus/BombSelectMenu.prefab
View file @ 973abb55
......@@ -1363,6 +1363,11 @@ PrefabInstance:
m_Modification:
m_TransformParent: {fileID: 7445062149737681535}
m_Modifications:
- target: {fileID: 5771943459716008010, guid: 4f20bec1d9a427542af5d6c88d43bc9c,
type: 3}
propertyPath: m_Name
value: Fire
objectReference: {fileID: 0}
- target: {fileID: 5057255988946892843, guid: 4f20bec1d9a427542af5d6c88d43bc9c,
type: 3}
propertyPath: m_LocalPosition.x
......@@ -1473,11 +1478,6 @@ PrefabInstance:
propertyPath: m_LocalScale.x
value: 1
objectReference: {fileID: 0}
- target: {fileID: 5771943459716008010, guid: 4f20bec1d9a427542af5d6c88d43bc9c,
type: 3}
propertyPath: m_Name
value: Fire
objectReference: {fileID: 0}
- target: {fileID: 5030609840570094160, guid: 4f20bec1d9a427542af5d6c88d43bc9c,
type: 3}
propertyPath: m_PreferredHeight
......@@ -1651,40 +1651,10 @@ PrefabInstance:
m_Modification:
m_TransformParent: {fileID: 7445062149737681535}
m_Modifications:
- target: {fileID: 7573027397699006796, guid: 4f20bec1d9a427542af5d6c88d43bc9c,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7573027397699006796, guid: 4f20bec1d9a427542af5d6c88d43bc9c,
type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7573027397699006796, guid: 4f20bec1d9a427542af5d6c88d43bc9c,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7573027397699006796, guid: 4f20bec1d9a427542af5d6c88d43bc9c,
type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7573027397699006796, guid: 4f20bec1d9a427542af5d6c88d43bc9c,
type: 3}
propertyPath: m_LocalScale.x
value: 0.6
objectReference: {fileID: 0}
- target: {fileID: 7573027397699006796, guid: 4f20bec1d9a427542af5d6c88d43bc9c,
type: 3}
propertyPath: m_LocalScale.y
value: 0.6
objectReference: {fileID: 0}
- target: {fileID: 7573027397699006796, guid: 4f20bec1d9a427542af5d6c88d43bc9c,
- target: {fileID: 5771943459716008010, guid: 4f20bec1d9a427542af5d6c88d43bc9c,
type: 3}
propertyPath: m_LocalScale.z
value: 0.6
propertyPath: m_Name
value: Casual
objectReference: {fileID: 0}
- target: {fileID: 5057255988946892843, guid: 4f20bec1d9a427542af5d6c88d43bc9c,
type: 3}
......@@ -1806,11 +1776,6 @@ PrefabInstance:
propertyPath: m_LocalScale.z
value: 1
objectReference: {fileID: 0}
- target: {fileID: 5771943459716008010, guid: 4f20bec1d9a427542af5d6c88d43bc9c,
type: 3}
propertyPath: m_Name
value: Casual
objectReference: {fileID: 0}
- target: {fileID: 5030609840570094160, guid: 4f20bec1d9a427542af5d6c88d43bc9c,
type: 3}
propertyPath: m_PreferredHeight
......@@ -1892,6 +1857,41 @@ PrefabInstance:
propertyPath: m_Enabled
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7573027397699006796, guid: 4f20bec1d9a427542af5d6c88d43bc9c,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7573027397699006796, guid: 4f20bec1d9a427542af5d6c88d43bc9c,
type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7573027397699006796, guid: 4f20bec1d9a427542af5d6c88d43bc9c,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7573027397699006796, guid: 4f20bec1d9a427542af5d6c88d43bc9c,
type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7573027397699006796, guid: 4f20bec1d9a427542af5d6c88d43bc9c,
type: 3}
propertyPath: m_LocalScale.x
value: 0.6
objectReference: {fileID: 0}
- target: {fileID: 7573027397699006796, guid: 4f20bec1d9a427542af5d6c88d43bc9c,
type: 3}
propertyPath: m_LocalScale.y
value: 0.6
objectReference: {fileID: 0}
- target: {fileID: 7573027397699006796, guid: 4f20bec1d9a427542af5d6c88d43bc9c,
type: 3}
propertyPath: m_LocalScale.z
value: 0.6
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 4f20bec1d9a427542af5d6c88d43bc9c, type: 3}
--- !u!224 &1381255078203642501 stripped
......@@ -1919,6 +1919,11 @@ PrefabInstance:
m_Modification:
m_TransformParent: {fileID: 7445062149737681535}
m_Modifications:
- target: {fileID: 5771943459716008010, guid: 4f20bec1d9a427542af5d6c88d43bc9c,
type: 3}
propertyPath: m_Name
value: Rocket
objectReference: {fileID: 0}
- target: {fileID: 5057255988946892843, guid: 4f20bec1d9a427542af5d6c88d43bc9c,
type: 3}
propertyPath: m_LocalPosition.x
......@@ -2039,11 +2044,6 @@ PrefabInstance:
propertyPath: m_LocalScale.z
value: 1
objectReference: {fileID: 0}
- target: {fileID: 5771943459716008010, guid: 4f20bec1d9a427542af5d6c88d43bc9c,
type: 3}
propertyPath: m_Name
value: Rocket
objectReference: {fileID: 0}
- target: {fileID: 5030609840570094160, guid: 4f20bec1d9a427542af5d6c88d43bc9c,
type: 3}
propertyPath: m_PreferredHeight
......@@ -2152,6 +2152,11 @@ PrefabInstance:
m_Modification:
m_TransformParent: {fileID: 7445062149737681535}
m_Modifications:
- target: {fileID: 5771943459716008010, guid: 4f20bec1d9a427542af5d6c88d43bc9c,
type: 3}
propertyPath: m_Name
value: Water
objectReference: {fileID: 0}
- target: {fileID: 5057255988946892843, guid: 4f20bec1d9a427542af5d6c88d43bc9c,
type: 3}
propertyPath: m_LocalPosition.x
......@@ -2267,10 +2272,20 @@ PrefabInstance:
propertyPath: m_LocalScale.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 5771943459716008010, guid: 4f20bec1d9a427542af5d6c88d43bc9c,
- target: {fileID: 3565460587281180683, guid: 4f20bec1d9a427542af5d6c88d43bc9c,
type: 3}
propertyPath: m_Name
value: Water
propertyPath: m_AnchorMax.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3565460587281180683, guid: 4f20bec1d9a427542af5d6c88d43bc9c,
type: 3}
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3565460587281180683, guid: 4f20bec1d9a427542af5d6c88d43bc9c,
type: 3}
propertyPath: m_AnchorMin.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 5030609840570094160, guid: 4f20bec1d9a427542af5d6c88d43bc9c,
type: 3}
......@@ -2343,21 +2358,6 @@ PrefabInstance:
propertyPath: m_Colors.m_PressedColor.b
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3565460587281180683, guid: 4f20bec1d9a427542af5d6c88d43bc9c,
type: 3}
propertyPath: m_AnchorMax.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3565460587281180683, guid: 4f20bec1d9a427542af5d6c88d43bc9c,
type: 3}
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3565460587281180683, guid: 4f20bec1d9a427542af5d6c88d43bc9c,
type: 3}
propertyPath: m_AnchorMin.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2031258567763282907, guid: 4f20bec1d9a427542af5d6c88d43bc9c,
type: 3}
propertyPath: BombType
......
Assets/_Game/UI/Menus/ShowWinScreen.anim
View file @ 973abb55
......@@ -143,6 +143,25 @@ AnimationClip:
path: Canvas (1)/MenuButton/Text
classID: 114
script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 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_Color.a
path: Canvas (1)/Text
classID: 114
script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_PPtrCurves: []
m_SampleRate: 60
m_WrapMode: 0
......@@ -172,6 +191,13 @@ AnimationClip:
typeID: 114
customType: 0
isPPtrCurve: 0
- serializedVersion: 2
path: 3514341197
attribute: 304273561
script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3}
typeID: 114
customType: 0
isPPtrCurve: 0
pptrCurveMapping: []
m_AnimationClipSettings:
serializedVersion: 2
......@@ -433,6 +459,25 @@ AnimationClip:
path: Canvas (1)/MenuButton/Text
classID: 114
script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 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_Color.a
path: Canvas (1)/Text
classID: 114
script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3}