From 06afe43cef70b5751c7ffaf99a7fa69ed050f647 Mon Sep 17 00:00:00 2001 From: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Sat, 24 Jun 2023 13:47:13 +0200 Subject: [PATCH] Implemented barelies into nightwalk gba --- .../Animations/Platform/FlowerBarely.anim | 2 +- .../Animations/Platform/LollipopBarely.anim | 2 +- .../Animations/Platform/UmbrellaBarely.anim | 2 +- Assets/Scripts/Games/NightWalkAgb/AgbPlatform.cs | 12 ++++++++++++ 4 files changed, 15 insertions(+), 3 deletions(-) diff --git a/Assets/Resources/Sprites/Games/NightWalkGBA/Animations/Platform/FlowerBarely.anim b/Assets/Resources/Sprites/Games/NightWalkGBA/Animations/Platform/FlowerBarely.anim index 1e290a1e1..fbe88285f 100644 --- a/Assets/Resources/Sprites/Games/NightWalkGBA/Animations/Platform/FlowerBarely.anim +++ b/Assets/Resources/Sprites/Games/NightWalkGBA/Animations/Platform/FlowerBarely.anim @@ -256,7 +256,7 @@ AnimationClip: m_Level: 0 m_CycleOffset: 0 m_HasAdditiveReferencePose: 0 - m_LoopTime: 1 + m_LoopTime: 0 m_LoopBlend: 0 m_LoopBlendOrientation: 0 m_LoopBlendPositionY: 0 diff --git a/Assets/Resources/Sprites/Games/NightWalkGBA/Animations/Platform/LollipopBarely.anim b/Assets/Resources/Sprites/Games/NightWalkGBA/Animations/Platform/LollipopBarely.anim index b15ce79b5..865767ab1 100644 --- a/Assets/Resources/Sprites/Games/NightWalkGBA/Animations/Platform/LollipopBarely.anim +++ b/Assets/Resources/Sprites/Games/NightWalkGBA/Animations/Platform/LollipopBarely.anim @@ -332,7 +332,7 @@ AnimationClip: m_Level: 0 m_CycleOffset: 0 m_HasAdditiveReferencePose: 0 - m_LoopTime: 1 + m_LoopTime: 0 m_LoopBlend: 0 m_LoopBlendOrientation: 0 m_LoopBlendPositionY: 0 diff --git a/Assets/Resources/Sprites/Games/NightWalkGBA/Animations/Platform/UmbrellaBarely.anim b/Assets/Resources/Sprites/Games/NightWalkGBA/Animations/Platform/UmbrellaBarely.anim index e95608517..3a8f9a506 100644 --- a/Assets/Resources/Sprites/Games/NightWalkGBA/Animations/Platform/UmbrellaBarely.anim +++ b/Assets/Resources/Sprites/Games/NightWalkGBA/Animations/Platform/UmbrellaBarely.anim @@ -347,7 +347,7 @@ AnimationClip: m_Level: 0 m_CycleOffset: 0 m_HasAdditiveReferencePose: 0 - m_LoopTime: 1 + m_LoopTime: 0 m_LoopBlend: 0 m_LoopBlendOrientation: 0 m_LoopBlendPositionY: 0 diff --git a/Assets/Scripts/Games/NightWalkAgb/AgbPlatform.cs b/Assets/Scripts/Games/NightWalkAgb/AgbPlatform.cs index 6545f1c1d..fd1c54d86 100644 --- a/Assets/Scripts/Games/NightWalkAgb/AgbPlatform.cs +++ b/Assets/Scripts/Games/NightWalkAgb/AgbPlatform.cs @@ -226,6 +226,18 @@ namespace HeavenStudio.Games.Scripts_AgbNightWalk } if (state >= 1 || state <= -1) { + switch (type) + { + case PlatformType.Flower: + anim.DoScaledAnimationAsync("FlowerBarely", 0.5f); + break; + case PlatformType.Lollipop: + anim.DoScaledAnimationAsync("LollipopBarely", 0.5f); + break; + case PlatformType.Umbrella: + anim.DoScaledAnimationAsync("UmbrellaBarely", 0.5f); + break; + } return; } if (doFillStartSound) SoundByte.PlayOneShotGame("nightWalkAgb/fillStart");