Commit 67bdeb13 authored by Mitchie Maluschnig's avatar Mitchie Maluschnig
Browse files

added speech files for silas and simon and updated their prefabs

parent 8591d282
......@@ -55,6 +55,7 @@ GameObject:
- component: {fileID: 61732122826720076}
- component: {fileID: 114808308278263708}
- component: {fileID: 114094690266867812}
- component: {fileID: 114787342697137634}
m_Layer: 0
m_Name: AhaveBaird
m_TagString: Untagged
......@@ -62,6 +63,23 @@ GameObject:
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!1 &1232486959068676
GameObject:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
serializedVersion: 6
m_Component:
- component: {fileID: 224897134811953066}
- component: {fileID: 222152718266836164}
- component: {fileID: 114369037744403530}
m_Layer: 5
m_Name: PrimarySpeech
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!1 &1297585788650952
GameObject:
m_ObjectHideFlags: 1
......@@ -72,7 +90,24 @@ GameObject:
- component: {fileID: 4713483939440704}
- component: {fileID: 212051256838438442}
m_Layer: 0
m_Name: AhavaBaird
m_Name: BeardedLadyImage
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!1 &1454491167270370
GameObject:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
serializedVersion: 6
m_Component:
- component: {fileID: 224511774531789040}
- component: {fileID: 222176497958174252}
- component: {fileID: 114151550790006464}
m_Layer: 5
m_Name: SecondarySpeech
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
......@@ -179,7 +214,7 @@ BoxCollider2D:
adaptiveTiling: 0
m_AutoTiling: 0
serializedVersion: 2
m_Size: {x: 3.2, y: 2.57}
m_Size: {x: 4, y: 2.57}
m_EdgeRadius: 0
--- !u!114 &114094690266867812
MonoBehaviour:
......@@ -192,7 +227,39 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 96b94b7db1e214148bb51ddcb027474a, type: 3}
m_Name:
m_EditorClassIdentifier:
interactButton: {fileID: 114816900526660398}
--- !u!114 &114151550790006464
MonoBehaviour:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1454491167270370}
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: 30
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 3
m_MaxSize: 61
m_Alignment: 7
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: My beard sense is tingling
--- !u!114 &114217342922327242
MonoBehaviour:
m_ObjectHideFlags: 1
......@@ -236,6 +303,39 @@ MonoBehaviour:
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
--- !u!114 &114369037744403530
MonoBehaviour:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1232486959068676}
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.01886791, g: 0.01886791, b: 0.01886791, 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: 30
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 10
m_MaxSize: 40
m_Alignment: 7
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: Didnt want to admire my glorious beard?
--- !u!114 &114430094776694032
MonoBehaviour:
m_ObjectHideFlags: 1
......@@ -248,6 +348,21 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
character: {fileID: 1297585788650952}
--- !u!114 &114787342697137634
MonoBehaviour:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1201578362876714}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 2b6520c4e0b254f33b7f838739288d21, type: 3}
m_Name:
m_EditorClassIdentifier:
interactButton: {fileID: 114816900526660398}
speechBox: {fileID: 114369037744403530}
secondarySpeechBox: {fileID: 114151550790006464}
playerbutton1: {fileID: 0}
--- !u!114 &114808308278263708
MonoBehaviour:
m_ObjectHideFlags: 1
......@@ -259,7 +374,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 9c41dca42caf14e17b64ff95fd032786, type: 3}
m_Name:
m_EditorClassIdentifier:
wandering: 1
--- !u!114 &114816900526660398
MonoBehaviour:
m_ObjectHideFlags: 1
......@@ -401,6 +515,20 @@ SpriteRenderer:
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!222 &222152718266836164
CanvasRenderer:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1232486959068676}
m_CullTransparentMesh: 0
--- !u!222 &222176497958174252
CanvasRenderer:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1454491167270370}
m_CullTransparentMesh: 0
--- !u!222 &222286130475247290
CanvasRenderer:
m_ObjectHideFlags: 1
......@@ -465,6 +593,8 @@ RectTransform:
m_LocalScale: {x: 0.01, y: 0.01, z: 1}
m_Children:
- {fileID: 224018282793070894}
- {fileID: 224897134811953066}
- {fileID: 224511774531789040}
m_Father: {fileID: 4885089913599246}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
......@@ -473,6 +603,24 @@ RectTransform:
m_AnchoredPosition: {x: 0, y: 2.5}
m_SizeDelta: {x: 400, y: 300}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!224 &224511774531789040
RectTransform:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1454491167270370}
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: 224304718089781694}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 52}
m_SizeDelta: {x: 300, y: 200}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!224 &224742012649364082
RectTransform:
m_ObjectHideFlags: 1
......@@ -491,3 +639,21 @@ RectTransform:
m_AnchoredPosition: {x: 0, y: -21.7}
m_SizeDelta: {x: 126, y: 19.5}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!224 &224897134811953066
RectTransform:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1232486959068676}
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: 224304718089781694}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 5}
m_SizeDelta: {x: 300, y: 300}
m_Pivot: {x: 0.5, y: 0.5}
......@@ -11,6 +11,40 @@ Prefab:
m_SourcePrefab: {fileID: 0}
m_RootGameObject: {fileID: 1229012123048104}
m_IsPrefabAsset: 1
--- !u!1 &1073329332813112
GameObject:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
serializedVersion: 6
m_Component:
- component: {fileID: 224461179410088276}
- component: {fileID: 222224602866937310}
- component: {fileID: 114195279910367104}
m_Layer: 5
m_Name: SecondarySpeech
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!1 &1081512559052024
GameObject:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
serializedVersion: 6
m_Component:
- component: {fileID: 224307686862357612}
- component: {fileID: 222034329956029266}
- component: {fileID: 114589071008195712}
m_Layer: 5
m_Name: PrimarySpeech
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!1 &1229012123048104
GameObject:
m_ObjectHideFlags: 0
......@@ -69,8 +103,10 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 4209594879430634}
- component: {fileID: 114476784054115588}
- component: {fileID: 61894361242696124}
- component: {fileID: 114832965839284464}
- component: {fileID: 114613926750057822}
- component: {fileID: 114364341595056200}
m_Layer: 0
m_Name: SilasUnspeakable
m_TagString: Untagged
......@@ -178,9 +214,42 @@ BoxCollider2D:
adaptiveTiling: 0
m_AutoTiling: 0
serializedVersion: 2
m_Size: {x: 3.2, y: 2.11}
m_Size: {x: 4, y: 2.11}
m_EdgeRadius: 0
--- !u!114 &114476784054115588
--- !u!114 &114195279910367104
MonoBehaviour:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1073329332813112}
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: 30
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 3
m_MaxSize: 61
m_Alignment: 7
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: did someone enter my invivible box
--- !u!114 &114364341595056200
MonoBehaviour:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
......@@ -191,7 +260,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 9c41dca42caf14e17b64ff95fd032786, type: 3}
m_Name:
m_EditorClassIdentifier:
wandering: 1
--- !u!114 &114496348782846658
MonoBehaviour:
m_ObjectHideFlags: 1
......@@ -272,6 +340,39 @@ MonoBehaviour:
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
--- !u!114 &114589071008195712
MonoBehaviour:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1081512559052024}
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.01886791, g: 0.01886791, b: 0.01886791, 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: 30
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 10
m_MaxSize: 40
m_Alignment: 7
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: its just white makeup, i swear!
--- !u!114 &114591821052929306
MonoBehaviour:
m_ObjectHideFlags: 1
......@@ -305,6 +406,21 @@ MonoBehaviour:
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: Interact
--- !u!114 &114613926750057822
MonoBehaviour:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1766672496195326}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 2b6520c4e0b254f33b7f838739288d21, type: 3}
m_Name:
m_EditorClassIdentifier:
interactButton: {fileID: 114497828420707912}
speechBox: {fileID: 114589071008195712}
secondarySpeechBox: {fileID: 114195279910367104}
playerbutton1: {fileID: 0}
--- !u!114 &114686253410882298
MonoBehaviour:
m_ObjectHideFlags: 1
......@@ -342,6 +458,17 @@ MonoBehaviour:
m_BlockingMask:
serializedVersion: 2
m_Bits: 4294967295
--- !u!114 &114832965839284464
MonoBehaviour:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1766672496195326}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 1d62676c38eb1d449bf303d6056ee1e7, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!212 &212820642852773866
SpriteRenderer:
m_ObjectHideFlags: 1
......@@ -388,6 +515,13 @@ SpriteRenderer:
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!222 &222034329956029266
CanvasRenderer:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1081512559052024}
m_CullTransparentMesh: 0
--- !u!222 &222038859711075632
CanvasRenderer:
m_ObjectHideFlags: 1
......@@ -395,6 +529,13 @@ CanvasRenderer:
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1983548482120778}
m_CullTransparentMesh: 0
--- !u!222 &222224602866937310
CanvasRenderer:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1073329332813112}
m_CullTransparentMesh: 0
--- !u!222 &222413830823748768
CanvasRenderer:
m_ObjectHideFlags: 1
......@@ -433,6 +574,8 @@ RectTransform:
m_LocalScale: {x: 0.01, y: 0.01, z: 1}
m_Children:
- {fileID: 224280878866813176}
- {fileID: 224307686862357612}
- {fileID: 224461179410088276}
m_Father: {fileID: 4549546449924174}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
......@@ -460,6 +603,42 @@ RectTransform:
m_AnchoredPosition: {x: 0, y: -80}
m_SizeDelta: {x: 60, y: 60}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!224 &224307686862357612
RectTransform:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1081512559052024}
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: 224255128738317178}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 5}
m_SizeDelta: {x: 300, y: 300}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!224 &224461179410088276
RectTransform:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1073329332813112}
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: 224255128738317178}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 52}
m_SizeDelta: {x: 300, y: 200}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!224 &224748969834089290
RectTransform:
m_ObjectHideFlags: 1
......
......@@ -11,6 +11,23 @@ Prefab:
m_SourcePrefab: {fileID: 0}
m_RootGameObject: {fileID: 1703580708648812}
m_IsPrefabAsset: 1
--- !u!1 &1376429143981506
GameObject:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
serializedVersion: 6
m_Component:
- component: {fileID: 224277061939259464}
- component: {fileID: 222068312664524182}
- component: {fileID: 114511222531318058}
m_Layer: 5
m_Name: PrimarySpeech
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!1 &1429544918798416
GameObject:
m_ObjectHideFlags: 0
......@@ -21,6 +38,8 @@ GameObject:
- component: {fileID: 4741545953596444}
- component: {fileID: 61304268965346496}
- component: {fileID: 114607002923280918}
- component: {fileID: 114691327387302778}
- component: {fileID: 114001346337691594}
m_Layer: 0
m_Name: Simon
m_TagString: Untagged
......@@ -28,6 +47,23 @@ GameObject:
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!1 &1458078113871820
GameObject:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
serializedVersion: 6
m_Component:
- component: {fileID: 224435810351648112}
- component: {fileID: 222057821864383060}
- component: {fileID: 114309493912240130}
m_Layer: 5
m_Name: SecondarySpeech
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!1 &1655663179895860
GameObject:
m_ObjectHideFlags: 1
......@@ -178,8 +214,23 @@ BoxCollider2D:
adaptiveTiling: 0
m_AutoTiling: 0
serializedVersion: 2
m_Size: {x: 3.2, y: 3.11}
m_Size: {x: 4, y: 3.11}
m_EdgeRadius: 0
--- !u!114 &114001346337691594
MonoBehaviour:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: