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

updated prefabs so that facecams work and fixed an issue with preventing the...

updated prefabs so that facecams work and fixed an issue with preventing the faceDisplay from flipping
parent 7038a16b
......@@ -113,6 +113,24 @@ GameObject:
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!1 &1516274406560312
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
serializedVersion: 6
m_Component:
- component: {fileID: 4967593859512098}
- component: {fileID: 20141266176392738}
- component: {fileID: 81779262949043148}
- component: {fileID: 114609290062385056}
m_Layer: 0
m_Name: FaceCam
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!1 &1532389646548492
GameObject:
m_ObjectHideFlags: 0
......@@ -156,7 +174,7 @@ Transform:
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1297585788650952}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalPosition: {x: -0.12, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 4757854157321786}
......@@ -188,9 +206,63 @@ Transform:
m_Children:
- {fileID: 4757854157321786}
- {fileID: 224304718089781694}
- {fileID: 4967593859512098}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &4967593859512098
Transform:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1516274406560312}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0.44000006, z: -10}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 4885089913599246}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!20 &20141266176392738
Camera:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1516274406560312}
m_Enabled: 1
serializedVersion: 2
m_ClearFlags: 1
m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0}
m_projectionMatrixMode: 1
m_SensorSize: {x: 36, y: 24}
m_LensShift: {x: 0, y: 0}
m_FocalLength: 50
m_NormalizedViewPortRect:
serializedVersion: 2
x: 0
y: 0
width: 1
height: 1
near clip plane: 0.3
far clip plane: 1000
field of view: 60
orthographic: 1
orthographic size: 0.6
m_Depth: 0
m_CullingMask:
serializedVersion: 2
m_Bits: 311
m_RenderingPath: -1
m_TargetTexture: {fileID: 8400000, guid: 914f2a757743f4fec91c567ac22fb7e6, type: 2}
m_TargetDisplay: 0
m_TargetEye: 3
m_HDR: 0
m_AllowMSAA: 0
m_AllowDynamicResolution: 0
m_ForceIntoRT: 0
m_OcclusionCulling: 0
m_StereoConvergence: 10
m_StereoSeparation: 0.022
--- !u!61 &61732122826720076
BoxCollider2D:
m_ObjectHideFlags: 1
......@@ -203,7 +275,7 @@ BoxCollider2D:
m_IsTrigger: 1
m_UsedByEffector: 0
m_UsedByComposite: 0
m_Offset: {x: 0.06, y: -0.34}
m_Offset: {x: 0, y: -0.34}
m_SpriteTilingProperty:
border: {x: 0, y: 0, z: 0, w: 0}
pivot: {x: 0.5, y: 0.5}
......@@ -216,6 +288,13 @@ BoxCollider2D:
serializedVersion: 2
m_Size: {x: 4, y: 2.57}
m_EdgeRadius: 0
--- !u!81 &81779262949043148
AudioListener:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1516274406560312}
m_Enabled: 1
--- !u!114 &114094690266867812
MonoBehaviour:
m_ObjectHideFlags: 1
......@@ -348,6 +427,18 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
character: {fileID: 1297585788650952}
--- !u!114 &114609290062385056
MonoBehaviour:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1516274406560312}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: e974c821358a54736b845863bbbaef8b, type: 3}
m_Name:
m_EditorClassIdentifier:
character: {fileID: 1201578362876714}
--- !u!114 &114787342697137634
MonoBehaviour:
m_ObjectHideFlags: 1
......@@ -363,6 +454,7 @@ MonoBehaviour:
speechBox: {fileID: 114369037744403530}
secondarySpeechBox: {fileID: 114151550790006464}
playerbutton1: {fileID: 0}
faceCam: {fileID: 20141266176392738}
--- !u!114 &114808308278263708
MonoBehaviour:
m_ObjectHideFlags: 1
......@@ -501,9 +593,9 @@ SpriteRenderer:
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_SortingLayerID: -1966733235
m_SortingLayer: 2
m_SortingOrder: 1
m_Sprite: {fileID: 21300000, guid: 15fe3851b7de048f4816224babe75f78, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
......@@ -560,7 +652,7 @@ Canvas:
m_OverridePixelPerfect: 0
m_SortingBucketNormalizedSize: 0
m_AdditionalShaderChannelsFlag: 0
m_SortingLayerID: 0
m_SortingLayerID: -1020251125
m_SortingOrder: 0
m_TargetDisplay: 0
--- !u!224 &224018282793070894
......
......@@ -11,6 +11,24 @@ Prefab:
m_SourcePrefab: {fileID: 0}
m_RootGameObject: {fileID: 1229012123048104}
m_IsPrefabAsset: 1
--- !u!1 &1001696896877634
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
serializedVersion: 6
m_Component:
- component: {fileID: 4934155815108812}
- component: {fileID: 20235399982903688}
- component: {fileID: 81365263224242478}
- component: {fileID: 114572358706682802}
m_Layer: 0
m_Name: FaceCam
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!1 &1073329332813112
GameObject:
m_ObjectHideFlags: 1
......@@ -175,6 +193,7 @@ Transform:
m_Children:
- {fileID: 4209594879430634}
- {fileID: 224255128738317178}
- {fileID: 4934155815108812}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
......@@ -185,12 +204,65 @@ Transform:
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1262843543609406}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalPosition: {x: -0.11, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 4209594879430634}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &4934155815108812
Transform:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1001696896877634}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0.473, z: -10}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 4549546449924174}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!20 &20235399982903688
Camera:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1001696896877634}
m_Enabled: 1
serializedVersion: 2
m_ClearFlags: 1
m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0}
m_projectionMatrixMode: 1
m_SensorSize: {x: 36, y: 24}
m_LensShift: {x: 0, y: 0}
m_FocalLength: 50
m_NormalizedViewPortRect:
serializedVersion: 2
x: 0
y: 0
width: 1
height: 1
near clip plane: 0.3
far clip plane: 1000
field of view: 60
orthographic: 1
orthographic size: 0.4
m_Depth: 0
m_CullingMask:
serializedVersion: 2
m_Bits: 311
m_RenderingPath: -1
m_TargetTexture: {fileID: 8400000, guid: 914f2a757743f4fec91c567ac22fb7e6, type: 2}
m_TargetDisplay: 0
m_TargetEye: 3
m_HDR: 0
m_AllowMSAA: 0
m_AllowDynamicResolution: 0
m_ForceIntoRT: 0
m_OcclusionCulling: 0
m_StereoConvergence: 10
m_StereoSeparation: 0.022
--- !u!61 &61894361242696124
BoxCollider2D:
m_ObjectHideFlags: 1
......@@ -203,7 +275,7 @@ BoxCollider2D:
m_IsTrigger: 1
m_UsedByEffector: 0
m_UsedByComposite: 0
m_Offset: {x: 0.11, y: -0.24}
m_Offset: {x: 0.06, y: -0.24}
m_SpriteTilingProperty:
border: {x: 0, y: 0, z: 0, w: 0}
pivot: {x: 0.5, y: 0.5}
......@@ -216,6 +288,13 @@ BoxCollider2D:
serializedVersion: 2
m_Size: {x: 4, y: 2.11}
m_EdgeRadius: 0
--- !u!81 &81365263224242478
AudioListener:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1001696896877634}
m_Enabled: 1
--- !u!114 &114195279910367104
MonoBehaviour:
m_ObjectHideFlags: 1
......@@ -340,6 +419,18 @@ MonoBehaviour:
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
--- !u!114 &114572358706682802
MonoBehaviour:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1001696896877634}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: e974c821358a54736b845863bbbaef8b, type: 3}
m_Name:
m_EditorClassIdentifier:
character: {fileID: 1766672496195326}
--- !u!114 &114589071008195712
MonoBehaviour:
m_ObjectHideFlags: 1
......@@ -421,6 +512,7 @@ MonoBehaviour:
speechBox: {fileID: 114589071008195712}
secondarySpeechBox: {fileID: 114195279910367104}
playerbutton1: {fileID: 0}
faceCam: {fileID: 20235399982903688}
--- !u!114 &114686253410882298
MonoBehaviour:
m_ObjectHideFlags: 1
......@@ -501,9 +593,9 @@ SpriteRenderer:
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_SortingLayerID: -1966733235
m_SortingLayer: 2
m_SortingOrder: 1
m_Sprite: {fileID: 21300000, guid: 5b1cdd571c6653d4d95e3e55c00f3601, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
......@@ -560,7 +652,7 @@ Canvas:
m_OverridePixelPerfect: 0
m_SortingBucketNormalizedSize: 0
m_AdditionalShaderChannelsFlag: 0
m_SortingLayerID: 0
m_SortingLayerID: -1020251125
m_SortingOrder: 0
m_TargetDisplay: 0
--- !u!224 &224255128738317178
......
......@@ -149,6 +149,24 @@ GameObject:
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!1 &1982303048129726
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
serializedVersion: 6
m_Component:
- component: {fileID: 4200239802958770}
- component: {fileID: 20401434979081770}
- component: {fileID: 81206696293522424}
- component: {fileID: 114347785576942556}
m_Layer: 0
m_Name: FaceCam
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &4050218536098896
Transform:
m_ObjectHideFlags: 1
......@@ -156,7 +174,7 @@ Transform:
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1922186877937550}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: -0, z: 0}
m_LocalPosition: {x: -0.38, y: -0, z: 0}
m_LocalScale: {x: 2, y: 2, z: 1}
m_Children: []
m_Father: {fileID: 4741545953596444}
......@@ -174,9 +192,23 @@ Transform:
m_Children:
- {fileID: 4741545953596444}
- {fileID: 224836882606519578}
- {fileID: 4200239802958770}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &4200239802958770
Transform:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1982303048129726}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 1.05, z: -10}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 4118635779259584}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &4741545953596444
Transform:
m_ObjectHideFlags: 1
......@@ -191,6 +223,46 @@ Transform:
m_Father: {fileID: 4118635779259584}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!20 &20401434979081770
Camera:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1982303048129726}
m_Enabled: 1
serializedVersion: 2
m_ClearFlags: 1
m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0}
m_projectionMatrixMode: 1
m_SensorSize: {x: 36, y: 24}
m_LensShift: {x: 0, y: 0}
m_FocalLength: 50
m_NormalizedViewPortRect:
serializedVersion: 2
x: 0
y: 0
width: 1
height: 1
near clip plane: 0.3
far clip plane: 1000
field of view: 60
orthographic: 1
orthographic size: 0.5
m_Depth: 0
m_CullingMask:
serializedVersion: 2
m_Bits: 311
m_RenderingPath: -1
m_TargetTexture: {fileID: 8400000, guid: 914f2a757743f4fec91c567ac22fb7e6, type: 2}
m_TargetDisplay: 0
m_TargetEye: 3
m_HDR: 0
m_AllowMSAA: 0
m_AllowDynamicResolution: 0
m_ForceIntoRT: 0
m_OcclusionCulling: 0
m_StereoConvergence: 10
m_StereoSeparation: 0.022
--- !u!61 &61304268965346496
BoxCollider2D:
m_ObjectHideFlags: 1
......@@ -203,7 +275,7 @@ BoxCollider2D:
m_IsTrigger: 1
m_UsedByEffector: 0
m_UsedByComposite: 0
m_Offset: {x: 0.06, y: -0.15}
m_Offset: {x: -0.21, y: -0.15}
m_SpriteTilingProperty:
border: {x: 0, y: 0, z: 0, w: 0}
pivot: {x: 0.5, y: 0.5}
......@@ -216,6 +288,13 @@ BoxCollider2D:
serializedVersion: 2
m_Size: {x: 4, y: 3.11}
m_EdgeRadius: 0
--- !u!81 &81206696293522424
AudioListener:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1982303048129726}
m_Enabled: 1
--- !u!114 &114001346337691594
MonoBehaviour:
m_ObjectHideFlags: 1
......@@ -231,6 +310,7 @@ MonoBehaviour:
speechBox: {fileID: 114511222531318058}
secondarySpeechBox: {fileID: 114309493912240130}
playerbutton1: {fileID: 0}
faceCam: {fileID: 20401434979081770}
--- !u!114 &114020310562610740
MonoBehaviour:
m_ObjectHideFlags: 1
......@@ -398,6 +478,18 @@ MonoBehaviour:
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: beep beep im a sheep, wait, no
--- !u!114 &114347785576942556
MonoBehaviour:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1982303048129726}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: e974c821358a54736b845863bbbaef8b, type: 3}
m_Name:
m_EditorClassIdentifier:
character: {fileID: 1429544918798416}
--- !u!114 &114511222531318058
MonoBehaviour:
m_ObjectHideFlags: 1
......@@ -501,9 +593,9 @@ SpriteRenderer:
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_SortingLayerID: -1966733235
m_SortingLayer: 2
m_SortingOrder: 1
m_Sprite: {fileID: 21300000, guid: 3ae1b490507d79e4ca407331d7098f81, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
......@@ -560,7 +652,7 @@ Canvas:
m_OverridePixelPerfect: 0
m_SortingBucketNormalizedSize: 0
m_AdditionalShaderChannelsFlag: 0
m_SortingLayerID: 0
m_SortingLayerID: -1020251125
m_SortingOrder: 0
m_TargetDisplay: 0
--- !u!224 &224084167354490040
......
......@@ -307,29 +307,14 @@ Prefab:
propertyPath: playerbutton1
value:
objectReference: {fileID: 555179065}
- target: {fileID: 212820642852773866, guid: 9e7fbf1a7c7a84dbc9e793c25c9e722a,
- target: {fileID: 114572358706682802, guid: 9e7fbf1a7c7a84dbc9e793c25c9e722a,
type: 2}
propertyPath: m_SortingLayerID
value: -1966733235
objectReference: {fileID: 0}
- target: {fileID: 212820642852773866, guid: 9e7fbf1a7c7a84dbc9e793c25c9e722a,
type: 2}
propertyPath: m_SortingLayer
value: 2
objectReference: {fileID: 0}
- target: {fileID: 212820642852773866, guid: 9e7fbf1a7c7a84dbc9e793c25c9e722a,
type: 2}
propertyPath: m_SortingOrder
propertyPath: isCamera
value: 1
objectReference: {fileID: 0}
- target: {fileID: 223108999240104072, guid: 9e7fbf1a7c7a84dbc9e793c25c9e722a,
type: 2}
propertyPath: m_SortingLayerID
value: -1020251125
objectReference: {fileID: 0}
- target: {fileID: 4683994713624020, guid: 9e7fbf1a7c7a84dbc9e793c25c9e722a, type: 2}
propertyPath: m_LocalPosition.x
value: -0.11
- target: {fileID: 1001696896877634, guid: 9e7fbf1a7c7a84dbc9e793c25c9e722a, type: 2}
propertyPath: m_TagString
value: Untagged
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 9e7fbf1a7c7a84dbc9e793c25c9e722a, type: 2}
......@@ -618,96 +603,6 @@ Transform:
m_Father: {fileID: 757305217}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &627483500
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 627483501}
- component: {fileID: 627483503}
- component: {fileID: 627483502}
- component: {fileID: 627483504}
m_Layer: 0
m_Name: FaceCam
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
--- !u!4 &627483501
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 627483500}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0.119999886, y: 0.44000006, z: -10}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 1603416592}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!81 &627483502
AudioListener: