Commit 2b919a9e authored by Mitchie Maluschnig's avatar Mitchie Maluschnig
Browse files

trapeze tutorial completed

parent 19b5402e
......@@ -63,8 +63,8 @@ Transform:
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1308170843970902}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -69.2, y: -58.22, z: 0}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0.99, y: 25.34, z: 0}
m_LocalScale: {x: 2, y: 2, z: 1}
m_Children:
- {fileID: 4716061649502930}
......
This diff is collapsed.
fileFormatVersion: 2
guid: fff2cdc8d12ef444195444df24b4bef4
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 100100000
userData:
assetBundleName:
assetBundleVariant:
This diff is collapsed.
fileFormatVersion: 2
guid: a6fe7b0f811eca64d95971cc96327bdb
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 100100000
userData:
assetBundleName:
assetBundleVariant:
......@@ -781,7 +781,7 @@ AudioSource:
m_Enabled: 1
serializedVersion: 4
OutputAudioMixerGroup: {fileID: 0}
m_audioClip: {fileID: 8300000, guid: 0bb8a9baae64949078b0d70a928a5848, type: 3}
m_audioClip: {fileID: 8300000, guid: 9f85b855fec294d9489c92132811566c, type: 3}
m_PlayOnAwake: 1
m_Volume: 0.68
m_Pitch: 1
......@@ -937,48 +937,6 @@ CanvasRenderer:
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 848583036}
m_CullTransparentMesh: 0
--- !u!1001 &850720959
Prefab:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 4730625805961704, guid: bf8747e4259d9bd46acdd2b6e3588586, type: 2}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4730625805961704, guid: bf8747e4259d9bd46acdd2b6e3588586, type: 2}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4730625805961704, guid: bf8747e4259d9bd46acdd2b6e3588586, type: 2}
propertyPath: m_LocalPosition.z
value: 90
objectReference: {fileID: 0}
- target: {fileID: 4730625805961704, guid: bf8747e4259d9bd46acdd2b6e3588586, type: 2}
propertyPath: m_LocalRotation.x
value: -0.7071068
objectReference: {fileID: 0}
- target: {fileID: 4730625805961704, guid: bf8747e4259d9bd46acdd2b6e3588586, type: 2}
propertyPath: m_LocalRotation.y
value: -0
objectReference: {fileID: 0}
- target: {fileID: 4730625805961704, guid: bf8747e4259d9bd46acdd2b6e3588586, type: 2}
propertyPath: m_LocalRotation.z
value: -0
objectReference: {fileID: 0}
- target: {fileID: 4730625805961704, guid: bf8747e4259d9bd46acdd2b6e3588586, type: 2}
propertyPath: m_LocalRotation.w
value: 0.7071068
objectReference: {fileID: 0}
- target: {fileID: 4730625805961704, guid: bf8747e4259d9bd46acdd2b6e3588586, type: 2}
propertyPath: m_RootOrder
value: 13
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: bf8747e4259d9bd46acdd2b6e3588586, type: 2}
m_IsPrefabAsset: 0
--- !u!1 &859786665
GameObject:
m_ObjectHideFlags: 0
......
......@@ -199,11 +199,11 @@ Prefab:
m_Modifications:
- target: {fileID: 4984355063605358, guid: cfb62dab04de2fe4da7137a2f627086b, type: 2}
propertyPath: m_LocalPosition.x
value: 7.7
value: 7.6190243
objectReference: {fileID: 0}
- target: {fileID: 4984355063605358, guid: cfb62dab04de2fe4da7137a2f627086b, type: 2}
propertyPath: m_LocalPosition.y
value: 22.98
value: 22.941002
objectReference: {fileID: 0}
- target: {fileID: 4984355063605358, guid: cfb62dab04de2fe4da7137a2f627086b, type: 2}
propertyPath: m_LocalPosition.z
......@@ -211,15 +211,15 @@ Prefab:
objectReference: {fileID: 0}
- target: {fileID: 4984355063605358, guid: cfb62dab04de2fe4da7137a2f627086b, type: 2}
propertyPath: m_LocalRotation.x
value: 0
value: -0
objectReference: {fileID: 0}
- target: {fileID: 4984355063605358, guid: cfb62dab04de2fe4da7137a2f627086b, type: 2}
propertyPath: m_LocalRotation.y
value: 0
value: -0
objectReference: {fileID: 0}
- target: {fileID: 4984355063605358, guid: cfb62dab04de2fe4da7137a2f627086b, type: 2}
propertyPath: m_LocalRotation.z
value: 0
value: -0
objectReference: {fileID: 0}
- target: {fileID: 4984355063605358, guid: cfb62dab04de2fe4da7137a2f627086b, type: 2}
propertyPath: m_LocalRotation.w
......@@ -229,14 +229,6 @@ Prefab:
propertyPath: m_RootOrder
value: 14
objectReference: {fileID: 0}
- target: {fileID: 4984355063605358, guid: cfb62dab04de2fe4da7137a2f627086b, type: 2}
propertyPath: m_LocalScale.x
value: 2
objectReference: {fileID: 0}
- target: {fileID: 4984355063605358, guid: cfb62dab04de2fe4da7137a2f627086b, type: 2}
propertyPath: m_LocalScale.y
value: 2
objectReference: {fileID: 0}
- target: {fileID: 1308170843970902, guid: cfb62dab04de2fe4da7137a2f627086b, type: 2}
propertyPath: m_Name
value: StandardTrapeze (1)
......@@ -649,6 +641,52 @@ CanvasRenderer:
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 542902488}
m_CullTransparentMesh: 0
--- !u!1001 &602419810
Prefab:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 4934536828311754, guid: fff2cdc8d12ef444195444df24b4bef4, type: 2}
propertyPath: m_LocalPosition.x
value: 7.6190243
objectReference: {fileID: 0}
- target: {fileID: 4934536828311754, guid: fff2cdc8d12ef444195444df24b4bef4, type: 2}
propertyPath: m_LocalPosition.y
value: 22.941002
objectReference: {fileID: 0}
- target: {fileID: 4934536828311754, guid: fff2cdc8d12ef444195444df24b4bef4, type: 2}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4934536828311754, guid: fff2cdc8d12ef444195444df24b4bef4, type: 2}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4934536828311754, guid: fff2cdc8d12ef444195444df24b4bef4, type: 2}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4934536828311754, guid: fff2cdc8d12ef444195444df24b4bef4, type: 2}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4934536828311754, guid: fff2cdc8d12ef444195444df24b4bef4, type: 2}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4934536828311754, guid: fff2cdc8d12ef444195444df24b4bef4, type: 2}
propertyPath: m_RootOrder
value: 15
objectReference: {fileID: 0}
- target: {fileID: 1912328415189754, guid: fff2cdc8d12ef444195444df24b4bef4, type: 2}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: fff2cdc8d12ef444195444df24b4bef4, type: 2}
m_IsPrefabAsset: 0
--- !u!1 &662604410
GameObject:
m_ObjectHideFlags: 0
......@@ -1214,9 +1252,10 @@ GameObject:
- component: {fileID: 847592695}
- component: {fileID: 847592694}
- component: {fileID: 847592696}
- component: {fileID: 847592697}
m_Layer: 0
m_Name: LevelMaster
m_TagString: Untagged
m_TagString: LevelMaster
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
......@@ -1272,6 +1311,103 @@ MonoBehaviour:
trapeze: {fileID: 1308170843970902, guid: cfb62dab04de2fe4da7137a2f627086b, type: 2}
specialTrapeze: {fileID: 1140605560837190, guid: d9eae21df7f7349429f09e42b02d7a23,
type: 2}
Level1: {fileID: 1912328415189754, guid: fff2cdc8d12ef444195444df24b4bef4, type: 2}
Level2: {fileID: 1185086021063166, guid: a6fe7b0f811eca64d95971cc96327bdb, type: 2}
--- !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: 9f85b855fec294d9489c92132811566c, 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
......@@ -1515,6 +1651,52 @@ Transform:
m_Father: {fileID: 1817158841}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &953424741
Prefab:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 4825414138028072, guid: a6fe7b0f811eca64d95971cc96327bdb, type: 2}
propertyPath: m_LocalPosition.x
value: 7.6190243
objectReference: {fileID: 0}
- target: {fileID: 4825414138028072, guid: a6fe7b0f811eca64d95971cc96327bdb, type: 2}
propertyPath: m_LocalPosition.y
value: 19.71
objectReference: {fileID: 0}
- target: {fileID: 4825414138028072, guid: a6fe7b0f811eca64d95971cc96327bdb, type: 2}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4825414138028072, guid: a6fe7b0f811eca64d95971cc96327bdb, type: 2}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4825414138028072, guid: a6fe7b0f811eca64d95971cc96327bdb, type: 2}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4825414138028072, guid: a6fe7b0f811eca64d95971cc96327bdb, type: 2}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4825414138028072, guid: a6fe7b0f811eca64d95971cc96327bdb, type: 2}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4825414138028072, guid: a6fe7b0f811eca64d95971cc96327bdb, type: 2}
propertyPath: m_RootOrder
value: 16
objectReference: {fileID: 0}
- target: {fileID: 1185086021063166, guid: a6fe7b0f811eca64d95971cc96327bdb, type: 2}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: a6fe7b0f811eca64d95971cc96327bdb, type: 2}
m_IsPrefabAsset: 0
--- !u!1 &969184689
GameObject:
m_ObjectHideFlags: 0
......@@ -2345,14 +2527,6 @@ Prefab:
propertyPath: m_RootOrder
value: 13
objectReference: {fileID: 0}
- target: {fileID: 4984355063605358, guid: cfb62dab04de2fe4da7137a2f627086b, type: 2}
propertyPath: m_LocalScale.x
value: 2
objectReference: {fileID: 0}
- target: {fileID: 4984355063605358, guid: cfb62dab04de2fe4da7137a2f627086b, type: 2}
propertyPath: m_LocalScale.y
value: 2
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: cfb62dab04de2fe4da7137a2f627086b, type: 2}
m_IsPrefabAsset: 0
......@@ -3241,6 +3415,8 @@ GameObject:
- component: {fileID: 2023603711}
- component: {fileID: 2023603710}
- component: {fileID: 2023603709}
- component: {fileID: 2023603712}
- component: {fileID: 2023603713}
m_Layer: 0
m_Name: Trampoline
m_TagString: Untagged
......@@ -3300,6 +3476,126 @@ Transform:
m_Father: {fileID: 0}
m_RootOrder: 8
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!61 &2023603712
BoxCollider2D:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 2023603708}
m_Enabled: 1
m_Density: 1
m_Material: {fileID: 0}
m_IsTrigger: 1
m_UsedByEffector: 0
m_UsedByComposite: 0
m_Offset: {x: 0, y: 0.6}
m_SpriteTilingProperty:
border: {x: 0, y: 0, z: 0, w: 0}
pivot: {x: 0, y: 0}
oldSize: {x: 0, y: 0}
newSize: {x: 0, y: 0}
adaptiveTilingThreshold: 0
drawMode: 0
adaptiveTiling: 0
m_AutoTiling: 0
serializedVersion: 2
m_Size: {x: 3, y: 0.1}
m_EdgeRadius: 0
--- !u!82 &2023603713
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
......@@ -3532,6 +3828,7 @@ MonoBehaviour:
swingForce: 25
rotateForce: 2
exitForce: 2
flipBonus: 1
handsPivot: {fileID: 1858953468}
midPivot: {fileID: 95257390}
botPivot: {fileID: 859786666}
......
......@@ -111,11 +111,27 @@ public class JohnSmithSpeech : MonoBehaviour, Character {
conversation.Enqueue("Well Done! Ill give you a bit more power");
responseQueue.Enqueue(new string[] { "Continue" });
conversation.Enqueue("Cool! now press SPACEABR to let go and swiiiing");
conversation.Enqueue("Cool! Now press SPACEABR to let go and Fly!");
responseQueue.Enqueue(new string[] { "Continue" });
conversation.Enqueue("Dont worry Simon will catch you! Use A and D to rotate in the air");
responseQueue.Enqueue(new string[] { "Continue" });
conversation.Enqueue("Nice Job! Try and manoeuvre yourself across these platforms");
responseQueue.Enqueue(new string[] { "Continue" });
conversation.Enqueue("Good one! PIES give you points and boost your time!");
responseQueue.Enqueue(new string[] { "Continue" });
conversation.Enqueue("Im so proud of you! youll be the best Trapezeist ever!");
responseQueue.Enqueue(new string[] { "Continue" });
conversation.Enqueue("Feel free to keep playing here or you could give it a go for real now!");
responseQueue.Enqueue(new string[] { "Play" });
conversation.Enqueue("Feel free to keep playing here or you could give it a go for real now!");
responseQueue.Enqueue(new string[] { "Play" });
}
private void conversationStage1() {
......
......@@ -27,6 +27,12 @@ public class HandsTrigger : MonoBehaviour {
if(lastTrapeze == null) {
lastTrapeze = collision.gameObject;
trapezePerson.AttachToTrapeze(collision.gameObject);
//tutorial stuff
if(collision.gameObject.tag == "Silas") {
GameObject.FindWithTag("LevelMaster").GetComponent<TrapezeTutorial>().landed(false);
}else if(collision.gameObject.tag == "Pie") {
GameObject.FindWithTag("LevelMaster").GetComponent<TrapezeTutorial>().landed(true);
}
}
}
}
......
......@@ -2,6 +2,7 @@
using System.Collections.Generic;
using UnityEngine;
using UnityEngine.UI;
using UnityEngine.SceneManagement;
public class TrapezeTutorial : MonoBehaviour {
......@@ -17,6 +18,10 @@ public class TrapezeTutorial : MonoBehaviour {
public GameObject trapeze;
public GameObject specialTrapeze;
public GameObject Level1;
public GameObject Level2;
private Vector3 levelPos;
private Transform firstTrapeze;
private bool spawnable;
......@@ -45,12 +50,26 @@ public class TrapezeTutorial : MonoBehaviour {