Commit eea8fa5e authored by Mitchie Maluschnig's avatar Mitchie Maluschnig
Browse files

press '1' to progress trapeze tutorial dialogue

parent 3dfc6d4a
......@@ -782,6 +782,8 @@ MonoBehaviour:
specialItem: {fileID: 1929470931612680}
OnCollectParticles: {fileID: 1290046360213332, guid: 107a7a15d7e65914d89e2647ad01e920,
type: 2}
textParticles: {fileID: 1044449210632190, guid: bf8747e4259d9bd46acdd2b6e3588586,
type: 2}
--- !u!114 &114078961028380754
MonoBehaviour:
m_ObjectHideFlags: 1
......@@ -798,6 +800,8 @@ MonoBehaviour:
specialItem: {fileID: 1104844275863738}
OnCollectParticles: {fileID: 1290046360213332, guid: 107a7a15d7e65914d89e2647ad01e920,
type: 2}
textParticles: {fileID: 1044449210632190, guid: bf8747e4259d9bd46acdd2b6e3588586,
type: 2}
--- !u!114 &114088591933865888
MonoBehaviour:
m_ObjectHideFlags: 1
......@@ -814,6 +818,8 @@ MonoBehaviour:
specialItem: {fileID: 1693443499505372}
OnCollectParticles: {fileID: 1290046360213332, guid: 107a7a15d7e65914d89e2647ad01e920,
type: 2}
textParticles: {fileID: 1044449210632190, guid: bf8747e4259d9bd46acdd2b6e3588586,
type: 2}
--- !u!212 &212044486889390446
SpriteRenderer:
m_ObjectHideFlags: 1
......
......@@ -145,8 +145,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 10}
m_SizeDelta: {x: 300, y: 20}
m_AnchoredPosition: {x: 0, y: 1.5150003}
m_SizeDelta: {x: 300, y: 3.03}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &32065003
MonoBehaviour:
......@@ -174,13 +174,13 @@ MonoBehaviour:
m_BestFit: 0
m_MinSize: 0
m_MaxSize: 40
m_Alignment: 7
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: 'Continue
m_Text: '(1) Continue
'
--- !u!222 &32065004
......@@ -641,6 +641,83 @@ CanvasRenderer:
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 542902488}
m_CullTransparentMesh: 0
--- !u!1 &585131530
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 585131531}
- component: {fileID: 585131533}
- component: {fileID: 585131532}
m_Layer: 5
m_Name: Text
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &585131531
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 585131530}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 1435460410}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 1.5150003}
m_SizeDelta: {x: 300, y: 3.03}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &585131532
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 585131530}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0, g: 0, b: 0, a: 1}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData:
m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
m_FontSize: 20
m_FontStyle: 1
m_BestFit: 0
m_MinSize: 0
m_MaxSize: 40
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: '(1) Play For Real
'
--- !u!222 &585131533
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 585131530}
m_CullTransparentMesh: 0
--- !u!1001 &602419810
Prefab:
m_ObjectHideFlags: 0
......@@ -1305,6 +1382,7 @@ MonoBehaviour:
John: {fileID: 439704334}
speech: {fileID: 439704337}
button: {fileID: 1207322006}
exitButton: {fileID: 1435460411}
SwingText: {fileID: 1110322467}
player: {fileID: 2089978956}
Hands: {fileID: 1858953468}
......@@ -1725,6 +1803,7 @@ RectTransform:
m_LocalScale: {x: 3.2002127, y: 3.2002127, z: 1.6001064}
m_Children:
- {fileID: 1207322005}
- {fileID: 1435460410}
m_Father: {fileID: 758433179}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
......@@ -1779,7 +1858,7 @@ GameObject:
- component: {fileID: 1055966192}
m_Layer: 0
m_Name: ParticleText
m_TagString: Untagged
m_TagString: Perfect
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
......@@ -2210,8 +2289,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {x: 0.5, y: 0}
m_AnchoredPosition: {x: 0, y: 6.1}
m_SizeDelta: {x: 100, y: 20}
m_AnchoredPosition: {x: 0, y: 6}
m_SizeDelta: {x: 130, y: 23.24}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1207322006
MonoBehaviour:
......@@ -2647,6 +2726,129 @@ SpriteRenderer:
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!1 &1435460409
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1435460410}
- component: {fileID: 1435460413}
- component: {fileID: 1435460412}
- component: {fileID: 1435460411}
m_Layer: 5
m_Name: response (1)
m_TagString: Button1
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
--- !u!224 &1435460410
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1435460409}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0.0000023840273}
m_LocalScale: {x: 0.43799248, y: 0.43799248, z: 43.79997}
m_Children:
- {fileID: 585131531}
m_Father: {fileID: 969184690}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {x: 0.5, y: 0}
m_AnchoredPosition: {x: 0, y: 6}
m_SizeDelta: {x: 168.82, y: 23.24}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1435460411
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1435460409}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Navigation:
m_Mode: 0
m_SelectOnUp: {fileID: 0}
m_SelectOnDown: {fileID: 0}
m_SelectOnLeft: {fileID: 0}
m_SelectOnRight: {fileID: 0}
m_Transition: 1
m_Colors:
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
m_HighlightedColor: {r: 0.6792453, g: 0.6792453, b: 0.6792453, a: 1}
m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
m_ColorMultiplier: 1
m_FadeDuration: 0.1
m_SpriteState:
m_HighlightedSprite: {fileID: 0}
m_PressedSprite: {fileID: 0}
m_DisabledSprite: {fileID: 0}
m_AnimationTriggers:
m_NormalTrigger: Normal
m_HighlightedTrigger: Highlighted
m_PressedTrigger: Pressed
m_DisabledTrigger: Disabled
m_Interactable: 1
m_TargetGraphic: {fileID: 1435460412}
m_OnClick:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 847592696}
m_MethodName: ButtonPress
m_Mode: 1
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
Culture=neutral, PublicKeyToken=null
--- !u!114 &1435460412
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1435460409}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0}
m_Type: 1
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
--- !u!222 &1435460413
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1435460409}
m_CullTransparentMesh: 0
--- !u!1 &1476889500
GameObject:
m_ObjectHideFlags: 0
......@@ -3436,6 +3638,8 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
player: {fileID: 95257389}
text: {fileID: 0}
textParticles: {fileID: 0}
--- !u!61 &2023603710
BoxCollider2D:
m_ObjectHideFlags: 0
......
......@@ -12,6 +12,7 @@ public class TrapezeTutorial : MonoBehaviour {
public GameObject John;
public JohnSmithSpeech speech;
public Button button;
public Button exitButton;
public GameObject SwingText;
public GameObject player;
public Transform Hands;
......@@ -46,6 +47,17 @@ public class TrapezeTutorial : MonoBehaviour {
}
private void Update() {
if (Input.GetKeyDown(KeyCode.Alpha1)) {
if(state <= 3 || state >= 8) {
if (state < 9) {
progress();
} else {
GameManager.JohnTutorial = false;
SceneManager.LoadScene("Trapeze");
}
}
}
if (Input.GetKeyDown(KeyCode.Space) && GameManager.TutorialState == 2) {
progress();
......@@ -127,10 +139,13 @@ public class TrapezeTutorial : MonoBehaviour {
//player planded on pie
button.gameObject.SetActive(true);
} else if (state == 9) {
//player finished tutorial
} else if (state == 10) {
//player finished tutorial, has to press play to exit
button.gameObject.SetActive(false);
exitButton.gameObject.SetActive(true);
} else if (state == 10) {
//idkWhy this is here
}
JohnText.text = speech.converse();
}
......
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