From d5240b420d85ec46c7236cd33e4449313b054ea3 Mon Sep 17 00:00:00 2001 From: maverickdgg Date: Sat, 1 Apr 2023 16:31:23 +0800 Subject: [PATCH 1/3] Credits scene --- Assets/Scenes/CreditsScene.shade | 112 ++++++++++++++++++ Assets/Scenes/CreditsScene.shade.shmeta | 3 + Assets/Scripts/UI/EasingHelper.cs | 23 ++++ Assets/Scripts/UI/SC_ScaleBounce.cs | 3 +- Assets/Scripts/UI/TransitToMainMenu.cs | 38 ++++++ Assets/Scripts/UI/TransitToMainMenu.cs.shmeta | 3 + 6 files changed, 181 insertions(+), 1 deletion(-) create mode 100644 Assets/Scenes/CreditsScene.shade create mode 100644 Assets/Scenes/CreditsScene.shade.shmeta create mode 100644 Assets/Scripts/UI/TransitToMainMenu.cs create mode 100644 Assets/Scripts/UI/TransitToMainMenu.cs.shmeta diff --git a/Assets/Scenes/CreditsScene.shade b/Assets/Scenes/CreditsScene.shade new file mode 100644 index 00000000..b1a8f9ea --- /dev/null +++ b/Assets/Scenes/CreditsScene.shade @@ -0,0 +1,112 @@ +- NavData: 0 +- EID: 0 + Name: Camera + IsActive: true + NumberOfChildren: 0 + Components: + Transform Component: + Translate: {x: 0, y: 0, z: 0} + Rotate: {x: 0, y: 0, z: 0} + Scale: {x: 1, y: 1, z: 1} + IsActive: true + Camera Component: + Position: {x: 0, y: 0, z: 0} + Pitch: 0 + Yaw: 0 + Roll: 0 + Width: 1920 + Near: 0.00999999978 + Far: 10000 + Perspective: true + FOV: 90 + IsActive: true + Scripts: ~ +- EID: 46 + Name: Credits Canvas + IsActive: true + NumberOfChildren: 3 + Components: + Canvas Component: + Canvas Width: 1920 + Canvas Height: 1080 + Scale by canvas width: false + IsActive: true + Scripts: ~ +- EID: 47 + Name: Scrolling Credits + IsActive: true + NumberOfChildren: 0 + Components: + Transform Component: + Translate: {x: 0, y: -3800, z: 1.5} + Rotate: {x: 0, y: 0, z: 0} + Scale: {x: 1920, y: 8026, z: 1} + IsActive: true + Renderable Component: + Mesh: 141771688 + Material: 120332672 + IsActive: true + UI Component: + Canvas ID: 46 + Hovered: false + Clicked: false + IsActive: true + Scripts: + - Type: SHADE_Scripting.UI.ScrollingCredits + Enabled: true + endY: 4300 + duration: 27 + - Type: SHADE_Scripting.UI.TransitToMainMenu + Enabled: true + timeToTransit: 27 + sceneToChange: 97158628 +- EID: 49 + Name: Credits Title Text + IsActive: false + NumberOfChildren: 0 + Components: + Transform Component: + Translate: {x: -150, y: 400, z: 0.100000001} + Rotate: {x: 0, y: 0, z: 0} + Scale: {x: 100, y: 100, z: 1} + IsActive: false + Text Renderer Component: + Text: Credits + Font: 174412429 + Color: {x: 0, y: 0, z: 0, w: 1} + Text Size: {x: 1, y: 1, z: 1} + IsActive: false + UI Component: + Canvas ID: 46 + Hovered: false + Clicked: false + IsActive: false + Scripts: ~ +- EID: 55 + Name: BackGround + IsActive: false + NumberOfChildren: 0 + Components: + Transform Component: + Translate: {x: 0, y: 0, z: 1.5} + Rotate: {x: 0, y: 0, z: 0} + Scale: {x: 1920, y: 1080, z: 1} + IsActive: false + Renderable Component: + Mesh: 141771688 + Material: 121834459 + IsActive: false + UI Component: + Canvas ID: 46 + Hovered: false + Clicked: false + IsActive: false + Scripts: ~ +- EID: 54 + Name: TweenManager + IsActive: true + NumberOfChildren: 0 + Components: ~ + Scripts: + - Type: TweenManager + Enabled: true \ No newline at end of file diff --git a/Assets/Scenes/CreditsScene.shade.shmeta b/Assets/Scenes/CreditsScene.shade.shmeta new file mode 100644 index 00000000..5122ac26 --- /dev/null +++ b/Assets/Scenes/CreditsScene.shade.shmeta @@ -0,0 +1,3 @@ +Name: CreditsScene +ID: 97376761 +Type: 5 diff --git a/Assets/Scripts/UI/EasingHelper.cs b/Assets/Scripts/UI/EasingHelper.cs index 4e20d3e0..08ee9e09 100644 --- a/Assets/Scripts/UI/EasingHelper.cs +++ b/Assets/Scripts/UI/EasingHelper.cs @@ -11,6 +11,8 @@ using System.Threading.Tasks; EASE_OUT_BOUNCE, EASE_IN_BOUNCE, EASE_INOUT_BOUNCE, + EASE_OUT_CIRCLE, + EASE_OUT_BACK, LINEAR } @@ -50,6 +52,14 @@ public static class EasingHelper { return value; } + case EASING_METHOD.EASE_OUT_CIRCLE: + { + return EaseOutCircle(value); + } + case EASING_METHOD.EASE_OUT_BACK: + { + return EaseOutBack(value); + } default: return 0.0f; @@ -102,5 +112,18 @@ public static class EasingHelper : (1.0f + EaseOutBounce(2.0f * value - 1.0f)) / 2.0f; } + + private static float EaseOutCircle(float value) + { + return (float)Math.Sqrt(1.0f - (float)Math.Pow(value - 1.0f, 2.0f)); + } + + private static float EaseOutBack(float value) + { + const float c1 = 1.70158f; + const float c3 = c1 + 1.0f; + return 1.0f + c3 * (float)Math.Pow(value - 1.0f, 3.0f) + c1 * (float)Math.Pow(value - 1.0f, 2.0f); + } + } diff --git a/Assets/Scripts/UI/SC_ScaleBounce.cs b/Assets/Scripts/UI/SC_ScaleBounce.cs index d6ec4792..31293539 100644 --- a/Assets/Scripts/UI/SC_ScaleBounce.cs +++ b/Assets/Scripts/UI/SC_ScaleBounce.cs @@ -35,7 +35,8 @@ namespace SHADE_Scripting.UI protected override void update() { - + if (thread == null) + return; if(isActive != lastActive && isActive == true) { thread.Reset(); diff --git a/Assets/Scripts/UI/TransitToMainMenu.cs b/Assets/Scripts/UI/TransitToMainMenu.cs new file mode 100644 index 00000000..cd948317 --- /dev/null +++ b/Assets/Scripts/UI/TransitToMainMenu.cs @@ -0,0 +1,38 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using SHADE; + +namespace SHADE_Scripting.UI +{ + public class TransitToMainMenu: Script + { + public float timeToTransit = 0.0f; + public uint sceneToChange = 0; + private float timer = 0.0f; + private bool sceneChanged = false; + + protected override void start() + { + timer = timeToTransit; + sceneChanged = false; + } + + + protected override void update() + { + timer -= Time.DeltaTimeF; + if(timer <= 0.0f && sceneChanged == false) + { + SceneManager.ChangeScene(sceneToChange); + sceneChanged = true; + } + } + + + + + } +} diff --git a/Assets/Scripts/UI/TransitToMainMenu.cs.shmeta b/Assets/Scripts/UI/TransitToMainMenu.cs.shmeta new file mode 100644 index 00000000..a5bea7ec --- /dev/null +++ b/Assets/Scripts/UI/TransitToMainMenu.cs.shmeta @@ -0,0 +1,3 @@ +Name: TransitToMainMenu +ID: 159865134 +Type: 9 From c643bd64f3c55e48dba59113442286db9d543de2 Mon Sep 17 00:00:00 2001 From: maverickdgg Date: Sat, 1 Apr 2023 16:32:56 +0800 Subject: [PATCH 2/3] Added a space to skip --- Assets/Scripts/UI/TransitToMainMenu.cs | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Assets/Scripts/UI/TransitToMainMenu.cs b/Assets/Scripts/UI/TransitToMainMenu.cs index cd948317..7d4d5d79 100644 --- a/Assets/Scripts/UI/TransitToMainMenu.cs +++ b/Assets/Scripts/UI/TransitToMainMenu.cs @@ -29,6 +29,12 @@ namespace SHADE_Scripting.UI SceneManager.ChangeScene(sceneToChange); sceneChanged = true; } + if(Input.GetKeyDown(Input.KeyCode.Space)) + { + timer = 0.0f; + } + + } From 483d8c706692fe02f30d6d4af2e9a25b1fb26fb6 Mon Sep 17 00:00:00 2001 From: maverickdgg Date: Sat, 1 Apr 2023 16:41:38 +0800 Subject: [PATCH 3/3] Added AI Humming --- Assets/Scripts/Gameplay/AIBehaviour/AIRework/HomeOwnerAI.cs | 3 +++ .../Gameplay/AIBehaviour/AIRework/States/PatrolState.cs | 4 +++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/Assets/Scripts/Gameplay/AIBehaviour/AIRework/HomeOwnerAI.cs b/Assets/Scripts/Gameplay/AIBehaviour/AIRework/HomeOwnerAI.cs index c72f4d09..c2c0ea1a 100644 --- a/Assets/Scripts/Gameplay/AIBehaviour/AIRework/HomeOwnerAI.cs +++ b/Assets/Scripts/Gameplay/AIBehaviour/AIRework/HomeOwnerAI.cs @@ -83,6 +83,9 @@ namespace SHADE_Scripting.Gameplay.AIBehaviour.AIRework AudioHandler.audioClipHandlers["HO_bark"] = SHADE.Audio.CreateAudioClip("event:/Homeowner/homeowner_bark"); SHADE.Audio.AttachAudioClipToObject(AudioHandler.audioClipHandlers["HO_bark"], GameObject.EntityId); + AudioHandler.audioClipHandlers["HO_humming"] = SHADE.Audio.CreateAudioClip("event:/Homeowner/homeowner_humming"); + SHADE.Audio.AttachAudioClipToObject(AudioHandler.audioClipHandlers["HO_humming"], GameObject.EntityId); + patrolPointPool = patrolPointParent.GetComponentsInChildren(); pppList = patrolPointPool.ToList(); transform = GetComponent(); diff --git a/Assets/Scripts/Gameplay/AIBehaviour/AIRework/States/PatrolState.cs b/Assets/Scripts/Gameplay/AIBehaviour/AIRework/States/PatrolState.cs index 22f233d1..2848e1d9 100644 --- a/Assets/Scripts/Gameplay/AIBehaviour/AIRework/States/PatrolState.cs +++ b/Assets/Scripts/Gameplay/AIBehaviour/AIRework/States/PatrolState.cs @@ -50,6 +50,7 @@ namespace SHADE_Scripting.Gameplay.AIBehaviour.AIRework.States animator.Play(ai.walkingAnim); AudioHandler.audioClipHandlers["HO_footsteps"].Play(); + AudioHandler.audioClipHandlers["HO_humming"].Play(); footStepTimer = footStepInterval; @@ -64,7 +65,8 @@ namespace SHADE_Scripting.Gameplay.AIBehaviour.AIRework.States public override void OnExit() { animator.Stop(); - } + AudioHandler.audioClipHandlers["HO_humming"].Stop(false); + } public override void update() {