diff --git a/game/Assets/3D Assets/TRAPS/Arrow.fbx b/game/Assets/3D Assets/TRAPS/Arrow.fbx
new file mode 100644
index 0000000..7de1cb9
--- /dev/null
+++ b/game/Assets/3D Assets/TRAPS/Arrow.fbx
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5eaf9d2a7ccfe1855c656ab9d19d781962d05df200fb7ffc0d2c9bde8aa15587
+size 681760
diff --git a/game/Assets/3D Assets/TRAPS/Arrow.fbx.meta b/game/Assets/3D Assets/TRAPS/Arrow.fbx.meta
new file mode 100644
index 0000000..7c563b3
--- /dev/null
+++ b/game/Assets/3D Assets/TRAPS/Arrow.fbx.meta
@@ -0,0 +1,107 @@
+fileFormatVersion: 2
+guid: c35d572b63b1e1b418b0a1ee9d773370
+ModelImporter:
+ serializedVersion: 20200
+ internalIDToNameTable: []
+ externalObjects:
+ - first:
+ type: UnityEngine:Material
+ assembly: UnityEngine.CoreModule
+ name: lambert1
+ second: {fileID: 2100000, guid: a0427cf339e5891468d5f2b433b2d44a, type: 2}
+ materials:
+ materialImportMode: 2
+ materialName: 0
+ materialSearch: 1
+ materialLocation: 1
+ animations:
+ legacyGenerateAnimations: 4
+ bakeSimulation: 0
+ resampleCurves: 1
+ optimizeGameObjects: 0
+ motionNodeName:
+ rigImportErrors:
+ rigImportWarnings:
+ animationImportErrors:
+ animationImportWarnings:
+ animationRetargetingWarnings:
+ animationDoRetargetingWarnings: 0
+ importAnimatedCustomProperties: 0
+ importConstraints: 0
+ animationCompression: 1
+ animationRotationError: 0.5
+ animationPositionError: 0.5
+ animationScaleError: 0.5
+ animationWrapMode: 0
+ extraExposedTransformPaths: []
+ extraUserProperties: []
+ clipAnimations: []
+ isReadable: 0
+ meshes:
+ lODScreenPercentages: []
+ globalScale: 100
+ meshCompression: 0
+ addColliders: 0
+ useSRGBMaterialColor: 1
+ sortHierarchyByName: 1
+ importVisibility: 1
+ importBlendShapes: 1
+ importCameras: 1
+ importLights: 1
+ fileIdsGeneration: 2
+ swapUVChannels: 0
+ generateSecondaryUV: 0
+ useFileUnits: 1
+ keepQuads: 0
+ weldVertices: 1
+ bakeAxisConversion: 0
+ preserveHierarchy: 0
+ skinWeightsMode: 0
+ maxBonesPerVertex: 4
+ minBoneWeight: 0.001
+ meshOptimizationFlags: -1
+ indexFormat: 0
+ secondaryUVAngleDistortion: 8
+ secondaryUVAreaDistortion: 15.000001
+ secondaryUVHardAngle: 88
+ secondaryUVMarginMethod: 1
+ secondaryUVMinLightmapResolution: 40
+ secondaryUVMinObjectScale: 1
+ secondaryUVPackMargin: 4
+ useFileScale: 1
+ tangentSpace:
+ normalSmoothAngle: 60
+ normalImportMode: 0
+ tangentImportMode: 3
+ normalCalculationMode: 4
+ legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0
+ blendShapeNormalImportMode: 1
+ normalSmoothingSource: 0
+ referencedClips: []
+ importAnimation: 1
+ humanDescription:
+ serializedVersion: 3
+ human: []
+ skeleton: []
+ armTwist: 0.5
+ foreArmTwist: 0.5
+ upperLegTwist: 0.5
+ legTwist: 0.5
+ armStretch: 0.05
+ legStretch: 0.05
+ feetSpacing: 0
+ globalScale: 1
+ rootMotionBoneName:
+ hasTranslationDoF: 0
+ hasExtraRoot: 0
+ skeletonHasParents: 1
+ lastHumanDescriptionAvatarSource: {instanceID: 0}
+ autoGenerateAvatarMappingIfUnspecified: 1
+ animationType: 2
+ humanoidOversampling: 1
+ avatarSetup: 0
+ addHumanoidExtraRootOnlyWhenUsingAvatar: 1
+ additionalBone: 0
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/game/Assets/3D Assets/TRIM 1/Meshes/Roof_A.fbx.meta b/game/Assets/3D Assets/TRIM 1/Meshes/Roof_A.fbx.meta
index 1e83d36..d5dc50e 100644
--- a/game/Assets/3D Assets/TRIM 1/Meshes/Roof_A.fbx.meta
+++ b/game/Assets/3D Assets/TRIM 1/Meshes/Roof_A.fbx.meta
@@ -3,7 +3,12 @@ guid: ef7a51de2c5c5c5438ce6fea733533b2
ModelImporter:
serializedVersion: 20200
internalIDToNameTable: []
- externalObjects: {}
+ externalObjects:
+ - first:
+ type: UnityEngine:Material
+ assembly: UnityEngine.CoreModule
+ name: blinn2
+ second: {fileID: 2100000, guid: 22a733893c7f0bc48b61d6a462964442, type: 2}
materials:
materialImportMode: 2
materialName: 0
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/Traps/ArrowWall.prefab b/game/Assets/Prefabs/Traps/ArrowWall.prefab
index 65416aa..8bda7e7 100644
--- a/game/Assets/Prefabs/Traps/ArrowWall.prefab
+++ b/game/Assets/Prefabs/Traps/ArrowWall.prefab
@@ -216,8 +216,8 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7705893802528651092}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
- m_LocalPosition: {x: 0, y: 1, z: -1}
- m_LocalScale: {x: 1, y: 1, z: 1}
+ m_LocalPosition: {x: 0, y: 0.945, z: -0.916}
+ m_LocalScale: {x: 0.96121, y: 0.87204, z: 1}
m_Children: []
m_Father: {fileID: 8768409224895496785}
m_RootOrder: 0
@@ -242,7 +242,7 @@ ParticleSystemRenderer:
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- - {fileID: 2100000, guid: b451a052397f03c4f8a04d915d1c0492, type: 3}
+ - {fileID: 2100004, guid: b451a052397f03c4f8a04d915d1c0492, type: 3}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
@@ -283,7 +283,7 @@ ParticleSystemRenderer:
m_FreeformStretching: 0
m_RotateWithStretchDirection: 1
m_VertexStreams: 00010304
- m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0}
+ m_Mesh: {fileID: 5302568919011541938, guid: c35d572b63b1e1b418b0a1ee9d773370, type: 3}
m_Mesh1: {fileID: 0}
m_Mesh2: {fileID: 0}
m_Mesh3: {fileID: 0}
@@ -361,7 +361,7 @@ ParticleSystem:
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
- moveWithTransform: 1
+ moveWithTransform: 0
moveWithCustomTransform: {fileID: 0}
scalingMode: 2
randomSeed: 0
@@ -699,7 +699,7 @@ ParticleSystem:
startRotationX:
serializedVersion: 2
minMaxState: 0
- scalar: 0
+ scalar: -1.5707963
minScalar: 0
maxCurve:
serializedVersion: 2
@@ -856,9 +856,9 @@ ParticleSystem:
m_PostInfinity: 2
m_RotationOrder: 4
randomizeRotationDirection: 0
- maxNumParticles: 1000
+ maxNumParticles: 100
size3D: 0
- rotation3D: 0
+ rotation3D: 1
gravityModifier:
serializedVersion: 2
minMaxState: 0
@@ -3931,7 +3931,7 @@ ParticleSystem:
m_Bounce:
serializedVersion: 2
minMaxState: 0
- scalar: 1
+ scalar: 0
minScalar: 1
maxCurve:
serializedVersion: 2
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 ac6d65e..c82d25a 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 @@
-
+
+