Commit 4758ba7a authored by Mitchie Maluschnig's avatar Mitchie Maluschnig
Browse files

Merge branch 'piethrowing'

parents 169cc128 aa740884
...@@ -156,6 +156,16 @@ Prefab: ...@@ -156,6 +156,16 @@ Prefab:
propertyPath: m_Name propertyPath: m_Name
value: support (1) value: support (1)
objectReference: {fileID: 0} 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_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 898b60acf46068e48b66a74e93a9bf6e, type: 2} m_SourcePrefab: {fileID: 100100000, guid: 898b60acf46068e48b66a74e93a9bf6e, type: 2}
m_IsPrefabAsset: 0 m_IsPrefabAsset: 0
...@@ -571,7 +581,7 @@ Prefab: ...@@ -571,7 +581,7 @@ Prefab:
type: 2} type: 2}
propertyPath: m_Sprite propertyPath: m_Sprite
value: value:
objectReference: {fileID: 21300000, guid: c852fb3a40b9b1a44a785acb32addb90, objectReference: {fileID: 21300000, guid: 6eafc9dbd6489444a91c8c8f0f88a445,
type: 3} type: 3}
- target: {fileID: 70003561548197678, guid: ff3bdd84db8dba5468da0ea66e4bac21, - target: {fileID: 70003561548197678, guid: ff3bdd84db8dba5468da0ea66e4bac21,
type: 2} type: 2}
...@@ -1466,7 +1476,7 @@ SpriteRenderer: ...@@ -1466,7 +1476,7 @@ SpriteRenderer:
m_SortingLayerID: -1966733235 m_SortingLayerID: -1966733235
m_SortingLayer: 2 m_SortingLayer: 2
m_SortingOrder: 0 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_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0 m_FlipX: 0
m_FlipY: 0 m_FlipY: 0
...@@ -1933,6 +1943,16 @@ Prefab: ...@@ -1933,6 +1943,16 @@ Prefab:
propertyPath: m_Name propertyPath: m_Name
value: support (3) value: support (3)
objectReference: {fileID: 0} 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_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 898b60acf46068e48b66a74e93a9bf6e, type: 2} m_SourcePrefab: {fileID: 100100000, guid: 898b60acf46068e48b66a74e93a9bf6e, type: 2}
m_IsPrefabAsset: 0 m_IsPrefabAsset: 0
...@@ -2621,6 +2641,16 @@ Prefab: ...@@ -2621,6 +2641,16 @@ Prefab:
propertyPath: m_RootOrder propertyPath: m_RootOrder
value: 0 value: 0
objectReference: {fileID: 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_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 898b60acf46068e48b66a74e93a9bf6e, type: 2} m_SourcePrefab: {fileID: 100100000, guid: 898b60acf46068e48b66a74e93a9bf6e, type: 2}
m_IsPrefabAsset: 0 m_IsPrefabAsset: 0
...@@ -2774,12 +2804,12 @@ Prefab: ...@@ -2774,12 +2804,12 @@ Prefab:
- target: {fileID: 212295318277162940, guid: 898b60acf46068e48b66a74e93a9bf6e, - target: {fileID: 212295318277162940, guid: 898b60acf46068e48b66a74e93a9bf6e,
type: 2} type: 2}
propertyPath: m_SortingOrder propertyPath: m_SortingOrder
value: 2 value: 3
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 212926169563688894, guid: 898b60acf46068e48b66a74e93a9bf6e, - target: {fileID: 212926169563688894, guid: 898b60acf46068e48b66a74e93a9bf6e,
type: 2} type: 2}
propertyPath: m_SortingOrder propertyPath: m_SortingOrder
value: 3 value: 4
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 1966512021026348, guid: 898b60acf46068e48b66a74e93a9bf6e, type: 2} - target: {fileID: 1966512021026348, guid: 898b60acf46068e48b66a74e93a9bf6e, type: 2}
propertyPath: m_Name propertyPath: m_Name
...@@ -2998,7 +3028,7 @@ Prefab: ...@@ -2998,7 +3028,7 @@ Prefab:
type: 2} type: 2}
propertyPath: m_Sprite propertyPath: m_Sprite
value: value:
objectReference: {fileID: 21300000, guid: c852fb3a40b9b1a44a785acb32addb90, objectReference: {fileID: 21300000, guid: 6eafc9dbd6489444a91c8c8f0f88a445,
type: 3} type: 3}
- target: {fileID: 70003561548197678, guid: ff3bdd84db8dba5468da0ea66e4bac21, - target: {fileID: 70003561548197678, guid: ff3bdd84db8dba5468da0ea66e4bac21,
type: 2} type: 2}
......
...@@ -10,10 +10,12 @@ public class MovingTarget : MonoBehaviour { ...@@ -10,10 +10,12 @@ public class MovingTarget : MonoBehaviour {
private Animator anim; private Animator anim;
private float speed; private float speed;
private bool moveLeft;
void Start() void Start()
{ {
previousPos = -9f; previousPos = -9f;
moveLeft = true;
posChangeSpeed += Random.Range(1f, -1f); posChangeSpeed += Random.Range(1f, -1f);
anim = GetComponent<Animator>(); anim = GetComponent<Animator>();
/*if (gameObject.activeSelf){ /*if (gameObject.activeSelf){
...@@ -73,6 +75,10 @@ public class MovingTarget : MonoBehaviour { ...@@ -73,6 +75,10 @@ public class MovingTarget : MonoBehaviour {
private void OnTriggerEnter2D(Collider2D collision) private void OnTriggerEnter2D(Collider2D collision)
{ {
Destroy(this); Destroy(this);
if (GetComponentInChildren<CanvasFollow>())
{
Destroy(GetComponentInChildren<CanvasFollow>());
}
//previousPos = currentPos; //previousPos = currentPos;
} }
......
{\rtf1\ansi\ansicpg1252\cocoartf1671\cocoasubrtf200 Ever wanted to be the greatest circus performer of all time? Well, here's your chance! Start your journey as the newest member of the crew and climb the carnival ladder, meeting some weird and wonderful characters along the way! And remember there's no failure at the circus, only fun!
{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
{\colortbl;\red255\green255\blue255;}
{\*\expandedcolortbl;;}
\margl1440\margr1440\vieww10800\viewh8400\viewkind0
\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural\partightenfactor0
\f0\fs24 \cf0 Ever wanted to be the greatest circus performer of all time? Well, here\'92s your chance! Start your journey as the newest member of the crew and climb the carnival ladder, meeting some weird and wonderful characters along the way! And remember there\'92s no failure at the circus, only fun!\ Instructions:
\ Daytime scene - A and D (or left and right) to move, W (or up) to interact, 1,2,3 to choose dialogue options
Instructions:\ Pie Throwing - Space down to set angle, space up to set power and to throw
Daytime scene - A and D (or left and right) to move, W (or up) to interact, 1,2,3 to choose dialogue options\ MimeMime - QWER or WASD (or arrow keys) to hit the notes
Pie Throwing - Space down to set angle, space up to set power and to throw \ Trapeze - A and D to swing and rotate in mid-air, space to let go of trapeze
MimeMime - QWER or WASD (or arrow keys) to hit the notes\ General - Esc to access pause menu
Trapeze - A and D to swing and rotate in mid-air, space to let go of trapeze \
General - Esc to access pause menu\ Known issues:
\ Moving targets sometimes get stuck in place in pie throwing
Music courtesy of Kevin Macleod and incompetech.com\
Sound effects courtesy of freesound.org} Music courtesy of Kevin Macleod and incompetech.com
\ No newline at end of file Sound effects courtesy of freesound.org
\ No newline at end of file
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