Skip to content

Commit

Permalink
Normalized menu sounds (you couldn't hear all of them). Added project…
Browse files Browse the repository at this point in the history
… info, banners, icons, splash screen etc.. Made the Esc menu available in all scenes, and the settings carry over (but the slider positions do not refresh to the values set from in a previous scene, even though the values are carried over correctly). FrequencyAnalysis.cs is now a spawned prefab like GameManager and WaveManager but the Mic is turned off in scene 0 and scene sceneCount-1. Also game ends 0.X seconds after you enter the building at the end
  • Loading branch information
tdbe committed Jan 25, 2017
1 parent c480d11 commit 9cfce9b
Show file tree
Hide file tree
Showing 50 changed files with 2,232 additions and 828 deletions.
152 changes: 152 additions & 0 deletions Assets/Prefabs/FrequencyAnalysis.prefab
Original file line number Diff line number Diff line change
@@ -0,0 +1,152 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1001 &100100000
Prefab:
m_ObjectHideFlags: 1
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications: []
m_RemovedComponents: []
m_ParentPrefab: {fileID: 0}
m_RootGameObject: {fileID: 1378734293407760}
m_IsPrefabParent: 1
--- !u!1 &1378734293407760
GameObject:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
serializedVersion: 5
m_Component:
- component: {fileID: 4065568214627114}
- component: {fileID: 114318298624476646}
- component: {fileID: 82234795683607610}
m_Layer: 0
m_Name: FrequencyAnalysis
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &4065568214627114
Transform:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1378734293407760}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: -10}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!82 &82234795683607610
AudioSource:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1378734293407760}
m_Enabled: 1
serializedVersion: 4
OutputAudioMixerGroup: {fileID: 0}
m_audioClip: {fileID: 0}
m_PlayOnAwake: 1
m_Volume: 1
m_Pitch: 1
Loop: 0
Mute: 0
Spatialize: 0
SpatializePostEffects: 0
Priority: 128
DopplerLevel: 1
MinDistance: 1
MaxDistance: 500
Pan2D: 0
rolloffMode: 0
BypassEffects: 0
BypassListenerEffects: 0
BypassReverbZones: 0
rolloffCustomCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 2
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
- serializedVersion: 2
time: 1
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
panLevelCustomCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 2
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 0
spreadCustomCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 2
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 0
reverbZoneMixCustomCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 2
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 0
--- !u!114 &114318298624476646
MonoBehaviour:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1378734293407760}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d5355b8c7dfaf904faed86a46ac1273a, type: 3}
m_Name:
m_EditorClassIdentifier:
aso: {fileID: 82234795683607610}
barParent: {fileID: 0}
numSamples: 2048
samplesToTake: 64
abar: {fileID: 1841577057140266, guid: ffc357e89b45e1d4aa3f50ce2b5f74c1, type: 2}
bars: 1
thebarsleft: []
pitch: 0
volumeScale: 10
noiseLevel: 0.7
lerpSpeed: 1.5
numOvertoneSamples: 3
freqAmpThreshold: 0.5
outputVolume: 0
micVolumeScale: 1
avgFreq: 0
calibrationFreqMin: 0
calibrationFreqMax: 684.8
76 changes: 61 additions & 15 deletions Assets/Prefabs/Level_02.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -369,6 +369,23 @@ GameObject:
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!1 &1378263221689866
GameObject:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
serializedVersion: 5
m_Component:
- component: {fileID: 4014880864958444}
- component: {fileID: 61215574066525054}
- component: {fileID: 114257138272165164}
m_Layer: 0
m_Name: BossTrigger
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!1 &1382465137048668
GameObject:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -743,16 +760,15 @@ GameObject:
m_IsActive: 1
--- !u!1 &1716006128102072
GameObject:
m_ObjectHideFlags: 0
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
serializedVersion: 5
m_Component:
- component: {fileID: 4411981355567744}
- component: {fileID: 61761883992002120}
- component: {fileID: 114257138272165164}
m_Layer: 0
m_Name: BossTrigger
m_Name: invisibleWall
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
Expand Down Expand Up @@ -1158,6 +1174,19 @@ GameObject:
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &4014880864958444
Transform:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1378263221689866}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 97.61, y: 1.7989302, z: 0}
m_LocalScale: {x: 1, y: 3.499994, z: 1}
m_Children: []
m_Father: {fileID: 4795906202838522}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &4032285507502914
Transform:
m_ObjectHideFlags: 1
Expand Down Expand Up @@ -1458,7 +1487,8 @@ Transform:
m_LocalRotation: {x: -0, y: -0, z: -0.051246244, w: 0.9986861}
m_LocalPosition: {x: 95.2, y: -1.56, z: 0}
m_LocalScale: {x: 0.32150963, y: 0.22056879, z: 1.8023399}
m_Children: []
m_Children:
- {fileID: 4411981355567744}
m_Father: {fileID: 4795906202838522}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: -5.8750005}
Expand Down Expand Up @@ -1585,12 +1615,12 @@ Transform:
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1716006128102072}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 97.61, y: 1.7989302, z: 0}
m_LocalScale: {x: 1, y: 3.499994, z: 1}
m_LocalRotation: {x: -0, y: -0, z: 0.051246244, w: 0.9986861}
m_LocalPosition: {x: 58.4, y: 24, z: 0}
m_LocalScale: {x: 3.1252398, y: 15.8158245, z: 0.5548343}
m_Children: []
m_Father: {fileID: 4795906202838522}
m_RootOrder: 2
m_Father: {fileID: 4272157836308538}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &4427981060240130
Transform:
Expand Down Expand Up @@ -1955,7 +1985,7 @@ Transform:
m_Children:
- {fileID: 4260050811680158}
- {fileID: 4272157836308538}
- {fileID: 4411981355567744}
- {fileID: 4014880864958444}
- {fileID: 4494447611711702}
- {fileID: 4922484045966592}
- {fileID: 4222987341111998}
Expand Down Expand Up @@ -2896,7 +2926,7 @@ PolygonCollider2D:
- {x: 6.225361, y: -1.2717079}
- {x: 6.1675124, y: -5.022064}
- {x: 6.5477805, y: -5.674431}
- {x: -5.6656184, y: -5.8719816}
- {x: -6.051856, y: -5.86226}
- {x: -4.4313188, y: -5.1654105}
- {x: 4.448819, y: -5.029972}
- {x: 4.2977977, y: -1.2558494}
Expand Down Expand Up @@ -3068,6 +3098,20 @@ BoxCollider2D:
m_Offset: {x: -0.11, y: 0.26}
serializedVersion: 2
m_Size: {x: 1.09, y: 5.62}
--- !u!61 &61215574066525054
BoxCollider2D:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1378263221689866}
m_Enabled: 1
m_Density: 1
m_Material: {fileID: 0}
m_IsTrigger: 1
m_UsedByEffector: 0
m_Offset: {x: 0, y: -0.94344586}
serializedVersion: 2
m_Size: {x: 2.0900555, y: 1.2061026}
--- !u!61 &61219813950112916
BoxCollider2D:
m_ObjectHideFlags: 1
Expand Down Expand Up @@ -3217,11 +3261,11 @@ BoxCollider2D:
m_Enabled: 1
m_Density: 1
m_Material: {fileID: 0}
m_IsTrigger: 1
m_IsTrigger: 0
m_UsedByEffector: 0
m_Offset: {x: 0, y: 3.2206268}
m_Offset: {x: 0.42454898, y: 1.672218}
serializedVersion: 2
m_Size: {x: 2.0900555, y: 27.855072}
m_Size: {x: 2.0900555, y: 21.23795}
--- !u!61 &61797248481799320
BoxCollider2D:
m_ObjectHideFlags: 1
Expand Down Expand Up @@ -3724,6 +3768,8 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: aea1d4783bc44c244811c12d799b39c3, type: 3}
m_Name:
m_EditorClassIdentifier:
minotaurFightTrigger: {fileID: 61215574066525054}
delay: 1.3
--- !u!114 &114113550466774432
MonoBehaviour:
m_ObjectHideFlags: 1
Expand Down Expand Up @@ -3765,7 +3811,7 @@ MonoBehaviour:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1716006128102072}
m_GameObject: {fileID: 1378263221689866}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: e6c702c486a0a1141a14b09cea439436, type: 3}
Expand Down
2 changes: 2 additions & 0 deletions Assets/Prefabs/ManagerLoader.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -55,3 +55,5 @@ MonoBehaviour:
type: 2}
gameManager: {fileID: 1384291445857206, guid: b92f18bd24118754d8eba9361153c845,
type: 2}
freqAnalysis: {fileID: 1378734293407760, guid: 0c1bd54b160001b4f91e3b6c32f1c686,
type: 2}
2 changes: 1 addition & 1 deletion Assets/RandomSoundPlayer.cs
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ public class RandomSoundPlayer : MonoBehaviour
public float maxTime = 10f;

float timer = 3f;
AudioSource audio;
new AudioSource audio;


void Start()
Expand Down
Loading

0 comments on commit 9cfce9b

Please sign in to comment.