Commit 5839e906 authored by astatham's avatar astatham
Browse files

Fixed Simon facecam bug in pie tutorial

parent 63883711
......@@ -156,6 +156,16 @@ Prefab:
propertyPath: m_Name
value: support (1)
objectReference: {fileID: 0}
- target: {fileID: 212295318277162940, guid: 898b60acf46068e48b66a74e93a9bf6e,
type: 2}
propertyPath: m_SortingOrder
value: 2
objectReference: {fileID: 0}
- target: {fileID: 212926169563688894, guid: 898b60acf46068e48b66a74e93a9bf6e,
type: 2}
propertyPath: m_SortingOrder
value: 2
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 898b60acf46068e48b66a74e93a9bf6e, type: 2}
m_IsPrefabAsset: 0
......@@ -571,7 +581,7 @@ Prefab:
type: 2}
propertyPath: m_Sprite
value:
objectReference: {fileID: 21300000, guid: c852fb3a40b9b1a44a785acb32addb90,
objectReference: {fileID: 21300000, guid: 6eafc9dbd6489444a91c8c8f0f88a445,
type: 3}
- target: {fileID: 70003561548197678, guid: ff3bdd84db8dba5468da0ea66e4bac21,
type: 2}
......@@ -1466,7 +1476,7 @@ SpriteRenderer:
m_SortingLayerID: -1966733235
m_SortingLayer: 2
m_SortingOrder: 0
m_Sprite: {fileID: 21300000, guid: c852fb3a40b9b1a44a785acb32addb90, type: 3}
m_Sprite: {fileID: 21300000, guid: 6eafc9dbd6489444a91c8c8f0f88a445, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
m_FlipY: 0
......@@ -1933,6 +1943,16 @@ Prefab:
propertyPath: m_Name
value: support (3)
objectReference: {fileID: 0}
- target: {fileID: 212295318277162940, guid: 898b60acf46068e48b66a74e93a9bf6e,
type: 2}
propertyPath: m_SortingOrder
value: 2
objectReference: {fileID: 0}
- target: {fileID: 212926169563688894, guid: 898b60acf46068e48b66a74e93a9bf6e,
type: 2}
propertyPath: m_SortingOrder
value: 2
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 898b60acf46068e48b66a74e93a9bf6e, type: 2}
m_IsPrefabAsset: 0
......@@ -2621,6 +2641,16 @@ Prefab:
propertyPath: m_RootOrder
value: 0
objectReference: {fileID: 0}
- target: {fileID: 212295318277162940, guid: 898b60acf46068e48b66a74e93a9bf6e,
type: 2}
propertyPath: m_SortingOrder
value: 3
objectReference: {fileID: 0}
- target: {fileID: 212926169563688894, guid: 898b60acf46068e48b66a74e93a9bf6e,
type: 2}
propertyPath: m_SortingOrder
value: 4
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 898b60acf46068e48b66a74e93a9bf6e, type: 2}
m_IsPrefabAsset: 0
......@@ -2774,12 +2804,12 @@ Prefab:
- target: {fileID: 212295318277162940, guid: 898b60acf46068e48b66a74e93a9bf6e,
type: 2}
propertyPath: m_SortingOrder
value: 2
value: 3
objectReference: {fileID: 0}
- target: {fileID: 212926169563688894, guid: 898b60acf46068e48b66a74e93a9bf6e,
type: 2}
propertyPath: m_SortingOrder
value: 3
value: 4
objectReference: {fileID: 0}
- target: {fileID: 1966512021026348, guid: 898b60acf46068e48b66a74e93a9bf6e, type: 2}
propertyPath: m_Name
......@@ -2998,7 +3028,7 @@ Prefab:
type: 2}
propertyPath: m_Sprite
value:
objectReference: {fileID: 21300000, guid: c852fb3a40b9b1a44a785acb32addb90,
objectReference: {fileID: 21300000, guid: 6eafc9dbd6489444a91c8c8f0f88a445,
type: 3}
- target: {fileID: 70003561548197678, guid: ff3bdd84db8dba5468da0ea66e4bac21,
type: 2}
......
......@@ -10,10 +10,12 @@ public class MovingTarget : MonoBehaviour {
private Animator anim;
private float speed;
private bool moveLeft;
void Start()
{
previousPos = -9f;
moveLeft = true;
posChangeSpeed += Random.Range(1f, -1f);
anim = GetComponent<Animator>();
/*if (gameObject.activeSelf){
......@@ -73,6 +75,10 @@ public class MovingTarget : MonoBehaviour {
private void OnTriggerEnter2D(Collider2D collision)
{
Destroy(this);
if (GetComponentInChildren<CanvasFollow>())
{
Destroy(GetComponentInChildren<CanvasFollow>());
}
//previousPos = currentPos;
}
......
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