From bc15721c0a86944f1fd24c573690e4aa0c50d3f2 Mon Sep 17 00:00:00 2001 From: maverickdgg Date: Tue, 21 Mar 2023 14:40:30 +0800 Subject: [PATCH] Updated Main Menu UI and gameplay UI --- Assets/Scenes/Level1.shade | 334 ++++++++++-------- Assets/Scenes/Level2.shade | 334 ++++++++++-------- Assets/Scenes/Level3.shade | 30 +- Assets/Scenes/MainMenu.shade | 161 ++++++++- .../Gameplay/Player/SC_PlayerController.cs | 2 + Assets/Scripts/Gameplay/SC_GameManager.cs | 15 + Assets/Scripts/UI/SC_FadeInOnActive.cs | 39 ++ Assets/Scripts/UI/SC_FadeInOnActive.cs.shmeta | 3 + Assets/Scripts/UI/SC_MinusTimerText.cs | 78 ++++ Assets/Scripts/UI/SC_MinusTimerText.cs.shmeta | 3 + Assets/Scripts/UI/SC_TweenManager.cs | 2 +- 11 files changed, 685 insertions(+), 316 deletions(-) create mode 100644 Assets/Scripts/UI/SC_FadeInOnActive.cs create mode 100644 Assets/Scripts/UI/SC_FadeInOnActive.cs.shmeta create mode 100644 Assets/Scripts/UI/SC_MinusTimerText.cs create mode 100644 Assets/Scripts/UI/SC_MinusTimerText.cs.shmeta diff --git a/Assets/Scenes/Level1.shade b/Assets/Scenes/Level1.shade index e1eeafc1..b502ede7 100644 --- a/Assets/Scenes/Level1.shade +++ b/Assets/Scenes/Level1.shade @@ -6840,9 +6840,10 @@ totalItemCount: 4 Score: 0 timer: 200 - scoreText: 449 - timeText: 520 - multiplierText: 139 + scoreText: 237 + timeText: 525 + minusTimerText: 65735 + multiplierText: 524 maxMultiplierDuration: 5 maxMultiplierCombo: 10 multiplierFont: 60 @@ -8001,156 +8002,6 @@ alphaValue: 1 fadeInTime: 0.5 fadeOutTime: 0.5 -- EID: 459 - Name: Gameplay Canvas - IsActive: true - NumberOfChildren: 4 - Components: - Canvas Component: - Canvas Width: 1920 - Canvas Height: 1080 - Scale by canvas width: false - IsActive: true - Scripts: ~ -- EID: 449 - Name: Score Text - IsActive: true - NumberOfChildren: 0 - Components: - Transform Component: - Translate: {x: -800, y: 365, z: 0.600000024} - Rotate: {x: 0, y: 0, z: 0} - Scale: {x: 100, y: 100, z: 60} - IsActive: true - Text Renderer Component: - Text: My name is Brandon. - Font: 174412429 - Color: {x: 1, y: 1, z: 1, w: 1} - Text Size: {x: 1, y: 1, z: 1} - IsActive: true - UI Component: - Canvas ID: 459 - Hovered: false - Clicked: false - IsActive: true - Scripts: - - Type: SHADE_Scripting.UI.ScoreTextDigitPositioning - Enabled: true - offsetPerDigit: 25 - - Type: SHADE_Scripting.UI.SingleScaleBounce - Enabled: true - durationUp: 0.150000006 - durationDown: 0.300000012 - scaleSize: 1.20000005 -- EID: 520 - Name: Timer Text - IsActive: true - NumberOfChildren: 1 - Components: - Transform Component: - Translate: {x: 700, y: 400, z: 0.100000001} - Rotate: {x: 0, y: 0, z: 0} - Scale: {x: 60, y: 60, z: 60} - IsActive: true - Text Renderer Component: - Text: My name is Brandon. - Font: 174412429 - Color: {x: 1, y: 1, z: 1, w: 1} - Text Size: {x: 1, y: 1, z: 1} - IsActive: true - UI Component: - Canvas ID: 459 - Hovered: false - Clicked: false - IsActive: true - Scripts: ~ -- EID: 519 - Name: Timer BG - IsActive: true - NumberOfChildren: 0 - Components: - Transform Component: - Translate: {x: 0.5, y: 0.300000012, z: 0.98999995} - Rotate: {x: 0, y: 0, z: 0} - Scale: {x: 5, y: 2, z: 1} - IsActive: true - Renderable Component: - Mesh: 141771688 - Material: 126220632 - IsActive: true - UI Component: - Canvas ID: 459 - Hovered: false - Clicked: false - IsActive: true - Scripts: ~ -- EID: 139 - Name: Multiplier Text - IsActive: true - NumberOfChildren: 1 - Components: - Transform Component: - Translate: {x: -800, y: 250, z: 0.100000001} - Rotate: {x: 0, y: 0, z: 0} - Scale: {x: 50, y: 50, z: 60} - IsActive: true - Text Renderer Component: - Text: X2 - Font: 174412429 - Color: {x: 1, y: 1, z: 1, w: 1} - Text Size: {x: 1, y: 1, z: 1} - IsActive: true - UI Component: - Canvas ID: 459 - Hovered: false - Clicked: false - IsActive: true - Scripts: - - Type: SHADE_Scripting.UI.MultiplierTextFx - Enabled: true - maxSize: 1 - minSize: 0.300000012 - minAlpha: 0.300000012 -- EID: 518 - Name: Multiplier BG - IsActive: true - NumberOfChildren: 0 - Components: - Transform Component: - Translate: {x: 0.400000006, y: 0.400000006, z: 0.98999995} - Rotate: {x: 0, y: 0, z: 0} - Scale: {x: 4.26499987, y: 2, z: 1} - IsActive: true - Renderable Component: - Mesh: 141771688 - Material: 133784677 - IsActive: true - UI Component: - Canvas ID: 459 - Hovered: false - Clicked: false - IsActive: true - Scripts: ~ -- EID: 521 - Name: Score BG - IsActive: true - NumberOfChildren: 0 - Components: - Transform Component: - Translate: {x: -770, y: 425, z: 59.9999962} - Rotate: {x: 0, y: 0, z: 0} - Scale: {x: 345.600006, y: 200, z: 60} - IsActive: true - Renderable Component: - Mesh: 141771688 - Material: 127527215 - IsActive: true - UI Component: - Canvas ID: 459 - Hovered: false - Clicked: false - IsActive: true - Scripts: ~ - EID: 503 Name: DirectionalLight IsActive: true @@ -8170,4 +8021,181 @@ Strength: 0.800000012 Casting Shadows: true IsActive: true + Scripts: ~ +- EID: 526 + Name: Gameplay Canvas + IsActive: true + NumberOfChildren: 4 + Components: + Canvas Component: + Canvas Width: 1920 + Canvas Height: 1080 + Scale by canvas width: false + IsActive: true + Scripts: ~ +- EID: 237 + Name: Score Text + IsActive: true + NumberOfChildren: 0 + Components: + Transform Component: + Translate: {x: -800, y: 365, z: 0.600000024} + Rotate: {x: 0, y: 0, z: 0} + Scale: {x: 100, y: 100, z: 60} + IsActive: true + Text Renderer Component: + Text: My name is Brandon. + Font: 174412429 + Color: {x: 1, y: 1, z: 1, w: 1} + Text Size: {x: 1, y: 1, z: 1} + IsActive: true + UI Component: + Canvas ID: 526 + Hovered: false + Clicked: false + IsActive: true + Scripts: + - Type: SHADE_Scripting.UI.ScoreTextDigitPositioning + Enabled: true + offsetPerDigit: 25 + - Type: SHADE_Scripting.UI.SingleScaleBounce + Enabled: true + durationUp: 0.150000006 + durationDown: 0.300000012 + scaleSize: 1.20000005 +- EID: 525 + Name: Timer Text + IsActive: true + NumberOfChildren: 2 + Components: + Transform Component: + Translate: {x: 700, y: 400, z: 0.100000001} + Rotate: {x: 0, y: 0, z: 0} + Scale: {x: 60, y: 60, z: 1} + IsActive: true + Text Renderer Component: + Text: My name is Brandon. + Font: 174412429 + Color: {x: 1, y: 1, z: 1, w: 1} + Text Size: {x: 1, y: 1, z: 1} + IsActive: true + UI Component: + Canvas ID: 526 + Hovered: false + Clicked: false + IsActive: true + Scripts: ~ +- EID: 520 + Name: Timer BG + IsActive: true + NumberOfChildren: 0 + Components: + Transform Component: + Translate: {x: 0.5, y: 0.300000012, z: 0.98999995} + Rotate: {x: 0, y: 0, z: 0} + Scale: {x: 5, y: 2, z: 1} + IsActive: true + Renderable Component: + Mesh: 141771688 + Material: 126220632 + IsActive: true + UI Component: + Canvas ID: 526 + Hovered: false + Clicked: false + IsActive: true + Scripts: ~ +- EID: 65735 + Name: Minus Timer Text + IsActive: false + NumberOfChildren: 0 + Components: + Transform Component: + Translate: {x: 0, y: -0.800000012, z: 0.100000001} + Rotate: {x: 0, y: 0, z: 0} + Scale: {x: 1, y: 1, z: 1} + IsActive: false + Text Renderer Component: + Text: -10 + Font: 174412429 + Color: {x: 1, y: 0, z: 0, w: 1} + Text Size: {x: 1, y: 1, z: 1} + IsActive: false + UI Component: + Canvas ID: 526 + Hovered: false + Clicked: false + IsActive: false + Scripts: + - Type: SHADE_Scripting.UI.MinusTimerText + Enabled: true + duration: 2 +- EID: 524 + Name: Multiplier Text + IsActive: true + NumberOfChildren: 1 + Components: + Transform Component: + Translate: {x: -800, y: 250, z: 0.100000001} + Rotate: {x: 0, y: 0, z: 0} + Scale: {x: 50, y: 50, z: 60} + IsActive: true + Text Renderer Component: + Text: X2 + Font: 174412429 + Color: {x: 1, y: 1, z: 1, w: 1} + Text Size: {x: 1, y: 1, z: 1} + IsActive: true + UI Component: + Canvas ID: 526 + Hovered: false + Clicked: false + IsActive: true + Scripts: + - Type: SHADE_Scripting.UI.MultiplierTextFx + Enabled: true + maxSize: 1 + minSize: 0.300000012 + minAlpha: 0.300000012 +- EID: 519 + Name: Multiplier BG + IsActive: true + NumberOfChildren: 0 + Components: + Transform Component: + Translate: {x: 0.400000006, y: 0.400000006, z: 0.98999995} + Rotate: {x: 0, y: 0, z: 0} + Scale: {x: 4.26499987, y: 2, z: 1} + IsActive: true + Renderable Component: + Mesh: 141771688 + Material: 133784677 + IsActive: true + UI Component: + Canvas ID: 526 + Hovered: false + Clicked: false + IsActive: true + Scripts: + - Type: FixRotation + Enabled: true +- EID: 521 + Name: Score BG + IsActive: true + NumberOfChildren: 0 + Components: + Transform Component: + Translate: {x: -770, y: 425, z: 59.9999962} + Rotate: {x: 0, y: 0, z: 0} + Scale: {x: 345.600006, y: 200, z: 60} + IsActive: true + Renderable Component: + Mesh: 141771688 + Material: 127527215 + IsActive: true + UI Component: + Canvas ID: 526 + Hovered: false + Clicked: false + IsActive: true Scripts: ~ \ No newline at end of file diff --git a/Assets/Scenes/Level2.shade b/Assets/Scenes/Level2.shade index c3c40c44..89918868 100644 --- a/Assets/Scenes/Level2.shade +++ b/Assets/Scenes/Level2.shade @@ -2878,8 +2878,9 @@ Score: 0 timer: 200 scoreText: 237 - timeText: 206 - multiplierText: 139 + timeText: 525 + minusTimerText: 65735 + multiplierText: 524 maxMultiplierDuration: 5 maxMultiplierCombo: 10 multiplierFont: 60 @@ -2889,158 +2890,6 @@ retryBtn: 458 quitBtn: 0 canvas: 10 -- EID: 199 - Name: Gameplay Canvas - IsActive: true - NumberOfChildren: 4 - Components: - Canvas Component: - Canvas Width: 1920 - Canvas Height: 1080 - Scale by canvas width: false - IsActive: true - Scripts: ~ -- EID: 237 - Name: Score Text - IsActive: true - NumberOfChildren: 0 - Components: - Transform Component: - Translate: {x: -800, y: 365, z: 0.600000024} - Rotate: {x: 0, y: 0, z: 0} - Scale: {x: 100, y: 100, z: 60} - IsActive: true - Text Renderer Component: - Text: My name is Brandon. - Font: 174412429 - Color: {x: 1, y: 1, z: 1, w: 1} - Text Size: {x: 1, y: 1, z: 1} - IsActive: true - UI Component: - Canvas ID: 199 - Hovered: false - Clicked: false - IsActive: true - Scripts: - - Type: SHADE_Scripting.UI.ScoreTextDigitPositioning - Enabled: true - offsetPerDigit: 25 - - Type: SHADE_Scripting.UI.SingleScaleBounce - Enabled: true - durationUp: 0.150000006 - durationDown: 0.300000012 - scaleSize: 1.20000005 -- EID: 206 - Name: Timer Text - IsActive: true - NumberOfChildren: 1 - Components: - Transform Component: - Translate: {x: 700, y: 400, z: 0.100000001} - Rotate: {x: 0, y: 0, z: 0} - Scale: {x: 60, y: 60, z: 60} - IsActive: true - Text Renderer Component: - Text: My name is Brandon. - Font: 174412429 - Color: {x: 1, y: 1, z: 1, w: 1} - Text Size: {x: 1, y: 1, z: 1} - IsActive: true - UI Component: - Canvas ID: 199 - Hovered: false - Clicked: false - IsActive: true - Scripts: ~ -- EID: 520 - Name: Timer BG - IsActive: true - NumberOfChildren: 0 - Components: - Transform Component: - Translate: {x: 0.5, y: 0.300000012, z: 0.98999995} - Rotate: {x: 0, y: 0, z: 0} - Scale: {x: 5, y: 2, z: 1} - IsActive: true - Renderable Component: - Mesh: 141771688 - Material: 126220632 - IsActive: true - UI Component: - Canvas ID: 199 - Hovered: false - Clicked: false - IsActive: true - Scripts: ~ -- EID: 139 - Name: Multiplier Text - IsActive: true - NumberOfChildren: 1 - Components: - Transform Component: - Translate: {x: -800, y: 250, z: 0.100000001} - Rotate: {x: 0, y: 0, z: 0} - Scale: {x: 50, y: 50, z: 60} - IsActive: true - Text Renderer Component: - Text: X2 - Font: 174412429 - Color: {x: 1, y: 1, z: 1, w: 1} - Text Size: {x: 1, y: 1, z: 1} - IsActive: true - UI Component: - Canvas ID: 199 - Hovered: false - Clicked: false - IsActive: true - Scripts: - - Type: SHADE_Scripting.UI.MultiplierTextFx - Enabled: true - maxSize: 1 - minSize: 0.300000012 - minAlpha: 0.300000012 -- EID: 519 - Name: Multiplier BG - IsActive: true - NumberOfChildren: 0 - Components: - Transform Component: - Translate: {x: 0.400000006, y: 0.400000006, z: 0.98999995} - Rotate: {x: 0, y: 0, z: 0} - Scale: {x: 4.26499987, y: 2, z: 1} - IsActive: true - Renderable Component: - Mesh: 141771688 - Material: 133784677 - IsActive: true - UI Component: - Canvas ID: 199 - Hovered: false - Clicked: false - IsActive: true - Scripts: - - Type: FixRotation - Enabled: true -- EID: 521 - Name: Score BG - IsActive: true - NumberOfChildren: 0 - Components: - Transform Component: - Translate: {x: -770, y: 425, z: 59.9999962} - Rotate: {x: 0, y: 0, z: 0} - Scale: {x: 345.600006, y: 200, z: 60} - IsActive: true - Renderable Component: - Mesh: 141771688 - Material: 127527215 - IsActive: true - UI Component: - Canvas ID: 199 - Hovered: false - Clicked: false - IsActive: true - Scripts: ~ - EID: 198 Name: ====Raccoon==== IsActive: true @@ -14315,4 +14164,181 @@ Position Offset: {x: 0, y: -0.00999999978, z: 0} Rotation Offset: {x: 0, y: 0, z: 0} IsActive: true + Scripts: ~ +- EID: 526 + Name: Gameplay Canvas + IsActive: true + NumberOfChildren: 4 + Components: + Canvas Component: + Canvas Width: 1920 + Canvas Height: 1080 + Scale by canvas width: false + IsActive: true + Scripts: ~ +- EID: 237 + Name: Score Text + IsActive: true + NumberOfChildren: 0 + Components: + Transform Component: + Translate: {x: -800, y: 365, z: 0.600000024} + Rotate: {x: 0, y: 0, z: 0} + Scale: {x: 100, y: 100, z: 60} + IsActive: true + Text Renderer Component: + Text: My name is Brandon. + Font: 174412429 + Color: {x: 1, y: 1, z: 1, w: 1} + Text Size: {x: 1, y: 1, z: 1} + IsActive: true + UI Component: + Canvas ID: 526 + Hovered: false + Clicked: false + IsActive: true + Scripts: + - Type: SHADE_Scripting.UI.ScoreTextDigitPositioning + Enabled: true + offsetPerDigit: 25 + - Type: SHADE_Scripting.UI.SingleScaleBounce + Enabled: true + durationUp: 0.150000006 + durationDown: 0.300000012 + scaleSize: 1.20000005 +- EID: 525 + Name: Timer Text + IsActive: true + NumberOfChildren: 2 + Components: + Transform Component: + Translate: {x: 700, y: 400, z: 0.100000001} + Rotate: {x: 0, y: 0, z: 0} + Scale: {x: 60, y: 60, z: 1} + IsActive: true + Text Renderer Component: + Text: My name is Brandon. + Font: 174412429 + Color: {x: 1, y: 1, z: 1, w: 1} + Text Size: {x: 1, y: 1, z: 1} + IsActive: true + UI Component: + Canvas ID: 526 + Hovered: false + Clicked: false + IsActive: true + Scripts: ~ +- EID: 520 + Name: Timer BG + IsActive: true + NumberOfChildren: 0 + Components: + Transform Component: + Translate: {x: 0.5, y: 0.300000012, z: 0.98999995} + Rotate: {x: 0, y: 0, z: 0} + Scale: {x: 5, y: 2, z: 1} + IsActive: true + Renderable Component: + Mesh: 141771688 + Material: 126220632 + IsActive: true + UI Component: + Canvas ID: 526 + Hovered: false + Clicked: false + IsActive: true + Scripts: ~ +- EID: 65735 + Name: Minus Timer Text + IsActive: false + NumberOfChildren: 0 + Components: + Transform Component: + Translate: {x: 0, y: -0.800000012, z: 0.100000001} + Rotate: {x: 0, y: 0, z: 0} + Scale: {x: 1, y: 1, z: 1} + IsActive: false + Text Renderer Component: + Text: -10 + Font: 174412429 + Color: {x: 1, y: 0, z: 0, w: 1} + Text Size: {x: 1, y: 1, z: 1} + IsActive: false + UI Component: + Canvas ID: 526 + Hovered: false + Clicked: false + IsActive: false + Scripts: + - Type: SHADE_Scripting.UI.MinusTimerText + Enabled: true + duration: 2 +- EID: 524 + Name: Multiplier Text + IsActive: true + NumberOfChildren: 1 + Components: + Transform Component: + Translate: {x: -800, y: 250, z: 0.100000001} + Rotate: {x: 0, y: 0, z: 0} + Scale: {x: 50, y: 50, z: 60} + IsActive: true + Text Renderer Component: + Text: X2 + Font: 174412429 + Color: {x: 1, y: 1, z: 1, w: 1} + Text Size: {x: 1, y: 1, z: 1} + IsActive: true + UI Component: + Canvas ID: 526 + Hovered: false + Clicked: false + IsActive: true + Scripts: + - Type: SHADE_Scripting.UI.MultiplierTextFx + Enabled: true + maxSize: 1 + minSize: 0.300000012 + minAlpha: 0.300000012 +- EID: 519 + Name: Multiplier BG + IsActive: true + NumberOfChildren: 0 + Components: + Transform Component: + Translate: {x: 0.400000006, y: 0.400000006, z: 0.98999995} + Rotate: {x: 0, y: 0, z: 0} + Scale: {x: 4.26499987, y: 2, z: 1} + IsActive: true + Renderable Component: + Mesh: 141771688 + Material: 133784677 + IsActive: true + UI Component: + Canvas ID: 526 + Hovered: false + Clicked: false + IsActive: true + Scripts: + - Type: FixRotation + Enabled: true +- EID: 521 + Name: Score BG + IsActive: true + NumberOfChildren: 0 + Components: + Transform Component: + Translate: {x: -770, y: 425, z: 59.9999962} + Rotate: {x: 0, y: 0, z: 0} + Scale: {x: 345.600006, y: 200, z: 60} + IsActive: true + Renderable Component: + Mesh: 141771688 + Material: 127527215 + IsActive: true + UI Component: + Canvas ID: 526 + Hovered: false + Clicked: false + IsActive: true Scripts: ~ \ No newline at end of file diff --git a/Assets/Scenes/Level3.shade b/Assets/Scenes/Level3.shade index b116d292..51dc9703 100644 --- a/Assets/Scenes/Level3.shade +++ b/Assets/Scenes/Level3.shade @@ -8741,12 +8741,12 @@ - EID: 525 Name: Timer Text IsActive: true - NumberOfChildren: 1 + NumberOfChildren: 2 Components: Transform Component: Translate: {x: 700, y: 400, z: 0.100000001} Rotate: {x: 0, y: 0, z: 0} - Scale: {x: 60, y: 60, z: 60} + Scale: {x: 60, y: 60, z: 1} IsActive: true Text Renderer Component: Text: My name is Brandon. @@ -8780,6 +8780,31 @@ Clicked: false IsActive: true Scripts: ~ +- EID: 285 + Name: Minus Timer Text + IsActive: false + NumberOfChildren: 0 + Components: + Transform Component: + Translate: {x: 0, y: -0.800000012, z: 0.100000001} + Rotate: {x: 0, y: 0, z: 0} + Scale: {x: 1, y: 1, z: 1} + IsActive: false + Text Renderer Component: + Text: -10 + Font: 174412429 + Color: {x: 1, y: 0, z: 0, w: 1} + Text Size: {x: 1, y: 1, z: 1} + IsActive: false + UI Component: + Canvas ID: 526 + Hovered: false + Clicked: false + IsActive: false + Scripts: + - Type: SHADE_Scripting.UI.MinusTimerText + Enabled: true + duration: 2 - EID: 524 Name: Multiplier Text IsActive: true @@ -8865,6 +8890,7 @@ timer: 200 scoreText: 237 timeText: 525 + minusTimerText: 285 multiplierText: 524 maxMultiplierDuration: 5 maxMultiplierCombo: 10 diff --git a/Assets/Scenes/MainMenu.shade b/Assets/Scenes/MainMenu.shade index 39eac8a6..73624bdb 100644 --- a/Assets/Scenes/MainMenu.shade +++ b/Assets/Scenes/MainMenu.shade @@ -95,9 +95,6 @@ Clicked: false IsActive: true Scripts: - - Type: ChangeSceneButton - Enabled: true - sceneID: 91947920 - Type: SHADE_Scripting.UI.ButtonFX Enabled: true onHoverEnterSound: event:/UI/botton_hover @@ -106,6 +103,9 @@ onReleaseSound: event:/UI/button_fail hoverScale: 1.10000002 clickScale: 0.899999976 + - Type: SHADE_Scripting.UI.ChangeCanvasButton + Enabled: true + canvasToActivate: 50 - EID: 6 Name: Quit Game Button IsActive: true @@ -527,11 +527,14 @@ Hovered: false Clicked: false IsActive: true - Scripts: ~ + Scripts: + - Type: SHADE_Scripting.UI.FadeInOnActive + Enabled: true + alpha: 0 - EID: 19 Name: Options Canvas IsActive: false - NumberOfChildren: 11 + NumberOfChildren: 12 Components: Canvas Component: Canvas Width: 1920 @@ -1211,6 +1214,29 @@ - Type: SHADE_Scripting.UI.SliderText Enabled: true sliderObj: 38 +- EID: 443 + Name: SubMenuBackGround + IsActive: true + NumberOfChildren: 0 + Components: + Transform Component: + Translate: {x: 0, y: 0, z: 1} + Rotate: {x: 0, y: 0, z: 0} + Scale: {x: 1920, y: 1080, z: 1} + IsActive: true + Renderable Component: + Mesh: 141771688 + Material: 130823048 + IsActive: true + UI Component: + Canvas ID: 19 + Hovered: false + Clicked: false + IsActive: true + Scripts: + - Type: SHADE_Scripting.UI.FadeInOnActive + Enabled: true + alpha: 0 - EID: 46 Name: Credits Canvas IsActive: false @@ -1327,7 +1353,7 @@ - EID: 50 Name: Level Select Canvas IsActive: false - NumberOfChildren: 3 + NumberOfChildren: 5 Components: Canvas Component: Canvas Width: 1920 @@ -1413,6 +1439,129 @@ Clicked: false IsActive: true Scripts: ~ +- EID: 442 + Name: SubMenuBackGround + IsActive: true + NumberOfChildren: 0 + Components: + Transform Component: + Translate: {x: 0, y: 0, z: 0.5} + Rotate: {x: 0, y: 0, z: 0} + Scale: {x: 1920, y: 1080, z: 1} + IsActive: true + Renderable Component: + Mesh: 141771688 + Material: 130823048 + IsActive: true + UI Component: + Canvas ID: 50 + Hovered: false + Clicked: false + IsActive: true + Scripts: + - Type: SHADE_Scripting.UI.FadeInOnActive + Enabled: true + alpha: 0 +- EID: 441 + Name: Level Select Buttons + IsActive: true + NumberOfChildren: 3 + Components: + Transform Component: + Translate: {x: 0, y: -75, z: 0.100000001} + Rotate: {x: 0, y: 0, z: 0} + Scale: {x: 1, y: 1, z: 1} + IsActive: true + UI Component: + Canvas ID: 50 + Hovered: false + Clicked: false + IsActive: true + Scripts: ~ +- EID: 440 + Name: Level 1 Button + IsActive: true + NumberOfChildren: 0 + Components: + Transform Component: + Translate: {x: -600, y: 0, z: 0} + Rotate: {x: 0, y: 0, z: 0} + Scale: {x: 380, y: 879, z: 1} + IsActive: true + Renderable Component: + Mesh: 141771688 + Material: 129340704 + IsActive: true + Button Component: + Default Texture: 52916516 + Hovered Texture: 52916516 + Clicked Texture: 52916516 + IsActive: true + UI Component: + Canvas ID: 50 + Hovered: false + Clicked: false + IsActive: true + Scripts: + - Type: ChangeSceneButton + Enabled: true + sceneID: 91947920 +- EID: 439 + Name: Level 2 Button + IsActive: true + NumberOfChildren: 0 + Components: + Transform Component: + Translate: {x: 0, y: 0, z: 0} + Rotate: {x: 0, y: 0, z: 0} + Scale: {x: 380, y: 879, z: 1} + IsActive: true + Renderable Component: + Mesh: 141771688 + Material: 129340704 + IsActive: true + Button Component: + Default Texture: 55380564 + Hovered Texture: 55380564 + Clicked Texture: 55380564 + IsActive: true + UI Component: + Canvas ID: 50 + Hovered: false + Clicked: false + IsActive: true + Scripts: + - Type: ChangeSceneButton + Enabled: true + sceneID: 86098106 +- EID: 438 + Name: Level 3 Button + IsActive: true + NumberOfChildren: 0 + Components: + Transform Component: + Translate: {x: 600, y: 0, z: 0} + Rotate: {x: 0, y: 0, z: 0} + Scale: {x: 380, y: 879, z: 1} + IsActive: true + Renderable Component: + Mesh: 141771688 + Material: 129340704 + IsActive: true + Button Component: + Default Texture: 53392159 + Hovered Texture: 53392159 + Clicked Texture: 53392159 + IsActive: true + UI Component: + Canvas ID: 50 + Hovered: false + Clicked: false + IsActive: true + Scripts: + - Type: ChangeSceneButton + Enabled: true + sceneID: 88928066 - EID: 450 Name: TransitionCanvas IsActive: true diff --git a/Assets/Scripts/Gameplay/Player/SC_PlayerController.cs b/Assets/Scripts/Gameplay/Player/SC_PlayerController.cs index 9bac991b..02b59b10 100644 --- a/Assets/Scripts/Gameplay/Player/SC_PlayerController.cs +++ b/Assets/Scripts/Gameplay/Player/SC_PlayerController.cs @@ -426,6 +426,8 @@ public class PlayerController : Script stateMachine.SetState(typeof(PlayerIdleState)); tranform.LocalPosition = respawnPoint.GetComponent().LocalPosition; + GameManager.Instance.RacoonCaught(); + if (pat && pat.item) { if (holdItem) diff --git a/Assets/Scripts/Gameplay/SC_GameManager.cs b/Assets/Scripts/Gameplay/SC_GameManager.cs index 78414b26..3e1f6fc0 100644 --- a/Assets/Scripts/Gameplay/SC_GameManager.cs +++ b/Assets/Scripts/Gameplay/SC_GameManager.cs @@ -3,6 +3,7 @@ using SHADE_Scripting.Audio; using SHADE_Scripting.UI; using System; using System.Collections.Generic; +using System.Diagnostics.Contracts; public class GameManager : Script { @@ -27,6 +28,7 @@ public class GameManager : Script public GameObject scoreText; public GameObject timeText; + public GameObject minusTimerText; //mulitpler info public GameObject multiplierText; @@ -179,6 +181,19 @@ public class GameManager : Script } } + public void RacoonCaught() + { + timer -= 10.0f; + if(minusTimerText != GameObject.Null) + { + MinusTimerText text =minusTimerText.GetScript(); + if(text) + { + text.Reset(); + } + } + } + private void Cheat() { if (Input.GetKeyUp(Input.KeyCode.F1)) diff --git a/Assets/Scripts/UI/SC_FadeInOnActive.cs b/Assets/Scripts/UI/SC_FadeInOnActive.cs new file mode 100644 index 00000000..d86dc5d2 --- /dev/null +++ b/Assets/Scripts/UI/SC_FadeInOnActive.cs @@ -0,0 +1,39 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using SHADE; + + +namespace SHADE_Scripting.UI +{ + public class FadeInOnActive: Script + { + [NonSerialized] + TweenThread thread; + + + protected override void start() + { + thread = TweenManager.CreateTweenThread(0.5f, 0.0f, 1.0f, EASING_METHOD.LINEAR); + thread.SetResetOnInactive(GameObject); + } + + protected override void update() + { + if(thread != null) + { + Renderable renderable = GetComponent(); + if(renderable) + { + renderable.Material.SetProperty("data.alpha", thread.GetValue()); + } + } + } + + + + + } +} diff --git a/Assets/Scripts/UI/SC_FadeInOnActive.cs.shmeta b/Assets/Scripts/UI/SC_FadeInOnActive.cs.shmeta new file mode 100644 index 00000000..d45157a2 --- /dev/null +++ b/Assets/Scripts/UI/SC_FadeInOnActive.cs.shmeta @@ -0,0 +1,3 @@ +Name: SC_FadeInOnActive +ID: 163833605 +Type: 9 diff --git a/Assets/Scripts/UI/SC_MinusTimerText.cs b/Assets/Scripts/UI/SC_MinusTimerText.cs new file mode 100644 index 00000000..8ab03d4d --- /dev/null +++ b/Assets/Scripts/UI/SC_MinusTimerText.cs @@ -0,0 +1,78 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using SHADE; + +namespace SHADE_Scripting.UI +{ + public class MinusTimerText: Script + { + public float duration = 0.5f; + + + private Vector3 startPos; + + [NonSerialized] + TweenThread thread; + + protected override void awake() + { + Transform transform = GetComponent(); + if(transform) + { + startPos = transform.LocalPosition; + } + + + } + + protected override void start() + { + thread = TweenManager.CreateTweenThread(duration, 1.0f, 0.0f, EASING_METHOD.LINEAR); + thread.SetResetOnInactive(GameObject); + } + + + protected override void update() + { + if(thread != null) + { + TextRenderable text = GetComponent(); + if (text) + { + Color temp = text.TextColor; + temp.a = thread.GetValue(); + text.TextColor = temp; + } + if(thread.IsCompleted()) + { + GameObject.SetActive(false); + } + } + + Transform transform = GetComponent(); + if(transform) + { + Vector3 temp = transform.LocalPosition; + temp.y -= (float)Time.DeltaTime; + transform.LocalPosition = temp; + } + + } + + public void Reset() + { + GameObject.SetActive(true); + thread.Reset(); + Transform transform = GetComponent(); + if (transform) + { + transform.LocalPosition = startPos; + } + } + + + } +} diff --git a/Assets/Scripts/UI/SC_MinusTimerText.cs.shmeta b/Assets/Scripts/UI/SC_MinusTimerText.cs.shmeta new file mode 100644 index 00000000..b99138cc --- /dev/null +++ b/Assets/Scripts/UI/SC_MinusTimerText.cs.shmeta @@ -0,0 +1,3 @@ +Name: SC_MinusTimerText +ID: 154875718 +Type: 9 diff --git a/Assets/Scripts/UI/SC_TweenManager.cs b/Assets/Scripts/UI/SC_TweenManager.cs index 206d15ef..0595f701 100644 --- a/Assets/Scripts/UI/SC_TweenManager.cs +++ b/Assets/Scripts/UI/SC_TweenManager.cs @@ -28,7 +28,7 @@ public class TweenThread if (goToCheckActive.IsActiveInHierarchy == false) { Reset(); - Debug.Log("RESETTING DUE TO INACTIVE"); + return; } }