From abc5fe0771976260bc0fc97341ee2df5a000c62c Mon Sep 17 00:00:00 2001 From: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Fri, 23 Feb 2024 18:45:23 +0100 Subject: [PATCH] fixed particles --- Assets/Resources/Games/lumbearjack.prefab | 1 + .../Resources/Prefabs/Games/Lumbearjack/BigObject.prefab | 2 +- .../Games/Lumbearjack/Animations/BeastCutMidNoImpact.anim | 2 +- Assets/Scripts/Games/LumBEARjack/LBJBear.cs | 4 ++-- Assets/Scripts/Games/LumBEARjack/LBJHugeObject.cs | 2 +- Assets/Scripts/Games/LumBEARjack/LumBEARjack.cs | 8 ++++---- Assets/Scripts/Util/ParticleSystemHelpers.cs | 5 ++--- 7 files changed, 12 insertions(+), 12 deletions(-) diff --git a/Assets/Resources/Games/lumbearjack.prefab b/Assets/Resources/Games/lumbearjack.prefab index 8fdf398d9..69e91d47b 100644 --- a/Assets/Resources/Games/lumbearjack.prefab +++ b/Assets/Resources/Games/lumbearjack.prefab @@ -74759,6 +74759,7 @@ MonoBehaviour: _bigLogCutParticle: {fileID: 77225483305886520} _hugeLogHitParticle: {fileID: 4465514175500312505} _hugeLogCutParticle: {fileID: 132537577928216743} + _freezerChipParticle: {fileID: 173406299863492919} _freezerBreakParticle: {fileID: 3094020854116406872} _peachHitParticle: {fileID: 6214329999445395356} _peachCutParticle: {fileID: 8065249703308610300} diff --git a/Assets/Resources/Prefabs/Games/Lumbearjack/BigObject.prefab b/Assets/Resources/Prefabs/Games/Lumbearjack/BigObject.prefab index 4230be15f..59bfaba04 100644 --- a/Assets/Resources/Prefabs/Games/Lumbearjack/BigObject.prefab +++ b/Assets/Resources/Prefabs/Games/Lumbearjack/BigObject.prefab @@ -48,7 +48,7 @@ MonoBehaviour: _rotationStart: -22 _rotationEnd: 22 _ease: 4 - _logSR: {fileID: 0} + _logSR: {fileID: 8098522755323641548} _logCutSprite: {fileID: 192267312, guid: 8e17e4341f5f44e44b892a9c0cacc5ba, type: 3} --- !u!1 &3051440580972758910 GameObject: diff --git a/Assets/Resources/Sprites/Games/Lumbearjack/Animations/BeastCutMidNoImpact.anim b/Assets/Resources/Sprites/Games/Lumbearjack/Animations/BeastCutMidNoImpact.anim index 1f2837b4c..5974a1616 100644 --- a/Assets/Resources/Sprites/Games/Lumbearjack/Animations/BeastCutMidNoImpact.anim +++ b/Assets/Resources/Sprites/Games/Lumbearjack/Animations/BeastCutMidNoImpact.anim @@ -694,7 +694,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/LumBEARjack/LBJBear.cs b/Assets/Scripts/Games/LumBEARjack/LBJBear.cs index b3730ae12..e7b5ca890 100644 --- a/Assets/Scripts/Games/LumBEARjack/LBJBear.cs +++ b/Assets/Scripts/Games/LumBEARjack/LBJBear.cs @@ -51,9 +51,9 @@ namespace HeavenStudio.Games.Scripts_LumBEARjack }); } - public void CutMid() + public void CutMid(bool noImpact = false) { - _anim.DoScaledAnimationAsync("BeastCutMid", 0.75f); + _anim.DoScaledAnimationAsync("BeastCutMid" + (noImpact ? "NoImpact" : ""), 0.75f); } public void Bop() diff --git a/Assets/Scripts/Games/LumBEARjack/LBJHugeObject.cs b/Assets/Scripts/Games/LumBEARjack/LBJHugeObject.cs index f329a9cf3..548eece4d 100644 --- a/Assets/Scripts/Games/LumBEARjack/LBJHugeObject.cs +++ b/Assets/Scripts/Games/LumBEARjack/LBJHugeObject.cs @@ -153,7 +153,7 @@ namespace HeavenStudio.Games.Scripts_LumBEARjack _ => throw new System.NotImplementedException(), }; SoundByte.PlayOneShotGame("lumbearjack/" + hitSound); - _bear.CutMid(); + _bear.CutMid(_type == LumBEARjack.HugeType.freezer); _rotationBeat = _soundsToDeleteIfMiss[step - 1].startBeat + _soundsToDeleteIfMiss[step - 1].timer; SetObjectCutSprite(step); diff --git a/Assets/Scripts/Games/LumBEARjack/LumBEARjack.cs b/Assets/Scripts/Games/LumBEARjack/LumBEARjack.cs index 4a167e76d..daefe7f08 100644 --- a/Assets/Scripts/Games/LumBEARjack/LumBEARjack.cs +++ b/Assets/Scripts/Games/LumBEARjack/LumBEARjack.cs @@ -289,6 +289,7 @@ namespace HeavenStudio.Games [SerializeField] private ParticleSystem _bigLogCutParticle; [SerializeField] private ParticleSystem _hugeLogHitParticle; [SerializeField] private ParticleSystem _hugeLogCutParticle; + [SerializeField] private ParticleSystem _freezerChipParticle; [SerializeField] private ParticleSystem _freezerBreakParticle; [SerializeField] private ParticleSystem _peachHitParticle; [SerializeField] private ParticleSystem _peachCutParticle; @@ -986,7 +987,7 @@ namespace HeavenStudio.Games break; case SmallType.can: ParticleSystem spawnedParticle1 = Instantiate(_canCutParticle, _particleCutPoint); - spawnedParticle1.PlayScaledAsyncAllChildren(1); + spawnedParticle1.PlayScaledAsyncAllChildren(0.5f); break; case SmallType.bat: ParticleSystem spawnedParticle2 = Instantiate(_batCutParticle, _particleCutPoint); @@ -1019,13 +1020,12 @@ namespace HeavenStudio.Games spawnedParticle.PlayScaledAsyncAllChildren(0.5f); break; case HugeType.freezer: - if (hit) break; - ParticleSystem spawnedParticle1 = Instantiate(_freezerBreakParticle, _particleCutPoint); + ParticleSystem spawnedParticle1 = Instantiate(hit ? _freezerChipParticle : _freezerBreakParticle, hit ? _particleHitPoint : _particleCutPoint); spawnedParticle1.PlayScaledAsyncAllChildren(0.5f); break; case HugeType.peach: ParticleSystem spawnedParticle2 = Instantiate(hit ? _peachHitParticle : _peachCutParticle, hit ? _particleHitPoint : _particleCutPoint); - spawnedParticle2.PlayScaledAsyncAllChildren(1); + spawnedParticle2.PlayScaledAsyncAllChildren(0.5f); break; } } diff --git a/Assets/Scripts/Util/ParticleSystemHelpers.cs b/Assets/Scripts/Util/ParticleSystemHelpers.cs index a3f01c53e..31c4b9983 100644 --- a/Assets/Scripts/Util/ParticleSystemHelpers.cs +++ b/Assets/Scripts/Util/ParticleSystemHelpers.cs @@ -6,15 +6,14 @@ namespace HeavenStudio.Util { public static void PlayScaledAsync(this ParticleSystem particleSystem, float timeScale) { - ParticleSystem.MainModule main = particleSystem.main; - main.simulationSpeed = (1 / Conductor.instance.pitchedSecPerBeat) * timeScale; + SetAsyncScaling(particleSystem, timeScale); particleSystem.Play(); } public static void SetAsyncScaling(this ParticleSystem particleSystem, float timeScale) { ParticleSystem.MainModule main = particleSystem.main; - main.simulationSpeed = (1 / Conductor.instance.pitchedSecPerBeat) * timeScale; + main.simulationSpeed = main.simulationSpeed / Conductor.instance.pitchedSecPerBeat * timeScale; } public static void PlayScaledAsyncAllChildren(this ParticleSystem particleSystem, float timeScale)