diff --git a/game/Assets/Materials/DeathVolume_MAt.mat b/game/Assets/Materials/DeathVolume_MAt.mat
index c709471..244549e 100644
--- a/game/Assets/Materials/DeathVolume_MAt.mat
+++ b/game/Assets/Materials/DeathVolume_MAt.mat
@@ -8,11 +8,11 @@ Material:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: DeathVolume_MAt
- m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
+ m_Shader: {fileID: 4800000, guid: 650dd9526735d5b46b79224bc6e94025, type: 3}
m_ShaderKeywords:
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
- m_DoubleSidedGI: 0
+ m_DoubleSidedGI: 1
m_CustomRenderQueue: 3000
stringTagMap:
RenderType: Transparent
@@ -83,7 +83,7 @@ Material:
- _BumpScale: 1
- _ClearCoatMask: 0
- _ClearCoatSmoothness: 0
- - _Cull: 2
+ - _Cull: 0
- _Cutoff: 0.5
- _DetailAlbedoMapScale: 1
- _DetailNormalMapScale: 1
@@ -97,6 +97,7 @@ Material:
- _Parallax: 0.005
- _QueueOffset: 0
- _ReceiveShadows: 1
+ - _SampleGI: 0
- _Smoothness: 0.5
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
@@ -105,8 +106,8 @@ Material:
- _WorkflowMode: 1
- _ZWrite: 0
m_Colors:
- - _BaseColor: {r: 1, g: 0, b: 0, a: 0.8156863}
- - _Color: {r: 1, g: 1, b: 1, a: 1}
+ - _BaseColor: {r: 1, g: 0, b: 0, a: 0.29803923}
+ - _Color: {r: 1, g: 1, b: 1, a: 0.30588236}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
m_BuildTextureStacks: []
diff --git a/game/Assets/Prefabs/Puzzles/Boost/boost_gauntlet.prefab b/game/Assets/Prefabs/Puzzles/Boost/boost_gauntlet.prefab
index 898eb2c..3f3790c 100644
--- a/game/Assets/Prefabs/Puzzles/Boost/boost_gauntlet.prefab
+++ b/game/Assets/Prefabs/Puzzles/Boost/boost_gauntlet.prefab
@@ -1,5 +1,191 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &1030309646971371643
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 3170673643267040457}
+ - component: {fileID: 4659098480715022804}
+ m_Layer: 0
+ m_Name: Point Light (3)
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!4 &3170673643267040457
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1030309646971371643}
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: 5.948, y: 8.805, z: 9.87}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_Children: []
+ m_Father: {fileID: 5350146081370570272}
+ m_RootOrder: 3
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!108 &4659098480715022804
+Light:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1030309646971371643}
+ m_Enabled: 1
+ serializedVersion: 10
+ m_Type: 2
+ m_Shape: 0
+ m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1}
+ m_Intensity: 10
+ m_Range: 10
+ m_SpotAngle: 30
+ m_InnerSpotAngle: 21.80208
+ m_CookieSize: 10
+ m_Shadows:
+ m_Type: 2
+ m_Resolution: -1
+ m_CustomResolution: -1
+ m_Strength: 1
+ m_Bias: 0.02
+ m_NormalBias: 0.1
+ m_NearPlane: 0.1
+ m_CullingMatrixOverride:
+ e00: 1
+ e01: 0
+ e02: 0
+ e03: 0
+ e10: 0
+ e11: 1
+ e12: 0
+ e13: 0
+ e20: 0
+ e21: 0
+ e22: 1
+ e23: 0
+ e30: 0
+ e31: 0
+ e32: 0
+ e33: 1
+ m_UseCullingMatrixOverride: 0
+ m_Cookie: {fileID: 0}
+ m_DrawHalo: 0
+ m_Flare: {fileID: 0}
+ m_RenderMode: 0
+ m_CullingMask:
+ serializedVersion: 2
+ m_Bits: 4294967295
+ m_RenderingLayerMask: 1
+ m_Lightmapping: 4
+ m_LightShadowCasterMode: 0
+ m_AreaSize: {x: 1, y: 1}
+ m_BounceIntensity: 1
+ m_ColorTemperature: 6570
+ m_UseColorTemperature: 0
+ m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0}
+ m_UseBoundingSphereOverride: 0
+ m_UseViewFrustumForShadowCasterCull: 1
+ m_ShadowRadius: 0
+ m_ShadowAngle: 0
+--- !u!1 &3036236982403987515
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 7200673242179787136}
+ - component: {fileID: 746778927373148202}
+ m_Layer: 0
+ m_Name: Point Light (1)
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!4 &7200673242179787136
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 3036236982403987515}
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: -1.56, y: 11.91, z: 9.53}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_Children: []
+ m_Father: {fileID: 5350146081370570272}
+ m_RootOrder: 1
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!108 &746778927373148202
+Light:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 3036236982403987515}
+ m_Enabled: 1
+ serializedVersion: 10
+ m_Type: 2
+ m_Shape: 0
+ m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1}
+ m_Intensity: 10
+ m_Range: 10
+ m_SpotAngle: 30
+ m_InnerSpotAngle: 21.80208
+ m_CookieSize: 10
+ m_Shadows:
+ m_Type: 2
+ m_Resolution: -1
+ m_CustomResolution: -1
+ m_Strength: 1
+ m_Bias: 0.02
+ m_NormalBias: 0.1
+ m_NearPlane: 0.1
+ m_CullingMatrixOverride:
+ e00: 1
+ e01: 0
+ e02: 0
+ e03: 0
+ e10: 0
+ e11: 1
+ e12: 0
+ e13: 0
+ e20: 0
+ e21: 0
+ e22: 1
+ e23: 0
+ e30: 0
+ e31: 0
+ e32: 0
+ e33: 1
+ m_UseCullingMatrixOverride: 0
+ m_Cookie: {fileID: 0}
+ m_DrawHalo: 0
+ m_Flare: {fileID: 0}
+ m_RenderMode: 0
+ m_CullingMask:
+ serializedVersion: 2
+ m_Bits: 4294967295
+ m_RenderingLayerMask: 1
+ m_Lightmapping: 4
+ m_LightShadowCasterMode: 0
+ m_AreaSize: {x: 1, y: 1}
+ m_BounceIntensity: 1
+ m_ColorTemperature: 6570
+ m_UseColorTemperature: 0
+ m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0}
+ m_UseBoundingSphereOverride: 0
+ m_UseViewFrustumForShadowCasterCull: 1
+ m_ShadowRadius: 0
+ m_ShadowAngle: 0
--- !u!1 &3735992581806452311
GameObject:
m_ObjectHideFlags: 0
@@ -126,6 +312,7 @@ Transform:
- {fileID: 3735992582440123785}
- {fileID: 3735992583116800599}
- {fileID: 3735992582968959505}
+ - {fileID: 5350146081370570272}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -1709,6 +1896,99 @@ BoxCollider:
serializedVersion: 2
m_Size: {x: 1, y: 1, z: 1}
m_Center: {x: 0, y: 0, z: 0}
+--- !u!1 &6900307235855570942
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 4629333197302909337}
+ - component: {fileID: 5594779066840866502}
+ m_Layer: 0
+ m_Name: Point Light (2)
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!4 &4629333197302909337
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 6900307235855570942}
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: 1.44, y: 7.85, z: 4.19}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_Children: []
+ m_Father: {fileID: 5350146081370570272}
+ m_RootOrder: 2
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!108 &5594779066840866502
+Light:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 6900307235855570942}
+ m_Enabled: 1
+ serializedVersion: 10
+ m_Type: 2
+ m_Shape: 0
+ m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1}
+ m_Intensity: 10
+ m_Range: 10
+ m_SpotAngle: 30
+ m_InnerSpotAngle: 21.80208
+ m_CookieSize: 10
+ m_Shadows:
+ m_Type: 2
+ m_Resolution: -1
+ m_CustomResolution: -1
+ m_Strength: 1
+ m_Bias: 0.02
+ m_NormalBias: 0.1
+ m_NearPlane: 0.1
+ m_CullingMatrixOverride:
+ e00: 1
+ e01: 0
+ e02: 0
+ e03: 0
+ e10: 0
+ e11: 1
+ e12: 0
+ e13: 0
+ e20: 0
+ e21: 0
+ e22: 1
+ e23: 0
+ e30: 0
+ e31: 0
+ e32: 0
+ e33: 1
+ m_UseCullingMatrixOverride: 0
+ m_Cookie: {fileID: 0}
+ m_DrawHalo: 0
+ m_Flare: {fileID: 0}
+ m_RenderMode: 0
+ m_CullingMask:
+ serializedVersion: 2
+ m_Bits: 4294967295
+ m_RenderingLayerMask: 1
+ m_Lightmapping: 4
+ m_LightShadowCasterMode: 0
+ m_AreaSize: {x: 1, y: 1}
+ m_BounceIntensity: 1
+ m_ColorTemperature: 6570
+ m_UseColorTemperature: 0
+ m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0}
+ m_UseBoundingSphereOverride: 0
+ m_UseViewFrustumForShadowCasterCull: 1
+ m_ShadowRadius: 0
+ m_ShadowAngle: 0
--- !u!1 &7162428585384658459
GameObject:
m_ObjectHideFlags: 0
@@ -1804,6 +2084,133 @@ BoxCollider:
serializedVersion: 2
m_Size: {x: 1, y: 1, z: 1}
m_Center: {x: 0, y: 0, z: 0}
+--- !u!1 &7898025805494435323
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 5350146081370570272}
+ m_Layer: 0
+ m_Name: Lights
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!4 &5350146081370570272
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 7898025805494435323}
+ 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:
+ - {fileID: 5638148163187684728}
+ - {fileID: 7200673242179787136}
+ - {fileID: 4629333197302909337}
+ - {fileID: 3170673643267040457}
+ m_Father: {fileID: 3735992581812067225}
+ m_RootOrder: 4
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &8269468435318789372
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 5638148163187684728}
+ - component: {fileID: 3681372896697557775}
+ m_Layer: 0
+ m_Name: Point Light
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!4 &5638148163187684728
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 8269468435318789372}
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: 2.81, y: 18.17, z: 5.65}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_Children: []
+ m_Father: {fileID: 5350146081370570272}
+ m_RootOrder: 0
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!108 &3681372896697557775
+Light:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 8269468435318789372}
+ m_Enabled: 1
+ serializedVersion: 10
+ m_Type: 2
+ m_Shape: 0
+ m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1}
+ m_Intensity: 16.23
+ m_Range: 10
+ m_SpotAngle: 30
+ m_InnerSpotAngle: 21.80208
+ m_CookieSize: 10
+ m_Shadows:
+ m_Type: 2
+ m_Resolution: -1
+ m_CustomResolution: -1
+ m_Strength: 1
+ m_Bias: 0.02
+ m_NormalBias: 0.1
+ m_NearPlane: 0.1
+ m_CullingMatrixOverride:
+ e00: 1
+ e01: 0
+ e02: 0
+ e03: 0
+ e10: 0
+ e11: 1
+ e12: 0
+ e13: 0
+ e20: 0
+ e21: 0
+ e22: 1
+ e23: 0
+ e30: 0
+ e31: 0
+ e32: 0
+ e33: 1
+ m_UseCullingMatrixOverride: 0
+ m_Cookie: {fileID: 0}
+ m_DrawHalo: 0
+ m_Flare: {fileID: 0}
+ m_RenderMode: 0
+ m_CullingMask:
+ serializedVersion: 2
+ m_Bits: 4294967295
+ m_RenderingLayerMask: 1
+ m_Lightmapping: 4
+ m_LightShadowCasterMode: 0
+ m_AreaSize: {x: 1, y: 1}
+ m_BounceIntensity: 1
+ m_ColorTemperature: 6570
+ m_UseColorTemperature: 0
+ m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0}
+ m_UseBoundingSphereOverride: 0
+ m_UseViewFrustumForShadowCasterCull: 1
+ m_ShadowRadius: 0
+ m_ShadowAngle: 0
--- !u!1 &9052041936886182352
GameObject:
m_ObjectHideFlags: 0
diff --git a/game/Assets/Scripts/Traps/ArrowWall.cs b/game/Assets/Scripts/Traps/ArrowWall.cs
index cd3cd41..b71da27 100644
--- a/game/Assets/Scripts/Traps/ArrowWall.cs
+++ b/game/Assets/Scripts/Traps/ArrowWall.cs
@@ -35,6 +35,7 @@ public class ArrowWall : MonoBehaviour
if (elapsed > _delay && objectTimeScale!=0)
{
// TODO: arrow whoosh noises
+ FMODUnity.RuntimeManager.PlayOneShot(_settings.ArrowWall.FMODEvent);
_particles.Play();
diff --git a/game/Assets/Scripts/Traps/TrapSettings.cs b/game/Assets/Scripts/Traps/TrapSettings.cs
index 5a6265b..e921834 100644
--- a/game/Assets/Scripts/Traps/TrapSettings.cs
+++ b/game/Assets/Scripts/Traps/TrapSettings.cs
@@ -42,6 +42,9 @@ public class TrapSettings : ScriptableObject
{
public float SafeResetTime => _safeResetTime;
[SerializeField] private float _safeResetTime;
+
+ public string FMODEvent => _fmodEvent;
+ [SerializeField] private string _fmodEvent;
}
public ArrowWallSettings ArrowWall => _arrowWall;
diff --git a/game/Assets/Settings/Traps/Trap Settings.asset b/game/Assets/Settings/Traps/Trap Settings.asset
index 512b3fb..a971086 100644
--- a/game/Assets/Settings/Traps/Trap Settings.asset
+++ b/game/Assets/Settings/Traps/Trap Settings.asset
@@ -21,3 +21,4 @@ MonoBehaviour:
_popInEase: 27
_arrowWall:
_safeResetTime: 0
+ _fmodEvent: event:/Environment/Traps/ArrowWall
diff --git a/game/FMOD Project/Assets/revival_arrow_volleys.wav b/game/FMOD Project/Assets/revival_arrow_volleys.wav
new file mode 100644
index 0000000..51ae2d6
--- /dev/null
+++ b/game/FMOD Project/Assets/revival_arrow_volleys.wav
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3ed58f18c4099ef0fc5108d37f8c13db8a5851bca14dab86830a7c821eac7d92
+size 314624
diff --git a/game/FMOD Project/Build/Desktop/Music.bank b/game/FMOD Project/Build/Desktop/Music.bank
index b59c59e..7d31125 100644
--- a/game/FMOD Project/Build/Desktop/Music.bank
+++ b/game/FMOD Project/Build/Desktop/Music.bank
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:a3bb41a32e3159e1cc90a01eddc6964619e91e5a7c8b2dc77c91ae497055d3c6
+oid sha256:cf68cd0b2e3c6898fd0a681e19fafefa4fc6adc3cd0719850c127fb973fe89a6
size 24374496
diff --git a/game/FMOD Project/Build/Desktop/SFX.bank b/game/FMOD Project/Build/Desktop/SFX.bank
index 3fd7caa..7e453fd 100644
--- a/game/FMOD Project/Build/Desktop/SFX.bank
+++ b/game/FMOD Project/Build/Desktop/SFX.bank
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:16e4c9f7af7d659904ef8aa398fda7f8e98786ac8b7f1aba34e9431ac5b9048c
-size 4149056
+oid sha256:17db81062a5850ae6d2d0d74509b74b023d78c718adad6a9da168803b31e4a8f
+size 4167776
diff --git a/game/FMOD Project/Metadata/AudioFile/{3f4721ae-c1a9-4c73-a4ef-466e8210c18d}.xml b/game/FMOD Project/Metadata/AudioFile/{3f4721ae-c1a9-4c73-a4ef-466e8210c18d}.xml
new file mode 100644
index 0000000..53d4198
--- /dev/null
+++ b/game/FMOD Project/Metadata/AudioFile/{3f4721ae-c1a9-4c73-a4ef-466e8210c18d}.xml
@@ -0,0 +1,20 @@
+
+
+
+
diff --git a/game/FMOD Project/Metadata/Event/{80b1514b-07aa-4a1b-8663-346bf60403f1}.xml b/game/FMOD Project/Metadata/Event/{80b1514b-07aa-4a1b-8663-346bf60403f1}.xml
index 6ec9111..291d295 100644
--- a/game/FMOD Project/Metadata/Event/{80b1514b-07aa-4a1b-8663-346bf60403f1}.xml
+++ b/game/FMOD Project/Metadata/Event/{80b1514b-07aa-4a1b-8663-346bf60403f1}.xml
@@ -59,11 +59,18 @@
-
+
+