Commit efae650a authored by mmaluschnig's avatar mmaluschnig
Browse files

tidied up Simon and player prefabs

parent 7c4a4355
......@@ -35,7 +35,7 @@ GameObject:
m_PrefabInternal: {fileID: 100100000}
serializedVersion: 6
m_Component:
- component: {fileID: 224009015136669916}
- component: {fileID: 4326011112805000}
m_Layer: 5
m_Name: PlayerPrefab
m_TagString: Untagged
......@@ -116,6 +116,21 @@ GameObject:
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &4326011112805000
Transform:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1155454820059914}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 1.271, y: -0.07000017, z: 0}
m_LocalScale: {x: 0.01, y: 0.01, z: 1}
m_Children:
- {fileID: 4845015650358456}
- {fileID: 224778898687761304}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &4845015650358456
Transform:
m_ObjectHideFlags: 1
......@@ -126,7 +141,7 @@ Transform:
m_LocalPosition: {x: 0, y: -262, z: 0}
m_LocalScale: {x: 100, y: 100, z: 1}
m_Children: []
m_Father: {fileID: 224009015136669916}
m_Father: {fileID: 4326011112805000}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!50 &50961624618835074
......@@ -449,26 +464,6 @@ Canvas:
m_SortingLayerID: 0
m_SortingOrder: 0
m_TargetDisplay: 0
--- !u!224 &224009015136669916
RectTransform:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1155454820059914}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0.01, y: 0.01, z: 1}
m_Children:
- {fileID: 4845015650358456}
- {fileID: 224778898687761304}
m_Father: {fileID: 0}
m_RootOrder: 0
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: 1.271, y: -0.07000017}
m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!224 &224153010147985166
RectTransform:
m_ObjectHideFlags: 1
......@@ -518,7 +513,7 @@ RectTransform:
m_Children:
- {fileID: 224516315276490334}
- {fileID: 224153010147985166}
m_Father: {fileID: 224009015136669916}
m_Father: {fileID: 4326011112805000}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
......
......@@ -397,7 +397,7 @@ MonoBehaviour:
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: My beard sense is tingling
m_Text: beep beep im a sheep, wait, no
--- !u!114 &114511222531318058
MonoBehaviour:
m_ObjectHideFlags: 1
......@@ -430,7 +430,7 @@ MonoBehaviour:
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: Didnt want to admire my glorious beard?
m_Text: rawr rawr im a bear hehe xd
--- !u!114 &114607002923280918
MonoBehaviour:
m_ObjectHideFlags: 1
......
......@@ -300,104 +300,46 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 5
m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &394067567
--- !u!1001 &374463344
Prefab:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 224009015136669916, guid: 1601fd9c4dae6aa49a28743fde0bd9a3,
type: 2}
- target: {fileID: 4326011112805000, guid: 1601fd9c4dae6aa49a28743fde0bd9a3, type: 2}
propertyPath: m_LocalPosition.x
value: 0
value: 1.271
objectReference: {fileID: 0}
- target: {fileID: 224009015136669916, guid: 1601fd9c4dae6aa49a28743fde0bd9a3,
type: 2}
- target: {fileID: 4326011112805000, guid: 1601fd9c4dae6aa49a28743fde0bd9a3, type: 2}
propertyPath: m_LocalPosition.y
value: 0
value: -0.07000017
objectReference: {fileID: 0}
- target: {fileID: 224009015136669916, guid: 1601fd9c4dae6aa49a28743fde0bd9a3,
type: 2}
- target: {fileID: 4326011112805000, guid: 1601fd9c4dae6aa49a28743fde0bd9a3, type: 2}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 224009015136669916, guid: 1601fd9c4dae6aa49a28743fde0bd9a3,
type: 2}
- target: {fileID: 4326011112805000, guid: 1601fd9c4dae6aa49a28743fde0bd9a3, type: 2}
propertyPath: m_LocalRotation.x
value: -0
objectReference: {fileID: 0}
- target: {fileID: 224009015136669916, guid: 1601fd9c4dae6aa49a28743fde0bd9a3,
type: 2}
- target: {fileID: 4326011112805000, guid: 1601fd9c4dae6aa49a28743fde0bd9a3, type: 2}
propertyPath: m_LocalRotation.y
value: -0
objectReference: {fileID: 0}
- target: {fileID: 224009015136669916, guid: 1601fd9c4dae6aa49a28743fde0bd9a3,
type: 2}
- target: {fileID: 4326011112805000, guid: 1601fd9c4dae6aa49a28743fde0bd9a3, type: 2}
propertyPath: m_LocalRotation.z
value: -0
objectReference: {fileID: 0}
- target: {fileID: 224009015136669916, guid: 1601fd9c4dae6aa49a28743fde0bd9a3,
type: 2}
- target: {fileID: 4326011112805000, guid: 1601fd9c4dae6aa49a28743fde0bd9a3, type: 2}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 224009015136669916, guid: 1601fd9c4dae6aa49a28743fde0bd9a3,
type: 2}
- target: {fileID: 4326011112805000, guid: 1601fd9c4dae6aa49a28743fde0bd9a3, type: 2}
propertyPath: m_RootOrder
value: 3
objectReference: {fileID: 0}
- target: {fileID: 224009015136669916, guid: 1601fd9c4dae6aa49a28743fde0bd9a3,
type: 2}
propertyPath: m_AnchoredPosition.x
value: 1.271
objectReference: {fileID: 0}
- target: {fileID: 224009015136669916, guid: 1601fd9c4dae6aa49a28743fde0bd9a3,
type: 2}
propertyPath: m_AnchoredPosition.y
value: -0.07000017
objectReference: {fileID: 0}
- target: {fileID: 224009015136669916, guid: 1601fd9c4dae6aa49a28743fde0bd9a3,
type: 2}
propertyPath: m_SizeDelta.x
value: 100
objectReference: {fileID: 0}
- target: {fileID: 224009015136669916, guid: 1601fd9c4dae6aa49a28743fde0bd9a3,
type: 2}
propertyPath: m_SizeDelta.y
value: 100
objectReference: {fileID: 0}
- target: {fileID: 224009015136669916, guid: 1601fd9c4dae6aa49a28743fde0bd9a3,
type: 2}
propertyPath: m_AnchorMin.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 224009015136669916, guid: 1601fd9c4dae6aa49a28743fde0bd9a3,
type: 2}
propertyPath: m_AnchorMin.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 224009015136669916, guid: 1601fd9c4dae6aa49a28743fde0bd9a3,
type: 2}
propertyPath: m_AnchorMax.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 224009015136669916, guid: 1601fd9c4dae6aa49a28743fde0bd9a3,
type: 2}
propertyPath: m_AnchorMax.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 224009015136669916, guid: 1601fd9c4dae6aa49a28743fde0bd9a3,
type: 2}
propertyPath: m_Pivot.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 224009015136669916, guid: 1601fd9c4dae6aa49a28743fde0bd9a3,
type: 2}
propertyPath: m_Pivot.y
value: 0.5
value: 5
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 1601fd9c4dae6aa49a28743fde0bd9a3, type: 2}
......@@ -525,7 +467,7 @@ Transform:
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 114085418804974162, guid: 1601fd9c4dae6aa49a28743fde0bd9a3,
type: 2}
m_PrefabInternal: {fileID: 394067567}
m_PrefabInternal: {fileID: 374463344}
m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3}
--- !u!1 &601223109
GameObject:
......@@ -663,6 +605,35 @@ SpriteRenderer:
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!1 &867173046
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 867173047}
m_Layer: 0
m_Name: Dialogue Box
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &867173047
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 867173046}
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:
- {fileID: 1949598428}
m_Father: {fileID: 0}
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1193059960
GameObject:
m_ObjectHideFlags: 0
......@@ -1248,5 +1219,98 @@ Transform:
- {fileID: 1424317323}
- {fileID: 110357699}
m_Father: {fileID: 0}
m_RootOrder: 4
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1949598427
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1949598428}
- component: {fileID: 1949598431}
- component: {fileID: 1949598430}
- component: {fileID: 1949598429}
m_Layer: 0
m_Name: Canvas
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &1949598428
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1949598427}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0, y: 0, z: 0}
m_Children: []
m_Father: {fileID: 867173047}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0, y: 0}
--- !u!114 &1949598429
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1949598427}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 1301386320, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_IgnoreReversedGraphics: 1
m_BlockingObjects: 0
m_BlockingMask:
serializedVersion: 2
m_Bits: 4294967295
--- !u!114 &1949598430
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1949598427}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 1980459831, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_UiScaleMode: 0
m_ReferencePixelsPerUnit: 100
m_ScaleFactor: 1
m_ReferenceResolution: {x: 800, y: 600}
m_ScreenMatchMode: 0
m_MatchWidthOrHeight: 0
m_PhysicalUnit: 3
m_FallbackScreenDPI: 96
m_DefaultSpriteDPI: 96
m_DynamicPixelsPerUnit: 1
--- !u!223 &1949598431
Canvas:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1949598427}
m_Enabled: 1
serializedVersion: 3
m_RenderMode: 0
m_Camera: {fileID: 0}
m_PlaneDistance: 100
m_PixelPerfect: 0
m_ReceivesEvents: 1
m_OverrideSorting: 0
m_OverridePixelPerfect: 0
m_SortingBucketNormalizedSize: 0
m_AdditionalShaderChannelsFlag: 0
m_SortingLayerID: 0
m_SortingOrder: 0
m_TargetDisplay: 0
m_EditorVersion: 2018.2.11f1
m_EditorVersion: 2018.2.12f1
Supports Markdown
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