From e88f5c9d1c2d7d6f942dcb759dfa8c662f1c7cdb Mon Sep 17 00:00:00 2001 From: maverickdgg Date: Mon, 20 Mar 2023 16:47:34 +0800 Subject: [PATCH] Main Menu update --- Assets/Scenes/MainMenu.shade | 70 +++++++++++------------- Assets/Scripts/UI/EasingHelper.cs | 12 ++-- Assets/Scripts/UI/SC_ScrollingCredits.cs | 4 +- 3 files changed, 40 insertions(+), 46 deletions(-) diff --git a/Assets/Scenes/MainMenu.shade b/Assets/Scenes/MainMenu.shade index 0d166674..39eac8a6 100644 --- a/Assets/Scenes/MainMenu.shade +++ b/Assets/Scenes/MainMenu.shade @@ -76,7 +76,7 @@ NumberOfChildren: 0 Components: Transform Component: - Translate: {x: 0, y: 150, z: 0.400000006} + Translate: {x: 0, y: 0, z: 0.400000006} Rotate: {x: 0, y: 0, z: 0} Scale: {x: 400, y: 100, z: 1} IsActive: true @@ -143,28 +143,28 @@ clickScale: 0.899999976 - EID: 7 Name: Level Select Button - IsActive: true + IsActive: false NumberOfChildren: 0 Components: Transform Component: Translate: {x: 0, y: 0, z: 0.400000006} Rotate: {x: 0, y: 0, z: 0} Scale: {x: 400, y: 100, z: 1} - IsActive: true + IsActive: false Renderable Component: Mesh: 141771688 Material: 129340704 - IsActive: true + IsActive: false Button Component: Default Texture: 66852025 Hovered Texture: 65992947 Clicked Texture: 57197441 - IsActive: true + IsActive: false UI Component: Canvas ID: 0 Hovered: false Clicked: false - IsActive: true + IsActive: false Scripts: - Type: SHADE_Scripting.UI.ButtonFX Enabled: true @@ -338,7 +338,7 @@ NumberOfChildren: 0 Components: ~ Scripts: - - Type: SHADE_Scripting.UI.TweenManager + - Type: TweenManager Enabled: true - EID: 13 Name: How To Play Canvas @@ -479,17 +479,17 @@ Components: Transform Component: Translate: {x: -800, y: 450, z: 0} - Rotate: {x: 0, y: 0, z: 3.14159274} - Scale: {x: 100, y: 100, z: 1} + Rotate: {x: 0, y: 0, z: 0} + Scale: {x: 273, y: 100, z: 1} IsActive: true Renderable Component: Mesh: 141771688 Material: 129340704 IsActive: true Button Component: - Default Texture: 55358401 - Hovered Texture: 59400474 - Clicked Texture: 52333376 + Default Texture: 59813125 + Hovered Texture: 59813125 + Clicked Texture: 59813125 IsActive: true UI Component: Canvas ID: 13 @@ -566,17 +566,17 @@ Components: Transform Component: Translate: {x: -800, y: 450, z: 0} - Rotate: {x: 0, y: 0, z: 3.14159274} - Scale: {x: 100, y: 100, z: 1} + Rotate: {x: 0, y: 0, z: 0} + Scale: {x: 273, y: 100, z: 1} IsActive: true Renderable Component: Mesh: 141771688 Material: 129340704 IsActive: true Button Component: - Default Texture: 55358401 - Hovered Texture: 59400474 - Clicked Texture: 52333376 + Default Texture: 59813125 + Hovered Texture: 59813125 + Clicked Texture: 59813125 IsActive: true UI Component: Canvas ID: 19 @@ -1095,8 +1095,6 @@ - Type: SHADE_Scripting.UI.SliderText Enabled: true sliderObj: 29 - minValue: 0 - maxValue: 0 - EID: 41 Name: SFX Volume Slider Text IsActive: true @@ -1122,8 +1120,6 @@ - Type: SHADE_Scripting.UI.SliderText Enabled: true sliderObj: 30 - minValue: 0 - maxValue: 0 - EID: 42 Name: BGM Volume Slider Text IsActive: true @@ -1149,8 +1145,6 @@ - Type: SHADE_Scripting.UI.SliderText Enabled: true sliderObj: 31 - minValue: 0 - maxValue: 0 - EID: 43 Name: Camera Slider Text Group IsActive: true @@ -1192,8 +1186,6 @@ - Type: SHADE_Scripting.UI.SliderText Enabled: true sliderObj: 37 - minValue: 0 - maxValue: 0 - EID: 45 Name: Sensitivity Slider Text IsActive: true @@ -1219,8 +1211,6 @@ - Type: SHADE_Scripting.UI.SliderText Enabled: true sliderObj: 38 - minValue: 0 - maxValue: 0 - EID: 46 Name: Credits Canvas IsActive: false @@ -1251,7 +1241,11 @@ Hovered: false Clicked: false IsActive: true - Scripts: ~ + Scripts: + - Type: SHADE_Scripting.UI.ScrollingCredits + Enabled: true + endY: 4500 + duration: 32 - EID: 48 Name: BackButton IsActive: true @@ -1259,17 +1253,17 @@ Components: Transform Component: Translate: {x: -800, y: 450, z: 0} - Rotate: {x: 0, y: 0, z: 3.14159274} - Scale: {x: 100, y: 100, z: 1} + Rotate: {x: 0, y: 0, z: 0} + Scale: {x: 273, y: 100, z: 1} IsActive: true Renderable Component: Mesh: 141771688 Material: 129340704 IsActive: true Button Component: - Default Texture: 55358401 - Hovered Texture: 59400474 - Clicked Texture: 52333376 + Default Texture: 59813125 + Hovered Texture: 59813125 + Clicked Texture: 59813125 IsActive: true UI Component: Canvas ID: 46 @@ -1368,17 +1362,17 @@ Components: Transform Component: Translate: {x: -800, y: 450, z: 0} - Rotate: {x: 0, y: 0, z: 3.14159274} - Scale: {x: 100, y: 100, z: 1} + Rotate: {x: 0, y: 0, z: 0} + Scale: {x: 273, y: 100, z: 1} IsActive: true Renderable Component: Mesh: 141771688 Material: 129340704 IsActive: true Button Component: - Default Texture: 55358401 - Hovered Texture: 59400474 - Clicked Texture: 52333376 + Default Texture: 59813125 + Hovered Texture: 59813125 + Clicked Texture: 59813125 IsActive: true UI Component: Canvas ID: 50 diff --git a/Assets/Scripts/UI/EasingHelper.cs b/Assets/Scripts/UI/EasingHelper.cs index cfa0c1d6..4e20d3e0 100644 --- a/Assets/Scripts/UI/EasingHelper.cs +++ b/Assets/Scripts/UI/EasingHelper.cs @@ -25,32 +25,32 @@ public static class EasingHelper { return EaseInSine(value); } - break; + case EASING_METHOD.EASE_OUT_SINE: { return EaseOutSine(value); } - break; + case EASING_METHOD.EASE_OUT_BOUNCE: { return EaseOutBounce(value); } - break; + case EASING_METHOD.EASE_IN_BOUNCE: { return EaseInBounce(value); } - break; + case EASING_METHOD.EASE_INOUT_BOUNCE: { return EaseInOutBounce(value); } - break; + case EASING_METHOD.LINEAR: { return value; } - break; + default: return 0.0f; } diff --git a/Assets/Scripts/UI/SC_ScrollingCredits.cs b/Assets/Scripts/UI/SC_ScrollingCredits.cs index b683e728..1e58d6bd 100644 --- a/Assets/Scripts/UI/SC_ScrollingCredits.cs +++ b/Assets/Scripts/UI/SC_ScrollingCredits.cs @@ -30,8 +30,8 @@ namespace SHADE_Scripting.UI Transform transform = GetComponent(); if(transform != null) { - thread = TweenManager.CreateTweenThread(duration, transform.LocalPosition.y, endY, EASING_METHOD.EASE_IN_SINE); - //thread.SetResetOnInactive(GameObject); + thread = TweenManager.CreateTweenThread(duration, transform.LocalPosition.y, endY, EASING_METHOD.LINEAR); + thread.SetResetOnInactive(GameObject); } }