Commit 83d93d91 authored by Rene's avatar Rene
Browse files

Fixed water sound after explosion

Fixed wrong preselected bomb
parent a83085c1
Pipeline #3171 failed
......@@ -38,7 +38,7 @@ RenderSettings:
m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 0}
m_IndirectSpecularColor: {r: 0.18065289, g: 0.22615503, b: 0.3071219, a: 1}
m_IndirectSpecularColor: {r: 0.18065293, g: 0.22615506, b: 0.30712184, a: 1}
m_UseRadianceAmbientProbe: 0
--- !u!157 &3
LightmapSettings:
......@@ -496,72 +496,6 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1215074048}
m_CullTransparentMesh: 0
--- !u!1 &1235484397
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1235484400}
- component: {fileID: 1235484399}
- component: {fileID: 1235484398}
m_Layer: 0
m_Name: EventSystem
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!114 &1235484398
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1235484397}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 1077351063, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_HorizontalAxis: Horizontal
m_VerticalAxis: Vertical
m_SubmitButton: Submit
m_CancelButton: Cancel
m_InputActionsPerSecond: 10
m_RepeatDelay: 0.5
m_ForceModuleActive: 0
--- !u!114 &1235484399
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1235484397}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: -619905303, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_FirstSelected: {fileID: 0}
m_sendNavigationEvents: 1
m_DragThreshold: 10
--- !u!4 &1235484400
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1235484397}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1520561419
GameObject:
m_ObjectHideFlags: 0
......@@ -874,7 +808,7 @@ PrefabInstance:
- target: {fileID: 2707152134575608605, guid: feb91bbc6bd3ab6a08b69bcbd5cf58b5,
type: 3}
propertyPath: m_RootOrder
value: 3
value: 2
objectReference: {fileID: 0}
- target: {fileID: 2707152134575608605, guid: feb91bbc6bd3ab6a08b69bcbd5cf58b5,
type: 3}
......
using System.Collections;
using System.Collections;
using System.Collections.Generic;
using UnityEngine.Audio;
using UnityEngine;
......@@ -45,6 +45,11 @@ public class AudioManager : MonoBehaviour
underwaterAmbience.volume = underwaterFactor * 0.5f;
}
public void SetNotInWater()
{
changeUnderwaterFactor(-100.0f);
}
// Update is called once per frame
void FixedUpdate()
{
......@@ -52,7 +57,7 @@ public class AudioManager : MonoBehaviour
{
if (!alreadyUnderwater)
{
changeUnderwaterFactor(-0.1f);
changeUnderwaterFactor(-0.10f);
}
alreadyUnderwater = false;
}
......
......@@ -82,7 +82,7 @@ public class Explosion : MonoBehaviour
}
}
GameManager.Instance.audioManager.SetNotInWater();
Destroy(gameObject);
}
......
......@@ -72,11 +72,13 @@ public class GameManager : MonoBehaviour
}
public void StartGame() {
Spawn();
PauseGame(false);
isPlaying = true;
isPausable = true;
HudController.DeactivateLevelSelection();
//HudController.DeactivateBombSelection();
if (!withoutTimer)
{
HudController.ActivateInGameHud();
......
using System.Collections;
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
......
......@@ -93,6 +93,7 @@ public class BombSelection : MonoBehaviour
break;
}
}
setSelectedBombButton(casual);
}
private void ValueChangeCheck()
......
......@@ -96,10 +96,10 @@ public class HUDController : MonoBehaviour
public void ActivateInGameHud()
{
PlayBombselectionCloseAnim();
ShowInGameHud(true);
ShowLoseMenu(false);
DeactivateLevelSelection();
PlayBombselectionCloseAnim();
}
public void DeactivateLevelSelection()
......@@ -148,6 +148,7 @@ public class HUDController : MonoBehaviour
DeactivateBombSelection();
return;
}
GameManager.Instance.audioManager.SetNotInWater();
BombSelectionIsHidden = true;
ShowLoseMenu(false);
ShowBombSelection(true);
......
......@@ -30,11 +30,11 @@ RectTransform:
m_Children:
- {fileID: 7722162062289997127}
m_Father: {fileID: 1183384670186406262}
m_RootOrder: 1
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 320, y: 20}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1409226261300371442
......@@ -80,7 +80,7 @@ MonoBehaviour:
m_MinValue: 0
m_MaxValue: 1
m_WholeNumbers: 0
m_Value: 0
m_Value: 0.572
m_OnValueChanged:
m_PersistentCalls:
m_Calls: []
......@@ -350,6 +350,80 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
--- !u!1 &2724116850427304164
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 8718391634560571528}
- component: {fileID: 3723699750246458520}
- component: {fileID: 638340827227333138}
m_Layer: 5
m_Name: Image
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &8718391634560571528
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2724116850427304164}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 1183384670186406262}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -10, y: -0}
m_SizeDelta: {x: 1350, y: 120}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3723699750246458520
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2724116850427304164}
m_CullTransparentMesh: 0
--- !u!114 &638340827227333138
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2724116850427304164}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 21300000, guid: 519f33a96a0084066b8c9d38857f2ff1, type: 3}
m_Type: 1
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
--- !u!1 &3091068961848887114
GameObject:
m_ObjectHideFlags: 0
......@@ -581,7 +655,7 @@ RectTransform:
- {fileID: 8379977744859677229}
- {fileID: 7397020606268164932}
m_Father: {fileID: 1183384670186406262}
m_RootOrder: 0
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
......@@ -1180,6 +1254,7 @@ RectTransform:
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 8718391634560571528}
- {fileID: 6773212828415038162}
- {fileID: 3553313434304969030}
m_Father: {fileID: 5112239117417149563}
......@@ -1211,7 +1286,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.08235294, g: 0.07450981, b: 0.08627451, a: 1}
m_Color: {r: 0.95454544, g: 0.8636364, b: 1, a: 0}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
......@@ -1219,7 +1294,7 @@ MonoBehaviour:
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 0}
m_Type: 1
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
......@@ -1354,6 +1429,21 @@ PrefabInstance:
propertyPath: m_LocalScale.x
value: 0.1975
objectReference: {fileID: 0}
- target: {fileID: 7090087039441404708, guid: 1052ec28b764caa41b9e5ae1fa88cb22,
type: 3}
propertyPath: InitialModule.startColor.maxColor.r
value: 0.990566
objectReference: {fileID: 0}
- target: {fileID: 7090087039441404708, guid: 1052ec28b764caa41b9e5ae1fa88cb22,
type: 3}
propertyPath: InitialModule.startColor.maxColor.g
value: 0.5160358
objectReference: {fileID: 0}
- target: {fileID: 7090087039441404708, guid: 1052ec28b764caa41b9e5ae1fa88cb22,
type: 3}
propertyPath: InitialModule.startColor.maxColor.b
value: 0.13550198
objectReference: {fileID: 0}
- target: {fileID: 417358019099163201, guid: 1052ec28b764caa41b9e5ae1fa88cb22,
type: 3}
propertyPath: moveWithCustomTransform
......@@ -1384,21 +1474,6 @@ PrefabInstance:
propertyPath: m_SortingOrder
value: 5
objectReference: {fileID: 0}
- target: {fileID: 7090087039441404708, guid: 1052ec28b764caa41b9e5ae1fa88cb22,
type: 3}
propertyPath: InitialModule.startColor.maxColor.r
value: 0.990566
objectReference: {fileID: 0}
- target: {fileID: 7090087039441404708, guid: 1052ec28b764caa41b9e5ae1fa88cb22,
type: 3}
propertyPath: InitialModule.startColor.maxColor.g
value: 0.5160358
objectReference: {fileID: 0}
- target: {fileID: 7090087039441404708, guid: 1052ec28b764caa41b9e5ae1fa88cb22,
type: 3}
propertyPath: InitialModule.startColor.maxColor.b
value: 0.13550198
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 1052ec28b764caa41b9e5ae1fa88cb22, type: 3}
--- !u!224 &6623567877549639121 stripped
......
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