Commit 684ae822 authored by Mitchie Maluschnig's avatar Mitchie Maluschnig
Browse files

increased the size of trapeze bg stripes, fixed a bunch of visuals here and there

parent 866af6d6
......@@ -350,7 +350,7 @@ Transform:
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1050029343530560}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 5.8, z: 0}
m_LocalPosition: {x: -50, y: 5.8, z: 0}
m_LocalScale: {x: 5, y: 5, z: 1}
m_Children:
- {fileID: 4294090477210918}
......@@ -434,7 +434,7 @@ SpriteRenderer:
m_SortingLayerID: -1106870113
m_SortingLayer: 1
m_SortingOrder: 1
m_Sprite: {fileID: 21300000, guid: 76570eb117e8b5544b13bfba9c7bdca1, type: 3}
m_Sprite: {fileID: 21300000, guid: dd761c558bdb9ee4db02625f11cc532e, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
m_FlipY: 0
......@@ -480,7 +480,7 @@ SpriteRenderer:
m_SortingLayerID: -1106870113
m_SortingLayer: 1
m_SortingOrder: 2
m_Sprite: {fileID: 21300000, guid: 720f212927cebee4f8931ba9dff28a34, type: 3}
m_Sprite: {fileID: 21300000, guid: 6bca34efc16acca4f87c276c67abeb5f, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
m_FlipY: 0
......@@ -526,7 +526,7 @@ SpriteRenderer:
m_SortingLayerID: -1106870113
m_SortingLayer: 1
m_SortingOrder: 3
m_Sprite: {fileID: 21300000, guid: 635d41e5da393c44b8acfaf62375145d, type: 3}
m_Sprite: {fileID: 21300000, guid: 79c1910a2972e2744b2bb0d964218f16, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
m_FlipY: 0
......@@ -572,7 +572,7 @@ SpriteRenderer:
m_SortingLayerID: -1106870113
m_SortingLayer: 1
m_SortingOrder: 3
m_Sprite: {fileID: 21300000, guid: 635d41e5da393c44b8acfaf62375145d, type: 3}
m_Sprite: {fileID: 21300000, guid: 79c1910a2972e2744b2bb0d964218f16, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
m_FlipY: 0
......@@ -618,7 +618,7 @@ SpriteRenderer:
m_SortingLayerID: -1106870113
m_SortingLayer: 1
m_SortingOrder: 1
m_Sprite: {fileID: 21300000, guid: 76570eb117e8b5544b13bfba9c7bdca1, type: 3}
m_Sprite: {fileID: 21300000, guid: dd761c558bdb9ee4db02625f11cc532e, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
m_FlipY: 0
......@@ -664,7 +664,7 @@ SpriteRenderer:
m_SortingLayerID: -1106870113
m_SortingLayer: 1
m_SortingOrder: 3
m_Sprite: {fileID: 21300000, guid: 635d41e5da393c44b8acfaf62375145d, type: 3}
m_Sprite: {fileID: 21300000, guid: 79c1910a2972e2744b2bb0d964218f16, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
m_FlipY: 0
......@@ -710,7 +710,7 @@ SpriteRenderer:
m_SortingLayerID: -1106870113
m_SortingLayer: 1
m_SortingOrder: 0
m_Sprite: {fileID: 21300000, guid: bcc7013868b64514ba2c8d3db682968c, type: 3}
m_Sprite: {fileID: 21300000, guid: ca94c10a79c5be944b71f66db178fb64, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
m_FlipY: 0
......@@ -756,7 +756,7 @@ SpriteRenderer:
m_SortingLayerID: -1106870113
m_SortingLayer: 1
m_SortingOrder: 1
m_Sprite: {fileID: 21300000, guid: 76570eb117e8b5544b13bfba9c7bdca1, type: 3}
m_Sprite: {fileID: 21300000, guid: dd761c558bdb9ee4db02625f11cc532e, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
m_FlipY: 0
......@@ -802,7 +802,7 @@ SpriteRenderer:
m_SortingLayerID: -1106870113
m_SortingLayer: 1
m_SortingOrder: 0
m_Sprite: {fileID: 21300000, guid: bcc7013868b64514ba2c8d3db682968c, type: 3}
m_Sprite: {fileID: 21300000, guid: ca94c10a79c5be944b71f66db178fb64, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
m_FlipY: 0
......@@ -848,7 +848,7 @@ SpriteRenderer:
m_SortingLayerID: -1106870113
m_SortingLayer: 1
m_SortingOrder: 1
m_Sprite: {fileID: 21300000, guid: 76570eb117e8b5544b13bfba9c7bdca1, type: 3}
m_Sprite: {fileID: 21300000, guid: dd761c558bdb9ee4db02625f11cc532e, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
m_FlipY: 0
......@@ -940,7 +940,7 @@ SpriteRenderer:
m_SortingLayerID: -1106870113
m_SortingLayer: 1
m_SortingOrder: 3
m_Sprite: {fileID: 21300000, guid: 635d41e5da393c44b8acfaf62375145d, type: 3}
m_Sprite: {fileID: 21300000, guid: 79c1910a2972e2744b2bb0d964218f16, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
m_FlipY: 0
......
......@@ -741,7 +741,8 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: da61e2cfda3fd4ded8570cfe5faa780b, type: 3}
m_Name:
m_EditorClassIdentifier:
exitText: {fileID: 755486145}
exitText: {fileID: 775000714}
finishText: {fileID: 755486145}
exitTimer: {fileID: 937751197}
scoreText: {fileID: 1531769647}
tutorial: 0
......@@ -1073,13 +1074,13 @@ RectTransform:
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 755486143}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
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: 937751196}
m_Father: {fileID: 1407271059}
m_RootOrder: 3
m_Father: {fileID: 775000715}
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}
......@@ -1098,7 +1099,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
......@@ -1126,6 +1127,76 @@ CanvasRenderer:
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 755486143}
m_CullTransparentMesh: 0
--- !u!1 &775000714
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 775000715}
- component: {fileID: 775000717}
- component: {fileID: 775000716}
m_Layer: 5
m_Name: ExitPanel
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &775000715
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 775000714}
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: 755486144}
m_Father: {fileID: 1407271059}
m_RootOrder: 3
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: 0}
m_SizeDelta: {x: 300, y: 70}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &775000716
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 775000714}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.3773585, g: 0, b: 0, a: 0.6784314}
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_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0}
m_Type: 1
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
--- !u!222 &775000717
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 775000714}
m_CullTransparentMesh: 0
--- !u!1 &800582569
GameObject:
m_ObjectHideFlags: 0
......@@ -1353,7 +1424,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
......@@ -2173,7 +2244,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 &1407271059
......@@ -2189,7 +2260,7 @@ RectTransform:
- {fileID: 1718877380}
- {fileID: 1435360628}
- {fileID: 100312134}
- {fileID: 755486144}
- {fileID: 775000715}
m_Father: {fileID: 0}
m_RootOrder: 8
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
......@@ -2438,7 +2509,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
......@@ -3075,7 +3146,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 0.392}
m_Color: {r: 0.3773585, g: 0, b: 0, a: 0.6784314}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
......
......@@ -945,7 +945,8 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: da61e2cfda3fd4ded8570cfe5faa780b, type: 3}
m_Name:
m_EditorClassIdentifier:
exitText: {fileID: 755486145}
exitText: {fileID: 643606376}
finishText: {fileID: 755486145}
exitTimer: {fileID: 937751197}
scoreText: {fileID: 1531769647}
tutorial: 1
......@@ -1041,6 +1042,76 @@ Transform:
m_Father: {fileID: 0}
m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &643606376
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 643606377}
- component: {fileID: 643606379}
- component: {fileID: 643606378}
m_Layer: 5
m_Name: ExitPanel
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &643606377
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 643606376}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1.0001669, y: 1.0001669, z: 1.0001669}
m_Children:
- {fileID: 755486144}
m_Father: {fileID: 1407271059}
m_RootOrder: 4
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: 0}
m_SizeDelta: {x: 300, y: 70}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &643606378
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 643606376}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.3773585, g: 0, b: 0, a: 0.6784314}
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_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0}
m_Type: 1
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
--- !u!222 &643606379
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 643606376}
m_CullTransparentMesh: 0
--- !u!1 &744014527
GameObject:
m_ObjectHideFlags: 0
......@@ -1136,13 +1207,13 @@ RectTransform:
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 755486143}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
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_LocalScale: {x: 0.9998331, y: 0.9998331, z: 0.9998331}
m_Children:
- {fileID: 937751196}
m_Father: {fileID: 1407271059}
m_RootOrder: 4
m_Father: {fileID: 643606377}
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}
......@@ -1161,7 +1232,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
......@@ -1416,7 +1487,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
......@@ -2166,7 +2237,7 @@ RectTransform:
- {fileID: 1435360628}
- {fileID: 53951141}
- {fileID: 100312134}
- {fileID: 755486144}
- {fileID: 643606377}
- {fileID: 744014528}
m_Father: {fileID: 0}
m_RootOrder: 8
......@@ -2187,7 +2258,7 @@ GameObject:
- component: {fileID: 1435360630}
- component: {fileID: 1435360629}
m_Layer: 0
m_Name: LevelPanel
m_Name: PowerPanel
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
......@@ -2224,7 +2295,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.098039225, g: 0.10196079, b: 0.10980393, a: 1}
m_Color: {r: 0, g: 0, b: 0, a: 0.63529414}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
......@@ -2298,7 +2369,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
......@@ -2617,7 +2688,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 0.392}
m_Color: {r: 0.3773585, g: 0, b: 0, a: 0.6784314}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
......
......@@ -10,7 +10,8 @@ public class PieManager : MonoBehaviour {
public static bool pieInScene = false;
public static bool start = true;
public static int numTargets;
public Text exitText;
public GameObject exitText;
public Text finishText;
public Text exitTimer;
private bool gameOver;
......@@ -24,7 +25,7 @@ public class PieManager : MonoBehaviour {
if(pieCount == 0 || numTargets == 0){
if (numTargets == 0)
{
exitText.text = "All targets hit! Exiting";
finishText.text = "All targets hit! Exiting";
}
if (!gameOver) {
gameOver = true;
......
fileFormatVersion: 2
guid: 635d41e5da393c44b8acfaf62375145d
guid: dd761c558bdb9ee4db02625f11cc532e
TextureImporter:
fileIDToRecycleName: {}
externalObjects: {}
......@@ -75,7 +75,7 @@ TextureImporter:
outline: []
physicsShape: []
bones: []
spriteID: 258357c31e1d5324ca5d10807f2388ac
spriteID: cbda9782afc49a1408d2c95e8771b054
vertices: []
indices:
edges: []
......
fileFormatVersion: 2
guid: 76570eb117e8b5544b13bfba9c7bdca1
guid: 6bca34efc16acca4f87c276c67abeb5f
TextureImporter:
fileIDToRecycleName: {}
externalObjects: {}
......@@ -75,7 +75,7 @@ TextureImporter:
outline: []
physicsShape: []
bones: []
spriteID: e07fd6b3bfe6f9b4796a8b4e5fbb7274
spriteID: 2e63b9f15a9bc4f4f9ad7cdd9ce18adf
vertices: []
indices:
edges: []
......
fileFormatVersion: 2
guid: 720f212927cebee4f8931ba9dff28a34
guid: 79c1910a2972e2744b2bb0d964218f16
TextureImporter:
fileIDToRecycleName: {}
externalObjects: {}
......@@ -75,7 +75,7 @@ TextureImporter:
outline: []
physicsShape: []
bones: []
spriteID: 6c160073faff9c348ada14602667ab36
spriteID: 7c8eed5c99621e44381482a3f676219d
vertices: []
indices:
edges: []
......
fileFormatVersion: 2
guid: bcc7013868b64514ba2c8d3db682968c
guid: ca94c10a79c5be944b71f66db178fb64
TextureImporter:
fileIDToRecycleName: {}
externalObjects: {}
......@@ -75,7 +75,7 @@ TextureImporter:
outline: []
physicsShape: []
bones: []
spriteID: 6d36acbd1bcab3144b8ad59db69301e1
spriteID: de45b7dd27222d348ba53bbcc4d03a64
vertices: []
indices:
edges: []
......
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