From 3fdf1a0103f73af2e09b654c4ea02f5b6165d696 Mon Sep 17 00:00:00 2001
From: ziegenf4 <ziegenf4@msu.edu>
Date: Mon, 22 Apr 2024 18:02:37 -0400
Subject: [PATCH] UI changes
---
Assets/Prefabs/UI/Canvas.prefab | 585 +++++++++++++++++-
Assets/Prefabs/UI/PointsPrefab.prefab | 2 +-
.../Finalized Scenes/LevelV1-Finalized.unity | 584 +----------------
Assets/Scripts/Game Systems/GM.cs | 25 +-
Assets/Scripts/Game Systems/PointTracker.cs | 2 +-
5 files changed, 597 insertions(+), 601 deletions(-)
diff --git a/Assets/Prefabs/UI/Canvas.prefab b/Assets/Prefabs/UI/Canvas.prefab
index 5d1c839..c1fd1b3 100644
--- a/Assets/Prefabs/UI/Canvas.prefab
+++ b/Assets/Prefabs/UI/Canvas.prefab
@@ -151,7 +151,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
- m_IsActive: 1
+ m_IsActive: 0
--- !u!224 &184906735829793803
RectTransform:
m_ObjectHideFlags: 0
@@ -304,7 +304,10 @@ RectTransform:
- {fileID: 9050627228898515155}
- {fileID: 184906735829793803}
- {fileID: 4990961992311145598}
+ - {fileID: 6954507749186114104}
- {fileID: 2238215701444918732}
+ - {fileID: 5934212647430267646}
+ - {fileID: 1214889294479665944}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
@@ -415,7 +418,11 @@ MonoBehaviour:
m_RotationOrder: 4
maxComboMultiplier: 100
sprintSlider: {fileID: 8102476545377027574}
- txtChildren: []
+ chaosSlider: {fileID: 6428478428636892697}
+ scoreText: {fileID: 4236462297071796605}
+ comboText: {fileID: 5301180041488004360}
+ SlowMoTriggerVelocity: 5
+ SlowMoDuration: 0.3
SlowSpeedCurve:
serializedVersion: 2
m_Curve:
@@ -449,6 +456,117 @@ MonoBehaviour:
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
+--- !u!1 &551991440807346380
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 5327925133862093013}
+ - component: {fileID: 1068948406367513951}
+ - component: {fileID: 3585367293778008331}
+ m_Layer: 5
+ m_Name: powerup ui 1
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &5327925133862093013
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 551991440807346380}
+ m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+ m_LocalPosition: {x: 0, y: 0, z: 0}
+ m_LocalScale: {x: 0.1625, y: 0.22505999, z: 1}
+ m_ConstrainProportionsScale: 0
+ m_Children: []
+ m_Father: {fileID: 1214889294479665944}
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 1, y: 1}
+ m_AnchoredPosition: {x: 0, y: 0}
+ m_SizeDelta: {x: 799.99994, y: 449.99997}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &1068948406367513951
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 551991440807346380}
+ m_CullTransparentMesh: 1
+--- !u!114 &3585367293778008331
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 551991440807346380}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ m_Color: {r: 1, g: 1, b: 1, a: 1}
+ m_RaycastTarget: 1
+ m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+ m_Maskable: 1
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ 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
+ m_UseSpriteMesh: 0
+ m_PixelsPerUnitMultiplier: 1
+--- !u!1 &2091829285995761555
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 2823585199160740086}
+ m_Layer: 5
+ m_Name: Fill Area
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &2823585199160740086
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2091829285995761555}
+ 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_ConstrainProportionsScale: 0
+ m_Children:
+ - {fileID: 8159476543796440838}
+ m_Father: {fileID: 6954507749186114104}
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0, y: 0.25}
+ m_AnchorMax: {x: 1, y: 0.75}
+ m_AnchoredPosition: {x: 0, y: 0}
+ m_SizeDelta: {x: 0, y: 0}
+ m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &2204432932048847562
GameObject:
m_ObjectHideFlags: 0
@@ -524,6 +642,81 @@ MonoBehaviour:
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
+--- !u!1 &4264764846366738695
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 6611348878624456353}
+ - component: {fileID: 1446110707060242162}
+ - component: {fileID: 7132291376955188400}
+ m_Layer: 5
+ m_Name: Background
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &6611348878624456353
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 4264764846366738695}
+ 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_ConstrainProportionsScale: 0
+ m_Children: []
+ m_Father: {fileID: 6954507749186114104}
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0, y: 0.25}
+ m_AnchorMax: {x: 1, y: 0.75}
+ m_AnchoredPosition: {x: -0.000030517578, y: -0.000061035156}
+ m_SizeDelta: {x: 0, y: 0}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &1446110707060242162
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 4264764846366738695}
+ m_CullTransparentMesh: 1
+--- !u!114 &7132291376955188400
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 4264764846366738695}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ m_Color: {r: 1, g: 1, b: 1, a: 1}
+ m_RaycastTarget: 1
+ m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+ m_Maskable: 1
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ 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
+ m_UseSpriteMesh: 0
+ m_PixelsPerUnitMultiplier: 1
--- !u!1 &4291852449502689381
GameObject:
m_ObjectHideFlags: 0
@@ -592,10 +785,10 @@ RectTransform:
m_Children: []
m_Father: {fileID: 267049304060646192}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0.5, y: 1}
- m_AnchorMax: {x: 0.5, y: 1}
- m_AnchoredPosition: {x: 0, y: -69}
- m_SizeDelta: {x: 200, y: 50}
+ m_AnchorMin: {x: 0.245, y: 0.84268767}
+ m_AnchorMax: {x: 0.5, y: 0.9606247}
+ m_AnchoredPosition: {x: 0, y: 0.5}
+ m_SizeDelta: {x: -4, y: -1}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5755851563912927270
CanvasRenderer:
@@ -625,7 +818,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
- m_text: 'COMBO *0 '
+ m_text: 0X
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
@@ -634,8 +827,8 @@ MonoBehaviour:
m_fontMaterials: []
m_fontColor32:
serializedVersion: 2
- rgba: 4278247134
- m_fontColor: {r: 0.87058824, g: 0.87058824, b: 0, a: 1}
+ rgba: 4278246938
+ m_fontColor: {r: 0.102493435, g: 0.87058824, b: 0, a: 1}
m_enableVertexGradient: 0
m_colorMode: 3
m_fontColorGradient:
@@ -694,6 +887,95 @@ MonoBehaviour:
m_hasFontAssetChanged: 0
m_baseMaterial: {fileID: 0}
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
+--- !u!1 &7090440470266669412
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 6954507749186114104}
+ - component: {fileID: 6428478428636892697}
+ m_Layer: 5
+ m_Name: Chaos Slider
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &6954507749186114104
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 7090440470266669412}
+ 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_ConstrainProportionsScale: 0
+ m_Children:
+ - {fileID: 6611348878624456353}
+ - {fileID: 2823585199160740086}
+ m_Father: {fileID: 267049304060646192}
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0.4025, y: 0.86581105}
+ m_AnchorMax: {x: 0.60124993, y: 0.95137537}
+ m_AnchoredPosition: {x: -1.5, y: -2.5}
+ m_SizeDelta: {x: 1, y: 3}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &6428478428636892697
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 7090440470266669412}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 67db9e8f0e2ae9c40bc1e2b64352a6b4, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Navigation:
+ m_Mode: 3
+ m_WrapAround: 0
+ m_SelectOnUp: {fileID: 0}
+ m_SelectOnDown: {fileID: 0}
+ m_SelectOnLeft: {fileID: 0}
+ m_SelectOnRight: {fileID: 0}
+ m_Transition: 1
+ m_Colors:
+ m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+ m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+ m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+ m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+ m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+ m_ColorMultiplier: 1
+ m_FadeDuration: 0.1
+ m_SpriteState:
+ m_HighlightedSprite: {fileID: 0}
+ m_PressedSprite: {fileID: 0}
+ m_SelectedSprite: {fileID: 0}
+ m_DisabledSprite: {fileID: 0}
+ m_AnimationTriggers:
+ m_NormalTrigger: Normal
+ m_HighlightedTrigger: Highlighted
+ m_PressedTrigger: Pressed
+ m_SelectedTrigger: Selected
+ m_DisabledTrigger: Disabled
+ m_Interactable: 0
+ m_TargetGraphic: {fileID: 0}
+ m_FillRect: {fileID: 8159476543796440838}
+ m_HandleRect: {fileID: 0}
+ m_Direction: 0
+ m_MinValue: 0
+ m_MaxValue: 50000
+ m_WholeNumbers: 0
+ m_Value: 0
+ m_OnValueChanged:
+ m_PersistentCalls:
+ m_Calls: []
--- !u!1 &7230680854217357651
GameObject:
m_ObjectHideFlags: 0
@@ -926,3 +1208,288 @@ MonoBehaviour:
m_OnValueChanged:
m_PersistentCalls:
m_Calls: []
+--- !u!1 &8465653915853072265
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 8159476543796440838}
+ - component: {fileID: 552888582963315503}
+ - component: {fileID: 3499190038016078212}
+ - component: {fileID: 3767453675589074485}
+ m_Layer: 5
+ m_Name: Fill
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &8159476543796440838
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 8465653915853072265}
+ 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_ConstrainProportionsScale: 0
+ m_Children: []
+ m_Father: {fileID: 2823585199160740086}
+ 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.5, y: 0.5}
+--- !u!222 &552888582963315503
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 8465653915853072265}
+ m_CullTransparentMesh: 1
+--- !u!114 &3499190038016078212
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 8465653915853072265}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ m_Color: {r: 1, g: 0, b: 0, a: 1}
+ m_RaycastTarget: 1
+ m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+ m_Maskable: 1
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0}
+ m_Type: 1
+ m_PreserveAspect: 0
+ m_FillCenter: 1
+ m_FillMethod: 0
+ m_FillAmount: 0
+ m_FillClockwise: 1
+ m_FillOrigin: 0
+ m_UseSpriteMesh: 0
+ m_PixelsPerUnitMultiplier: 1
+--- !u!114 &3767453675589074485
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 8465653915853072265}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: b2fc7400fe19d6340bb12f2058e331bc, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ _gradient:
+ serializedVersion: 2
+ key0: {r: 1, g: 0.015686275, b: 0, a: 1}
+ key1: {r: 0.99607843, g: 0.915632, b: 0.007843133, a: 1}
+ key2: {r: 0, g: 1, b: 0.118023396, a: 0}
+ key3: {r: 0, g: 0, b: 0, a: 0}
+ key4: {r: 0, g: 0, b: 0, a: 0}
+ key5: {r: 0, g: 0, b: 0, a: 0}
+ key6: {r: 0, g: 0, b: 0, a: 0}
+ key7: {r: 0, g: 0, b: 0, a: 0}
+ ctime0: 0
+ ctime1: 32768
+ ctime2: 65304
+ ctime3: 0
+ ctime4: 0
+ ctime5: 0
+ ctime6: 0
+ ctime7: 0
+ atime0: 0
+ atime1: 65535
+ atime2: 0
+ atime3: 0
+ atime4: 0
+ atime5: 0
+ atime6: 0
+ atime7: 0
+ m_Mode: 0
+ m_ColorSpace: -1
+ m_NumColorKeys: 3
+ m_NumAlphaKeys: 2
+ _image: {fileID: 3499190038016078212}
+--- !u!1 &8470283676710401412
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1214889294479665944}
+ - component: {fileID: 8073164790354141130}
+ m_Layer: 5
+ m_Name: Powerup UI Manager
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 0
+--- !u!224 &1214889294479665944
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 8470283676710401412}
+ 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_ConstrainProportionsScale: 0
+ m_Children:
+ - {fileID: 5327925133862093013}
+ m_Father: {fileID: 267049304060646192}
+ 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: 0, y: 0}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &8073164790354141130
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 8470283676710401412}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 9e9aa552b12fa4db39e7a9ee092ff0e7, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ powerupUIComponents: []
+ speed: {fileID: 0}
+ speedPowerupUI: {fileID: 551991440807346380}
+--- !u!1001 &4273326096531318791
+PrefabInstance:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_Modification:
+ serializedVersion: 3
+ m_TransformParent: {fileID: 267049304060646192}
+ m_Modifications:
+ - target: {fileID: 2137160592996659769, guid: 9efdc9c2a94b8a5478023b732d5aa5c5, type: 3}
+ propertyPath: m_Name
+ value: Timer
+ objectReference: {fileID: 0}
+ - target: {fileID: 5423666487528666627, guid: 9efdc9c2a94b8a5478023b732d5aa5c5, type: 3}
+ propertyPath: gm
+ value:
+ objectReference: {fileID: 2460987501928265480}
+ - target: {fileID: 5423666487528666627, guid: 9efdc9c2a94b8a5478023b732d5aa5c5, type: 3}
+ propertyPath: tracker
+ value:
+ objectReference: {fileID: 2284625504777190685, guid: e17e38e5b41db384bb6ab481c312f7f9, type: 3}
+ - target: {fileID: 5423666487528666627, guid: 9efdc9c2a94b8a5478023b732d5aa5c5, type: 3}
+ propertyPath: remainingTime
+ value: 20
+ objectReference: {fileID: 0}
+ - target: {fileID: 7572637330722376441, guid: 9efdc9c2a94b8a5478023b732d5aa5c5, type: 3}
+ propertyPath: m_Pivot.x
+ value: 0.5
+ objectReference: {fileID: 0}
+ - target: {fileID: 7572637330722376441, guid: 9efdc9c2a94b8a5478023b732d5aa5c5, type: 3}
+ propertyPath: m_Pivot.y
+ value: 0.5
+ objectReference: {fileID: 0}
+ - target: {fileID: 7572637330722376441, guid: 9efdc9c2a94b8a5478023b732d5aa5c5, type: 3}
+ propertyPath: m_AnchorMax.x
+ value: 0.5
+ objectReference: {fileID: 0}
+ - target: {fileID: 7572637330722376441, guid: 9efdc9c2a94b8a5478023b732d5aa5c5, type: 3}
+ propertyPath: m_AnchorMax.y
+ value: 0.5
+ objectReference: {fileID: 0}
+ - target: {fileID: 7572637330722376441, guid: 9efdc9c2a94b8a5478023b732d5aa5c5, type: 3}
+ propertyPath: m_AnchorMin.x
+ value: 0.5
+ objectReference: {fileID: 0}
+ - target: {fileID: 7572637330722376441, guid: 9efdc9c2a94b8a5478023b732d5aa5c5, type: 3}
+ propertyPath: m_AnchorMin.y
+ value: 0.5
+ objectReference: {fileID: 0}
+ - target: {fileID: 7572637330722376441, guid: 9efdc9c2a94b8a5478023b732d5aa5c5, type: 3}
+ propertyPath: m_SizeDelta.x
+ value: 200
+ objectReference: {fileID: 0}
+ - target: {fileID: 7572637330722376441, guid: 9efdc9c2a94b8a5478023b732d5aa5c5, type: 3}
+ propertyPath: m_SizeDelta.y
+ value: 50
+ objectReference: {fileID: 0}
+ - target: {fileID: 7572637330722376441, guid: 9efdc9c2a94b8a5478023b732d5aa5c5, type: 3}
+ propertyPath: m_LocalPosition.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7572637330722376441, guid: 9efdc9c2a94b8a5478023b732d5aa5c5, type: 3}
+ propertyPath: m_LocalPosition.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7572637330722376441, guid: 9efdc9c2a94b8a5478023b732d5aa5c5, type: 3}
+ propertyPath: m_LocalPosition.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7572637330722376441, guid: 9efdc9c2a94b8a5478023b732d5aa5c5, type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 7572637330722376441, guid: 9efdc9c2a94b8a5478023b732d5aa5c5, type: 3}
+ propertyPath: m_LocalRotation.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7572637330722376441, guid: 9efdc9c2a94b8a5478023b732d5aa5c5, type: 3}
+ propertyPath: m_LocalRotation.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7572637330722376441, guid: 9efdc9c2a94b8a5478023b732d5aa5c5, type: 3}
+ propertyPath: m_LocalRotation.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7572637330722376441, guid: 9efdc9c2a94b8a5478023b732d5aa5c5, type: 3}
+ propertyPath: m_AnchoredPosition.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7572637330722376441, guid: 9efdc9c2a94b8a5478023b732d5aa5c5, type: 3}
+ propertyPath: m_AnchoredPosition.y
+ value: -144
+ objectReference: {fileID: 0}
+ - target: {fileID: 7572637330722376441, guid: 9efdc9c2a94b8a5478023b732d5aa5c5, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7572637330722376441, guid: 9efdc9c2a94b8a5478023b732d5aa5c5, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7572637330722376441, guid: 9efdc9c2a94b8a5478023b732d5aa5c5, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: 0
+ objectReference: {fileID: 0}
+ m_RemovedComponents: []
+ m_RemovedGameObjects: []
+ m_AddedGameObjects: []
+ m_AddedComponents: []
+ m_SourcePrefab: {fileID: 100100000, guid: 9efdc9c2a94b8a5478023b732d5aa5c5, type: 3}
+--- !u!224 &5934212647430267646 stripped
+RectTransform:
+ m_CorrespondingSourceObject: {fileID: 7572637330722376441, guid: 9efdc9c2a94b8a5478023b732d5aa5c5, type: 3}
+ m_PrefabInstance: {fileID: 4273326096531318791}
+ m_PrefabAsset: {fileID: 0}
diff --git a/Assets/Prefabs/UI/PointsPrefab.prefab b/Assets/Prefabs/UI/PointsPrefab.prefab
index 46ee6df..c028269 100644
--- a/Assets/Prefabs/UI/PointsPrefab.prefab
+++ b/Assets/Prefabs/UI/PointsPrefab.prefab
@@ -147,7 +147,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 231be2c99e905684c8d28300bdf391a3, type: 3}
m_Name:
m_EditorClassIdentifier:
- scoreColor: {r: 0.87058824, g: 0.87058824, b: 0.08627451, a: 0.87058824}
+ scoreColor: {r: 0.13760762, g: 0.87058824, b: 0.08627451, a: 0.87058824}
blinkTime: 0.2
scoreMoveTime: 0.5
tracking: {fileID: 0}
diff --git a/Assets/Scenes/Finalized Scenes/LevelV1-Finalized.unity b/Assets/Scenes/Finalized Scenes/LevelV1-Finalized.unity
index d0743f4..726b526 100644
--- a/Assets/Scenes/Finalized Scenes/LevelV1-Finalized.unity
+++ b/Assets/Scenes/Finalized Scenes/LevelV1-Finalized.unity
@@ -545,81 +545,6 @@ Transform:
m_CorrespondingSourceObject: {fileID: 5807723327665561808, guid: fb9785df6011940469da87b9a9fbd941, type: 3}
m_PrefabInstance: {fileID: 209574758}
m_PrefabAsset: {fileID: 0}
---- !u!1 &43121103
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 43121104}
- - component: {fileID: 43121106}
- - component: {fileID: 43121105}
- m_Layer: 5
- m_Name: Background
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!224 &43121104
-RectTransform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 43121103}
- 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_ConstrainProportionsScale: 0
- m_Children: []
- m_Father: {fileID: 527729765}
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 0.25}
- m_AnchorMax: {x: 1, y: 0.75}
- m_AnchoredPosition: {x: -0.000030517578, y: -0.000061035156}
- m_SizeDelta: {x: 0, y: 0}
- m_Pivot: {x: 0.5, y: 0.5}
---- !u!114 &43121105
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 43121103}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- m_Material: {fileID: 0}
- m_Color: {r: 1, g: 1, b: 1, a: 1}
- m_RaycastTarget: 1
- m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
- m_Maskable: 1
- m_OnCullStateChanged:
- m_PersistentCalls:
- m_Calls: []
- 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
- m_UseSpriteMesh: 0
- m_PixelsPerUnitMultiplier: 1
---- !u!222 &43121106
-CanvasRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 43121103}
- m_CullTransparentMesh: 1
--- !u!1 &43943409
GameObject:
m_ObjectHideFlags: 0
@@ -5539,81 +5464,6 @@ PrefabInstance:
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: fb9785df6011940469da87b9a9fbd941, type: 3}
---- !u!1 &414978016
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 414978017}
- - component: {fileID: 414978019}
- - component: {fileID: 414978018}
- m_Layer: 5
- m_Name: powerup ui 1
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!224 &414978017
-RectTransform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 414978016}
- m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
- m_LocalPosition: {x: 0, y: 0, z: 0}
- m_LocalScale: {x: 0.1625, y: 0.22505999, z: 1}
- m_ConstrainProportionsScale: 0
- m_Children: []
- m_Father: {fileID: 1964370992}
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 0}
- m_AnchorMax: {x: 1, y: 1}
- m_AnchoredPosition: {x: 0, y: 0}
- m_SizeDelta: {x: 799.99994, y: 449.99997}
- m_Pivot: {x: 0.5, y: 0.5}
---- !u!114 &414978018
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 414978016}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- m_Material: {fileID: 0}
- m_Color: {r: 1, g: 1, b: 1, a: 1}
- m_RaycastTarget: 1
- m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
- m_Maskable: 1
- m_OnCullStateChanged:
- m_PersistentCalls:
- m_Calls: []
- 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
- m_UseSpriteMesh: 0
- m_PixelsPerUnitMultiplier: 1
---- !u!222 &414978019
-CanvasRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 414978016}
- m_CullTransparentMesh: 1
--- !u!1 &423228208
GameObject:
m_ObjectHideFlags: 0
@@ -7310,95 +7160,6 @@ MeshFilter:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 514465226}
m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0}
---- !u!1 &527729764
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 527729765}
- - component: {fileID: 527729766}
- m_Layer: 5
- m_Name: Chaos Slider
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!224 &527729765
-RectTransform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 527729764}
- 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_ConstrainProportionsScale: 0
- m_Children:
- - {fileID: 43121104}
- - {fileID: 1660775133}
- m_Father: {fileID: 1615970939}
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 1, y: 1}
- m_AnchorMax: {x: 1, y: 1}
- m_AnchoredPosition: {x: -400, y: -42}
- m_SizeDelta: {x: 160, y: 40}
- m_Pivot: {x: 0.5, y: 0.5}
---- !u!114 &527729766
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 527729764}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 67db9e8f0e2ae9c40bc1e2b64352a6b4, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- m_Navigation:
- m_Mode: 3
- m_WrapAround: 0
- m_SelectOnUp: {fileID: 0}
- m_SelectOnDown: {fileID: 0}
- m_SelectOnLeft: {fileID: 0}
- m_SelectOnRight: {fileID: 0}
- m_Transition: 1
- m_Colors:
- m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
- m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
- m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
- m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
- m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
- m_ColorMultiplier: 1
- m_FadeDuration: 0.1
- m_SpriteState:
- m_HighlightedSprite: {fileID: 0}
- m_PressedSprite: {fileID: 0}
- m_SelectedSprite: {fileID: 0}
- m_DisabledSprite: {fileID: 0}
- m_AnimationTriggers:
- m_NormalTrigger: Normal
- m_HighlightedTrigger: Highlighted
- m_PressedTrigger: Pressed
- m_SelectedTrigger: Selected
- m_DisabledTrigger: Disabled
- m_Interactable: 0
- m_TargetGraphic: {fileID: 0}
- m_FillRect: {fileID: 701257919}
- m_HandleRect: {fileID: 0}
- m_Direction: 0
- m_MinValue: 0
- m_MaxValue: 50000
- m_WholeNumbers: 0
- m_Value: 0
- m_OnValueChanged:
- m_PersistentCalls:
- m_Calls: []
--- !u!4 &541372683 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 2130861646226648366, guid: 21fef04dd509042798bbb4ed0da0a14c, type: 3}
@@ -8427,125 +8188,6 @@ MeshFilter:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 691576843}
m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0}
---- !u!1 &701257918
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 701257919}
- - component: {fileID: 701257921}
- - component: {fileID: 701257920}
- - component: {fileID: 701257922}
- m_Layer: 5
- m_Name: Fill
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!224 &701257919
-RectTransform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 701257918}
- 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_ConstrainProportionsScale: 0
- m_Children: []
- m_Father: {fileID: 1660775133}
- 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.5, y: 0.5}
---- !u!114 &701257920
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 701257918}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- m_Material: {fileID: 0}
- m_Color: {r: 1, g: 0, b: 0, a: 1}
- m_RaycastTarget: 1
- m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
- m_Maskable: 1
- m_OnCullStateChanged:
- m_PersistentCalls:
- m_Calls: []
- m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0}
- m_Type: 1
- m_PreserveAspect: 0
- m_FillCenter: 1
- m_FillMethod: 0
- m_FillAmount: 0
- m_FillClockwise: 1
- m_FillOrigin: 0
- m_UseSpriteMesh: 0
- m_PixelsPerUnitMultiplier: 1
---- !u!222 &701257921
-CanvasRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 701257918}
- m_CullTransparentMesh: 1
---- !u!114 &701257922
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 701257918}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: b2fc7400fe19d6340bb12f2058e331bc, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- _gradient:
- serializedVersion: 2
- key0: {r: 1, g: 0.015686275, b: 0, a: 1}
- key1: {r: 0.99607843, g: 0.915632, b: 0.007843133, a: 1}
- key2: {r: 0, g: 1, b: 0.118023396, a: 0}
- key3: {r: 0, g: 0, b: 0, a: 0}
- key4: {r: 0, g: 0, b: 0, a: 0}
- key5: {r: 0, g: 0, b: 0, a: 0}
- key6: {r: 0, g: 0, b: 0, a: 0}
- key7: {r: 0, g: 0, b: 0, a: 0}
- ctime0: 0
- ctime1: 32768
- ctime2: 65304
- ctime3: 0
- ctime4: 0
- ctime5: 0
- ctime6: 0
- ctime7: 0
- atime0: 0
- atime1: 65535
- atime2: 0
- atime3: 0
- atime4: 0
- atime5: 0
- atime6: 0
- atime7: 0
- m_Mode: 0
- m_ColorSpace: -1
- m_NumColorKeys: 3
- m_NumAlphaKeys: 2
- _image: {fileID: 701257920}
--- !u!1 &722965076
GameObject:
m_ObjectHideFlags: 0
@@ -16596,29 +16238,15 @@ PrefabInstance:
propertyPath: m_Name
value: Canvas
objectReference: {fileID: 0}
- - target: {fileID: 2460987501928265480, guid: 06692ad41b0a861469a27086300d9bd0, type: 3}
- propertyPath: chaosSlider
- value:
- objectReference: {fileID: 527729766}
+ - target: {fileID: 8159476543796440838, guid: 06692ad41b0a861469a27086300d9bd0, type: 3}
+ propertyPath: m_AnchorMax.y
+ value: 0
+ objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
- m_AddedGameObjects:
- - targetCorrespondingSourceObject: {fileID: 267049304060646192, guid: 06692ad41b0a861469a27086300d9bd0, type: 3}
- insertIndex: 4
- addedObject: {fileID: 527729765}
- - targetCorrespondingSourceObject: {fileID: 267049304060646192, guid: 06692ad41b0a861469a27086300d9bd0, type: 3}
- insertIndex: -1
- addedObject: {fileID: 1851033580}
- - targetCorrespondingSourceObject: {fileID: 267049304060646192, guid: 06692ad41b0a861469a27086300d9bd0, type: 3}
- insertIndex: -1
- addedObject: {fileID: 1964370992}
+ m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 06692ad41b0a861469a27086300d9bd0, type: 3}
---- !u!224 &1615970939 stripped
-RectTransform:
- m_CorrespondingSourceObject: {fileID: 267049304060646192, guid: 06692ad41b0a861469a27086300d9bd0, type: 3}
- m_PrefabInstance: {fileID: 1615970938}
- m_PrefabAsset: {fileID: 0}
--- !u!1 &1618479807
GameObject:
m_ObjectHideFlags: 0
@@ -17100,42 +16728,6 @@ PrefabInstance:
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 21fef04dd509042798bbb4ed0da0a14c, type: 3}
---- !u!1 &1660775132
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 1660775133}
- m_Layer: 5
- m_Name: Fill Area
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!224 &1660775133
-RectTransform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1660775132}
- 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_ConstrainProportionsScale: 0
- m_Children:
- - {fileID: 701257919}
- m_Father: {fileID: 527729765}
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 0.25}
- m_AnchorMax: {x: 1, y: 0.75}
- m_AnchoredPosition: {x: 0, y: 0}
- m_SizeDelta: {x: 0, y: 0}
- m_Pivot: {x: 0.5, y: 0.5}
--- !u!1001 &1677025727
PrefabInstance:
m_ObjectHideFlags: 0
@@ -18563,11 +18155,6 @@ Transform:
m_CorrespondingSourceObject: {fileID: 5128530458926381508, guid: 27582e192e140e44b8716432ed6f0d63, type: 3}
m_PrefabInstance: {fileID: 1847084902}
m_PrefabAsset: {fileID: 0}
---- !u!224 &1851033580 stripped
-RectTransform:
- m_CorrespondingSourceObject: {fileID: 7572637330722376441, guid: 9efdc9c2a94b8a5478023b732d5aa5c5, type: 3}
- m_PrefabInstance: {fileID: 4108585882020976467}
- m_PrefabAsset: {fileID: 0}
--- !u!1 &1854262026
GameObject:
m_ObjectHideFlags: 0
@@ -20281,58 +19868,6 @@ MeshFilter:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1962772318}
m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0}
---- !u!1 &1964370991
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 1964370992}
- - component: {fileID: 1964370993}
- m_Layer: 5
- m_Name: Powerup UI Manager
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 0
---- !u!224 &1964370992
-RectTransform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1964370991}
- 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_ConstrainProportionsScale: 0
- m_Children:
- - {fileID: 414978017}
- m_Father: {fileID: 1615970939}
- 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: 0, y: 0}
- m_Pivot: {x: 0.5, y: 0.5}
---- !u!114 &1964370993
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1964370991}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 9e9aa552b12fa4db39e7a9ee092ff0e7, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- powerupUIComponents: []
- speed: {fileID: 0}
- speedPowerupUI: {fileID: 414978016}
--- !u!1001 &1966682260
PrefabInstance:
m_ObjectHideFlags: 0
@@ -40497,115 +40032,6 @@ PrefabInstance:
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 8ff19ef8c23acec4ca703d44eafbe1e5, type: 3}
---- !u!1001 &4108585882020976467
-PrefabInstance:
- m_ObjectHideFlags: 0
- serializedVersion: 2
- m_Modification:
- serializedVersion: 3
- m_TransformParent: {fileID: 1615970939}
- m_Modifications:
- - target: {fileID: 2137160592996659769, guid: 9efdc9c2a94b8a5478023b732d5aa5c5, type: 3}
- propertyPath: m_Name
- value: Timer
- objectReference: {fileID: 0}
- - target: {fileID: 5423666487528666627, guid: 9efdc9c2a94b8a5478023b732d5aa5c5, type: 3}
- propertyPath: gm
- value:
- objectReference: {fileID: 1742357166}
- - target: {fileID: 5423666487528666627, guid: 9efdc9c2a94b8a5478023b732d5aa5c5, type: 3}
- propertyPath: tracker
- value:
- objectReference: {fileID: 2284625504777190685, guid: e17e38e5b41db384bb6ab481c312f7f9, type: 3}
- - target: {fileID: 5423666487528666627, guid: 9efdc9c2a94b8a5478023b732d5aa5c5, type: 3}
- propertyPath: remainingTime
- value: 20
- objectReference: {fileID: 0}
- - target: {fileID: 7572637330722376441, guid: 9efdc9c2a94b8a5478023b732d5aa5c5, type: 3}
- propertyPath: m_Pivot.x
- value: 0.5
- objectReference: {fileID: 0}
- - target: {fileID: 7572637330722376441, guid: 9efdc9c2a94b8a5478023b732d5aa5c5, type: 3}
- propertyPath: m_Pivot.y
- value: 0.5
- objectReference: {fileID: 0}
- - target: {fileID: 7572637330722376441, guid: 9efdc9c2a94b8a5478023b732d5aa5c5, type: 3}
- propertyPath: m_AnchorMax.x
- value: 0.5
- objectReference: {fileID: 0}
- - target: {fileID: 7572637330722376441, guid: 9efdc9c2a94b8a5478023b732d5aa5c5, type: 3}
- propertyPath: m_AnchorMax.y
- value: 0.5
- objectReference: {fileID: 0}
- - target: {fileID: 7572637330722376441, guid: 9efdc9c2a94b8a5478023b732d5aa5c5, type: 3}
- propertyPath: m_AnchorMin.x
- value: 0.5
- objectReference: {fileID: 0}
- - target: {fileID: 7572637330722376441, guid: 9efdc9c2a94b8a5478023b732d5aa5c5, type: 3}
- propertyPath: m_AnchorMin.y
- value: 0.5
- objectReference: {fileID: 0}
- - target: {fileID: 7572637330722376441, guid: 9efdc9c2a94b8a5478023b732d5aa5c5, type: 3}
- propertyPath: m_SizeDelta.x
- value: 200
- objectReference: {fileID: 0}
- - target: {fileID: 7572637330722376441, guid: 9efdc9c2a94b8a5478023b732d5aa5c5, type: 3}
- propertyPath: m_SizeDelta.y
- value: 50
- objectReference: {fileID: 0}
- - target: {fileID: 7572637330722376441, guid: 9efdc9c2a94b8a5478023b732d5aa5c5, type: 3}
- propertyPath: m_LocalPosition.x
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 7572637330722376441, guid: 9efdc9c2a94b8a5478023b732d5aa5c5, type: 3}
- propertyPath: m_LocalPosition.y
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 7572637330722376441, guid: 9efdc9c2a94b8a5478023b732d5aa5c5, type: 3}
- propertyPath: m_LocalPosition.z
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 7572637330722376441, guid: 9efdc9c2a94b8a5478023b732d5aa5c5, type: 3}
- propertyPath: m_LocalRotation.w
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 7572637330722376441, guid: 9efdc9c2a94b8a5478023b732d5aa5c5, type: 3}
- propertyPath: m_LocalRotation.x
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 7572637330722376441, guid: 9efdc9c2a94b8a5478023b732d5aa5c5, type: 3}
- propertyPath: m_LocalRotation.y
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 7572637330722376441, guid: 9efdc9c2a94b8a5478023b732d5aa5c5, type: 3}
- propertyPath: m_LocalRotation.z
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 7572637330722376441, guid: 9efdc9c2a94b8a5478023b732d5aa5c5, type: 3}
- propertyPath: m_AnchoredPosition.x
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 7572637330722376441, guid: 9efdc9c2a94b8a5478023b732d5aa5c5, type: 3}
- propertyPath: m_AnchoredPosition.y
- value: -144
- objectReference: {fileID: 0}
- - target: {fileID: 7572637330722376441, guid: 9efdc9c2a94b8a5478023b732d5aa5c5, type: 3}
- propertyPath: m_LocalEulerAnglesHint.x
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 7572637330722376441, guid: 9efdc9c2a94b8a5478023b732d5aa5c5, type: 3}
- propertyPath: m_LocalEulerAnglesHint.y
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 7572637330722376441, guid: 9efdc9c2a94b8a5478023b732d5aa5c5, type: 3}
- propertyPath: m_LocalEulerAnglesHint.z
- value: 0
- objectReference: {fileID: 0}
- m_RemovedComponents: []
- m_RemovedGameObjects: []
- m_AddedGameObjects: []
- m_AddedComponents: []
- m_SourcePrefab: {fileID: 100100000, guid: 9efdc9c2a94b8a5478023b732d5aa5c5, type: 3}
--- !u!1001 &4519972146151171227
PrefabInstance:
m_ObjectHideFlags: 0
diff --git a/Assets/Scripts/Game Systems/GM.cs b/Assets/Scripts/Game Systems/GM.cs
index 9787ed8..82d9b9f 100644
--- a/Assets/Scripts/Game Systems/GM.cs
+++ b/Assets/Scripts/Game Systems/GM.cs
@@ -27,7 +27,10 @@ public class GM : MonoBehaviour
public Slider sprintSlider;
public Slider chaosSlider;
- public TextMeshProUGUI[] txtChildren;
+/* public TextMeshProUGUI[] txtChildren;*/
+ public TextMeshProUGUI scoreText;
+ public TextMeshProUGUI comboText;
+
private float comboFontStartSize;
private int comboPrevSize;
@@ -50,8 +53,8 @@ void Start()
pointPre = pointsPrefab;
canvasTransform = transform;
- txtChildren = GetComponentsInChildren<TextMeshProUGUI>();
- if (txtChildren[1]) { comboFontStartSize = txtChildren[1].fontSize; }
+ /*txtChildren = GetComponentsInChildren<TextMeshProUGUI>();*/
+ if (comboText) { comboFontStartSize = comboText.fontSize; }
}
@@ -64,12 +67,12 @@ void Update()
SlowMoTime = SlowMoDuration;
SlowingCurve = SlowSpeedCurve;
- if (txtChildren[0]) { txtChildren[0].text = "Score: " + score; }
- if (txtChildren[1])
+ if (scoreText) { scoreText.text = "Score: " + score; }
+ if (comboText)
{
if (combo > 0)
{
- txtChildren[1].text = "COMBO *" + combo;
+ comboText.text = combo + "X";
if (trackingObjects.Count <= 0)
{
currentComboTime += Time.deltaTime;
@@ -78,14 +81,14 @@ void Update()
if (comboPrevSize < combo) { StartCoroutine(ComboSizeIncrease()); }
}
- else { txtChildren[1].text = ""; }
+ else { comboText.text = ""; }
}
- if (txtChildren[2])
+/* if (txtChildren[2])
{
if (currentComboPoints > 0) { txtChildren[2].text = currentComboPoints + " points"; }
else { txtChildren[2].text = ""; }
pointPosition = txtChildren[2].transform.position;
- }
+ }*/
if (chaosSlider) { chaosSlider.value = ImageGradient.total - (score + (int)currentComboPoints); }
if (sprintSlider) { sprintSlider.value = sprintPercent; }
}
@@ -96,9 +99,9 @@ public IEnumerator ComboSizeIncrease()
comboPrevSize = combo;
var sizeIncrease = 1.23f;
- txtChildren[1].fontSize *= sizeIncrease;
+ comboText.fontSize *= sizeIncrease;
yield return new WaitForSeconds(0.33f);
- txtChildren[1].fontSize = comboFontStartSize;
+ comboText.fontSize = comboFontStartSize;
}
diff --git a/Assets/Scripts/Game Systems/PointTracker.cs b/Assets/Scripts/Game Systems/PointTracker.cs
index 8dfbcd1..94c4f62 100644
--- a/Assets/Scripts/Game Systems/PointTracker.cs
+++ b/Assets/Scripts/Game Systems/PointTracker.cs
@@ -59,7 +59,7 @@ void Update()
}
- myTxt.text = points + "";
+ myTxt.text = "$" + points + "";
}
--
GitLab