Commit bf7f289a authored by Benjamin Lane's avatar Benjamin Lane

Init

parent 4f5c0d00
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!241 &24100000
AudioMixerController:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_Name: Mixer
m_OutputGroup: {fileID: 0}
m_MasterGroup: {fileID: 24300001}
m_Snapshots:
- {fileID: 24500003}
m_StartSnapshot: {fileID: 24500003}
m_SuspendThreshold: -80
m_EnableSuspend: 1
m_UpdateMode: 0
m_ExposedParameters: []
m_AudioMixerGroupViews: []
m_CurrentViewIndex: 0
m_TargetSnapshot: {fileID: 24500003}
--- !u!243 &24300001
AudioMixerGroupController:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_Name: Master
m_AudioMixer: {fileID: 24100000}
m_GroupID: 4fbaba74863ea4a478d01cded091d507
m_Children: []
m_Volume: ff0949947087ac249877fa323a23f16f
m_Pitch: 479b72a06389252418663e388cf19571
m_Effects:
- {fileID: 24400002}
m_UserColorIndex: 0
m_Mute: 0
m_Solo: 0
m_BypassEffects: 0
--- !u!244 &24400002
AudioMixerEffectController:
m_ObjectHideFlags: 3
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_Name:
m_EffectID: 71175d72745b5a940b767e96ce820aef
m_EffectName: Attenuation
m_MixLevel: bc75095c179dcac4e82c3d72710623c8
m_Parameters: []
m_SendTarget: {fileID: 0}
m_EnableWetMix: 0
m_Bypass: 0
--- !u!245 &24500003
AudioMixerSnapshotController:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_Name: Snapshot
m_AudioMixer: {fileID: 24100000}
m_SnapshotID: 894e161afdaa0be4f8053d55ceae36ab
m_FloatValues: {}
m_TransitionOverrides: {}
fileFormatVersion: 2
guid: 503ad029026f16b4fbe6ba0c3f591bd9
timeCreated: 1492735178
licenseType: Free
NativeFormatImporter:
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: 5fbde4ffeec1d0c47a027fda56b1be61
folderAsset: yes
timeCreated: 1492735312
licenseType: Free
DefaultImporter:
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: 4953993318aabae4d921b3df6bab1eac
timeCreated: 1492740530
licenseType: Free
AudioImporter:
serializedVersion: 6
defaultSettings:
loadType: 0
sampleRateSetting: 0
sampleRateOverride: 44100
compressionFormat: 1
quality: 1
conversionMode: 0
platformSettingOverrides: {}
forceToMono: 0
normalize: 1
preloadAudioData: 1
loadInBackground: 0
3D: 1
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: e42ff69c61be8aa47a00dd8fbb668b60
timeCreated: 1492735340
licenseType: Free
AudioImporter:
serializedVersion: 6
defaultSettings:
loadType: 0
sampleRateSetting: 0
sampleRateOverride: 44100
compressionFormat: 1
quality: 1
conversionMode: 0
platformSettingOverrides: {}
forceToMono: 0
normalize: 1
preloadAudioData: 1
loadInBackground: 0
3D: 1
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: 5c3da9645c59f324797063dec78c21e2
timeCreated: 1492735381
licenseType: Free
AudioImporter:
serializedVersion: 6
defaultSettings:
loadType: 0
sampleRateSetting: 0
sampleRateOverride: 44100
compressionFormat: 1
quality: 1
conversionMode: 0
platformSettingOverrides: {}
forceToMono: 0
normalize: 1
preloadAudioData: 1
loadInBackground: 0
3D: 1
userData:
assetBundleName:
assetBundleVariant:
......@@ -23,6 +23,7 @@ GameObject:
- component: {fileID: 58460928687217622}
- component: {fileID: 50635277209838516}
- component: {fileID: 114154880416009188}
- component: {fileID: 82249370167070322}
m_Layer: 0
m_Name: CaramelBullet
m_TagString: Untagged
......@@ -77,6 +78,87 @@ CircleCollider2D:
m_Offset: {x: -0.1, y: 0}
serializedVersion: 2
m_Radius: 0.35
--- !u!82 &82249370167070322
AudioSource:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1971150978506544}
m_Enabled: 1
serializedVersion: 4
OutputAudioMixerGroup: {fileID: 24300001, guid: 503ad029026f16b4fbe6ba0c3f591bd9,
type: 2}
m_audioClip: {fileID: 8300000, guid: 49e98787811967d4b972bc8186acef38, type: 3}
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: 4
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 &114154880416009188
MonoBehaviour:
m_ObjectHideFlags: 1
......
......@@ -297,6 +297,7 @@ GameObject:
- component: {fileID: 114496983445290320}
- component: {fileID: 114468523229820794}
- component: {fileID: 114397509330875448}
- component: {fileID: 82669694635491248}
m_Layer: 8
m_Name: Player
m_TagString: Player
......@@ -898,6 +899,87 @@ CircleCollider2D:
m_Offset: {x: 0, y: 0}
serializedVersion: 2
m_Radius: 0.5
--- !u!82 &82669694635491248
AudioSource:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1784255690954616}
m_Enabled: 1
serializedVersion: 4
OutputAudioMixerGroup: {fileID: 24300001, guid: 503ad029026f16b4fbe6ba0c3f591bd9,
type: 2}
m_audioClip: {fileID: 0}
m_PlayOnAwake: 0
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: 4
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!95 &95430605418900558
Animator:
serializedVersion: 3
......@@ -928,6 +1010,9 @@ MonoBehaviour:
m_EditorClassIdentifier:
inputButtons: 05000000
disableScripts: []
SexyDash: {fileID: 82669694635491248}
DashSound: {fileID: 8300000, guid: 5c3da9645c59f324797063dec78c21e2, type: 3}
Cooldown: {fileID: 8300000, guid: 98020b267c9d96b4e8c04c9a13b730ce, type: 3}
dashVelocityCurve:
serializedVersion: 2
m_Curve:
......@@ -955,6 +1040,7 @@ MonoBehaviour:
dashDistance: 5
coolDown: 2
holdTime: 1.25
DashReady: 1
--- !u!114 &114331805935495066
MonoBehaviour:
m_ObjectHideFlags: 1
......@@ -1008,6 +1094,9 @@ MonoBehaviour:
m_EditorClassIdentifier:
inputButtons:
disableScripts: []
SexyDeath: {fileID: 82669694635491248}
Death: {fileID: 0}
state: 0
--- !u!114 &114468523229820794
MonoBehaviour:
m_ObjectHideFlags: 1
......@@ -1045,6 +1134,9 @@ MonoBehaviour:
airJumpCount: 1
wallJumpHeight: 3
wallJumpHorizontalSpeed: 10
JumpSound: {fileID: 8300000, guid: 5c3da9645c59f324797063dec78c21e2, type: 3}
JumpEaster: {fileID: 8300000, guid: e42ff69c61be8aa47a00dd8fbb668b60, type: 3}
Sexy: {fileID: 82669694635491248}
--- !u!114 &114757865948649954
MonoBehaviour:
m_ObjectHideFlags: 1
......@@ -1166,7 +1258,7 @@ ParticleSystem:
m_GameObject: {fileID: 1812230161422426}
serializedVersion: 5
lengthInSec: 0.1
speed: 1
simulationSpeed: 1
looping: 1
prewarm: 0
playOnAwake: 1
......@@ -3803,7 +3895,7 @@ ParticleSystem:
m_GameObject: {fileID: 1560513321517206}
serializedVersion: 5
lengthInSec: 0.1
speed: 1
simulationSpeed: 1
looping: 0
prewarm: 0
playOnAwake: 1
......
......@@ -20,6 +20,7 @@ GameObject:
m_Component:
- component: {fileID: 4925115359248076}
- component: {fileID: 114705734518377386}
- component: {fileID: 82420351808291562}
m_Layer: 0
m_Name: GameManager
m_TagString: Untagged
......@@ -76,6 +77,87 @@ Transform:
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!82 &82420351808291562
AudioSource:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1200922632209692}
m_Enabled: 1
serializedVersion: 4
OutputAudioMixerGroup: {fileID: 24300001, guid: 503ad029026f16b4fbe6ba0c3f591bd9,
type: 2}
m_audioClip: {fileID: 8300000, guid: 77bd07b29f5ada34bbb1bb8e5e0dbfc0, type: 3}
m_PlayOnAwake: 0
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: 4
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 &114465074132951858
MonoBehaviour:
m_ObjectHideFlags: 1
......@@ -126,6 +208,8 @@ MonoBehaviour:
m_EditorClassIdentifier:
waitTime: 0
timerText: {fileID: 114712972450195582}
SexyWin: {fileID: 82420351808291562}
WinSound: {fileID: 8300000, guid: 77bd07b29f5ada34bbb1bb8e5e0dbfc0, type: 3}
--- !u!114 &114712972450195582
MonoBehaviour:
m_ObjectHideFlags: 1
......
......@@ -1308,7 +1308,7 @@ ParticleSystem:
m_GameObject: {fileID: 920148520}
serializedVersion: 5
lengthInSec: 0.1
speed: 1
simulationSpeed: 1
looping: 1
prewarm: 0
playOnAwake: 1
......@@ -3984,9 +3984,110 @@ Prefab:
propertyPath: m_LocalScale.x
value: 1
objectReference: {fileID: 0}
- target: {fileID: 114496983445290320, guid: dfa71b7b6162c694ab929717dd70b38d,
type: 2}
propertyPath: JumpEaster
value:
objectReference: {fileID: 8300000, guid: e42ff69c61be8aa47a00dd8fbb668b60, type: 3}
- target: {fileID: 114496983445290320, guid: dfa71b7b6162c694ab929717dd70b38d,
type: 2}
propertyPath: JumpSound
value:
objectReference: {fileID: 8300000, guid: 5c3da9645c59f324797063dec78c21e2, type: 3}
- target: {fileID: 114496983445290320, guid: dfa71b7b6162c694ab929717dd70b38d,
type: 2}
propertyPath: Sexy
value:
objectReference: {fileID: 933542340}
m_RemovedComponents: []
m_ParentPrefab: {fileID: 100100000, guid: dfa71b7b6162c694ab929717dd70b38d, type: 2}
m_IsPrefabParent: 0
--- !u!1 &933542339 stripped
GameObject:
m_PrefabParentObject: {fileID: 1784255690954616, guid: dfa71b7b6162c694ab929717dd70b38d,
type: 2}
m_PrefabInternal: {fileID: 933542338}
--- !u!82 &933542340
AudioSource:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 933542339}
m_Enabled: 1
serializedVersion: 4
OutputAudioMixerGroup: {fileID: 24300001, guid: 503ad029026f16b4fbe6ba0c3f591bd9,
type: 2}
m_audioClip: {fileID: 0}
m_PlayOnAwake: 0
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!1001 &973884571
Prefab:
m_ObjectHideFlags: 0
......@@ -6005,7 +6106,7 @@ ParticleSystem:
m_GameObject: {fileID: 2100709141}
serializedVersion: 5
lengthInSec: 0.1
speed: 1
simulationSpeed: 1
looping: 0
prewarm: 0
playOnAwake: 1
......
This diff is collapsed.
......@@ -5,7 +5,11 @@ using UnityEngine;
// Sets dash velocity and smoothly decelerates to a minimum velocity
public class Dash : AbstractBehavior {
public class Dash : AbstractBehavior
{
public AudioSource SexyDash;
public AudioClip DashSound;
public AudioClip Cooldown;
//The velocity curve over time
[SerializeField] private AnimationCurve dashVelocityCurve;
......@@ -22,6 +26,7 @@ public class Dash : AbstractBehavior {
public float coolDown = 1f;
public float holdTime = 0.4f;
public bool DashReady = true;
private bool _isDashing = false;
private Transform dashMeter;
......@@ -86,6 +91,7 @@ public class Dash : AbstractBehavior {
public void Activate(Directions direction) {
// not in cooldown
if (Time.time > lastDash) {
DashReady = false;
StartCoroutine(DashRoutine(direction));
}
}
......@@ -110,6 +116,9 @@ public class Dash : AbstractBehavior {
lastDash = Time.time + coolDown;
// Is dashing
isDashing = true;
SexyDash.PlayOneShot (DashSound);
// Disable gravity
float initialGrav = body.gravityScale;
body.gravityScale = 0;
......
......@@ -13,6 +13,10 @@ public class GameManager : SingletonBehaviour<GameManager>
public Text timerText;
private GameObject birb;
public AudioSource SexyWin;
public AudioClip WinSound;
void Awake()
{
birb = GameObject.Find("Player");
......@@ -60,6 +64,7 @@ public class GameManager : SingletonBehaviour<GameManager>
}
public static void Win()
{