Commit bf48e072 authored by astatham's avatar astatham
Browse files

Finished Tarantella, added music to Pie Throwing and Trapeze

parent b418eea7
......@@ -38,4 +38,148 @@ up 19.55
down 19.85
left 20.4
right 20.7
up 22.25
\ No newline at end of file
up 22.25
left 25.2
down 25.9
right 26.05
right 27.35
down 27.5
up 27.6
left 27.75
up 27.9
down 28.2
right 28.35
down 28.5
up 28.65
down 29.35
right 29.5
right 30.8
down 30.9
up 31.1
left 31.25
up 31.35
down 31.5
right 31.7
down 31.8
up 31.95
left 32.1
down 32.7
right 32.85
right 34.3
down 34.4
right 34.55
up 34.7
right 34.8
left 35.0
down 35.15
down 35.4
right 35.55
down 36.3
right 36.45
down 37.2
right 37.3
down 37.6
right 37.75
down 38.05
right 38.15
down 38.45
left 38.6
down 38.9
left 39.05
down 39.8
right 39.9
right 41.2
down 41.3
up 41.5
left 41.65
up 41.75
down 41.9
right 42.1
down 42.2
up 42.35
left 42.5
down 43.2
right 43.35
right 44.65
down 44.85
up 44.95
left 45.1
up 45.2
down 45.4
right 45.55
down 45.65
up 45.8
left 45.95
down 46.7
right 46.85
right 48.15
down 48.25
right 48.45
up 48.6
right 48.7
left 48.85
down 49.0
left 49.15
up 49.25
right 49.45
down 50.2
right 50.3
down 51.0
right 51.15
down 51.45
up 51.6
down 51.9
left 52.05
right 52.45
down 52.75
up 52.9
right 53.15
down 53.3
up 53.45
down 53.6
left 53.75
left 54.6
left 54.9
left 55.0
up 55.2
down 55.3
left 55.45
left 55.7
right 55.9
left 56.15
right 56.3
right 56.6
right 56.7
left 56.85
right 57.0
left 57.15
right 58.0
up 58.25
up 58.4
up 58.65
left 58.85
left 59.7
down 60.0
up 60.1
right 60.25
up 60.4
down 60.55
down 61.4
down 61.65
down 61.8
up 61.95
left 62.1
left 62.5
right 62.65
left 62.9
right 63.05
right 63.35
right 63.45
up 63.65
right 63.75
down 63.9
down 64.75
down 65.05
left 65.2
left 65.45
down 65.6
\ No newline at end of file
......@@ -840,7 +840,7 @@ AudioSource:
OutputAudioMixerGroup: {fileID: 0}
m_audioClip: {fileID: 8300000, guid: 289d382b3061449ed9d1c4925bcd7231, type: 3}
m_PlayOnAwake: 1
m_Volume: 1
m_Volume: 0.69
m_Pitch: 1
Loop: 0
Mute: 0
......
......@@ -994,7 +994,7 @@ AudioSource:
OutputAudioMixerGroup: {fileID: 0}
m_audioClip: {fileID: 8300000, guid: 289d382b3061449ed9d1c4925bcd7231, type: 3}
m_PlayOnAwake: 1
m_Volume: 1
m_Volume: 0.69
m_Pitch: 1
Loop: 0
Mute: 0
......
......@@ -736,6 +736,7 @@ GameObject:
m_Component:
- component: {fileID: 847592695}
- component: {fileID: 847592694}
- component: {fileID: 847592696}
m_Layer: 0
m_Name: LevelMaster
m_TagString: Untagged
......@@ -771,6 +772,101 @@ Transform:
m_Father: {fileID: 0}
m_RootOrder: 8
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!82 &847592696
AudioSource:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 847592693}
m_Enabled: 1
serializedVersion: 4
OutputAudioMixerGroup: {fileID: 0}
m_audioClip: {fileID: 8300000, guid: 0bb8a9baae64949078b0d70a928a5848, type: 3}
m_PlayOnAwake: 1
m_Volume: 0.68
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: 3
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
panLevelCustomCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
spreadCustomCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
reverbZoneMixCustomCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
--- !u!1 &848583036
GameObject:
m_ObjectHideFlags: 0
......
......@@ -1214,6 +1214,7 @@ GameObject:
- component: {fileID: 847592695}
- component: {fileID: 847592694}
- component: {fileID: 847592696}
- component: {fileID: 847592697}
m_Layer: 0
m_Name: LevelMaster
m_TagString: Untagged
......@@ -1268,6 +1269,101 @@ MonoBehaviour:
button: {fileID: 1207322006}
SwingText: {fileID: 1110322467}
player: {fileID: 0}
--- !u!82 &847592697
AudioSource:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 847592693}
m_Enabled: 1
serializedVersion: 4
OutputAudioMixerGroup: {fileID: 0}
m_audioClip: {fileID: 8300000, guid: 0bb8a9baae64949078b0d70a928a5848, type: 3}
m_PlayOnAwake: 1
m_Volume: 0.69
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: 3
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
panLevelCustomCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
spreadCustomCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
reverbZoneMixCustomCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
--- !u!1 &848583036
GameObject:
m_ObjectHideFlags: 0
......@@ -3237,6 +3333,7 @@ GameObject:
- component: {fileID: 2023603711}
- component: {fileID: 2023603710}
- component: {fileID: 2023603709}
- component: {fileID: 2023603712}
m_Layer: 0
m_Name: Trampoline
m_TagString: Untagged
......@@ -3296,6 +3393,101 @@ Transform:
m_Father: {fileID: 0}
m_RootOrder: 8
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!82 &2023603712
AudioSource:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 2023603708}
m_Enabled: 1
serializedVersion: 4
OutputAudioMixerGroup: {fileID: 0}
m_audioClip: {fileID: 8300000, guid: 3ae896e9e52674372bec157939579d91, 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: 3
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
panLevelCustomCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
spreadCustomCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
reverbZoneMixCustomCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
--- !u!1 &2061639490
GameObject:
m_ObjectHideFlags: 0
......
......@@ -6,7 +6,6 @@ public class FollowPlayerx : MonoBehaviour {
public GameObject player;
private Animator anim;
private bool facingRight;
// Use this for initialization
......@@ -38,9 +37,9 @@ public class FollowPlayerx : MonoBehaviour {
transform.localScale = newScale;
}
void OnCollisionEnter(Collision collision)
{
void OnCollisionEnter(Collision collision)
{
//player.GetComponent<Rigidbody2D>().angularVelocity = 0;
print("Tramp");
print("Tramp");
}
}
m_EditorVersion: 2018.2.11f1
m_EditorVersion: 2018.2.12f1
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